diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 00000000..9fe16ffb
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,4 @@
+# To use this file: https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+# reformat everything commit
+b5349478cfb0dc2dd0de8c8e8aeebdd24cf7ac6b
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9571fb41..a2d9ed19 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -37,4 +37,17 @@ Copy & paste `help` -> `about` -> `Copy version info` to here
 - Version [e.g. 22]
 
 **Additional context**
-Add any other context about the problem here.
+Add any other context about the problem here.  
+
+Windows:
+
+Upload the dmp file in the crash folder located in the configuration folder (can be opened through the menu help->configuration folder) to here
+
+Macos:
+
+upload the crashpad crash log
+
+Linux:
+
+gdb backtrace info.
+
diff --git a/.github/ISSUE_TEMPLATE/bug_report_cn.md b/.github/ISSUE_TEMPLATE/bug_report_cn.md
index 99ce9179..f8b9374a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_cn.md
+++ b/.github/ISSUE_TEMPLATE/bug_report_cn.md
@@ -33,3 +33,15 @@ assignees: ''
 - Version [e.g. 22]
 
 **额外的信息**
+
+Windows:
+
+ _将位于配置文件夹中（可以通过菜单  **help->配置文件夹** 打开）crash文件夹里面的dmp文件上传到此处_
+
+Macos:
+
+将macos自带的crashpad的log粘贴到此处
+
+Linux:
+
+gdb crash 堆栈信息
\ No newline at end of file
diff --git a/.github/scripts/windows-publish.ps1 b/.github/scripts/windows-publish.ps1
index 4b5ede64..5d2ec84c 100644
--- a/.github/scripts/windows-publish.ps1
+++ b/.github/scripts/windows-publish.ps1
@@ -57,7 +57,6 @@ function Main() {
     Write-Host "copy sdk dll$($sdkDll)"
     Copy-Item $sdkDll $archiveName\
     Copy-Item winlibs\lib\msvc\*.dll $archiveName\
-    Copy-Item winlibs\lib\xapian\rel\*.dll $archiveName\
     Copy-Item winlibs\lib\*.dll $archiveName\
     Copy-Item locale\*.qm $archiveName\locale\
 
diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml
index 44d611bb..0fad7252 100644
--- a/.github/workflows/AutoTag.yml
+++ b/.github/workflows/AutoTag.yml
@@ -43,7 +43,7 @@ jobs:
 
          
       - name: Bump version and push tag
-        if: ${{env.prerelease != true}}
+        if: ${{env.prerelease != 'true'}}
         uses: mathieudutour/github-tag-action@v6.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/auto clang format.yml b/.github/workflows/auto clang format.yml
deleted file mode 100644
index a5228815..00000000
--- a/.github/workflows/auto clang format.yml	
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "auto clang-format code"
-
-on:
-  pull_request:
-    branches:
-      # - dev
-      # - master
-      - staged
-    paths-ignore:
-      - "docs/**"
-      # - ".github/**"
-      - "howto/**"
-      - "*.md"
-      - "locale/**"
-
-jobs:
-  format:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.5.2
-        with:
-          # check out HEAD on the branch
-          ref: ${{ github.head_ref }}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
-          # make sure the parent commit is grabbed as well, because
-          # that's what will get formatted (i.e. the most recent commit)
-          fetch-depth: 2
-      # format the latest commit
-      - name: ubuntu install clang-format
-        if: ${{ github.event.pull_request.head.repo.full_name == 'xiaoyifang/goldendict-ng' }}
-        id: clang-format
-        run: |
-          sudo apt-get install git  lsb-release wget software-properties-common
-          wget -qO - https://apt.llvm.org/llvm.sh| sudo bash
-          sudo apt-get update 
-          sudo apt-get install -y clang-format
-          git-clang-format --style=file HEAD^
-          
-
-      - uses: EndBug/add-and-commit@v9
-        if: ${{ github.event.pull_request.head.repo.full_name == 'xiaoyifang/goldendict-ng' }}
-        with:
-          default_author: github_actor
-          message: 🎨 apply clang-format changes
diff --git a/.github/workflows/auto format.yml b/.github/workflows/auto format.yml
new file mode 100644
index 00000000..113a57e1
--- /dev/null
+++ b/.github/workflows/auto format.yml	
@@ -0,0 +1,61 @@
+name: autofix.ci
+
+on:
+  pull_request:
+    branches:
+      # - dev
+      # - master
+      - staged
+    paths-ignore:
+      - "docs/**"
+      # - ".github/**"
+      - "howto/**"
+      - "*.md"
+      - "locale/**"
+permissions:
+  contents: read
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.5.2
+        with:
+          # check out HEAD on the branch
+          # ref: ${{ github.head_ref }}
+          # repository: ${{github.event.pull_request.head.repo.full_name}}
+          # make sure the parent commit is grabbed as well, because
+          # that's what will get formatted (i.e. the most recent commit)
+          fetch-depth: 2
+      # format the latest commit
+      - name: ubuntu install clang-format
+        # if: ${{ github.event.pull_request.head.repo.full_name == 'xiaoyifang/goldendict-ng' }}
+        id: clang-format
+        run: |
+          sudo apt-get install git  lsb-release wget software-properties-common
+          wget -qO - https://apt.llvm.org/llvm.sh| sudo bash
+          sudo apt-get update 
+          sudo apt-get install -y clang-format
+          git-clang-format --style=file HEAD^
+
+      - uses: autofix-ci/action@89762f9c25dd85f6b78cd40e521232e403357ec0    
+
+
+  css-js-html-format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - run: npm ci
+      - run: npx prettier  --write src/stylesheets src/scripts/gd-*.js
+      # Optimize all PNGs with https://pngquant.org/
+      # - run: sudo apt-get update && sudo apt-get install -y pngquant
+      # - name: Run pngquant
+      #   run: |
+      #     shopt -s globstar
+      #     pngquant -f --ext .png --skip-if-larger -- **/*.png
+      - uses: autofix-ci/action@89762f9c25dd85f6b78cd40e521232e403357ec0
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 17f6b388..ec20bd56 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,9 +24,9 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.4.3
+          version: 6.5.1
           arch: gcc_64
-          cached: 'false'
+          
           #serialport linuxdeploy need serialport to work.
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
           setup-python: 'false'
diff --git a/.github/workflows/cmake build check.yml b/.github/workflows/cmake build check.yml
index 8b3dc2d1..6b1c9f90 100644
--- a/.github/workflows/cmake build check.yml	
+++ b/.github/workflows/cmake build check.yml	
@@ -26,9 +26,9 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.4.3
+          version: 6.5.1
           arch: gcc_64
-          cached: 'false'
+          
           #serialport linuxdeploy need serialport to work.
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
           setup-python: 'false'
@@ -70,9 +70,9 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.4.3
+          version: 6.5.1
           arch: win64_msvc2019_64
-          cached: 'false'
+          
           #serialport linuxdeploy need serialport to work.
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
           setup-python: 'false'
@@ -96,9 +96,9 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: 6.4.3
+          version: 6.5.1
           arch: clang_64
-          cached: 'false'
+          
           #serialport linuxdeploy need serialport to work.
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
           setup-python: 'false'
diff --git a/.github/workflows/ffmpeg-macos-build.yml b/.github/workflows/ffmpeg-macos-build.yml
deleted file mode 100644
index 79db44fd..00000000
--- a/.github/workflows/ffmpeg-macos-build.yml
+++ /dev/null
@@ -1,223 +0,0 @@
-name: ffmpeg-macos-build
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-on: 
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-12]
-       
-    steps:
-      # macos 11.0 默认环境变了,要指定
-      - name: prepare env
-        if: ${{ matrix.os == 'macos-11' }}
-        run: |
-          softwareupdate --all --install --force
-          sudo xcode-select --print-path
-          sudo xcode-select --switch /Library/Developer/CommandLineTools             
-       
-      - name: build ffmpeg
-        run: |
-          mkdir build
-          brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          brew install speex
-          git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
-          cd ffmpeg
-          ./configure  --prefix=../build/  \
-          --enable-shared \
-          --disable-static \
-          --disable-debug \
-          --disable-programs \
-          --disable-network \
-          --disable-avdevice \
-          --disable-avfilter \
-          --disable-swscale \
-          --disable-network \
-          --disable-muxers \
-          --disable-demuxers \
-          --enable-rdft \
-          --enable-demuxer=aac \
-          --enable-demuxer=ac3 \
-          --enable-demuxer=aiff \
-          --enable-demuxer=ape \
-          --enable-demuxer=asf \
-          --enable-demuxer=flac \
-          --enable-demuxer=matroska \
-          --enable-demuxer=mp3 \
-          --enable-demuxer=mpc \
-          --enable-demuxer=mov \
-          --enable-demuxer=mpc8 \
-          --enable-demuxer=ogg \
-          --enable-demuxer=tta \
-          --enable-demuxer=wav \
-          --enable-demuxer=wv \
-          --disable-bsfs \
-          --disable-filters \
-          --disable-parsers \
-          --enable-parser=aac \
-          --enable-parser=ac3 \
-          --enable-parser=mpegaudio \
-          --disable-protocols \
-          --disable-indevs \
-          --disable-outdevs \
-          --disable-encoders \
-          --disable-decoders \
-          --enable-decoder=eightsvx_exp \
-          --enable-decoder=eightsvx_fib \
-          --enable-decoder=aac \
-          --enable-decoder=aac_latm \
-          --enable-decoder=ac3 \
-          --enable-decoder=adpcm_4xm \
-          --enable-decoder=adpcm_adx \
-          --enable-decoder=adpcm_afc \
-          --enable-decoder=adpcm_ct \
-          --enable-decoder=adpcm_ea \
-          --enable-decoder=adpcm_ea_maxis_xa \
-          --enable-decoder=adpcm_ea_r1 \
-          --enable-decoder=adpcm_ea_r2 \
-          --enable-decoder=adpcm_ea_r3 \
-          --enable-decoder=adpcm_ea_xas \
-          --enable-decoder=adpcm_g722 \
-          --enable-decoder=adpcm_g726 \
-          --enable-decoder=adpcm_ima_amv \
-          --enable-decoder=adpcm_ima_apc \
-          --enable-decoder=adpcm_ima_dk3 \
-          --enable-decoder=adpcm_ima_dk4 \
-          --enable-decoder=adpcm_ima_ea_eacs \
-          --enable-decoder=adpcm_ima_ea_sead \
-          --enable-decoder=adpcm_ima_iss \
-          --enable-decoder=adpcm_ima_oki \
-          --enable-decoder=adpcm_ima_qt \
-          --enable-decoder=adpcm_ima_smjpeg \
-          --enable-decoder=adpcm_ima_wav \
-          --enable-decoder=adpcm_ima_ws \
-          --enable-decoder=adpcm_ms \
-          --enable-decoder=adpcm_sbpro_2 \
-          --enable-decoder=adpcm_sbpro_3 \
-          --enable-decoder=adpcm_sbpro_4 \
-          --enable-decoder=adpcm_swf \
-          --enable-decoder=adpcm_thp \
-          --enable-decoder=adpcm_xa \
-          --enable-decoder=adpcm_yamaha \
-          --enable-decoder=alac \
-          --enable-decoder=amrnb \
-          --enable-decoder=libopencore_amrnb \
-          --enable-decoder=amrwb \
-          --enable-decoder=libopencore_amrwb \
-          --enable-decoder=ape \
-          --enable-decoder=atrac1 \
-          --enable-decoder=atrac3 \
-          --enable-decoder=binkaudio_dct \
-          --enable-decoder=binkaudio_rdft \
-          --enable-decoder=bmv_audio \
-          --enable-decoder=comfortnoise \
-          --enable-decoder=cook \
-          --enable-decoder=dsicinaudio \
-          --enable-decoder=dca \
-          --enable-decoder=eac3 \
-          --enable-decoder=flac \
-          --enable-decoder=g723_1 \
-          --enable-decoder=g729 \
-          --enable-decoder=gsm \
-          --enable-decoder=libgsm \
-          --enable-decoder=gsm_ms \
-          --enable-decoder=libgsm_ms \
-          --enable-decoder=iac \
-          --enable-decoder=imc \
-          --enable-decoder=interplay_dpcm \
-          --enable-decoder=mace3 \
-          --enable-decoder=mace6 \
-          --enable-decoder=mlp \
-          --enable-decoder=mp1 \
-          --enable-decoder=mp1float \
-          --enable-decoder=mp2 \
-          --enable-decoder=mp2float \
-          --enable-decoder=mp3 \
-          --enable-decoder=mp3float \
-          --enable-decoder=mp3adu \
-          --enable-decoder=mp3adufloat \
-          --enable-decoder=mp3on4 \
-          --enable-decoder=mp3on4float \
-          --enable-decoder=als \
-          --enable-decoder=mpc7 \
-          --enable-decoder=mpc8 \
-          --enable-decoder=nellymoser \
-          --enable-decoder=libopus \
-          --enable-decoder=paf_audio \
-          --enable-decoder=pcm_alaw \
-          --enable-decoder=pcm_bluray \
-          --enable-decoder=pcm_dvd \
-          --enable-decoder=pcm_f32be \
-          --enable-decoder=pcm_f32le \
-          --enable-decoder=pcm_f64be \
-          --enable-decoder=pcm_f64le \
-          --enable-decoder=pcm_lxf \
-          --enable-decoder=pcm_mulaw \
-          --enable-decoder=pcm_s16be \
-          --enable-decoder=pcm_s16be_planar \
-          --enable-decoder=pcm_s16le \
-          --enable-decoder=pcm_s16le_planar \
-          --enable-decoder=pcm_s24be \
-          --enable-decoder=pcm_s24daud \
-          --enable-decoder=pcm_s24le \
-          --enable-decoder=pcm_s24le_planar \
-          --enable-decoder=pcm_s32be \
-          --enable-decoder=pcm_s32le \
-          --enable-decoder=pcm_s32le_planar \
-          --enable-decoder=pcm_s8 \
-          --enable-decoder=pcm_s8_planar \
-          --enable-decoder=pcm_u16be \
-          --enable-decoder=pcm_u16le \
-          --enable-decoder=pcm_u24be \
-          --enable-decoder=pcm_u24le \
-          --enable-decoder=pcm_u32be \
-          --enable-decoder=pcm_u32le \
-          --enable-decoder=pcm_u8 \
-          --enable-decoder=pcm_zork \
-          --enable-decoder=qcelp \
-          --enable-decoder=qdm2 \
-          --enable-decoder=ra_144 \
-          --enable-decoder=ra_288 \
-          --enable-decoder=ralf \
-          --enable-decoder=roq_dpcm \
-          --enable-decoder=s302m \
-          --enable-decoder=shorten \
-          --enable-decoder=sipr \
-          --enable-decoder=smackaud \
-          --enable-decoder=sol_dpcm \
-          --enable-decoder=sonic \
-          --enable-decoder=libspeex \
-          --enable-decoder=tak \
-          --enable-decoder=truehd \
-          --enable-decoder=truespeech \
-          --enable-decoder=tta \
-          --enable-decoder=twinvq \
-          --enable-decoder=vima \
-          --enable-decoder=vmdaudio \
-          --enable-decoder=vorbis \
-          --enable-decoder=ffwavesynth \
-          --enable-decoder=wavpack \
-          --enable-decoder=ws_snd1 \
-          --enable-decoder=wmalossless \
-          --enable-decoder=wmapro \
-          --enable-decoder=wmav1 \
-          --enable-decoder=wmav2 \
-          --enable-decoder=wmavoice \
-          --enable-decoder=xan_dpcm \
-          --enable-libspeex
-          make
-          sudo make install
-
-          ls -al ../build
-          # otool -L build/*.dylib
-
-      # - uses: actions/upload-artifact@v2
-      #   with:
-      #     name: build
-      #     path: build/*
\ No newline at end of file
diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
deleted file mode 100644
index aaa9bdbd..00000000
--- a/.github/workflows/ffmpeg.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: ffmpeg-build
-concurrency: 
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-on: 
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: Build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-12]
-       
-    steps:
-      # macos 11.0 默认环境变了,要指定
-      - name: prepare env
-        if: ${{ matrix.os == 'macos-11' }}
-        run: |
-          softwareupdate --all --install --force
-          sudo xcode-select --print-path
-          sudo xcode-select --switch /Library/Developer/CommandLineTools             
-       
-      - name: build ffmpeg
-        run: |
-          mkdir build
-         
-          brew install autoconf automake libtool
-          brew install nasm
-          export VCPKG_OSX_ARCHITECTURES="x86_64 arm64"
-          vcpkg install ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl]:arm64-osx-dynamic --x-install-root=build
-          vcpkg install ffmpeg[core,avcodec,avformat,mp3lame,opus,speex,swresample,vorbis,fdk-aac,gpl]:x64-osx-dynamic --x-install-root=build
-          ls -al build/arm64-osx-dynamic/lib
-          ls -al build/
-          lipo -info build/arm64-osx-dynamic/lib/libavco*
-
-          cd build
-          lipo -create -output libavcodec.dylib arm64-osx-dynamic/lib/libavcodec.dylib x64-osx-dynamic/lib/libavcodec.dylib
-          lipo -create -output libspeex.dylib arm64-osx-dynamic/lib/libspeex.dylib x64-osx-dynamic/lib/libspeex.dylib
-          lipo -detailed_info libavcodec.dylib
-          lipo -detailed_info libspeex.dylib
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: build
-          path: build/*
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: build-lipo
-          path: build/*.dylib
diff --git a/.github/workflows/issue-translator.yml b/.github/workflows/issue-translator.yml
index 5fb75203..8a7afb58 100644
--- a/.github/workflows/issue-translator.yml
+++ b/.github/workflows/issue-translator.yml
@@ -12,7 +12,7 @@ jobs:
       - uses: a631807682/issues-translator@v1.2.1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          match-languages: cmn
+          match-languages: cmn,rus
           min-match-percent: 0.15
           modify-title: true
           modify-body: true
diff --git a/.github/workflows/macos-homebrew-PR-check.yml b/.github/workflows/macos-homebrew-PR-check.yml
index 4eb2042c..6768fd74 100644
--- a/.github/workflows/macos-homebrew-PR-check.yml
+++ b/.github/workflows/macos-homebrew-PR-check.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-12]
-        qt_ver: [6.4.3]
+        qt_ver: [6.5.1]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
@@ -41,7 +41,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtspeech
       - uses: actions/checkout@v3
         with:
diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
new file mode 100644
index 00000000..9cc85ade
--- /dev/null
+++ b/.github/workflows/macos-homebrew-breakpad.yml
@@ -0,0 +1,238 @@
+name: macos-homebrew-breakpad
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+on: 
+  workflow_dispatch:
+  #push:
+  #  branches:
+  #    - dev
+  #    - master
+  #    # - staged
+  #  paths-ignore:
+  #    - 'docs/**'
+  #    - ".github/**"
+  #    - "howto/**"
+  #    - "*.md"
+  #    - ".clang-format"
+jobs:
+  build:
+    name: Build
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-13]
+        qt_ver: [ 6.4.3,6.5.1 ]
+        qt_arch: [clang_64]
+    env:
+      targetName: GoldenDict
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
+    steps:
+      # macos 11.0 默认环境变了,要指定
+      - name: prepare env
+        if: ${{ matrix.os == 'macos-11' }}
+        run: |
+          softwareupdate --all --install --force
+          sudo xcode-select --print-path
+          sudo xcode-select --switch /Library/Developer/CommandLineTools    
+               
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Set outputs
+        id: githash
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"   
+       
+      - name: install deps on macos
+        run: |
+          brew install pcre2 harfbuzz freetype
+          brew install cmake ninja python
+          brew install automake
+          brew install autoconf
+          brew install libtool
+          brew install opencc
+          brew install speex
+          brew install wavpack
+          brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
+          brew install speex
+          
+          brew tap homebrew-ffmpeg/ffmpeg
+          brew install homebrew-ffmpeg/ffmpeg/ffmpeg --with-speex
+
+          brew install libiconv
+          brew install lzo bzip2
+          brew install libogg
+          brew install zstd lzip
+          brew install libvorbis
+          brew install hunspell
+          git clone https://github.com/xiaoyifang/eb.git
+          cd eb && ./configure && make -j 8 && sudo make install && cd ..
+          brew install  xz lzo 
+          brew install pkg-config
+          brew install create-dmg
+          brew install xapian
+          brew install libzim
+          # brew reinstall icu4c
+          brew install dylibbundler
+          find /opt -name libicudata.72.dylib 
+          find /usr/local -name libicudata.72.dylib 
+      - name: version-file
+        shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
+        run: |   
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
+          cat version.txt
+          echo "$version"        
+          
+      - name: vcpkg install
+        shell: bash
+        run: |   
+          vcpkg install breakpad
+      - name: copy vcpkg packages into winlibs
+        shell: bash
+        run: |   
+          ls -al /usr/local/share/vcpkg/packages/breakpad*
+          cp -R /usr/local/share/vcpkg/packages/breakpad*/*  thirdparty/breakpad
+          ls -al thirdparty/breakpad/lib
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.9'              
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          
+          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
+          setup-python: 'false'
+          
+      - name: compile
+        run: |          
+          qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian CONFIG+=use_breakpad
+          make -j8
+          
+      - name: package
+        run: |
+          
+          macdeployqt ${targetName}.app -no-strip -qmldir=. -verbose=1
+          otool -L GoldenDict.app/Contents/MacOS/GoldenDict
+          ls -al GoldenDict.app/Contents/Frameworks
+          otool -L GoldenDict.app/Contents/Frameworks/libicu*.dylib
+          ls -al /usr/local/Cellar/icu4c/7*/lib/libicudata.*.dylib
+          cp -r /usr/local/Cellar/icu4c/7*/lib/libicudata.*.dylib  GoldenDict.app/Contents/Frameworks
+
+          codesign --force --deep -s - GoldenDict.app
+          
+          ls -al GoldenDict.app/Contents/Frameworks
+          mkdir tmp
+          mv ${targetName}.app ./tmp
+          # --background "installer_background.png"
+          create-dmg --volname "${targetName} Installer" --volicon "icons/macicon.icns" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon "${targetName}.app" 200 190 --hide-extension "${targetName}.app" --app-drop-link 600 185 --skip-jenkins "${targetName}.dmg" tmp/
+      - name: changelog
+        id: changelog
+        run: |   
+          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
+          echo "previousTag : $previousTag"
+          
+
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)"
+
+      - name: Set outputs
+        id: vars
+        run: |
+          echo "::set-output name=sha_short::$(git rev-parse --short=8 HEAD)"    
+          echo "::set-output name=release_date::$(date +'%Y%m%d')"    
+          echo "::set-output name=release_time::$(date +'%H%M%S')"  
+          echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
+          echo "::set-output name=release_hm::$(date +'%y%m%d')"  
+
+      # tag 上传Release
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        with:
+          commitMode: false
+          fromTag: ${{ steps.changelog.outputs.prev_tag }}
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}"  
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
+
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }          
+      - name: uploadRelease
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ env.targetName }}.dmg
+          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_homebrew_breakpad_${{steps.vars.outputs.release_date}}.dmg
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
+          release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          prerelease: ${{env.prerelease}}
+          body: |
+            #### Install instructions for Windows, macOS and Linux 
+
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
+
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
+
+
+
+            #### Changes
+            
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/macos-homebrew-xapian.yml b/.github/workflows/macos-homebrew.yml
similarity index 56%
rename from .github/workflows/macos-homebrew-xapian.yml
rename to .github/workflows/macos-homebrew.yml
index ae98e11b..0c78d367 100644
--- a/.github/workflows/macos-homebrew-xapian.yml
+++ b/.github/workflows/macos-homebrew.yml
@@ -1,4 +1,4 @@
-name: macos-homebrew-xapian
+name: macos-homebrew
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -11,7 +11,7 @@ on:
       # - staged
     paths-ignore:
       - 'docs/**'
-      - ".github/**"
+      # - ".github/**"
       - "howto/**"
       - "*.md"
       - ".clang-format"
@@ -21,14 +21,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11,macos-12]
-        qt_ver: [6.4.3]
+        os: [macos-12,macos-13]
+        qt_ver: [ 6.4.3 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 23.06.01
-      version-suffix: ChildrenDay
-      prerelease: false
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
     steps:
       # macos 11.0 默认环境变了,要指定
       - name: prepare env
@@ -37,18 +37,7 @@ jobs:
           softwareupdate --all --install --force
           sudo xcode-select --print-path
           sudo xcode-select --switch /Library/Developer/CommandLineTools    
-      - uses: actions/setup-python@v3
-        with:
-          python-version: '3.9'              
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: ${{ matrix.qt_ver }}
-          arch: ${{ matrix.qt_arch }}
-          cached: 'false'
-          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
-          setup-python: 'false'
-                         
+               
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
@@ -93,9 +82,38 @@ jobs:
           find /usr/local -name libicudata.72.dylib 
       - name: version-file
         shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-)
-          echo "$previousTag">version.txt          
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
+          cat version.txt
+          echo "$version"     
+          
+      - name: vcpkg install
+        shell: bash
+        run: |   
+          vcpkg install breakpad
+      - name: copy vcpkg packages into winlibs
+        shell: bash
+        run: |   
+          ls -al /usr/local/share/vcpkg/packages/breakpad*
+          cp -R /usr/local/share/vcpkg/packages/breakpad*/*  thirdparty/breakpad
+          ls -al thirdparty/breakpad/lib
+      - uses: actions/setup-python@v3
+        with:
+          python-version: '3.9'              
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          
+          modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
+          setup-python: 'false'
+          
       - name: compile
         run: |          
           qmake CONFIG+=release CONFIG+=no_macos_universal CONFIG+=zim_support CONFIG+=use_xapian
@@ -108,7 +126,7 @@ jobs:
           otool -L GoldenDict.app/Contents/MacOS/GoldenDict
           ls -al GoldenDict.app/Contents/Frameworks
           otool -L GoldenDict.app/Contents/Frameworks/libicu*.dylib
-          cp /usr/local/Cellar/icu4c/72.1/lib/libicudata.72.dylib  GoldenDict.app/Contents/Frameworks/libicudata.72.dylib
+          cp -r /usr/local/Cellar/icu4c/7*/lib/libicudata.*.dylib  GoldenDict.app/Contents/Frameworks
 
           codesign --force --deep -s - GoldenDict.app
           
@@ -120,16 +138,12 @@ jobs:
       - name: changelog
         id: changelog
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          previousTag=$(git tag --sort=-creatordate | grep "v.*" | sed -n 2p)
           echo "previousTag : $previousTag"
           
-          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          CHANGELOG="${CHANGELOG//'\"'/'%22'}"
-          CHANGELOG="${CHANGELOG//"'"/ }"
-          echo "::set-output name=changelog::$(echo "$CHANGELOG")"
+
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "v.*" | sed -n 1p)"
 
       - name: Set outputs
         id: vars
@@ -139,43 +153,85 @@ jobs:
           echo "::set-output name=release_time::$(date +'%H%M%S')"  
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
           echo "::set-output name=release_hm::$(date +'%y%m%d')"  
-        
+
       # tag 上传Release
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        with:
+          commitMode: false
+          fromTag: ${{ steps.changelog.outputs.prev_tag }}
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}"  
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
+
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }          
       - name: uploadRelease
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.dmg
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_homebrew_${{steps.vars.outputs.release_date}}.dmg
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          overwrite: true 
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
           body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2, Qt6.X  
-            Windows built with:   msvc64,  Visual studio 2019
-            ## goldendict.exe can not be used alone 
-            if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
+            #### Install instructions for Windows, macOS and Linux 
 
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  Qt6.X(Universal Build)
-                                  Qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)
-            **recommend version**:Qt6.X   (with the latest bug fixes and performance enhancements)   
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
 
-            Filename pattern: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]**
-            [xapian](https://xapian.org/)  is enabled by default which offers 10X~20X performance 
-            ------------------------------
-            文件名的模式: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]** 
-            [xapian](https://xapian.org/) 用于全文索引的创建，提供更快的全文索引创建、搜索支持
-            比如：
-            6.4.3-GoldenDict.exe_windows-2022_20230502.zip
-            表示基于qt6.4.3，windows-2022,  于20230502日创建的版本。
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
 
 
-            CHANGES:
-            ${{ steps.changelog.outputs.changelog }}  
+
+            #### Changes
+            
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/ubuntu-6.2-xapian.yml b/.github/workflows/ubuntu-6.2.yml
similarity index 52%
rename from .github/workflows/ubuntu-6.2-xapian.yml
rename to .github/workflows/ubuntu-6.2.yml
index 58c72280..794f3537 100644
--- a/.github/workflows/ubuntu-6.2-xapian.yml
+++ b/.github/workflows/ubuntu-6.2.yml
@@ -1,6 +1,5 @@
-name: Ubuntu-6.2-xapian
-# Qt官方没有linux平台的x86包
-concurrency: 
+name: Ubuntu-6.2
+concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 on: 
@@ -15,7 +14,7 @@ on:
       # - staged
     paths-ignore:
       - 'docs/**'
-      - ".github/**"
+      # - ".github/**"
       - "howto/**"
       - "*.md"
       - ".clang-format"
@@ -26,20 +25,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        qt_ver: [6.4.3]
+        os: [ubuntu-20.04]
+        qt_ver: [ 6.5.1 ]
         qt_arch: [gcc_64]
     env:
-      version: 23.06.01
-      version-suffix: ChildrenDay
-      prerelease: false
-    steps:          
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
+    steps:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           #serialport linuxdeploy need serialport to work.
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech qtserialport
           
@@ -69,8 +68,8 @@ jobs:
           # sudo make install
           # cd ..
           sudo apt install libxapian-dev
-          sudo apt-get install libzim-dev
-          # sudo ls -al /usr/lib/|grep xapian
+          sudo add-apt-repository --yes --update ppa:kiwixteam/release
+          sudo apt install libzim-dev
 
       - uses: actions/checkout@v3
         with:
@@ -79,9 +78,15 @@ jobs:
 
       - name: version-file
         shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-)
-          echo "$previousTag">version.txt
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
+          cat version.txt
+          echo "$version"   
           
       - name: build goldendict
         run: |
@@ -91,6 +96,15 @@ jobs:
           ls -al appdir
       - name: Build AppImage
         run: |
+          # for /usr/lib/qt6/plugins/platforminputcontexts/libfcitx5platforminputcontextplugin.so
+          sudo apt-get install extra-cmake-modules libxkbcommon-dev libxcb1 libxcb-cursor0
+          git clone --single-branch --depth 1 https://github.com/fcitx/fcitx5-qt.git
+          cd fcitx5-qt
+          cmake -S . -B build  -DCMAKE_BUILD_TYPE=Release -DENABLE_QT4=OFF -DENABLE_QT5=OFF -DENABLE_QT6=ON -DBUILD_ONLY_PLUGIN=ON
+          cmake --build build
+          sudo cmake --install ./build
+          cd ..
+          
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
           chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
@@ -100,16 +114,11 @@ jobs:
       - name: changelog
         id: changelog
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
           echo "previousTag : $previousTag"
           
-          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          CHANGELOG="${CHANGELOG//'\"'/'%22'}"
-          CHANGELOG="${CHANGELOG//"'"/ }"
-          echo "::set-output name=changelog::$(echo "$CHANGELOG")"
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)"
 
       - name: Set outputs
         id: vars
@@ -120,7 +129,47 @@ jobs:
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
           echo "::set-output name=release_hm::$(date +'%y%m%d')"  
           echo "::set-output name=appname::$(ls *.AppImage*)"
-            
+
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        with:
+          commitMode: false
+          fromTag: ${{ steps.changelog.outputs.prev_tag }}
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}"  
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
+
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }
       - name: uploadRelease
         # if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
@@ -128,35 +177,35 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.vars.outputs.appname }}
           asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }}
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          overwrite: true 
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
           body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2, Qt6.X  
-            Windows built with:   msvc64,  Visual studio 2019
-            ## goldendict.exe can not be used alone 
-            if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
+            #### Install instructions for Windows, macOS and Linux 
+
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
+
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
+
+            #### Changes
             
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  Qt6.X(Universal Build)
-                                  Qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)
-            **recommend version**:Qt6.X   (with the latest bug fixes and performance enhancements)  
-
-            Filename pattern: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]**
-            [xapian](https://xapian.org/)  is enabled by default which offers 10X~20X performance 
-            ------------------------------
-            文件名的模式: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]** 
-            [xapian](https://xapian.org/) 用于全文索引的创建，提供更快的全文索引创建、搜索支持
-            比如：
-            6.4.3-GoldenDict.exe_windows-2022_20230502.zip
-            表示基于qt6.4.3，windows-2022,  于20230502日创建的版本。
-
-
-            CHANGES:
-            ${{ steps.changelog.outputs.changelog }}  
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/ubuntu-PR-check.yml b/.github/workflows/ubuntu-PR-check.yml
index 0bcca739..d0e08c04 100644
--- a/.github/workflows/ubuntu-PR-check.yml
+++ b/.github/workflows/ubuntu-PR-check.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        qt_ver: [5.15.2,6.4.3]
+        qt_ver: [5.15.2,6.5.1]
         qt_arch: [gcc_64]
 
     steps:
@@ -35,7 +35,7 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          
           modules: qtwebengine
           
       - name: Install Qt
@@ -44,7 +44,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
                     
       - name: ubuntu install thirdparty dependencies
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 325e1fd7..c41adae3 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -15,7 +15,7 @@ on:
       # - staged
     paths-ignore:
       - 'docs/**'
-      - ".github/**"
+      # - ".github/**"
       - "howto/**"
       - "*.md"
       - ".clang-format"
@@ -26,19 +26,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
         qt_ver: [5.15.2]
         qt_arch: [gcc_64]
     env:
-      version: 23.06.01
-      version-suffix: ChildrenDay
-      prerelease: false
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
     steps:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          
           modules: qtwebengine
       - name: ubuntu install thirdparty dependencies
         run: |
@@ -57,7 +57,8 @@ jobs:
           make PREFIX=/usr -j$(nproc)
           sudo make install
           cd ..
-          sudo apt-get install libzim-dev
+          sudo add-apt-repository --yes --update ppa:kiwixteam/release
+          sudo apt install libzim-dev
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0 
@@ -65,9 +66,15 @@ jobs:
 
       - name: version-file
         shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-)
-          echo "$previousTag">version.txt
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
+          cat version.txt
+          echo "$version"  
           
       - name: build goldendict
         run: |
@@ -81,6 +88,7 @@ jobs:
 
       - name: Build AppImage
         run: |
+          sudo apt install fcitx5-frontend-qt5
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
           chmod a+x linuxdeploy-plugin-qt-x86_64.AppImage
           wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
@@ -90,16 +98,11 @@ jobs:
       - name: changelog
         id: changelog
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
           echo "previousTag : $previousTag"
           
-          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          CHANGELOG="${CHANGELOG//'\"'/'%22'}"
-          CHANGELOG="${CHANGELOG//"'"/ }"
-          echo "::set-output name=changelog::$(echo "$CHANGELOG")"
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)"
       - name: Set outputs
         id: vars
         run: |
@@ -109,43 +112,83 @@ jobs:
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
           echo "::set-output name=release_hm::$(date +'%y%m%d')"  
           echo "::set-output name=appname::$(ls *.AppImage*)"
-          
+
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        with:
+          commitMode: false
+          fromTag: ${{ steps.changelog.outputs.prev_tag }}
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}" 
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
+
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }           
       - name: uploadRelease
         # if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.vars.outputs.appname }}
-          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.AppImage
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          overwrite: true 
+          asset_name: ${{ matrix.qt_ver }}-${{ steps.vars.outputs.appname }}
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
           body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2, Qt6.X  
-            Windows built with:   msvc64,  Visual studio 2019
-            ## goldendict.exe can not be used alone 
-            if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
+            #### Install instructions for Windows, macOS and Linux 
+
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
+
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
+
+
+            #### Changes
             
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  Qt6.X(Universal Build)
-                                  Qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)
-            **recommend version**:Qt6.X   (with the latest bug fixes and performance enhancements)  
-
-            Filename pattern: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]**
-            [xapian](https://xapian.org/)  is enabled by default which offers 10X~20X performance 
-            ------------------------------
-            文件名的模式: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]** 
-            [xapian](https://xapian.org/) 用于全文索引的创建，提供更快的全文索引创建、搜索支持
-            比如：
-            6.4.3-GoldenDict.exe_windows-2022_20230502.zip
-            表示基于qt6.4.3，windows-2022,  于20230502日创建的版本。
-
-
-            CHANGES:
-            ${{ steps.changelog.outputs.changelog }}  
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/windows-6.x-xapian.yml b/.github/workflows/windows-6.x.yml
similarity index 62%
rename from .github/workflows/windows-6.x-xapian.yml
rename to .github/workflows/windows-6.x.yml
index 63fdb4e0..78d68872 100644
--- a/.github/workflows/windows-6.x-xapian.yml
+++ b/.github/workflows/windows-6.x.yml
@@ -1,4 +1,4 @@
-name: Windows-6.x-xapian
+name: Windows-6.x
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -14,7 +14,7 @@ on:
       # - staged
     paths-ignore:
       - 'docs/**'
-      - ".github/**"
+      # - ".github/**"
       - "howto/**"
       - "*.md"
       - ".clang-format"      
@@ -27,13 +27,13 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.4.3]
+        qt_ver: [6.5.1]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 23.06.01
-      version-suffix: ChildrenDay
-      prerelease: false
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
     steps:
       - uses: actions/setup-python@v3
         with:
@@ -56,16 +56,57 @@ jobs:
         id: changelog
         shell: bash
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
           echo "previousTag : $previousTag"
           
-          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          CHANGELOG="${CHANGELOG//'\"'/'%22'}"
-          CHANGELOG="${CHANGELOG//"'"/ }"
-          echo "::set-output name=changelog::$(echo "$CHANGELOG")"
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)"
+
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
+        with:
+          commitMode: false
+          fromTag: "${{ steps.changelog.outputs.prev_tag }}"
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}"
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
+
+
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }
+          
+          
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}               
       - name: Set outputs
         id: vars
         shell: bash
@@ -74,14 +115,19 @@ jobs:
           echo "::set-output name=release_date::$(date +'%Y%m%d')"    
           echo "::set-output name=release_time::$(date +'%H%M%S')"  
           echo "::set-output name=release_time_clock::$(date +'%H:%M:%S')"   
-          echo "::set-output name=release_hm::$(date +'%y%m%d')"     
+          echo "::set-output name=release_hm::$(date +'%y%m%d')"          
 
       - name: version-file
         shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-)
-          echo "$previousTag">version.txt
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
           cat version.txt
+          echo "$version"  
 
       - name: vcpkg install
         shell: powershell
@@ -115,7 +161,7 @@ jobs:
 
       # 打包 
       - name: package
-        id: package      
+        id: package
         env:
           archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }}
           msvcArch: ${{ matrix.msvc_arch }}
@@ -124,43 +170,8 @@ jobs:
           & .github\scripts\windows-publish.ps1 ${env:archiveName} ${env:targetName}
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name" 
-    
-      - name: uploadRelease
-        # if: startsWith(github.event.ref, 'refs/tags/')
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}-xapian.zip
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          overwrite: true 
-          release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          prerelease: ${{env.prerelease}}
-          body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2, Qt6.X  
-            Windows built with:   msvc64,  Visual studio 2019
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  Qt6.X(Universal Build)
-                                  Qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)
-            **recommend version**:Qt6.X   (with the latest bug fixes and performance enhancements)
+       
 
-            Filename pattern: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]**
-            [xapian](https://xapian.org/)  is enabled by default which offers 10X~20X performance 
-            ------------------------------
-            文件名的模式: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]** 
-            [xapian](https://xapian.org/) 用于全文索引的创建，提供更快的全文索引创建、搜索支持
-            比如：
-            6.4.3-GoldenDict.exe_windows-2022_20230502.zip
-            表示基于qt6.4.3，windows-2022,  于20230502日创建的版本。
-
-
-            CHANGES:
-            ${{ steps.changelog.outputs.changelog }}  
 
       - name: upload goldendict.exe only
         uses: svenstaro/upload-release-action@v2
@@ -168,7 +179,8 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: release/${{ env.targetName }}
           asset_name: ${{ matrix.qt_ver }}.${{ matrix.os }}-${{ env.targetName }}
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
@@ -179,7 +191,8 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: release/GoldenDict.pdb
           asset_name: ${{ matrix.qt_ver }}.${{ matrix.os }}-GoldenDict.pdb
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}          
@@ -198,13 +211,54 @@ jobs:
           cd ${{ steps.package.outputs.packageName }} 
           ls *.exe
       - name: upload goldendict installer
-        # if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}/GoldenDict-ng-v23-Installer.exe
           asset_name: ${{ matrix.qt_ver }}-GoldenDict-ng-Installer.exe
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
+
+      - name: uploadRelease
+        # if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
+          release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          prerelease: ${{env.prerelease}}
+          body: |
+            #### Install instructions for Windows, macOS and Linux 
+
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
+
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
+
+
+            #### Changes
+            
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.github/workflows/windows-PR-check.yml b/.github/workflows/windows-PR-check.yml
index b68a207c..1364da89 100644
--- a/.github/workflows/windows-PR-check.yml
+++ b/.github/workflows/windows-PR-check.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [5.15.2,6.4.3]
+        qt_ver: [5.15.2,6.5.1]
         qt_arch: [win64_msvc2019_64]
     steps:
       - uses: actions/setup-python@v3
@@ -39,7 +39,7 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           modules: qtwebengine          
       - name: Install Qt
         if: ${{ matrix.qt_ver != '5.15.2' }}      
@@ -48,7 +48,7 @@ jobs:
           version: ${{ matrix.qt_ver }}
           # target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           modules: qtwebengine qtwebchannel qtpositioning qt5compat qtmultimedia qtimageformats qtspeech
           setup-python: 'false'
           
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index f88a900a..20164927 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -14,7 +14,7 @@ on:
       # - staged
     paths-ignore:
       - 'docs/**'
-      - ".github/**"
+      # - ".github/**"
       - "howto/**"
       - "*.md"
       - ".clang-format"      
@@ -32,9 +32,9 @@ jobs:
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 23.06.01
-      version-suffix: ChildrenDay
-      prerelease: false
+      version: 23.06.02
+      version-suffix: alpha
+      prerelease: true
     # 步骤
     steps:
       # 安装Qt
@@ -47,7 +47,7 @@ jobs:
           # Target platform for build
           # target: ${{ matrix.qt_target }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          
           modules: qtwebengine
       # 拉取代码
       - uses: actions/checkout@v3
@@ -59,16 +59,12 @@ jobs:
         id: changelog
         shell: bash
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 2p)
+          previousTag=$(git tag --sort=-creatordate | grep "^v" | sed -n 2p)
           echo "previousTag : $previousTag"
           
-          CHANGELOG="$(git log --oneline --no-decorate $previousTag..HEAD)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-          CHANGELOG="${CHANGELOG//'\"'/'%22'}"
-          CHANGELOG="${CHANGELOG//"'"/ }"
-          echo "::set-output name=changelog::$(echo "$CHANGELOG")"
+
+          echo "::set-output name=prev_tag::$previousTag"
+          echo "::set-output name=curr_tag::$(git tag --sort=-creatordate | grep "^v" | sed -n 1p)"
 
       - name: Set outputs
         id: vars
@@ -82,9 +78,15 @@ jobs:
 
       - name: version-file
         shell: bash
+        env:
+          VAR_SUFFIX: ${{env.version-suffix}}
+          VAR_VERSION: ${{env.version}}
         run: |   
-          previousTag=$(git tag --sort=-creatordate | sed -n 1p |cut -c 2-)
-          echo "$previousTag">version.txt
+          current_tag=$(git rev-parse --short=8 HEAD)
+          release_date=$(date +'%Y%m%d')
+          echo "$VAR_VERSION-$VAR_SUFFIX.$release_date.$current_tag">version.txt  
+          cat version.txt
+          echo "$version"  
 
       - uses: ilammy/msvc-dev-cmd@v1
       # msvc编译
@@ -104,7 +106,7 @@ jobs:
 
       # 打包 
       - name: package
-        id: package      
+        id: package
         env:
           archiveName: GoldenDict-Windows.${{ steps.vars.outputs.sha_short }}-${{ steps.vars.outputs.release_time }}
           msvcArch: ${{ matrix.msvc_arch }}
@@ -114,44 +116,47 @@ jobs:
            $name = ${env:archiveName}
            echo "::set-output name=packageName::$name" 
 
-      - name: uploadRelease
-        # if: startsWith(github.event.ref, 'refs/tags/')
-        uses: svenstaro/upload-release-action@v2
+      - name: "Build Changelog"
+        id: build_changelog
+        uses: mikepenz/release-changelog-builder-action@v3
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          overwrite: true 
-          release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
-          prerelease: ${{env.prerelease}}
-          body: |
-            release on date:      ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}  
-            branch:               ${{ github.ref_name }}
-            commit:               ${{ steps.vars.outputs.sha_short }} 
-            Qt version:           Qt5.15.2, Qt6.X  
-            Windows built with:   msvc64,  Visual studio 2019
-            ## goldendict.exe can not be used alone 
-            if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
-            AppImage built with:  Ubuntu-20.04 ,latest gcc
-            macos built with:     macos-10.15,macos-11.0,clang_64 x86_64
-                                  Qt6.X(Universal Build)
-                                  Qt5.15.2(Intel Kind)
-            auto built by github action. use on your on risk:-)
-            **recommend version**:Qt6.X   (with the latest bug fixes and performance enhancements)
+          commitMode: false
+          fromTag: ${{ steps.changelog.outputs.prev_tag }}
+          toTag:  "${{ steps.changelog.outputs.curr_tag }}"
+          configurationJson: |
+            {
+              "template": "#{{CHANGELOG}}\n\n<details>\n<summary>🔴 Uncategorized</summary>\n\n#{{UNCATEGORIZED}}\n</details>",
+              "categories": [
+                {
+                    "title": "## 🚀 Features",
+                    "labels": ["feature","feat","opt"]
+                },
+                {
+                    "title": "## 🐛 Fixes",
+                    "labels": ["fix","bug"]
+                }
+                ,
+                {
+                    "title": "##  🤖  Github action",
+                    "labels": ["action"]
+                }
+                ,
+                {
+                    "title": "##  🧼  Clean Code",
+                    "labels": ["clean"]
+                }
 
-            Filename pattern: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]**
-            [xapian](https://xapian.org/)  is enabled by default which offers 10X~20X performance 
-            ------------------------------
-            文件名的模式: **[Qt version]-GoldenDict-[OS]-[release-date].[ext]** 
-            [xapian](https://xapian.org/) 用于全文索引的创建，提供更快的全文索引创建、搜索支持
-            比如：
-            6.4.3-GoldenDict.exe_windows-2022_20230502.zip
-            表示基于qt6.4.3，windows-2022,  于20230502日创建的版本。
-
-
-            CHANGES:
-            ${{ steps.changelog.outputs.changelog }}  
+              ],
+              "label_extractor": [
+              {
+                "pattern": "([^:]*):.*",
+                "target": "$1",
+                "on_property": "title",
+                "flags": "gu"
+              }
+            ]
+            }
+      
       - name: upload goldendict.exe only
         # if: startsWith(github.event.ref, 'refs/tags/')
         uses: svenstaro/upload-release-action@v2
@@ -159,7 +164,8 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: release/${{ env.targetName }}
           asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
@@ -187,8 +193,48 @@ jobs:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}/GoldenDict-ng-v23-Installer.exe
           asset_name: ${{ matrix.qt_ver }}-GoldenDict-ng-Installer.exe
-          tag: v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
           overwrite: true 
           release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
           prerelease: ${{env.prerelease}}
-          
\ No newline at end of file
+      - name: uploadRelease
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ matrix.qt_ver }}-${{ env.targetName }}_${{ matrix.os }}_${{steps.vars.outputs.release_date}}.zip
+          
+          tag: tag-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
+          overwrite: true
+          release_name: GoldenDict-ng-v${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.release_hm }}.${{ steps.vars.outputs.sha_short }}
+          prerelease: ${{env.prerelease}}
+          body: |
+            #### Install instructions for Windows, macOS and Linux 
+
+            <https://xiaoyifang.github.io/goldendict-ng/install/>.
+
+            #### Filename pattern (文件名模式): **[Qt version]-GoldenDict-ng-[OS]-[release-date].[ext]**  
+
+            Qt6.X is recommended for various enhancements.
+
+            Windows users can use either `****-installer.exe` (for installer) or `****.zip` (unzip and run).
+            The `goldendict.exe` can be dropped into previous installation's folder (if dependencies aren't changed).
+
+            Linux users can use AppImages.
+
+            macOS users can use `.dmg` installer.
+
+            `6.5.1-GoldenDict.exe_windows-2019_20230701.zip` means built with Qt6.5.1, windows/msvc-2019 at 20230701 as a zip archive.
+
+            #### Build Details
+
+            AppImage: Ubuntu-20.04
+            macOS: macOS-12 and macOS-13
+            Windows: Visual studio 2019
+
+
+
+            #### Changes
+            
+            ${{steps.build_changelog.outputs.changelog}}
diff --git a/.gitignore b/.gitignore
index c7baaeea..782304db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,8 @@ CMakeSettings.json
 goldendict.vcxproj
 goldendict.vcxproj.filters
 GoldenDict_resource.rc
+
+*.TMP
+*.orig
+
+node_modules
\ No newline at end of file
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..1d1644cd
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,2 @@
+**/.clang-format
+
diff --git a/.prettierrc.json b/.prettierrc.json
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/.prettierrc.json
@@ -0,0 +1 @@
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 085b5c1d..50939bdb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.25) # ubuntu 23.04 Fedora 36
 
-# Experimental Cmake build only supposed to be used by dev
 # Qt6.4+ only
 
 option(WITH_FFMPEG_PLAYER "Enable support for FFMPEG player" ON)
@@ -15,7 +14,7 @@ option(USE_SYSTEM_TOML "use system toml++ instead of bundled one" OFF)
 include(FeatureSummary)
 
 project(goldendict-ng
-        VERSION 23.06.01
+        VERSION 23.06.02
         LANGUAGES CXX C)
 
 set(GOLDENDICT "goldendict") # binary/executable name
@@ -95,6 +94,11 @@ endif ()
 # Note: used as c++ string thus need surrounding " "
 add_compile_definitions(PROGRAM_VERSION="${PROJECT_VERSION}")
 
+if (LINUX)
+    # see: config.cc -> getProgramDataDir
+    add_compile_definitions(PROGRAM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/goldendict")
+endif ()
+
 target_link_libraries(${GOLDENDICT} PRIVATE
         Qt6::Xml
         Qt6::Concurrent
diff --git a/CMake_Unix.cmake b/CMake_Unix.cmake
index 358b710a..431a3826 100644
--- a/CMake_Unix.cmake
+++ b/CMake_Unix.cmake
@@ -40,7 +40,6 @@ pkg_check_modules(PKGCONFIG_DEPS IMPORTED_TARGET
         vorbis # .ogg
         vorbisfile
         liblzma
-        libzstd
         )
 
 target_link_libraries(${GOLDENDICT} PRIVATE
diff --git a/CMake_Win.cmake b/CMake_Win.cmake
index 0c6d71b7..12d704c6 100644
--- a/CMake_Win.cmake
+++ b/CMake_Win.cmake
@@ -15,16 +15,15 @@ foreach (A_WIN_LIB ${WINLIBS_FILES})
     target_link_libraries(${GOLDENDICT} PRIVATE ${A_WIN_LIB})
 endforeach ()
 
-file(GLOB WINLIBS_FILES "${CMAKE_SOURCE_DIR}/winlibs/lib/xapian/rel/*.lib")
-foreach (A_WIN_LIB ${WINLIBS_FILES})
-    target_link_libraries(${GOLDENDICT} PRIVATE ${A_WIN_LIB})
-endforeach ()
-
-# zim dependencies
-file(GLOB WINLIBS_FILES "${CMAKE_SOURCE_DIR}/winlibs/lib/*.lib")
-foreach (A_WIN_LIB ${WINLIBS_FILES})
-    target_link_libraries(${GOLDENDICT} PRIVATE ${A_WIN_LIB})
-endforeach ()
+set(THIRD_PARTY_LIBARY
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/lzma.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/lzma.lib
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/zstd.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/zstd.lib
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/xapian.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/xapian.lib
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/hunspell-1.7.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/hunspell-1.7.lib
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/zim.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/zim.lib
+        debug ${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/opencc.lib optimized ${CMAKE_SOURCE_DIR}/winlibs/lib/opencc.lib
+        )
+target_link_libraries(${GOLDENDICT} PRIVATE ${THIRD_PARTY_LIBARY})
 
 # Copy .dlls to output dir
 
@@ -34,13 +33,11 @@ foreach (A_DLL_FILE ${DLL_FILES})
     configure_file("${A_DLL_FILE}" "${CMAKE_BINARY_DIR}/${TEMP_VAR_HOLDING_DLL_FILENAME}" COPYONLY)
 endforeach ()
 
-file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/xapian/rel/*.dll")
-foreach (A_DLL_FILE ${DLL_FILES})
-    get_filename_component(TEMP_VAR_HOLDING_DLL_FILENAME ${A_DLL_FILE} NAME)
-    configure_file("${A_DLL_FILE}" "${CMAKE_BINARY_DIR}/${TEMP_VAR_HOLDING_DLL_FILENAME}" COPYONLY)
-endforeach ()
-
-file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/*.dll")
+if (CMAKE_BUILD_TYPE MATCHES Debug)
+    file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/dbg/*.dll")
+else ()
+    file(GLOB DLL_FILES LIST_DIRECTORIES false "${CMAKE_SOURCE_DIR}/winlibs/lib/*.dll")
+endif ()
 foreach (A_DLL_FILE ${DLL_FILES})
     get_filename_component(TEMP_VAR_HOLDING_DLL_FILENAME ${A_DLL_FILE} NAME)
     configure_file("${A_DLL_FILE}" "${CMAKE_BINARY_DIR}/${TEMP_VAR_HOLDING_DLL_FILENAME}" COPYONLY)
@@ -49,7 +46,9 @@ endforeach ()
 if (WITH_EPWING_SUPPORT)
     add_subdirectory(thirdparty/eb EXCLUDE_FROM_ALL)
     target_include_directories(${GOLDENDICT} PRIVATE
-        thirdparty
-    )
+            thirdparty
+            )
     target_link_libraries(${GOLDENDICT} PRIVATE eb)
+
+    set_target_properties(eb PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 endif ()
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..18c91471
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..253b18ca
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1 @@
+https://xiaoyifang.github.io/goldendict-ng/developer/
diff --git a/README.md b/README.md
index 5c89d079..04c67f00 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 [![Crowdin](https://badges.crowdin.net/goldendict-ng/localized.svg)](https://crowdin.com/project/goldendict-ng)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=xiaoyifang_goldendict&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=xiaoyifang_goldendict)
-[![Windows-6.x-xapian](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x-xapian.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x-xapian.yml)
-[![Ubuntu-6.2-xapian](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2-xapian.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2-xapian.yml)
-[![macos-homebrew-xapian](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew-xapian.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew-xapian.yml)
+[![Windows-6.x](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x.yml)
+[![Ubuntu-6.2](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml/badge.svg?branch=staged)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml)
+[![macos-homebrew](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew.yml)
 
 The Next Generation GoldenDict. A feature-rich open-source dictionary lookup program,
 supporting [multiple dictionary formats](https://xiaoyifang.github.io/goldendict-ng/dictformats/) and online
@@ -29,36 +29,7 @@ dictionaries.
 
 ## Installation
 
-### Downloads
-
-* [Latest stable version](https://github.com/xiaoyifang/goldendict/releases/latest)
-* [Daily pre-release builds](https://github.com/xiaoyifang/goldendict/releases).
-
-Both Qt5 and Qt6 builds are provided.
-
-## Windows
-
-Choose either
-
-* `****-installer.exe ` for traditional installer experience
-* `****.zip` for simply unzip and run experience
-
-If Qt's version is not changed, you can also download a single `goldendict.exe` and drop it into previous installation's folder.
-
-## Linux
-
-* `.Appimage` can be used in any recent linux distros.
-* [Debian packages](https://tracker.debian.org/pkg/goldendict-webengine) are available in Debian 12 or later.
-* [Ubuntu packages](https://launchpad.net/ubuntu/+source/goldendict-webengine) are available in Ubuntu 23.04 or later.
-* Archlinux can use [goldendict-ng-git](https://aur.archlinux.org/packages/goldendict-ng-git). Built binary is also availiable from [archlinuxcn's repo](https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/goldendict-ng-git).
-* [Gentoo package from PG_Overlay](https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/blob/master/app-text/goldendict/goldendict-9999-r6.ebuild)
-* openSUSE ships an old version of this fork.
-
-> Help wanted to package this GoldenDict for linux distros.
-
-## macOS
-
-One of the `.dmg` installers.
+<https://xiaoyifang.github.io/goldendict-ng/install/>
 
 ## Help GoldenDict's Development
 
@@ -72,172 +43,7 @@ To start development, check out [developer guide](https://xiaoyifang.github.io/g
 
 ## Build from source
 
-### Dependencies
-
-* C++17 compiler
-* Qt 5.15 or latest QT version 6.X
-* Various libraries on Linux, see below
-* On Mac and Windows all the libraries are included in the repository
-* Qt Creator is recommended for development
-
-Steps below are using qt5, and you may use qt6 by replacing `5` with `6`.
-
-#### Ubuntu
-
-```
-sudo apt-get install git pkg-config build-essential qt5-qmake \
-        libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
-        libxtst-dev liblzo2-dev libbz2-dev \
-        libavutil-dev libavformat-dev libeb16-dev \
-        libqt5svg5-dev libqt5x11extras5-dev qttools5-dev \
-        qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5webchannel5-dev qtwebengine5-dev \
-        libqt5texttospeech5-dev
-```
-
-#### Fedora 35
-
-```
-sudo dnf install git pkg-config libzstd-devel opencc-devel xz-devel xz-lzma-compat\
-     libvorbis-devel zlib-devel hunspell-devel lzo-devel bzip2-devel \
-     ffmpeg-devel eb-devel qt5-qtx11extras-devel libXtst-devel \
-     libxkbcommon-devel qt5-qtbase qt5-qttools qt5-qtsvg-devl qt5-qtwebengine-devel qt5-qtmultimedia-devel
-```
-
-### Build steps
-
-Clone this repository:
-```
-git clone https://github.com/xiaoyifang/goldendict-ng.git
-```
-
-#### Linux build
-
-```
-cd goldendict-ng && qmake-qt5 && make
-```
-
-#### macOS build
-
-```
-brew install qt # or use official offline installer
-qmake CONFIG+=release CONFIG+=zim_support CONFIG+=chinese_conversion_support QMAKE_APPLE_DEVICE_ARCHS="x86_64 arm64"
-make 
-make install
-```
-
-#### Windows build
-
-the source code has offered precompile x64 windows libs on winlibs/lib/msvc. you can build your own version either.
-
-To build with Visual Studio.
-check this [how to build with visual studio](howto/how%20to%20build%20and%20debug%20with%20VS2019.md)
-
-Alternatively, you might want to load `goldendict.pro` file from within Qt Creator.
-
-### Build Configurations
-
-**Notice**: All additional configs for `qmake` that must be combined in one  of pass config options to `qmake`:
-```
-qmake-qt5 "CONFIG+=release" "CONFIG+=zim_support" "CONFIG+=chinese_conversion_support"
-```
-
-To ensure the changes applied, you may want to use `make clean` before `make`.
-
-#### Building with Chinese conversion support
-
-To add Chinese conversion support you need at first install libopencc-dev package, then pass `"CONFIG+=chinese_conversion_support"` to `qmake`.
-
-```
-sudo apt-get install libopencc-dev
-```
-
-#### Building with Zim dictionaries support
-
-To add Zim and Slob formats support you need at first install lzma-dev and zstd-dev packages, then pass `"CONFIG+=zim_support"` to `qmake`
-
-```
-sudo apt-get install liblzma-dev libzstd-dev libzim-dev
-```
-
-**Note**: Some linux distros do not support latest zim version, so you need to compile from latest source.
-On Windows,  you can use vcpkg to compile the libzim
-```
-vcpkg install libzim:x64-windows
-```
-and copy the corresponding(debug/release) library to the `winlibs/lib` folder. the zim's `include` directory to the `winlibs/include` directory.
-
-
-#### 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
-
-#### Building without internal audio players
-
-If you have problem building with FFmpeg (for example, very old linux distro), you can pass
-`"CONFIG+=no_ffmpeg_player"` to `qmake` in order to disable FFmpeg internal audio player back end.
-
-If you have problem building with Qt5 Multimedia or experience GStreamer run-time errors (for example, Ubuntu 14.04), you can pass
-`"CONFIG+=no_qtmultimedia_player"` to `qmake` in order to disable Qt Multimedia internal audio player back end.
-
-#### Building with xapian
-
-build xapian from source, download and extract the xapian-core source code.
-
-```
-./configure
-make 
-make install
-```
-
- On Windows,follow the instructions in the xapian-core/INSTALL Visual Studio parts.（**xapian does not support to use the  Debug lib in Windows. have to debug in release version mode using xapian's release lib**）.
-A precompiled version of xapian lib has provided in winlibs
-On Linux,  install libxapian-dev package using package manager.
-On Mac, use homebrew to install xapian `brew install xapian`
-
-Goldendict-ng has used xapian as the default and the only one fulltext engine.
-
-#### use iconv (recommend to enable)
-use `CONFIG+=use_iconv` to enable this feature. when enabled ,iconv will be used to convert encoding other than the QTextCodec(which will be deprecated in future Qt version)
-
-```
-qmake "CONFIG+=use_iconv"
-```
-
-when enabled ,iconv should be installed on the platform at the same time.
-
-#### use breakpad
-
-use `CONFIG+=use_breakpad` to enable this crash dump. when enabled [breakpad](https://chromium.googlesource.com/breakpad/breakpad/+/master/docs), goldendict will generate a crash dump alongside with Goldendict in the `crash` directory.
-
-on Windows:
-`vcpkg install breakpad:x64-windows-release` and copy the installed packages into `thirdparty/breakpad` directory.
-with a structure like this:
-```
-├─breakpad
-│  ├─include
-│  │  ├─client
-│  │  │  └─windows
-│  │  │      ├─common
-│  │  │      ├─crash_generation
-│  │  │      ├─handler
-│  │  │      └─sender
-│  │  ├─common
-│  │  │  └─windows
-│  │  └─google_breakpad
-│  │      ├─common
-│  │      └─processor
-│  └─lib
-```
-
-on Mac/Linux:
-[vcpkg](https://techviewleo.com/install-vcpkg-c-library-manager-on-linux-macos-windows/) can also be used or you can just install breakpad from source or use precompiled packages. 
-
-Then enable google breakpad like this with qmake:
-
-```
-qmake "CONFIG+=use_breakpad"
-```
+<https://xiaoyifang.github.io/goldendict-ng/howto/build_from_source/>
 
 ## Support
 
@@ -245,6 +51,7 @@ Bug reporting: [GoldenDict issue tracker](https://github.com/xiaoyifang/goldendi
 
 General discussions: [discussions](https://github.com/xiaoyifang/goldendict-ng/discussions)
 
+
 ## License
 
 This project is licensed under the <b>GNU GPLv3+</b> license, a copy of which can be found in the `LICENSE.txt` file.
diff --git a/goldendict.pro b/goldendict.pro
index 5e857b21..fbcf7fb6 100644
--- a/goldendict.pro
+++ b/goldendict.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = goldendict
-VERSION = 23.06.01-ChildrenDay
+VERSION = 23.06.02-alpha
 
 # Generate version file. We do this here and in a build rule described later.
 # The build rule is required since qmake isn't run each time the project is
@@ -19,13 +19,7 @@ system(git describe --tags --always --dirty): hasGit=1
 }
 
 
-!CONFIG( verbose_build_output ) {
-  !win32|*-msvc* {
-    # Reduce build log verbosity except for MinGW builds (mingw-make cannot
-    # execute "@echo ..." commands inserted by qmake).
-    CONFIG += silent
-  }
-}
+# users can suppress verbose console compile output by add `CONFIG += silent` to qmake.
 
 CONFIG( release, debug|release ) {
   DEFINES += NDEBUG
@@ -74,8 +68,8 @@ contains(DEFINES, MAKE_QTMULTIMEDIA_PLAYER|MAKE_FFMPEG_PLAYER) {
 
 #xapian is the must option now.
 win32{
-  Debug: LIBS+= -L$$PWD/winlibs/lib/xapian/dbg/ -lxapian
-  Release: LIBS+= -L$$PWD/winlibs/lib/xapian/rel/ -lxapian
+  Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/ -lxapian
+  Release: LIBS+= -L$$PWD/winlibs/lib -lxapian
 }else{
   LIBS += -lxapian
 }
@@ -83,8 +77,8 @@ win32{
 CONFIG( use_breakpad ) {
   DEFINES += USE_BREAKPAD
 
-  win32: LIBS += -L$$PWD/thirdparty/breakpad/lib/ -llibbreakpad -llibbreakpad_client
-  else:unix: LIBS += -L$$PWD/thirdparty/breakpad/lib/ -llibbreakpa
+  LIBS += -L$$PWD/thirdparty/breakpad/lib/ -llibbreakpad -llibbreakpad_client
+
 
   INCLUDEPATH += $$PWD/thirdparty/breakpad/include
   DEPENDPATH += $$PWD/thirdparty/breakpad/include
@@ -138,7 +132,7 @@ win32 {
 
     win32-msvc* {
         # VS does not recognize 22.number.alpha,cause errors during compilation under MSVC++
-        VERSION = 23.06.01 
+        VERSION = 23.06.02 
         DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS
         contains(QMAKE_TARGET.arch, x86_64) {
             DEFINES += NOMINMAX __WIN64
@@ -150,9 +144,8 @@ win32 {
 
         # QMAKE_CXXFLAGS_RELEASE += /GL # slows down the linking significantly
         LIBS += -lshell32 -luser32 -lsapi -lole32
-        Debug: LIBS+= -lhunspelld
-        Release: LIBS+= -lhunspell
-        HUNSPELL_LIB = hunspell
+        Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/ -lhunspell-1.7
+        Release: LIBS+= -L$$PWD/winlibs/lib/ -lhunspell-1.7
     }
 
     LIBS += -lwsock32 \
@@ -291,16 +284,17 @@ HEADERS += \
     src/ankiconnector.hh \
     src/article_maker.hh \
     src/article_netmgr.hh \
-    src/common/atomic_rename.hh \
     src/audiolink.hh \
     src/audioplayerfactory.hh \
     src/audioplayerinterface.hh \
     src/btreeidx.hh \
     src/chunkedstorage.hh \
+    src/common/atomic_rename.hh \
     src/common/base_type.hh \
     src/common/ex.hh \
     src/common/file.hh \
     src/common/filetype.hh \
+    src/common/folding.hh \
     src/common/gddebug.hh \
     src/common/globalbroadcaster.hh \
     src/common/globalregex.hh \
@@ -359,7 +353,6 @@ HEADERS += \
     src/externalviewer.hh \
     src/ffmpegaudio.hh \
     src/ffmpegaudioplayer.hh \
-    src/common/folding.hh \
     src/ftshelpers.hh \
     src/fulltextsearch.hh \
     src/gestures.hh \
@@ -376,6 +369,7 @@ HEADERS += \
     src/metadata.hh \
     src/multimediaaudioplayer.hh \
     src/parsecmdline.hh \
+    src/pronounceengine.hh \
     src/resourceschemehandler.hh \
     src/splitfile.hh \
     src/termination.hh \
@@ -407,10 +401,10 @@ HEADERS += \
     src/ui/searchpanewidget.hh \
     src/ui/stylescombobox.hh \
     src/ui/translatebox.hh \
+    src/version.hh \
     src/webmultimediadownload.hh \
     src/weburlrequestinterceptor.hh \
     src/wordfinder.hh \
-    src/wordlist.hh \
     src/zipfile.hh \
     thirdparty/tomlplusplus/toml++/toml.h
 
@@ -420,13 +414,14 @@ SOURCES += \
     src/ankiconnector.cc \
     src/article_maker.cc \
     src/article_netmgr.cc \
-    src/common/atomic_rename.cc \
     src/audiolink.cc \
     src/audioplayerfactory.cc \
     src/btreeidx.cc \
     src/chunkedstorage.cc \
+    src/common/atomic_rename.cc \
     src/common/file.cc \
     src/common/filetype.cc \
+    src/common/folding.cc \
     src/common/gddebug.cc \
     src/common/globalbroadcaster.cc \
     src/common/globalregex.cc \
@@ -481,7 +476,6 @@ SOURCES += \
     src/externalaudioplayer.cc \
     src/externalviewer.cc \
     src/ffmpegaudio.cc \
-    src/common/folding.cc \
     src/ftshelpers.cc \
     src/fulltextsearch.cc \
     src/gestures.cc \
@@ -499,6 +493,7 @@ SOURCES += \
     src/metadata.cc \
     src/multimediaaudioplayer.cc \
     src/parsecmdline.cc \
+    src/pronounceengine.cc \
     src/resourceschemehandler.cc \
     src/splitfile.cc \
     src/termination.cc \
@@ -528,10 +523,10 @@ SOURCES += \
     src/ui/searchpanel.cc \
     src/ui/stylescombobox.cc \
     src/ui/translatebox.cc \
+    src/version.cc \
     src/webmultimediadownload.cc \
     src/weburlrequestinterceptor.cc \
     src/wordfinder.cc \
-    src/wordlist.cc \
     src/zipfile.cc \
     thirdparty/fmt/format.cc
 
@@ -559,7 +554,7 @@ SOURCES += src/common/wildcard.cc
 
 CONFIG( zim_support ) {
   DEFINES += MAKE_ZIM_SUPPORT
-  LIBS += -llzma -lzstd -lzim
+  LIBS += -llzma -lzim
 
     win32{
       Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/
@@ -595,9 +590,16 @@ CONFIG( chinese_conversion_support ) {
              src/ui/chineseconversion.hh
   SOURCES += src/dict/chinese.cc \
              src/ui/chineseconversion.cc
+
+win32{
+  Debug: LIBS+= -L$$PWD/winlibs/lib/dbg/ -lopencc
+  Release: LIBS+= -L$$PWD/winlibs/lib -lopencc
+}else{
   LIBS += -lopencc
 }
 
+}
+
 RESOURCES += resources.qrc \
     src/scripts/scripts.qrc \
     icons/flags.qrc \
diff --git a/icons/icon_dsl_native.png b/icons/icon_dsl_native.png
deleted file mode 100644
index 731c57ec..00000000
Binary files a/icons/icon_dsl_native.png and /dev/null differ
diff --git a/icons/lsasound.svg b/icons/lsasound.svg
new file mode 100644
index 00000000..58d761c6
--- /dev/null
+++ b/icons/lsasound.svg
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   sodipodi:docname="lsasound.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:version="0.32"
+   id="svg2963"
+   height="48px"
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="Package-x-generic.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><rect
+       x="10.606602"
+       y="25.102291"
+       width="26.870057"
+       height="13.788583"
+       id="rect3582" /><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective77" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" /><linearGradient
+       id="linearGradient5048"><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" /><stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" /><linearGradient
+       id="linearGradient2869"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2871" /><stop
+         style="stop-color:#cccccc;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2873" /></linearGradient><linearGradient
+       id="linearGradient4995"><stop
+         id="stop4997"
+         offset="0"
+         style="stop-color:#de9523;stop-opacity:1;" /><stop
+         id="stop4999"
+         offset="1.0000000"
+         style="stop-color:#a36d18;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4987"
+       inkscape:collect="always"><stop
+         id="stop4989"
+         offset="0"
+         style="stop-color:#a0670c;stop-opacity:1;" /><stop
+         id="stop4991"
+         offset="1"
+         style="stop-color:#a0670c;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient4979"><stop
+         id="stop4981"
+         offset="0.0000000"
+         style="stop-color:#fbf0e0;stop-opacity:1.0000000;" /><stop
+         id="stop4983"
+         offset="1.0000000"
+         style="stop-color:#f0ce99;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4946"
+       inkscape:collect="always"><stop
+         id="stop4948"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" /><stop
+         id="stop4950"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient4222"><stop
+         id="stop4224"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" /><stop
+         id="stop4226"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.68639052;" /></linearGradient><linearGradient
+       id="linearGradient4210"><stop
+         id="stop4212"
+         offset="0.0000000"
+         style="stop-color:#eaba6f;stop-opacity:1.0000000;" /><stop
+         id="stop4214"
+         offset="1.0000000"
+         style="stop-color:#b97a1b;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4192"><stop
+         id="stop4194"
+         offset="0"
+         style="stop-color:#e9b96e;stop-opacity:1;" /><stop
+         id="stop4196"
+         offset="1.0000000"
+         style="stop-color:#f1d19e;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4182"><stop
+         id="stop4184"
+         offset="0.0000000"
+         style="stop-color:#a36d18;stop-opacity:1.0000000;" /><stop
+         id="stop4186"
+         offset="1.0000000"
+         style="stop-color:#d79020;stop-opacity:1.0000000;" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4946"
+       id="radialGradient2252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
+       cx="22.930462"
+       cy="35.373093"
+       fx="22.930462"
+       fy="35.373093"
+       r="17.576654" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4995"
+       id="linearGradient2274"
+       gradientUnits="userSpaceOnUse"
+       x1="36.288929"
+       y1="14.661557"
+       x2="47.065835"
+       y2="15.267649" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4192"
+       id="linearGradient2277"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
+       x1="25.381256"
+       y1="24.720648"
+       x2="24.119167"
+       y2="16.170370" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4182"
+       id="linearGradient2280"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
+       x1="16.148972"
+       y1="12.636667"
+       x2="34.193642"
+       y2="12.636667" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4987"
+       id="linearGradient2282"
+       gradientUnits="userSpaceOnUse"
+       x1="21.906841"
+       y1="9.7577486"
+       x2="22.071806"
+       y2="16.020695" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient2285"
+       gradientUnits="userSpaceOnUse"
+       x1="18.706615"
+       y1="19.912336"
+       x2="30.014812"
+       y2="47.388485" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4210"
+       id="linearGradient2288"
+       gradientUnits="userSpaceOnUse"
+       x1="24.990499"
+       y1="34.004856"
+       x2="24.990499"
+       y2="22.585211" /><radialGradient
+       xlink:href="#a"
+       id="d"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#a"
+       id="e"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient5060"
+       id="c"
+       cx="23.25"
+       cy="35.375"
+       r="18.5"
+       fx="23.25"
+       fy="35.375"
+       gradientTransform="matrix(1,0,0,0.39865,0,21.2728)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="a"><stop
+         offset="0"
+         stop-color="#fff"
+         id="stop3397" /><stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop3399" /></linearGradient></defs><sodipodi:namedview
+     inkscape:window-y="-9"
+     inkscape:window-x="-9"
+     inkscape:window-height="991"
+     inkscape:window-width="1920"
+     stroke="#c17d11"
+     fill="#e9b96e"
+     inkscape:showpageshadow="false"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="80.079843"
+     inkscape:cx="83.615377"
+     inkscape:zoom="2.8284271"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.16470588"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:window-maximized="1" /><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz/</dc:source><dc:subject><rdf:Bag><rdf:li>package</rdf:li><rdf:li>archive</rdf:li><rdf:li>tarball</rdf:li><rdf:li>tar</rdf:li><rdf:li>bzip</rdf:li><rdf:li>gzip</rdf:li><rdf:li>zip</rdf:li><rdf:li>arj</rdf:li><rdf:li>tar</rdf:li><rdf:li>jar</rdf:li></rdf:Bag></dc:subject><cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"><g
+       style="display:inline"
+       transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
+       id="g6707"><rect
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect6709"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" /><path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path6711"
+         sodipodi:nodetypes="cccc" /><path
+         sodipodi:nodetypes="cccc"
+         id="path6713"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /></g><rect
+       ry="2.3944440"
+       rx="2.4241352"
+       y="15.275433"
+       x="7.4623847"
+       height="23.112879"
+       width="31.978371"
+       id="rect3115"
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><rect
+       style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       id="rect4220"
+       width="29.804138"
+       height="21.075352"
+       x="8.4989996"
+       y="16.243698"
+       rx="1.2846882"
+       ry="1.2846882" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4162"
+       d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
+       style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4164"
+       d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4178"
+       d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><path
+       sodipodi:nodetypes="ccccc"
+       style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
+       id="path4180" /><path
+       style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
+       id="path4954"
+       sodipodi:nodetypes="ccccc" /><g
+       color="#000000"
+       id="g3414"
+       transform="matrix(0.56662726,0,0,0.57555804,7.9823278,3.8741842)"><path
+         fill="url(#c)"
+         fill-rule="evenodd"
+         d="m 41.75,35.375 a 18.5,7.375 0 1 1 -37,0 18.5,7.375 0 1 1 37,0 z"
+         opacity="0.3"
+         overflow="visible"
+         style="fill:url(#c);marker:none"
+         transform="translate(0,2.834646)"
+         id="path3404" /><path
+         fill="#9db029"
+         stroke="#596616"
+         stroke-linecap="round"
+         stroke-linejoin="round"
+         d="M 41.625,7.7951523 18.5625,10.629798 v 21.78125 c -1.645955,-0.557651 -3.931785,-0.703429 -6.4375,-0.1875 -4.356314,0.896969 -7.4778602,3.299487 -7,5.34375 0.4778601,2.044263 4.393685,2.99072 8.75,2.09375 4.116641,-0.84762 7.684123,-3.037802 7.602633,-5 l 0.15625,-19.03125 16.930457,-2.895306 v 17.284614 c -10.25,-1.5 -13.292201,2.893236 -12.81434,4.9375 0.47786,2.044263 4.393686,2.990719 8.75,2.09375 3.865376,-0.795885 6.63241,-2.763211 6.90625,-4.625 z"
+         display="block"
+         style="marker:none"
+         id="path3406" /><path
+         fill="none"
+         stroke="#ffffff"
+         d="M 40.729036,8.8956383 19.547267,11.730284 V 33.568621 C 11.982012,31.663311 5.8141632,35.40303 6.2685944,37.347065 6.9730255,40.6661 20.646969,38.449299 20.569474,34.208305 l 0.148589,-19.473166 18.850374,-2.892332 v 19.437166 c -7.566284,-1.926647 -13.265498,1.376384 -12.811066,3.32042 0.579431,3.194035 12.378226,2.113362 13.76364,-2.657146 z"
+         display="block"
+         opacity="0.511765"
+         style="marker:none"
+         id="path3408" /><path
+         fill="url(#d)"
+         d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+         display="block"
+         opacity="0.511765"
+         overflow="visible"
+         style="fill:url(#d);marker:none"
+         transform="matrix(0.73452,-0.11164,0.11164,0.73452,3.903362,12.22551)"
+         id="path3410" /><path
+         fill="url(#e)"
+         d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+         display="block"
+         opacity="0.511765"
+         overflow="visible"
+         style="fill:url(#e);marker:none"
+         transform="matrix(0.73452,-0.11164,0.11164,0.73452,23.74587,9.390864)"
+         id="path3412" /></g><text
+       xml:space="preserve"
+       id="text3580"
+       style="white-space:pre;shape-inside:url(#rect3582);fill:#808080;stroke:#000000"
+       transform="translate(4.5961941,0.70710678)"><tspan
+         x="10.607422"
+         y="36.020065"
+         id="tspan3816"><tspan
+           style="fill:#008000"
+           id="tspan3814">lsa</tspan></tspan></text></g></svg>
diff --git a/icons/macicon.png b/icons/macicon.png
deleted file mode 100644
index df8fe10b..00000000
Binary files a/icons/macicon.png and /dev/null differ
diff --git a/icons/programdict.svg b/icons/programdict.svg
new file mode 100644
index 00000000..48483adf
--- /dev/null
+++ b/icons/programdict.svg
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="48px"
+   height="48px"
+   id="svg1256"
+   sodipodi:version="0.32"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:docname="programdict.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><linearGradient
+       id="linearGradient12512"><stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" /><stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" /><stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12512"
+       id="radialGradient278"
+       gradientUnits="userSpaceOnUse"
+       cx="55.000000"
+       cy="125.00000"
+       fx="55.000000"
+       fy="125.00000"
+       r="14.375000" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient21644"><stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop21646" /><stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop21648" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       id="linearGradient2116"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2118" /><stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2120" /></linearGradient><linearGradient
+       id="linearGradient2094"><stop
+         style="stop-color:#d6e3f0;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop2096" /><stop
+         style="stop-color:#95b1cf;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2098" /></linearGradient><linearGradient
+       id="linearGradient2803"><stop
+         id="stop2805"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" /><stop
+         id="stop2807"
+         offset="1.0000000"
+         style="stop-color:#cbcbcb;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient2795"><stop
+         id="stop2797"
+         offset="0.0000000"
+         style="stop-color:#000000;stop-opacity:0.068627454;" /><stop
+         id="stop2799"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="4.9530048"
+       x2="41.219128"
+       y1="4.9530050"
+       x1="35.433035"
+       gradientTransform="matrix(0.254000,0.000000,1.822151e-16,3.759813,0.788629,0.148567)"
+       id="linearGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" /><linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="84.287079"
+       x2="10.219901"
+       y1="93.338043"
+       x1="10.496115"
+       gradientTransform="matrix(2.262742,0.000000,0.000000,0.441942,1.000000,-0.875000)"
+       id="linearGradient2813"
+       xlink:href="#linearGradient2803"
+       inkscape:collect="always" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2094"
+       id="linearGradient2100"
+       gradientTransform="matrix(0.957750,0.000000,0.000000,1.027989,1.000000,-0.571911)"
+       x1="6.5871811"
+       y1="22.132999"
+       x2="14.511404"
+       y2="22.132999"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2116"
+       id="linearGradient2112"
+       gradientTransform="matrix(1.025428,0.000000,0.000000,0.957303,0.000000,-0.806758)"
+       x1="73.361984"
+       y1="26.652197"
+       x2="-2.7582901"
+       y2="21.270376"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient21644"
+       id="radialGradient21650"
+       cx="25.125"
+       cy="36.75"
+       fx="25.125"
+       fy="36.75"
+       r="15.75"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.595238,-6.245005e-16,14.87500)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="linearGradient3264"><stop
+         id="stop3266"
+         offset="0"
+         style="stop-color:#c9c9c9;stop-opacity:1;" /><stop
+         style="stop-color:#f8f8f8;stop-opacity:1;"
+         offset="0.25"
+         id="stop3276" /><stop
+         style="stop-color:#e2e2e2;stop-opacity:1;"
+         offset="0.5"
+         id="stop3272" /><stop
+         id="stop3274"
+         offset="0.75"
+         style="stop-color:#b0b0b0;stop-opacity:1;" /><stop
+         id="stop3268"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1;" /></linearGradient><radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.315315,0,26.81305)"
+       r="19.622213"
+       fy="39.161163"
+       fx="25.455845"
+       cy="39.161163"
+       cx="25.455845"
+       id="radialGradient3262"
+       xlink:href="#linearGradient21644" /><linearGradient
+       gradientTransform="matrix(1.241935,0,0,1.241935,-5.027508,-7.208988)"
+       y2="39.684914"
+       x2="34.534348"
+       y1="12.284524"
+       x1="14.462892"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3281"
+       xlink:href="#linearGradient3264" /></defs><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.27843137"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="20.948039"
+     inkscape:cy="24.483573"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     fill="#ef2929"
+     stroke="#cc0000"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1" /><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:date /><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz</dc:source><dc:subject><rdf:Bag><rdf:li>address</rdf:li><rdf:li>contact</rdf:li><rdf:li>book</rdf:li><rdf:li>office</rdf:li></rdf:Bag></dc:subject><cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"><cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" /><cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" /><cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" /></cc:License></rdf:RDF></metadata><g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"><path
+       sodipodi:type="arc"
+       style="opacity:1;color:#000000;fill:url(#radialGradient21650);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       id="path21642"
+       sodipodi:cx="25.125"
+       sodipodi:cy="36.75"
+       sodipodi:rx="15.75"
+       sodipodi:ry="9.375"
+       d="M 40.875 36.75 A 15.75 9.375 0 1 1  9.375,36.75 A 15.75 9.375 0 1 1  40.875 36.75 z"
+       transform="matrix(1.150794,0.000000,0.000000,1.000000,-4.913690,0.625000)" /><path
+       style="color:#000000;fill:#5b6b94;fill-opacity:1;fill-rule:nonzero;stroke:#364878;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 6.3643222,5.5185897 C 6.4551049,3.6036003 7.3719758,2.5542814 9.0788784,2.549044 L 38.405776,2.4590577 C 38.652361,2.4583011 38.974317,2.6592071 38.999012,2.9089888 L 42.257491,35.867228 L 40.942189,35.923862 L 41.571429,42.369516 C 41.632441,42.994499 41.390059,43.52882 40.5,43.533035 L 9.7893046,43.678474 C 7.25676,43.690468 4.6538454,41.59976 4.7759337,39.024403 L 6.3643222,5.5185897 z "
+       id="rect1408"
+       sodipodi:nodetypes="csssccsssss" /><path
+       id="path2489"
+       d="M 40.125,34.875 L 10.9375,35 C 9.3809819,35.177868 8.125,36.39612 8.125,38 C 8.125,39.60388 9.3809819,40.822132 10.9375,41 L 40.125,41.125 L 40.125,41.0625 C 38.469378,40.984348 37.125,39.674851 37.125,38 C 37.125,36.325149 38.469378,35.015652 40.125,34.9375 L 40.125,34.875 z "
+       style="color:#000000;fill:url(#linearGradient2813);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+       sodipodi:nodetypes="ccccccssc"
+       id="path2784"
+       d="M 9.6875,2.8125 C 7.9805897,2.8125 7.050103,3.8215062 6.96875,5.6738658 L 5.3125,37.825772 C 5.22054,40.904199 7.1393732,42.654485 9.125,43.15625 C 4.875,41.525579 5.4375,34.164455 10.75,34.195222 L 41.648286,34.195222 L 38.335786,3.2432432 C 38.310025,3.0025304 37.987878,2.8125 37.742036,2.8125 L 9.6875,2.8125 z "
+       style="color:#000000;fill:url(#linearGradient2100);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><rect
+       y="3.968539"
+       x="9.7886267"
+       height="29.604792"
+       width="2"
+       id="rect2793"
+       style="opacity:0.48044691;color:#000000;fill:url(#linearGradient2801);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.60818715;visibility:visible;display:inline;overflow:visible"
+       transform="matrix(1.000000,0.000000,-3.582731e-2,0.999358,0.000000,0.000000)" /><path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2112);stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:20;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+       d="M 9.8751008,3.3336831 C 8.1912014,3.3336831 7.5384236,4.0658459 7.4581673,5.887831 L 6.1592633,35.777198 C 7.0925916,34.170451 8.5988591,33.594437 11.011665,33.594437 L 40.963081,33.594437 L 38.137179,3.7573631 C 38.114727,3.5203092 37.793961,3.3336831 37.551434,3.3336831 L 9.8751008,3.3336831 z "
+       id="path2104"
+       sodipodi:nodetypes="cccscssc" /><g
+       id="layer1-6"
+       transform="matrix(0.53009019,0,0,0.4975302,20.296504,20.285242)"><path
+         transform="translate(-0.883885,2.474874)"
+         d="m 45.078058,39.161163 a 19.622213,6.187185 0 1 1 -39.2444265,0 19.622213,6.187185 0 1 1 39.2444265,0 z"
+         id="path3254"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.409091;fill:url(#radialGradient3262);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
+         id="path3243"
+         d="M 23.25,0.46875 C 22.784561,0.50059628 22.332166,0.57268469 21.875,0.625 H 21.84375 L 20.75,6.59375 C 18.967275,6.9997399 17.290091,7.6887415 15.78125,8.625 L 10.875,5.09375 C 9.5487118,6.1234406 8.3418016,7.3243453 7.28125,8.625 l 3.40625,4.96875 c -1.0342329,1.580515 -1.8119683,3.385224 -2.25,5.28125 -7.5e-5,0.009 -6.09e-5,0.02969 0,0.03125 L 2.5,19.84375 c -0.1085533,0.886633 -0.15625,1.802939 -0.15625,2.71875 10e-8,0.7493 0.020689,1.488589 0.09375,2.21875 l 5.9375,1.0625 c 0.422279,2.061892 1.2244587,3.987512 2.34375,5.6875 L 7.1875,36.375 c 1.0113261,1.255518 2.1788917,2.398616 3.4375,3.40625 l 5,-3.4375 c 1.747433,1.114717 3.698083,1.896374 5.8125,2.28125 l 0.9375,5.90625 c 0.666183,0.06064 1.349349,0.0625 2.03125,0.0625 0.962685,-10e-7 1.882237,-0.03648 2.8125,-0.15625 l 1.125,-6.03125 C 30.351311,37.906649 32.237219,37.03996 33.875,35.875 l 4.8125,3.5 c 1.248028,-1.061797 2.389277,-2.282256 3.375,-3.59375 l -3.5,-5.0625 c 0.947853,-1.63699 1.604629,-3.443141 1.9375,-5.375 l 5.90625,-0.9375 c 0.05179,-0.616346 0.0625,-1.214087 0.0625,-1.84375 0,-1.094214 -0.127182,-2.167084 -0.28125,-3.21875 l -6,-1.09375 C 39.717306,16.513776 38.945824,14.893898 37.96875,13.4375 L 41.5,8.59375 C 40.405427,7.2551429 39.156822,6.0185688 37.78125,4.96875 l -5.09375,3.5 C 31.223504,7.6029126 29.648037,6.9385679 27.9375,6.5625 L 27,0.625 C 26.146701,0.52462461 25.286379,0.46875 24.40625,0.46875 c -0.237872,10e-9 -0.482684,-0.007485 -0.71875,0 -0.115083,0.003649 -0.228966,-0.006695 -0.34375,0 -0.03109,0.001813 -0.06272,-0.002123 -0.09375,0 z m 0.8125,15.1875 c 0.114166,-0.0058 0.228152,0 0.34375,0 3.699127,0 6.71875,3.019624 6.71875,6.71875 1e-6,3.699126 -3.019624,6.6875 -6.71875,6.6875 -3.699125,1e-6 -6.6875,-2.988374 -6.6875,-6.6875 1e-6,-3.583527 2.8046,-6.539158 6.34375,-6.71875 z"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3281);fill-opacity:1;fill-rule:nonzero;stroke:#808080;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
+         transform="matrix(0.606518,0,0,0.606518,10.15021,7.936835)"
+         d="m 36.239223,23.781593 a 12.727922,12.727922 0 1 1 -25.455844,0 12.727922,12.727922 0 1 1 25.455844,0 z"
+         id="path3283"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.647727;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.64876;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.346591;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="M 22.557788,1.6501132 21.679599,7.4291233 C 20.008601,7.8096689 16.934874,8.9735344 15.520595,9.8511162 L 10.848562,6.3639293 C 9.6053938,7.3290873 9.5201391,7.3945394 8.5260544,8.6136804 l 3.3780526,5.0099536 c -0.969415,1.481461 -2.1338039,4.121495 -2.5518734,6.008088 0,0 -5.9194088,0.997841 -5.9194088,0.997841 -0.1017499,0.831066 -0.05285,2.609798 0.015632,3.294198 l 5.6542436,1.018588 c 0.395814,1.932669 1.8770306,5.043588 2.9261736,6.637034 l -3.575576,4.724044 c 0.9479445,1.176832 1.1376642,1.284521 2.317393,2.229005 l 4.781168,-3.50282 c 1.637918,1.044855 4.889033,2.315886 6.870935,2.676641 l 0.784687,5.706254 c 0.624432,0.05684 2.349481,0.216281 3.221443,0.10402 l 0.878188,-5.940154 c 1.881743,-0.468289 5.13316,-1.80296 6.668298,-2.89491 l 4.776055,3.450808 c 1.169811,-0.995251 1.180292,-1.145216 2.104238,-2.374516 l -3.539198,-5.030701 c 0.888449,-1.534398 2.037228,-4.535223 2.349237,-6.346009 l 5.794642,-0.961463 c 0.04855,-0.577719 0.05091,-2.188789 -0.0935,-3.174545 L 39.463105,19.226449 C 39.022378,17.599038 37.509894,14.666467 36.594056,13.301345 L 40.346408,8.5773019 C 39.320436,7.3225876 38.938964,7.150431 37.649602,6.1664065 L 32.707289,9.7056032 C 31.335043,8.8940304 28.598675,7.6568558 26.995341,7.3043568 L 26.122266,1.6501132 c -0.799821,-0.094085 -3.107395,-0.052306 -3.564478,0 z"
+         id="path3285" /></g></g></svg>
diff --git a/icons/sounddir.svg b/icons/sounddir.svg
new file mode 100644
index 00000000..6ec1446d
--- /dev/null
+++ b/icons/sounddir.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   version="1.0"
+   width="48"
+   height="48"
+   id="svg97"
+   sodipodi:docname="sounddir.svg"
+   xml:space="preserve"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview26"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="5.9514821"
+     inkscape:cx="-9.1573829"
+     inkscape:cy="61.749325"
+     inkscape:window-width="1920"
+     inkscape:window-height="991"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg97" /><defs
+     id="defs3"><radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient6719"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" /><linearGradient
+       id="linearGradient5060"><stop
+         id="stop5062"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" /><stop
+         id="stop5064"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" /></linearGradient><radialGradient
+       cx="605.71429"
+       cy="486.64789"
+       r="117.14286"
+       fx="605.71429"
+       fy="486.64789"
+       id="radialGradient6717"
+       xlink:href="#linearGradient5060"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" /><linearGradient
+       id="linearGradient5048"><stop
+         id="stop5050"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="0" /><stop
+         id="stop5056"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0.5" /><stop
+         id="stop5052"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" /></linearGradient><linearGradient
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507"
+       id="linearGradient6715"
+       xlink:href="#linearGradient5048"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" /><linearGradient
+       id="linearGradient4970"><stop
+         id="stop4972"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" /><stop
+         id="stop4974"
+         style="stop-color:#b9b9b9;stop-opacity:1"
+         offset="1" /></linearGradient><linearGradient
+       x1="23.150063"
+       y1="36.103832"
+       x2="23.150063"
+       y2="8.6947012"
+       id="linearGradient4976"
+       xlink:href="#linearGradient4970"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#a"
+       id="d"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#a"
+       id="e"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient5060"
+       id="c"
+       cx="23.25"
+       cy="35.375"
+       r="18.5"
+       fx="23.25"
+       fy="35.375"
+       gradientTransform="matrix(1,0,0,0.39865,0,21.2728)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="a"><stop
+         offset="0"
+         stop-color="#fff"
+         id="stop325" /><stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop327" /></linearGradient></defs><g
+     id="layer1" /><g
+     id="layer3"><g
+       transform="matrix(2.262383e-2,0,0,2.086758e-2,43.38343,36.36962)"
+       id="g6707"
+       style="display:inline"
+       inkscape:label="g6707"><rect
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685"
+         id="rect6709"
+         style="opacity:0.40206185;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z"
+         id="path6711"
+         style="opacity:0.40206185;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /><path
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z"
+         id="path6713"
+         style="opacity:0.40206185;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /></g><path
+       d="M 2.3125,5.4375 C 1.8987305,5.4375 1.551942,5.8362304 1.59375,6.25 L 4.625,38.75 C 4.666808,39.163769 5.1174803,39.5625 5.53125,39.5625 L 6.25,39.5625 C 6.3134628,39.584176 6.330441,39.65625 6.40625,39.65625 L 39.71875,39.65625 C 39.925644,39.65625 40.21924,39.541309 40.40625,39.40625 C 40.936652,39.023186 41.074578,38.790769 41.3125,38.4375 C 43.760628,34.80244 47.125,18.96875 47.125,18.96875 C 47.228443,18.761866 46.997826,18.53125 46.6875,18.53125 L 35.4375,18.53125 L 34.71875,11.4375 C 34.676942,11.02373 34.226269,10.59375 33.8125,10.59375 L 21.09375,10.59375 C 20.503204,10.59375 19.881278,10.2278 19.6875,9.65625 L 18.5625,6.15625 C 18.393248,5.6570373 18.017323,5.4375 17.25,5.4375 L 2.3125,5.4375 z"
+       transform="matrix(0.987714,0,0,0.993607,-7.07861e-2,9.727255e-2)"
+       id="path2375"
+       style="fill:url(#linearGradient4976);fill-opacity:1;fill-rule:nonzero;stroke:#5a5a5a;stroke-width:1.00943172;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /></g><g
+     id="layer2" /><g
+     color="#000000"
+     id="g342"
+     transform="matrix(0.54899486,0,0,0.56569663,7.467974,12.963828)"><path
+       fill="url(#c)"
+       fill-rule="evenodd"
+       d="m 41.75,35.375 a 18.5,7.375 0 1 1 -37,0 18.5,7.375 0 1 1 37,0 z"
+       opacity="0.3"
+       overflow="visible"
+       style="fill:url(#c);marker:none"
+       transform="translate(0,2.834646)"
+       id="path332" /><path
+       fill="#9db029"
+       stroke="#596616"
+       stroke-linecap="round"
+       stroke-linejoin="round"
+       d="M 41.625,7.7951523 18.5625,10.629798 v 21.78125 c -1.645955,-0.557651 -3.931785,-0.703429 -6.4375,-0.1875 -4.356314,0.896969 -7.4778602,3.299487 -7,5.34375 0.4778601,2.044263 4.393685,2.99072 8.75,2.09375 4.116641,-0.84762 7.684123,-3.037802 7.602633,-5 l 0.15625,-19.03125 16.930457,-2.895306 v 17.284614 c -10.25,-1.5 -13.292201,2.893236 -12.81434,4.9375 0.47786,2.044263 4.393686,2.990719 8.75,2.09375 3.865376,-0.795885 6.63241,-2.763211 6.90625,-4.625 z"
+       display="block"
+       style="marker:none"
+       id="path334" /><path
+       fill="none"
+       stroke="#ffffff"
+       d="M 40.729036,8.8956383 19.547267,11.730284 V 33.568621 C 11.982012,31.663311 5.8141632,35.40303 6.2685944,37.347065 6.9730255,40.6661 20.646969,38.449299 20.569474,34.208305 l 0.148589,-19.473166 18.850374,-2.892332 v 19.437166 c -7.566284,-1.926647 -13.265498,1.376384 -12.811066,3.32042 0.579431,3.194035 12.378226,2.113362 13.76364,-2.657146 z"
+       display="block"
+       opacity="0.511765"
+       style="marker:none"
+       id="path336" /><path
+       fill="url(#d)"
+       d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+       display="block"
+       opacity="0.511765"
+       overflow="visible"
+       style="fill:url(#d);marker:none"
+       transform="matrix(0.73452,-0.11164,0.11164,0.73452,3.903362,12.22551)"
+       id="path338" /><path
+       fill="url(#e)"
+       d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+       display="block"
+       opacity="0.511765"
+       overflow="visible"
+       style="fill:url(#e);marker:none"
+       transform="matrix(0.73452,-0.11164,0.11164,0.73452,23.74587,9.390864)"
+       id="path340" /></g></svg>
diff --git a/icons/splash.png b/icons/splash.png
new file mode 100644
index 00000000..4e022c11
Binary files /dev/null and b/icons/splash.png differ
diff --git a/icons/zipsound.svg b/icons/zipsound.svg
new file mode 100644
index 00000000..6046da3f
--- /dev/null
+++ b/icons/zipsound.svg
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   sodipodi:docname="zipsound.svg"
+   inkscape:version="1.2.2 (732a01da63, 2022-12-09)"
+   sodipodi:version="0.32"
+   id="svg2963"
+   height="48px"
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="Package-x-generic.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs3"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective77" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient5060"><stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0"
+         id="stop5062" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5064" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient6717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" /><linearGradient
+       id="linearGradient5048"><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" /><stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" /><stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5048"
+       id="linearGradient6715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       x1="302.85715"
+       y1="366.64789"
+       x2="302.85715"
+       y2="609.50507" /><linearGradient
+       id="linearGradient2869"><stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2871" /><stop
+         style="stop-color:#cccccc;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop2873" /></linearGradient><linearGradient
+       id="linearGradient4995"><stop
+         id="stop4997"
+         offset="0"
+         style="stop-color:#de9523;stop-opacity:1;" /><stop
+         id="stop4999"
+         offset="1.0000000"
+         style="stop-color:#a36d18;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4987"
+       inkscape:collect="always"><stop
+         id="stop4989"
+         offset="0"
+         style="stop-color:#a0670c;stop-opacity:1;" /><stop
+         id="stop4991"
+         offset="1"
+         style="stop-color:#a0670c;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient4979"><stop
+         id="stop4981"
+         offset="0.0000000"
+         style="stop-color:#fbf0e0;stop-opacity:1.0000000;" /><stop
+         id="stop4983"
+         offset="1.0000000"
+         style="stop-color:#f0ce99;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4946"
+       inkscape:collect="always"><stop
+         id="stop4948"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" /><stop
+         id="stop4950"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" /></linearGradient><linearGradient
+       id="linearGradient4222"><stop
+         id="stop4224"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" /><stop
+         id="stop4226"
+         offset="1.0000000"
+         style="stop-color:#ffffff;stop-opacity:0.68639052;" /></linearGradient><linearGradient
+       id="linearGradient4210"><stop
+         id="stop4212"
+         offset="0.0000000"
+         style="stop-color:#eaba6f;stop-opacity:1.0000000;" /><stop
+         id="stop4214"
+         offset="1.0000000"
+         style="stop-color:#b97a1b;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4192"><stop
+         id="stop4194"
+         offset="0"
+         style="stop-color:#e9b96e;stop-opacity:1;" /><stop
+         id="stop4196"
+         offset="1.0000000"
+         style="stop-color:#f1d19e;stop-opacity:1.0000000;" /></linearGradient><linearGradient
+       id="linearGradient4182"><stop
+         id="stop4184"
+         offset="0.0000000"
+         style="stop-color:#a36d18;stop-opacity:1.0000000;" /><stop
+         id="stop4186"
+         offset="1.0000000"
+         style="stop-color:#d79020;stop-opacity:1.0000000;" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4946"
+       id="radialGradient2252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,2.658463e-16,23.58206)"
+       cx="22.930462"
+       cy="35.373093"
+       fx="22.930462"
+       fy="35.373093"
+       r="17.576654" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4995"
+       id="linearGradient2274"
+       gradientUnits="userSpaceOnUse"
+       x1="36.288929"
+       y1="14.661557"
+       x2="47.065835"
+       y2="15.267649" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4192"
+       id="linearGradient2277"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,0.986355,0.000000,0.316638)"
+       x1="25.381256"
+       y1="24.720648"
+       x2="24.119167"
+       y2="16.170370" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4182"
+       id="linearGradient2280"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.000000,0.000000,0.000000,1.039184,0.000000,-4.057054e-2)"
+       x1="16.148972"
+       y1="12.636667"
+       x2="34.193642"
+       y2="12.636667" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4987"
+       id="linearGradient2282"
+       gradientUnits="userSpaceOnUse"
+       x1="21.906841"
+       y1="9.7577486"
+       x2="22.071806"
+       y2="16.020695" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient2285"
+       gradientUnits="userSpaceOnUse"
+       x1="18.706615"
+       y1="19.912336"
+       x2="30.014812"
+       y2="47.388485" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4210"
+       id="linearGradient2288"
+       gradientUnits="userSpaceOnUse"
+       x1="24.990499"
+       y1="34.004856"
+       x2="24.990499"
+       y2="22.585211" /><radialGradient
+       xlink:href="#a"
+       id="d"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#a"
+       id="e"
+       cx="4.3920336"
+       cy="32.307854"
+       r="6.375"
+       fx="4.3920336"
+       fy="32.307854"
+       gradientTransform="matrix(1,0,0,0.5098,0,16.05392)"
+       gradientUnits="userSpaceOnUse" /><radialGradient
+       xlink:href="#linearGradient5060"
+       id="c"
+       cx="23.25"
+       cy="35.375"
+       r="18.5"
+       fx="23.25"
+       fy="35.375"
+       gradientTransform="matrix(1,0,0,0.39865,0,21.2728)"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       id="a"><stop
+         offset="0"
+         stop-color="#fff"
+         id="stop3397" /><stop
+         offset="1"
+         stop-color="#fff"
+         stop-opacity="0"
+         id="stop3399" /></linearGradient></defs><sodipodi:namedview
+     inkscape:window-y="-9"
+     inkscape:window-x="-9"
+     inkscape:window-height="991"
+     inkscape:window-width="1920"
+     stroke="#c17d11"
+     fill="#e9b96e"
+     inkscape:showpageshadow="false"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     showgrid="false"
+     inkscape:current-layer="layer1"
+     inkscape:cy="80.079843"
+     inkscape:cx="83.615377"
+     inkscape:zoom="2.8284271"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     borderopacity="0.16470588"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:window-maximized="1" /><metadata
+     id="metadata4"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:creator><cc:Agent><dc:title>Jakub Steiner</dc:title></cc:Agent></dc:creator><dc:source>http://jimmac.musichall.cz/</dc:source><dc:subject><rdf:Bag><rdf:li>package</rdf:li><rdf:li>archive</rdf:li><rdf:li>tarball</rdf:li><rdf:li>tar</rdf:li><rdf:li>bzip</rdf:li><rdf:li>gzip</rdf:li><rdf:li>zip</rdf:li><rdf:li>arj</rdf:li><rdf:li>tar</rdf:li><rdf:li>jar</rdf:li></rdf:Bag></dc:subject><cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/licenses/publicdomain/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><g
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1"><g
+       style="display:inline"
+       transform="matrix(2.105461e-2,0,0,2.086758e-2,42.60172,35.4036)"
+       id="g6707"><rect
+         style="opacity:0.40206185;color:black;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         id="rect6709"
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" /><path
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
+         id="path6711"
+         sodipodi:nodetypes="cccc" /><path
+         sodipodi:nodetypes="cccc"
+         id="path6713"
+         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
+         style="opacity:0.40206185;color:black;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /></g><rect
+       ry="2.3944440"
+       rx="2.4241352"
+       y="15.275433"
+       x="7.4623847"
+       height="23.112879"
+       width="31.978371"
+       id="rect3115"
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2288);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000007;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><rect
+       style="opacity:0.48101267;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#linearGradient2285);stroke-width:1.0000011;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       id="rect4220"
+       width="29.804138"
+       height="21.075352"
+       x="8.4989996"
+       y="16.243698"
+       rx="1.2846882"
+       ry="1.2846882" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4162"
+       d="M 8.7697819,16.547178 L 13.819731,9.7363408 L 32.615291,9.6353255 L 37.835264,16.408941 L 8.7697819,16.547178 z "
+       style="fill:url(#linearGradient2280);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2282);stroke-width:1.0000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4164"
+       d="M 38.276321,16.325703 L 43.469269,23.520364 L 3.9609455,23.520364 L 8.6250143,16.320763 L 38.276321,16.325703 z "
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2277);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><path
+       sodipodi:nodetypes="ccccc"
+       id="path4178"
+       d="M 32.849333,9.6141009 L 37.532219,16.536370 L 46.565835,20.921197 L 38.451329,12.008545 L 32.849333,9.6141009 z "
+       style="opacity:1.0000000;color:#000000;fill:url(#linearGradient2274);fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000005;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible" /><path
+       sodipodi:nodetypes="ccccc"
+       style="opacity:1.0000000;color:#000000;fill:#f8e8cf;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#a0670c;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       d="M 13.617702,9.7151161 L 9.6419233,16.435355 L 0.50729183,20.820182 L 8.6217973,11.907530 L 13.617702,9.7151161 z "
+       id="path4180" /><path
+       style="opacity:1.0000000;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#f4e3ca;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
+       d="M 37.024959,16.436050 L 41.478871,22.493011 L 5.6482792,22.493011 L 9.7892982,16.312694 L 37.024959,16.436050 z "
+       id="path4954"
+       sodipodi:nodetypes="ccccc" /><g
+       color="#000000"
+       id="g3414"
+       transform="matrix(0.56662726,0,0,0.57555804,9.3965414,4.9348444)"><path
+         fill="url(#c)"
+         fill-rule="evenodd"
+         d="m 41.75,35.375 a 18.5,7.375 0 1 1 -37,0 18.5,7.375 0 1 1 37,0 z"
+         opacity="0.3"
+         overflow="visible"
+         style="fill:url(#c);marker:none"
+         transform="translate(0,2.834646)"
+         id="path3404" /><path
+         fill="#9db029"
+         stroke="#596616"
+         stroke-linecap="round"
+         stroke-linejoin="round"
+         d="M 41.625,7.7951523 18.5625,10.629798 v 21.78125 c -1.645955,-0.557651 -3.931785,-0.703429 -6.4375,-0.1875 -4.356314,0.896969 -7.4778602,3.299487 -7,5.34375 0.4778601,2.044263 4.393685,2.99072 8.75,2.09375 4.116641,-0.84762 7.684123,-3.037802 7.602633,-5 l 0.15625,-19.03125 16.930457,-2.895306 v 17.284614 c -10.25,-1.5 -13.292201,2.893236 -12.81434,4.9375 0.47786,2.044263 4.393686,2.990719 8.75,2.09375 3.865376,-0.795885 6.63241,-2.763211 6.90625,-4.625 z"
+         display="block"
+         style="marker:none"
+         id="path3406" /><path
+         fill="none"
+         stroke="#ffffff"
+         d="M 40.729036,8.8956383 19.547267,11.730284 V 33.568621 C 11.982012,31.663311 5.8141632,35.40303 6.2685944,37.347065 6.9730255,40.6661 20.646969,38.449299 20.569474,34.208305 l 0.148589,-19.473166 18.850374,-2.892332 v 19.437166 c -7.566284,-1.926647 -13.265498,1.376384 -12.811066,3.32042 0.579431,3.194035 12.378226,2.113362 13.76364,-2.657146 z"
+         display="block"
+         opacity="0.511765"
+         style="marker:none"
+         id="path3408" /><path
+         fill="url(#d)"
+         d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+         display="block"
+         opacity="0.511765"
+         overflow="visible"
+         style="fill:url(#d);marker:none"
+         transform="matrix(0.73452,-0.11164,0.11164,0.73452,3.903362,12.22551)"
+         id="path3410" /><path
+         fill="url(#e)"
+         d="m 12.25,32.75 a 6.375,3.25 0 1 1 -12.75,0 6.375,3.25 0 1 1 12.75,0 z"
+         display="block"
+         opacity="0.511765"
+         overflow="visible"
+         style="fill:url(#e);marker:none"
+         transform="matrix(0.73452,-0.11164,0.11164,0.73452,23.74587,9.390864)"
+         id="path3412" /></g></g></svg>
diff --git a/locale/.clang-format b/locale/.clang-format
new file mode 100644
index 00000000..f54a540f
--- /dev/null
+++ b/locale/.clang-format
@@ -0,0 +1,4 @@
+---
+DisableFormat: true
+SortIncludes: Never
+...
diff --git a/locale/ar_SA.ts b/locale/ar_SA.ts
index 77f06780..9552a47b 100644
--- a/locale/ar_SA.ts
+++ b/locale/ar_SA.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>حول</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>برنامج القاموس الذهبي للبحث في القواميس، الإصدار </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>مرخص وفق الإصدار الثّالث من رُخصة غنّو أو أحدث</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>نسخ معلومات الإصدار</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>نسخ قائمة القواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>إشادات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[غير معروف]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>مبني على كيوتي %1 (%2، %3 بت)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 قسطنطين ايزاكوف (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>الحبيب: يمكن&apos;إنشاء بطاقة بدون كلمة</translation>
+      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -66,12 +61,12 @@
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>أنكي: فشل النشر إلى أنكي</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>أنكي: وظيفة أنكي النجاح</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>افحص</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;&quot;وظيفة منبثقة الاستكشاف&quot;&lt;/i&gt; في &lt;b&gt;تفضيلات&lt;/b&gt;، ثمّ مكّنها في أي وقت بإطلاق أيقونة &quot;منبثقة&quot; بالأعلى، أو بنقر أيقونة صينية النظام بزر الفأرة الأيمن واختيارها في القائمة التي ظهرت.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>وسّع المقالة</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>اطوِ المقالة</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>العمل مع المنبثقات</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(غير معنون)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>مرحبًا بك!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;منتدى&lt;/a&gt; البرنامج.&lt;p dir=&quot;RTL&quot;&gt;تحقّق من &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;موقع وِب&lt;/a&gt; البرنامج للتحديثات.&lt;p dir=&quot;RTL&quot;&gt;حقوق النشر 2008-2013 كونستانتين إيساكوف. مرخّص وفق رخصة جنو العمومية الإصدار 3 أو أحدث.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(صورة)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>وسّع المقالة</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>من</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>اطوِ المقالة</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>قم بتدوين ملاحظة Anki الجديدة</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>خطأ استعلام: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>الكلمات القريبة:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>التعابير المركّبة:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>الكلمات مفردةً: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>فشل في إنشاء ملف مؤقت.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>اب&amp;حث عن &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>ابحث عن &quot;%1&quot; في لسان &amp;جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>المورد المشار إليه غير موجود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>فشل في فتح ملف المورد تلقائيًّا، حاول فتحه يدويًّا: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>ابحث عن &quot;%1&quot; في %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>حدّد المقالة الحالية</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>انسخ كنص</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>افحص</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>ابحث عن &quot;%1&quot; في %2 في لسان &amp;جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>افتح الوصلة في &amp;لسان جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>افتح الوصلة في متصفّح &amp;خارجي</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>المورد</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>صوت قراءة النّصوص</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>الصورة</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>المرئيات</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>المقطع المرئي: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>التّعريف من القاموس &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>تعريف: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
-      <translation>برنامج الصوت المشار إليه غير موجود.</translation>
+      <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>افتح الرابط</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>حفظ وإشارة مرجعية &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>تحذير: مشغل الصوت: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>خطأ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>احفظ الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>احفظ الصّورة</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>ملفات صورة (*.bmp *.jpg *.png *.tif);;كل الملفات (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>احفظ ال&amp;صّورة...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>لم يتم العثور على المرحلة</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 من %2 تطابق</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>احفظ الصّو&amp;ت...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>أرسل &quot;%1&quot; إلى سطر الإدخال</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>أ&amp;ضف &quot;%1&quot; إلى التأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp; إرسال المقال الحالي إلى Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp; إرسال النص المحدد إلى Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>ملفات الصوت (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;جميع الملفات (*.*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>فشل تشغيل ملف الصوت: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp; إنشاء ملاحظة Anki</translation>
     </message>
   </context>
   <context>
@@ -413,93 +408,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>التحويل الصيني</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>تمكين التحويل بين الأحرف الصينية المبسطة والتقليدية</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>يخدع ونسخة الصينية</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>قم بتمكين التحويل من الأحرف المبسطة إلى الأحرف التقليدية (البديل التايواني)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC إلى TC (البديل التايواني)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>تمكين التحويل من الأحرف المبسطة إلى الأحرف التقليدية (متغير هونج كونج)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC إلى TC (متغير هونغ كونغ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>تمكين التحويل من الأحرف التقليدية إلى الأحرف المبسطة</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC إلى SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>مبسطة لتحويل الصينية التقليدية (البديل التايواني)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>مبسطة لتحويل الصينية التقليدية (متغير هونج كونج)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>التقليدية إلى الصينية المبسطة التحويل</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>تحويل صوتي مخصص</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>مطلوب مصادقة الوكيل</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>تحتاج إلى توفير اسم مستخدم وكلمة مرور للوصول عبر الوكيل</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>اسم المستخدم:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>كلمة المرور:</translation>
     </message>
@@ -507,24 +502,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>نموذج</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>رمز المجموعة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>الاختصار:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>مجلد المفضلة:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>الصور</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>كل الملفات</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>خطأ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>تعذّر قراءة ملف الصورة المحدّد.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>التّأكيد</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>هل أنت متأكد من توليد مجموعة مجموعات مبنية على زوجي اللّغة؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>هل أنت متأكد من أنك تريد إنشاء مجموعة من المجموعات بناءً على metadata.toml؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>ادمج المجموعات باللغة المصدر إلى &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>ادمج المجموعات باللغة الهدف إلى &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>فشل التجميع التلقائي حسب المجلد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>لا يمكن الوصول إلى الدليل الرئيسي لـ %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>هل أنت متأكد من أنك تريد إنشاء مجموعة من المجموعات بناءً على المجلدات المحتوية؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>أنشئ مجموعة ترجمة من جهتين &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>ادمج المجموعات بـ &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>القواميس:</translation>
     </message>
@@ -634,200 +629,210 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
-      <translation type="unfinished">Search mode</translation>
+      <translation>وضع البحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>يحدد هذا العنصر كيفية تفسير سلسلة المرشح</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>إذا تم التحقق من حالة الرموز ، فسيتم أخذها في الاعتبار عند التصفية</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
+      <translation>حالات التطابق</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>تصدير الكلمات الرئيسية إلى ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>صدّر</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>يساعد</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>نعم</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>اضغط على هذا الزر لتطبيق عامل التصفية على قائمة الكلمات الرئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
+      <translation>يتقدم</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>إذا تم تحديد أي تغييرات في التصفية ، فسنطبق على الفور على قائمة الكلمات الرئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>تطبيق تلقائي</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>منقي:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
+      <translation>سلسلة عامل التصفية (سلسلة ثابتة أو أحرف بدل أو تعبير عادي)</translation>
     </message>
     <message>
       <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <source>Text</source>
+      <translation>نص</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
+      <source>Wildcards</source>
+      <translation>البدل</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>جارٍ تحميل الكلمات الرئيسية ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>إجمالي عدد الكلمات الرئيسية الفريدة: %1، المصفاة: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>حفظ كلمات رئيسية في ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>ملفات نص (*.txt);;كل الملفات (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>لا يمكن فتح الملف المصدر</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>تصدير كلمات رئيسية ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>ألغِ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>توقفت عملية التصدير</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>انتهى التصدير</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>مجموع المقالات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>ترجم من:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>مجموع الكلمات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>ترجم إلى:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>افتح المجلد</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>حرّر القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>الملفات التي تتضمن القاموس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>الوصف:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>عرض كل كلمات رئيسية فريدة من نوعها في القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>كلمات رئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>حرّر القاموس بالأمر: %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 من المدخلات</translation>
     </message>
@@ -837,105 +842,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>عنوان Url: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>قواعد بيانات: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>استراتيجيات البحث: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>قواعد بيانات الخادم</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
+      <translation>ممكن</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>العنوان</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>قواعد بيانات</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>الاستراتيجيات</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
+      <translation>أيقونة</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>قائمة قواعد البيانات مفصولة بفواصل
+(سلسلة فارغة أو &quot;*&quot; تطابق جميع قواعد البيانات)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>قائمة بإستراتيجيات البحث
+مفصولة بفواصل (السلسلة الفارغة تعني إستراتيجية &quot;بادئة&quot;)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>قائمة موسّعة بكل القواميس...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>حرّر هذه المجموعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>معلومات القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>كلمات رئيسية في القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>افتح مجلد القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>حرّر القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>شريط ال&amp;قواميس</translation>
     </message>
@@ -944,27 +949,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;قواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>قواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>اقبل</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>ألغِ</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>تغيّرت المصادر</translation>
     </message>
@@ -975,12 +980,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>م&amp;جموعات</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>بعض المصادر تغيّرت. أتقبل التّغييرات؟</translation>
     </message>
@@ -990,12 +995,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>الصفحة السابقة</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>الصفحة التالية</translation>
     </message>
   </context>
   <context>
@@ -1009,85 +1014,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>البحث عن نص كامل</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>نص عادي</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <source>Wildcards</source>
+      <translation>البدل</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
+      <source>support xapian search syntax,such as AND OR +/- etc</source>
+      <translation>support بناء جملة البحث xapian ، مثل AND OR +/- إلخ</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
       <location filename="../src/fulltextsearch.cc" line="243"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
-      <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>المقالات التي تم العثور عليها: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>الفهرسة الآن: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
-      <translation type="unfinished">None</translation>
+      <translation>لا أحد</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>لا توجد قواميس للبحث عن نص كامل</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>خطأ في ملف المفضلات</translation>
     </message>
   </context>
   <context>
@@ -1105,17 +1090,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>أضف المجلد</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>المفضلة:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>سيتم حذف جميع العناصر المحددة. يكمل؟</translation>
     </message>
   </context>
   <context>
@@ -1151,7 +1136,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>من</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>اذهب إلى حرّر|قواميس|فورڤو واطلب منّا مفتاح API لإخفاء هذا الخطأ.</translation>
     </message>
@@ -1161,79 +1146,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;سابق</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;التالي</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>يبحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>وضع:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>المقالات التي تم العثور عليها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>القواميس المتوفرة في المجموعة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>انتظر الفهرسة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>يساعد</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>المجموع:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>مفهرس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>الفهرسة الآن: لا شيء</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>ألغِ</translation>
     </message>
@@ -1265,27 +1234,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>لسان 2</translation>
     </message>
@@ -1307,7 +1276,7 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>افتح قائمة المجموعات</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1325,12 +1294,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>ضع اسمًا جديدًا للمجموعة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>القواميس المتوفرة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>أ&amp;ضف مجموعة</translation>
     </message>
@@ -1340,42 +1309,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>أضف مجموعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>أنشئ مجموعة قواميس جديدة</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>تجميع حسب اللغات</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>إنشاء مجموعات قائمة على المجلد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>تجميع حسب المجلدات</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>تجميع حسب البيانات الوصفية</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>أعد تسمية مجموعة القواميس الحالية</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>أزل مجموعة القواميس الحالية</translation>
     </message>
@@ -1385,43 +1354,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>ضع اسمًا للمجموعة الجديدة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>أزل كل المجموعات</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>أزل القواميس المحدّدة من المجموعة (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>أضف القواميس المحدّدة إلى المجموعة (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>أ&amp;زل المجموعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>المجموعات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>أ&amp;عد تسمية المجموعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>أزل كل مجموعات القواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>أنشئ مجموعات مبنية على اللغات</translation>
     </message>
@@ -1444,12 +1413,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>التأريخ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>حجم التأريخ: %1 من المدخلات من أصل %2</translation>
     </message>
@@ -1457,12 +1426,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>اقتراحات الإملاء:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>الصَرْف %1</translation>
     </message>
@@ -1470,12 +1439,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>مُمكّن</translation>
     </message>
@@ -1483,1031 +1452,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>اسم القامويس</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>القاموس الذهبي - يهيّئ</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>فضلًا انتظر بينما تُفهرَس القواميس</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>فضلًا انتظر...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>اليو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>الآيدوية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>اللاوية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>التوي</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>العفرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>الأكانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>الكري</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>الإيبو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>الكومية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>المنكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>البالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>التايلاندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>الأُردية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>الزولو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>التشيكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>الهولندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>الغاندا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>الفولانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>اليونانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>الهوساوية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>الهندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>الأيرلندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>الخميرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>الكونغو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>اللاتينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>المالاوية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>الماورية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>الناورو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>الأوريا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>الأورومية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>السانغو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>الشونا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>الطاجيكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>التاميلية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>التتارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>السواتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>التونغا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>الاينبياك</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>الفيندا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>الأوزبكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>الويلزية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>الوولوف</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>زوسا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>الإيطالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>ريتو-الرومانسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>الزونخاية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>الكانادية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>شمال نديبيلي</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>الأبخازية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>القيرقيزية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>الكيروندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>الغيلية الأسكتلندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>الألبانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>اللاتفية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>المالايالامية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>الكردية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>البلغارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>اللينغالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>المالطية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>المهاراتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>العربية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>الباسكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>الأفارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>البيهارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>الأيمارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>البريتونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>السوندانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>الدنماركية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>الدِّيْفِيْهيّة</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>لوبا-كاتانغا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>الفيجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>المجرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>الفرنسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>الألمانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>المنغولية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>العبرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>الهيريرو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>اللوكسمبرجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>الكانورية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>الكازاخية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>الكيكويو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>الكورية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>النافاهو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>الإندونجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>النيبالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>الأوجيبوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>البشتونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>البولندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>الساموية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>الأوكيتانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>السندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>السلوفاكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>الصومالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>التيلجو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>التسونجا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>التسوانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>الإيغورية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>الصربية الكرواتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>اليوروبية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>التشوانغية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>الرومانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>الأندونيسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>البنجابية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>جنوب السوتو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>الكورسيكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>الاسبرانتو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>الفارسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>السلوفينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>الفريزيان</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>الأراغونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>التاهيتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>المالاجاشية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>الجاليكية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>الأذرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>الأمهرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>السنسكريتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>اليابانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>الأوكرانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>البامبارية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>الجرينلاندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>الباشكيرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>البلاروسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>الكشميرية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>السردينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>الحيري موتو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>الكويتشوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>البنغالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>الجاوية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>الأفستية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>الكينيارواندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>الإفريقية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>البيسلامية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>الأرمينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>بوكمال النرويجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>الكرواتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>البوسنية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>الوسيطة</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>الإنترلينجوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>الكتالانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>الصربية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>البورمية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>الروسية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>الليمبرجيشية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>النرويجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>الشيشانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>الصينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>التشوفاشية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>السنهالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>الإسبانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>الكورنية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>التاجالوجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>الأسامية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>الأوسيتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>الأستونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>السواحلية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>السويدية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>التبتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>الفيتنامية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>المقدونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>البرتغالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>التركية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>التركمانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>الغوجاراتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>الأيسلاندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>الإنكتيتوتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>الإنجليزية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>الجورجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>الكنيسة السلافية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>الفاروية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>الفنلندية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>فولابوك</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>الولونية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>الكوانيامية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>المارشالية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>شمال سامي</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>الهايتية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>التشامورو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>النينورسك النرويجية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>الغوارانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>جنوب نديبيلي</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>الشيشيوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>اللتوانية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>سيتشوان يي</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>التغرينية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>اليديشية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>الصينية التقليدية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>الصينية المبسطة</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>أخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>لهجات الصينية المبسطة الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>لهجات الصينية التقليدية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>لغات شرق أوروبا الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>لغات غرب أوروبا الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>اللغات الروسية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>اللغات اليابانية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>اللغات البلطيقية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>اللغات اليونانية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>اللهجات الكورية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>اللهجات التركية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>اللهجات التايلاندية الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>الأمازيغية</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>اللوجبانية</translation>
     </message>
@@ -2515,215 +2488,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>فرنسي</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>الأسبانية</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>البيلاروسية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>البلغارية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>التشيكية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>ألمانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>اليونانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>الفنلندية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>إيطالي</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>اليابانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>الكورية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>الليتوانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>المقدونية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>هولندي</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>تلميع</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>البرتغالية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>الروسية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>السلوفاكية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>الألبانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>الصربية (السيريلية)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>السويدية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>اللغة التركية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>الأوكرانية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>الصينية المبسطة</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>تقاليد صينية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>فيتنامي</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>البرتغالية والبرازيلية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>اللغة الفارسية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>الإسبانية والأرجنتين</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>هندي</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>اسبرانتو</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>الألمانية ، سويسرا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>الإسبانية ، بوليفيا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>طاجيك</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>الكيتشوا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>ايمارا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>العربية السعودية</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>التركمان</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>إنترلينج</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>لوجبان</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>إنجليزي</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>خطأ في تحميل القواميس</translation>
     </message>
@@ -2731,7 +2704,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>خطأ في ملف الإعداد. أأتابع بالإعدادات الافتراضية؟</translation>
     </message>
@@ -2739,702 +2712,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation type="unfinished">Favo&amp;rites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>الكل</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>ارجع</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 من القواميس، %2 من المقالات، %3 من الكلمات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;حرّر</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>م&amp;ساعدة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>البحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>ا&amp;خرج</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>خطأ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>اخرج من التطبيق</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>أ&amp;غلق إلى صينية النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>تعذّر حفظ المقالة: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>قرّب</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;قواميس...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;حول</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>المن&amp;تدى</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>ا&amp;طبع</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>ا&amp;حفظ المقالة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>احفظ المقالة كـ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>يصغّر النافذة إلى صينية النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>إ&amp;عداد الصفحة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;صفحة البداية</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>إصدار جديد متوفّر</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>ابحث عن:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>بعّد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>أظهر النافذة ال&amp;رئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>حول القاموس الذهبي</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>نزّل</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>إعداد الصفحة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>ابحث في:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>الحجم الطّبيعي</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>يحمّل...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(غير معنون)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>ت&amp;فضيلات...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>مرحبًا بك!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>انطق الكلمة (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>احفظ المقالة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>تخطّ هذا الإصدار</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>تقدّم</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>اطبع المقالة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>لا تتوفر طابعة. فضلًا ثبّت واحدة أولًا.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;عرض</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;تأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>ا&amp;محُ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>ت&amp;قريب</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>قرّب الكلمات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>يعّد الكلمات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>حجم الكلمات العادي</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>أغلق اللسان الحالي</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>أغلق كل الألسنة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>أغلق كل الألسنة ما عدا هذا</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>الألسنة المفتوحة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>لسان جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>مجلد الإ&amp;عداد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>شريط ال&amp;قوائم</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>اعثر في القواميس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation type="unfinished">Add all tabs to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>قائمة الألسنة المفتوحة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation type="unfinished">Remove current tab from Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>اخترت إخفاء شريط القوائم. استخدم %1 لإظهاره مرة أخرى.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>أ&amp;ظهر</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;صدّر</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>أ&amp;خفِ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>صدّر التأريخ إلى ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>ملفات نص (*.txt);;كل الملفات (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>اكتمل تصدير التأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>خطأ استيراد:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>ا&amp;ستورد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>استورد التأريخ من ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>خطأ استيراد: بيانات غير صالحة في الملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>اكتمل استيراد التأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>خطأ استيراد:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>تصدير المفضلة إلى ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>ملفات XML (* .xml) ؛؛ كافة الملفات (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>اكتمل تصدير المفضلة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>تصدير المفضلة إلى ملف كقائمة عادية</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>استيراد المفضلة من ملف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>ملفات XML (* .xml) ؛؛ ملفات Txt (* .txt) ؛؛ كافة الملفات (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>اكتمل استيراد المفضلة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>خطأ في تحليل البيانات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>معلومات القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>افتح مجلد القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>حرّر القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation type="unfinished">Now indexing for full-text search: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>لوحة ال&amp;بحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>لوحة التنقّل بين النتائ&amp;ج</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation type="unfinished">Favor&amp;ites Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>معاي&amp;نة الطباعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>أعد إ&amp;كتشاف الملفات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>لسان &amp;جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;دائمًا في الأعلى</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>دائمًا في الأعلى</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>زر قائمة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>البحث في الصفحة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>البحث في كامل النص</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation type="unfinished">GoldenDict reference</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>عرض</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>تصدير</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>استيراد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>أضف</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>إضافة علامة التبويب الحالية إلى المفضلة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>تصدير إلى القائمة</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>أظهر الأسماء في &amp;شريط القواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>أظهر رموز صغيرة في شريط الأد&amp;وات</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>التن&amp;قّل</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>تمكين المسح</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>مقالة، بالكامل (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>مقالة، HTML فقط (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>يحفظ المقالة...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>اكتمل حفظ المقال</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>عُيّنت النافذة الرئيسية في الأعلى دائمًا.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>لوحة التأري&amp;خ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>أداة الإتاحة غير ممكّنة</translation>
     </message>
@@ -3442,12 +3415,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>عُبث في ملف القاموس أو أُتلف</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>فشل تحميل المقالة من %1، السبب: %2</translation>
     </message>
@@ -3455,7 +3428,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>خطأ تحليل XML: %1 عند %2،%3</translation>
     </message>
@@ -3471,22 +3444,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>العنوان</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>ممكّن</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>الرّمز</translation>
     </message>
@@ -3502,95 +3475,95 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>النموذج</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>القواميس غير النشطة (المعطّلة):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>الاسم:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>مجموع المقالات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>الترجمات من:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>الترجمات إلى:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>مجموع الكلمات:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>ترتيب القواميس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>الملفات التي تتضمن القاموس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>معلومات القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>الوصف:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>افرز بالاسم</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>افرز باللغة</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>كلمات رئيسية في القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>قواميس نشطة: %1، غير نشطة: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>المسار</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>التكرارية</translation>
     </message>
@@ -3598,69 +3571,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>بديل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>ابدأ إلى صينية النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Shift اليساري فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>ويندوز/ميتا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>مكّن رمز صينية النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>المضيف:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>المنفذ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>النّوع:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>المستخدم:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>منبثقة الا&amp;ستكشاف</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,138 +3640,138 @@ switching to them.</source>
 التبديل إليها.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>استخدم مُلقّمًا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>استخدم المفاتيح السّريع التالي لترجمة كلمة من الحافظة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>مفتاح الشّعار</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>انطق تلقائيًّا الكلمات في النافذة الرئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>ابدأ مع النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Alt اليساري فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>التصفّح المبوّب</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Shift اليميني فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>ال&amp;صوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>مكّنه إن وددت استخدام مُلقّم
 لجميع طلبات البرنامج في الشبكة.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>لغة الواجهة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Ctrl اليساري فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>افتح الألسنة الجديدة في الخلفية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>ال&amp;شّبكة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Ctrl اليميني فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>لنغفو</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift اليميني</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift اليساري</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>انطق تلقائيًّا الكلمات في منبثقة الاستكشاف</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>افتح الألسنة الجديدة بعد الحاليّة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>أعد تشغيل البرنامج لتطبيق تغيير اللغة.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>مفتاح Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>التمس عن إصدار جديد للبرنامج كل فترة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 إلى الألسنة الأخيرة.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>أغلق إلى صينية النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>افتراضي النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>عند تمكينه، سيظهر رمز في صينية النظام حيث يمكن استخدامها
 لفتح النافذة الرئيسية وإجراء مهامَ أخرى.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,141 +3809,141 @@ download page.</source>
 سيُعلمك البرنامج عنه ويطلب فتح صفحة التنزيل.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>البدء</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>كلمة المرور:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>الافتراضي</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>ال&amp;واجهة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>يغيّر اللغة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>مفتاح Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>استخدم المفتاح السّريع التالي لإظهار أو إخفاء النافذة الرئيسية:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt اليساري</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Alt اليميني فقط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>تفضيلات</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl اليساري</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt اليميني</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl اليميني</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>المفاتيح السريعة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>ابدأ و منبثقة الاستكشاف تعمل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>بهذه، يبدأ التطبيق تلقائيًّا في صينية النظام دون
 أن تظهر النافذة الرئيسية.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>مفتاح Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>يبدأ القاموس الذهبي مباشرة بعد إقلاع النّظام .</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>تشغيل ملفات الصوت عبر دعم الصوت المدمج</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>استخدام المشغل الداخلي:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>اختر نهاية خلفية الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>أدخل سطر أوامر مشغل الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3982,533 +3952,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 الذي تتصفّحه. إن انهارت بعض المواقع بسبب هذا، حاول تعطيله.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>امنع تحميل المحتوى من مواقع أخرى (يخفي أغلب الإعلانات)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>النطق</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>التشغيل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>استخدم برنامجًا خارجيًا:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>النقر المزدوج يترجم الكلمة المحدّدة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>استخدم أي برنامج خارجي لتشغيل ملفات الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>مفتاح ESC يخفي النافذة الرئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>أخفِ لسانًا واحدًا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>اضبط هذه القيمة لتجنّب قوائم المحتوى الضخمة.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>حد القواميس في قائمة السياق:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>أرسل الكلمة المترجمة إلى النافذة الرئيسية بدلًا من إظهارها في نافذة منبثقة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>أرسل الكلمة المترجمة إلى النافذة الرئيسية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>إظهار نافذة العلم قبل إظهار النافذة المنبثقة ، انقر فوق العلم لإظهار النافذة المنبثقة. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>عادةً ، يؤدي النقر فوق ارتباط أو النقر نقرًا مزدوجًا فوق كلمة أو البحث عن تحديد
+في المقالة إلى تحميل الترجمة ويتم تمرير
+على الفور تقريبًا إلى المقالة من نفس القاموس. مع إيقاف تشغيل هذا الخيار
+، ومع ذلك ، يتم عرض المقالة من القاموس الأعلى.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>قم بالتمرير تلقائيًا إلى المقالة المستهدفة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>أسلوب عرض المادة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>تحويل واجهة المستخدم إلى الظلام.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>الوضع الداكن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>تحويل نمط عرض المقالة إلى الظلام.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>وضع القارئ الداكن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>ترتيب MRU: النظام المستخدم مؤخرًا.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>تتبع تغييرات الحافظة عند تمكين المسح. يلاحظ! يجب عليك دائمًا تمكين هذا إلا إذا كنت تستخدم نظام Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>تتبع تغيير الحافظة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>تغيير المسار التحديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>اختيار المسار فقط عندما يتم الضغط باستمرار على جميع المفاتيح المحددة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>إظهار علم المسح عند تحديد الكلمة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>وكيل النظام</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>وكيل مخصص</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>إعدادات مخصصة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>أنكي كونيكت</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http: //</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>ظهر السفينة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>نموذج:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>كلمة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>مجال المفردات ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>نص</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>جملة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>حقل الجملة (يمكن أن يكون فارغاً)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>لا تعرّف القاموس الذهبي في ترويسات HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>الحد الأقصى لحجم ذاكرة التخزين المؤقت للشبكة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>الحد الأقصى لمساحة القرص الذي يشغله GoldenDict&apos;s للشبكة ذاكرة التخزين المؤقت في
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+إذا تم تعيين إلى 0 سيتم تعطيل ذاكرة التخزين المؤقت لقرص الشبكة.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>عند تمكين هذا الخيار ، يقوم GoldenDict
+بمسح ذاكرة التخزين المؤقت للشبكة من القرص أثناء الخروج.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>امسح ذاكرة التخزين المؤقت للشبكة عند الخروج</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>البحث في كامل النص</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>السماح بالبحث عن النص الكامل لـ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>لا تبحث في قواميس تحتوي على أكثر من</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>المقالات (0 - غير محدود)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>مت&amp;قدّم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>أثناء عمليات البحث المتتالية ، إذا تم طي أحد القواميس يدويًا ، فسيظل مطويًا في البحث التالي</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>انهيار الجلسة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>عند استخدام الحافظة ، اخلع كل شيء بعد سطر جديد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>في بحث جديد ، ركز على النافذة الرئيسية أو النافذة المنبثقة حتى لو كانت مرئية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>المفضلة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>الفاصل الزمني لحفظ المفضلة. إذا تم التعيين على 0 المفضلة ، فسيتم حفظها أثناء الخروج فقط.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>قم بتشغيل هذا الخيار لتأكيد كل عملية حذف للعناصر</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>تأكيد على حذف العناصر</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>قم بتشغيل هذا الخيار لتجاهل إدخال النص
+الطويل بشكل غير معقول من تمرير الماوس أو التحديد أو الحافظة أو سطر الأوامر</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>تجاهل عبارات المدخلة أطول من</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>سيتم تجاهل عبارات الإدخال الأطول من هذا الحجم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>تشغيل هذا الخيار لتجاهل علامات التشكيل خلال البحث عن المقالات</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>تجاهل علامات التشكيل خلال البحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>مكّن هذا الخيار لتوسيع الأجزاء الاختيارية من المقالات دائمًا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>وسّع الأ&amp;قسام الاختيارية</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>حدّد هذا الخيار لطي المقالات الكبيرة تلقائيًّا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>اطو المقالات الأكبر من الـ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>المقالات الأكبر من هذا الحجم ستطوى</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>تجاهل علامات الترقيم خلال البحث</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>تشغيل هذا الخيار لتمكين البحث عن مقالات إضافية عبر قوائم مرادفات
+من قواميس Stardict, Babylon و GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>بحث إضافي عبر مرادفات</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>رمز</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab يتنقّل بين الألسنة بترتيب MRU</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>بابيلون</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>التأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>مكّن هذا الخيار لتخزين تأريخ الكلمات المترجمة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>خزّن ال&amp;تأريخ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>المقالات</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>مكّن هذا الخيار إن أردت تحديد الكلمة بنقرة فأرة واحدة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>حدّد الكلمة بنقرة مفردة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>نمط الملحقة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>حدّد عدد المدخلات الأقصى لإبقائها في التأريخ.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>حجم التأريخ الأقصى:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>فترة حفظ التأريخ. إن عُيِّنت إلى 0، سيُحفظ التأريخ أثناء إنهاء التطبيق فقط.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>احفظ كلّ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>دقيقة</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>كلاسيك</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>عصري</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>لِنْغوز</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>لِنْغوز-بلو</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> ميجابايت</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>المعلومات الموضعية مطلوبة لاستخدام البحث عن عبارة Xapian وعامل NEAR ، لكن حجم قاعدة البيانات سيكون أكبر بكثير. ينطبق فقط على القواميس الواردة الجديدة.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>صوت</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>نص مجرّد</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>طابِق السابقة</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>غير معروف</translation>
     </message>
@@ -4516,17 +4528,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>لم يُعطَ اسم للبرنامج.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>انهار البرنامج.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>أرجعَ البرنامج شِفرة الخروج %1.</translation>
     </message>
@@ -4534,27 +4546,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>ممكّن</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>النوع</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>سطر الأوامر</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>الرّمز</translation>
     </message>
@@ -4562,99 +4574,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>خطأ في تحميل المقالة</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>خطأ في فك ترميز المقالة</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>حقوق التأليف والنشر: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>الإصدار: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>المؤلف: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>البريد الإلكتروني: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>العنوان: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>موقع الويب: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>التاريخ: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>برنامج البحث في القاموس.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>كلمة أو جملة للاستعلام.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>حفظ رسائل التصحيح إلى gd_log.txt في مجلد التكييف.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>تغيير مجموعة النافذة الرئيسية.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>تغيير مجموعة النوافذ المنبثقة.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>قم بتبديل قائمة الفحص المنبثقة.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>رشّح/ابحث في القاموس (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>امحُ البحث</translation>
     </message>
@@ -4662,22 +4689,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>خطأ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>خطأ في حفظ المورد: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>فشل تنزيل المورد المشار إليه.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>تحذير: %1</translation>
     </message>
@@ -4706,67 +4733,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>الحوار</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>انطق الكلمة (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>أضف كلمة إلى المفضلة (Ctrl + E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>يُظهر أو يخفي شريط القاموس</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>ابق دائمًا فوق جميع النوافذ الأخرى</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>أرسل الكلمة إلى النافذة الرئيسية (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>ارجع</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>تقدّم</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
     </message>
   </context>
   <context>
@@ -4774,53 +4806,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;سابق</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;التالي</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>إبراز &amp;الكل</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;تحسس حالة الأحرف</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>اعثر على:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>المسار</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>الرّمز</translation>
     </message>
@@ -4828,60 +4860,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>الملفات</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>الهيراجانا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>الأنظمة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>نيهون-شيكي</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>ويكيبيديا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>الكتابة اليابانية الكاتاكانا المقطعية</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>اعمل قواميس من مجموعات من ملفات الصوت بإضافة المسارات هنا:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>روماجي اليابانية</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4892,84 +4924,84 @@ Not implemented yet in GoldenDict.</source>
 لم يُنفَّذ حتى الآن في القاموس الذهبي.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>مواقع ويكيبيديا (ميدياويكي):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>أدلة الصوت</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>أي برامج خارجية. سيتم استبدال سلسلة %GDWORD% بكلمة الاستعلام. سيتم استبدال السلسلة %GDSEARCH% بالنص الموجود في شريط البحث. إذا لم يتم توفير كلا المعلمتين ، فسيتم إدخال الكلمة الرئيسية في الإدخال القياسي.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;التصريحات التي أدلى بها &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;، مكتبة وسائط لغوية تعاونية في ويكيميديا فرنسا. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>قم بتمكين Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>رمز لغة ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;يتطلب استخدام Forvo حاليًا مفتاح API ، قم بالتسجيل في الموقع للحصول على المفتاح الخاص بك.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;احصل على مفتاحك الخاص &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;هنا&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>الطريقة الأكثر استخدامًا لنسخ اليابانية،
 مبنية على الفونولوجيا الإنجليزية</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>الكتابة اليابانية الهيراجانا المقطعية</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>التحويل الصوتي المخصص</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>يتم تطبيق هذا فقط في عبارة البحث ، حيث يمثل كل سطر كتابة بحروف لغة أخرى ، وفاصلة منقوطة منفصلة. على سبيل المثال ، ae ؛ æ ، يمكن للمستخدمين إدخال ae لتمثيل æ في الكلمة الهدف.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae ؛ æ # هذا مثال</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>النسخ الحرفي</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ Not implemented yet in GoldenDict.</source>
 لم يُنفَّذ حتى الآن في القاموس الذهبي.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>النسخ الروسي الحرفي</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>الصَرْف</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;غيّر...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>أمثلة:  &amp;quot;eng&amp;quot; للغة الإنجليزية ، &amp;quot;fra&amp;quot; للفرنسية &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+يمكن العثور على القائمة الكاملة للغات المتاحة &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; هنا &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>الكاتاكانا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>المسار إلى دليل بقواميس Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>أعد الا&amp;كتشاف الآن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>النسخ الألماني الحرفي</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>أي مواقع للوِب. السلسلة %GDWORD% ستُستبدل بكلمة الاستعلام:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>أ&amp;ضف...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>اختر قاموسًا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>أ&amp;زل</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>مواقع الوِب</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>المسارات للبحث فيها عن ملفات القواميس:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>تأكيد الإزالة</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>الكتابة المقطعية:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>قواميس الصَرْف المتوفّرة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>يمكّن استخدام الأبجدية اللاتينية لكتابة اللغة اليابانية</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5107,94 +5129,94 @@ of the appropriate groups to use them.</source>
 المناسبة لاستخدامها.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>هِپ‌بيرن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>كنريه-شيكي</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>فورڤو</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>خوادم DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>خوادم DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>مكّن النطق من فورڤو</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>مفتاح API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>ترميزات اللغة (مقسّمة بفواصل):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>النسخ اليوناني الحرفي</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(ليس متوفّرًا في الإصدار المحمول)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>البرامج</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>النسخ البلاروسي الحرفي</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>قراءة النّصوص</translation>
     </message>
@@ -5210,42 +5232,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>محركات الصوت المحدّدة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>أ&amp;ضف</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>أ&amp;زل</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>معاينة</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>محركات الصوت المتوفّرة:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>النص لمعاينته:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>اطبع نصًّا هنا لعرضه.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;عاين</translation>
     </message>
@@ -5267,20 +5289,20 @@ of the appropriate groups to use them.</source>
     <message>
       <location filename="../src/texttospeechsource.cc" line="80"/>
       <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>
+      <translation>لا يمكن العثور على صوت TTS متوفر.&lt;br&gt;يرجى التأكد من تثبيت محرك TTS واحد على الأقل على جهازك.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>تفضيلات</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>الحجم:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>المعدّل:</translation>
     </message>
@@ -5288,12 +5310,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>اطبع كلمة أو عبارة للبحث في القواميس</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>القائمة المنسدلة</translation>
     </message>
@@ -5324,33 +5346,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>الاسم</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>العنوان</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>ممكّن</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>إدراج المقالة كارتباط داخل علامة &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>كوصلة</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>الرّمز</translation>
     </message>
@@ -5358,17 +5380,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>فشل الاستعلام عن بعض القواميس.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>تحذير: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/ay_BO.ts b/locale/ay_BO.ts
index 5577f95f..d86478bd 100644
--- a/locale/ay_BO.ts
+++ b/locale/ay_BO.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Uka jak&apos;atxa</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, aru pirwa electrónico, jakhu uñjawi </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencia GNU GPLv3 jan ukax qhipata</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation type="unfinished">Copy version info</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation type="unfinished">Copy dictionaries list</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Yanapirinaka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Jan uñt&apos;ata]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Qt %1 (%2, %3 bit) ukampi uñstayata</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@users.berlios.de)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,12 +80,12 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Ukat cursor uk uchasmawa kuna arutix thaqhañ munt ukxaru yaqha aplicación ukana, ukatja mä wintanaw uñstanini, thaqhawi uñachayañataki.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;Uñstir wintana apnaqasa&lt;/h3&gt;
 Yaqha aplicaciones ukat arunak thaqhañatakixa, &lt;i&gt;&quot;Escaneo apnaqañatakixa uñstir wintanana&quot;&lt;/i&gt; &lt;b&gt;Askichaña&gt;Ajlliñanaka&lt;/b&gt; ukan naktayañama. Ukatxa jist&apos;arasmawa klik ukampi salta uñstir wintanana jan ukjax klik ukampi sistema wak&apos;ana achakut kupi wutunampi. 
@@ -100,38 +95,32 @@ antes la &lt;i&gt;&quot;función de ventana emergente de búsqueda&quot;&lt;/i&g
 &lt;b&gt;Askichaña&gt;Ajlliñanaka&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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Qillqa janatataña</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Qillqa suk&apos;aña</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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; qutuna janiw &lt;b&gt;%1&lt;/b&gt; aru utjkiti.&lt;br&gt;&lt;br&gt;
-No se ha encontrado la palabra &lt;b&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Uñstir wintanampi apnaqkasa</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(jan sutini)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>¡Aski jutawi!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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&gt;Ukat kawkir aru thaqhañ munt uk ajllismawa yaqha aplicación ukana ukaxa achakumpi (pä kuti limt&apos;am jan ukjax llust&apos;ayam achakun wutunap limt&apos;asa) ukatxa mä wintana uñstanini, thaqhawi uñachayañataki.
 &lt;p&gt;Entonces puedes seleccionar cualquier palabra que 
@@ -140,13 +129,18 @@ sobre la palabra con el botón del ratón oprimido), y aparecerá una ventana
  que mostrará los resultados de la búsqueda.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>&lt;b&gt;%1&lt;/b&gt; qutuna janiw aru utjkiti.&lt;br&gt;&lt;br&gt;
 No se ha encontrado la palabra en el grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;Suma puriwi &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;
 &lt;p&gt;Aka programampi apnaqañatakixa nayraqataxa, &lt;b&gt;Askichaña &gt; Aru-pirwanaka&lt;/b&gt; ukar saram, kawkinkisa uka aru-pirwanak q’ipinakaxa churañataki. Wikipedia ukhamaraki yaqha jalsunaka uskusmawa, kunjams thaqhaña aru-pirwanakana, jan ukjax qutu aru-pirwanaka uñstayañ, ukanak lurasma.
@@ -174,7 +168,7 @@ 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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(jamuqa)</translation>
     </message>
@@ -182,42 +176,42 @@ programa para estar al corriente de las actualizaciones.
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Qillqa janatataña</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Ukata </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Qillqa suk&apos;aña</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation type="unfinished">Make a new Anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Thaqtawit pantjata: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Arunak jist&apos;antaña: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Lip&apos;katata arunaka: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Sapa arunaka: </translation>
     </message>
@@ -225,197 +219,197 @@ programa para estar al corriente de las actualizaciones.
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Temporal wayaqax panthiwa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot; &amp;thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>&amp;Machaq phichhun &quot;%1&quot; thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Janiw Chiqanchata wakiskirix utjkiti.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Wayaqax ist&apos;arañ pantthiwa. Manualmente yant&apos;am: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>%2 ukan &quot;%1&quot; thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Jichha qillqata uk ajlliña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Qillqjama qillqaqaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Uñakipaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>&amp;Machaq phichhun %2 ukan &quot;%1&quot; thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>&amp;Machaq phichhunxa chinuñ jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>&amp;Internet tuyurinxa chinuñ jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Yatiyawi jalsu</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Ist&apos;añataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Aru</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Jamuqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation type="unfinished">Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation type="unfinished">Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>&quot;%1&quot; aru-pirwat aru qhanañchaña: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Aru qhanañchaña: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
-      <translation>Ist&apos;añataki uka programax janiw utjkiti.</translation>
+      <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation type="unfinished">Op&amp;en Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>UKATARAKI: Kirkiyiri: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>PANTJATA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Ist&apos;añataki imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Jamuqa imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Jamuqan uka wayaqanaka (*.bmp *.jpg *.png *.tif);;Taqpach wayaqanaka (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>&amp;Jamuqa imaña...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation type="unfinished">Phrase not found</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>&amp;Ist&apos;añataki imaña...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Arunak thaqiriru &quot;%1&quot; qillqaqaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Thaqhat arunakaru &quot;%1&quot; yapxataña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation type="unfinished">&amp;Send Current Article to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation type="unfinished">Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Ist&apos;añataki wayaqaxa janiw kirkiyañ yatkiti: %1</translation>
     </message>
@@ -447,62 +441,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>&amp;Chino aru tukuyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Chino simplificado ukhamaraki chino tradicional uka tukuyawi naktayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>&amp;Chino aru tukuyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Chino simplificado ukat chino tradicional (aru Taiwan) ukaru tukuyawi naktayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC ukat TC ukar (aru Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Chino simplificado ukat chino tradicional (aru Hong Kong) ukaru tukuyawi naktayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC ukat TC ukar (aru Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Chino aru tradicional uk chino aru simplificado ukar tukuyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC ukat SC ukar</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Chino simplificado ukat chino tradicional (aru Taiwan) tukuyawi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Chino simplificado ukat chino tradicional (aru Hong Kong) tukuyawi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Chino tradicional ukat chino simplificado tukuyawi</translation>
     </message>
@@ -510,7 +504,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -518,22 +512,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Autenticación de proxy uk munasi</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Jumax apnaqirin sutipa ukhamaraki jamasat aru churañamawa proxy ukanjam mantañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Apnaqiri suti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Jamasat aru:</translation>
     </message>
@@ -541,22 +535,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Phuqañataki laphi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Qutu unancha:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Jank&apos;a tecla mantañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Munat arunakampi q&apos;ipi:</translation>
     </message>
@@ -581,17 +575,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Jamuqanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Taqpach wayaqanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Pantja</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Jamuq wayaqa ajllita ukaxa, janiw ullañ atkiti.</translation>
     </message>
@@ -599,65 +593,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Jaysawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>¿Parisa arunakjama qutunak uñstayapun muntati?
 
 ¿Quiere generar grupos basados en pares de idiomas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Aru qalltampi &quot;%1-&gt;&quot; ukarjama qutunak kisantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Aru tukutampi &quot;-&gt;%1&quot; ukarjama qutunak kisantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Jaqukipayir qutu uñstayaña purapata &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>&quot;%1&quot; ukampi qutunak kisantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Aru-pirwanaka: </translation>
     </message>
@@ -670,133 +664,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Kunjams thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Kunjamatixa akaxa, aru-pirwanakxa susuyasini</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Thaqhañanxa JACH&apos;A / jisk&apos;a qillqanaka amuyaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>JACH&apos;A / jisk&apos;a qillqa jikhthaptaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Wayaqa ukan piq&apos;i arunak imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>&amp;Anqar apsuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Yanapa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Jisa saña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Aka wutuna limt&apos;aña, tanta arunaka susuyañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Luraña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Tanta arunakarux jichhpachaw susuyasini</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Justupaki lurayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Susuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Susuña (arsuta ch&apos;akuntata, taqi kunatakis wakisi o expresiones regulares)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Qillqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Taqi kunatakis wakisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Expresión regular</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Jakhu p&apos;iqi arunaka mayaki: %1, susuyata: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Wayaqa ukan p&apos;iqi arunak imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Qillqa wayaqanaka (*.txt);;Taqpacha wayaqanaka (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>P&apos;iqi arunak anqar apsuña...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Jan saña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation type="unfinished">Export finished</translation>
     </message>
@@ -804,67 +798,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Qillqatanak jakhuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Jaqukipaña akata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Arunak jakhuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Jaqukipaña akar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Q&apos;ipi jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Aru-pirwa askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Apkata wayaqanaka, aka aru-pirwana:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Qillqatax kunjamasa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Taqpach p&apos;iqi arunaka uñachayaña jani payachata</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>P&apos;iqi arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Aru-pirwa askichaña lurayaña ukampi:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 mantañanaka</translation>
     </message>
@@ -895,44 +899,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Naktata</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Web utjawi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Yatiya base</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Kunjams luraña</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Salta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Yatiyawinak lakiriri coma uka qillqampi t&apos;aqxata
 (ch&apos;usa, jan ukax &quot;*&quot; taqpach uñach&apos;ayaña)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Kunjams thaqhaña coma uka qillqamp t&apos;aqxata
@@ -942,37 +946,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menú taqpach aru-pirwanakampi...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Aka qutu askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Aru-pirwa yatiyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Aru-pirwat p&apos;iqi arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Aru-pirwa ukat q&apos;ipi jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Aru-pirwa askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Aru-pirwa wak&apos;a</translation>
     </message>
@@ -981,27 +985,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Aru-pirwanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Aru-pirwanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Jis saña</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Jan saña</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Mayjt&apos;ayat yatiyaw jalsunaka</translation>
     </message>
@@ -1012,12 +1016,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Qutunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Yaqhip yatiyaw jalsunakax mayjt&apos;ayatawa.
 Uka majt&apos;ayatanakxa, jisa sañ muntati?
@@ -1050,75 +1054,55 @@ Se han modificado algunas fuentes.
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Taqpach qillqan thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Ukch&apos;pacha arunaka</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Q&apos;ala qillqa</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Taqi kunatakis wakisi</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Expresión regular</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Qawqha mayjas arupurkama (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Qawqha qillqatanakas sapa aru-pirwana (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Qillqatanak jikita: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Jichhax ullaskiwa: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ni maya</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Thaqhañatakixa utjañapapuniwa mä aru ukampi </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> jan ukaxa juk&apos;amp chimpunakampi</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Taqpach qillqan thaqhañataki janiw aru-pirwanakax utjkiti</translation>
     </message>
@@ -1126,7 +1110,7 @@ Se han modificado algunas fuentes.
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Wayaqa munat arunakan pantjasiwa</translation>
     </message>
@@ -1194,7 +1178,7 @@ Todos los items seleccionados serán borrados. ¿Quiere continuar?</translation>
       <translation>ukata</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Askichaña&gt;Aru-pirwanaka&gt;Yatiyaw jalsunaka&gt;Forvo ukar saram,
 ukat API chimpuma churam, aka pantjawi chhaqtayañataki.
@@ -1219,68 +1203,52 @@ su propia clave de la API para que este error desaparezca.</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>JACH&apos;A / jisk&apos;a qillqa jikhthaptaña</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Kunjams:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Qillqa siqinak jan yaqaña</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Qillqat chimpunaka (´`¨˜¯) jan yaqaña</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Qillqatanak jikita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Qututaki aru-pirwanak wakichata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Tanta utjirinaka uka layku suyt&apos;aña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Yanapa</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Taqpacha:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Tanta utjirinaka tukuyata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Ni maya</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Jan saña</translation>
     </message>
@@ -1314,27 +1282,27 @@ Elegir un grupo (Alt+G)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation type="unfinished">&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation type="unfinished">&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>SUPR</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>INS</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Phichhu 2</translation>
     </message>
@@ -1379,12 +1347,12 @@ Abrir una lista de grupos</translation>
       <translation>Machaq suti qutur ucham:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Aru-pirwanaka apnaqañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Qutu &amp;yapaña</translation>
     </message>
@@ -1394,47 +1362,47 @@ Abrir una lista de grupos</translation>
       <translation>Qutu yapaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Machaq qutu aru-pirwanak uñstayana.
 
 Crear un nuevo grupo de diccionarios.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Qutunakan aru-pirwanaka qatatim ukhamaraki uskum achakumpi. Aru-pirwanakxa unuqiyasmawa ukxa wakichañataki.
 Arrastre y suelte con el ratón para pasar diccionarios de un grupo a otro, para moverlos dentro de un grupo o para ordenar los grupos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Jichha qutu aru-pirwanak mayampi suticht&apos;aña.
 
 Renombrar el grupo de diccionarios actual.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Jiccha qutu aru-pirwanaka chhaqtayaña.
 
@@ -1446,49 +1414,49 @@ Eliminar el grupo actual de diccionarios.</translation>
       <translation>Machaq quturu suti qillqam:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Taqi qutunaka chhaqtayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Qutu ukat ajllit aru-pirwanak chhaqtayaña (SUPR)
 
 Eliminar los diccionarios seleccionados del grupo (SUPR)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Ajllit aru-pirwanak qutur yapaña (INS)
 
 Añadir los diccionarios seleccionados al grupo (INS)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Qutu &amp;chhaqtayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Qutunaka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Mayamp qutur suticht&apos;aña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Taqpach qutu aru-pirwanaka chhaqtayaña.
 
 Eliminar todos los grupos de diccionarios.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Parisa arunakataki qutunak uñstayaña.
 
@@ -1513,12 +1481,12 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
       <translation>Thaqhat arunaka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation type="unfinished">%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Qawqhas aru thaqhatanakax: %1 arunak %2 ukjaki</translation>
     </message>
@@ -1526,12 +1494,12 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Arunak amuyt&apos;awinaka: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfología %1</translation>
     </message>
@@ -1539,12 +1507,12 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Apnaqañataki</translation>
     </message>
@@ -1552,1031 +1520,1035 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Aru-pirwa suti</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - qaltaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Amp suma suyt&apos;am aru pirwanaka uñjañataki</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Amp suma suyt&apos;am...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation type="unfinished">Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation type="unfinished">Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laosiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation type="unfinished">Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation type="unfinished">Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Acano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation type="unfinished">Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation type="unfinished">Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation type="unfinished">Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation type="unfinished">Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation type="unfinished">Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation type="unfinished">Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Neerlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation type="unfinished">Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation type="unfinished">Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Camboyano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latín</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation type="unfinished">Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation type="unfinished">Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation type="unfinished">Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation type="unfinished">Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation type="unfinished">Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tayiko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation type="unfinished">Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tártaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation type="unfinished">Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation type="unfinished">Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation type="unfinished">Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation type="unfinished">Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wólof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation type="unfinished">Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retorrománico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation type="unfinished">Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation type="unfinished">Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abjasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirguís</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation type="unfinished">Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico escocés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation type="unfinished">Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation type="unfinished">Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation type="unfinished">Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Vasco (Euskara)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Ávaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation type="unfinished">Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation type="unfinished">Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation type="unfinished">Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiyiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation type="unfinished">Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation type="unfinished">Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Cazaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation type="unfinished">Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation type="unfinished">Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation type="unfinished">Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation type="unfinished">Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pastún</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation type="unfinished">Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation type="unfinished">Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation type="unfinished">Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation type="unfinished">Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation type="unfinished">Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation type="unfinished">Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation type="unfinished">Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sotho sureño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisón occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Gallego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amárico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucranio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation type="unfinished">Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation type="unfinished">Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation type="unfinished">Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avéstico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation type="unfinished">Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Africanos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation type="unfinished">Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Noruego bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation type="unfinished">Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Chechén</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Español</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation type="unfinished">Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asamés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osseto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suajili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Guyaratí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation type="unfinished">Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation type="unfinished">Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation type="unfinished">Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Criollo haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation type="unfinished">Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Noruego Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele sureño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation type="unfinished">Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation type="unfinished">Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigriña</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yidis</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chino tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chino simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Yaqha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Yaqha chino simplificado arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Yaqha chino tradicional arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Europeos orientales yaqha arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Europeos occidentales yaqha arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Yaqha ruso arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Yaqha japonés arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Yaqha baltico arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Yaqha griego arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Yaqha coreano arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Yaqha turco arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Yaqha tailandés arunaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation type="unfinished">Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
@@ -2584,207 +2556,207 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation type="unfinished">French</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation type="unfinished">Spanish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation type="unfinished">Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation type="unfinished">Czech</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation type="unfinished">German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation type="unfinished">Greek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation type="unfinished">Finnish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation type="unfinished">Dutch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation type="unfinished">Polish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation type="unfinished">Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation type="unfinished">Russian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation type="unfinished">Turkish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation type="unfinished">German, Switzerland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation type="unfinished">Spanish, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation type="unfinished">Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation type="unfinished">English</translation>
     </message>
@@ -2792,7 +2764,7 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Aru-pirwanak ullasinxa pantjiwa</translation>
     </message>
@@ -2800,7 +2772,7 @@ Crear grupos de diccionarios para pares de idiomas.</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Mayjachat wayaqaxa pantjiwa. Qallta mayjachat apnaqañ muntati?
 
@@ -2810,208 +2782,197 @@ Error en el archivo de configuración. ¿Continuar con la configuración por def
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation type="unfinished">F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation type="unfinished">F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Munat arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation type="unfinished">F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation type="unfinished">F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Taqpacha</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Nayriri
 
 Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 aru-pirwanaka, %2 qillqatanaka, %3 arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Wayaqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Yanapa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>&amp;Thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Mistuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Pantja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Programata mistuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Wak&apos;a ukan imantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Janiw qillqa imañ atiykiti: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Jach&apos;aptayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Aru-pirwanaka...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;GoldenDictxata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>G&amp;oldenDictxata parlakipañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Laphi liq&apos;suña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Qillqat imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Kunjam qillqata imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Wintan jisk&apos;aptam wak&apos;a ukana</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>L&amp;aphi mayjachaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>GoldenDict-ng &amp;web laphi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Machaq jakhuwi apnaqasmawa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Thaqham:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Jisk&apos;aptayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Nayrankir wintanax uñachayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>GoldenDict-ng ukxata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Apaqaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Laphi askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Kawkins thaqhaña:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Qawqhch&apos;akansa ukhama</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation>Pantjiw teclas jank&apos;aki uñjañataki.&lt;br&gt;Uñjam XServer naqañapaw RECORD.&lt;br&gt;
 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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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>Machaq jakhuwi &lt;b&gt;%1&lt;/b&gt; GoldenDict ukata utjxiwa.&lt;br&gt;
 &lt;b&gt;Apaqaña&lt;/b&gt; ukjar klik luram apaqañataki.&lt;br&gt;&lt;br&gt;
@@ -3019,69 +2980,69 @@ La nueva versión &lt;b&gt;%1&lt;/b&gt; de GoldenDict está disponible.&lt;br&gt
 Pulse en &lt;b&gt;Apaqaña&lt;/b&gt; para ir a la página de descarga.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation type="unfinished">Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation type="unfinished">Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Ullaskiwa...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(jan sutini)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>Ajlliña&amp;naka...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>¡Aski jutawi!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Aru arst&apos;aña (Alt+S)
 
 Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Qillqat imaña
 
 Guardar artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Aka version thuqukipaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Jutiri
 
 Posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Laphin qillqata liq&apos;suña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Janiw liq&apos;suri utjkiti. Amp suma mayampi ucham.
 
@@ -3089,94 +3050,99 @@ No hay ninguna impresora disponible. Por favor
 instale una primero.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Uñjaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Nayra arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Chhaqtayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Ja&amp;ch&apos;a/Jisk&apos;aptayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Arunak jach&apos;aptaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Arunak jisk&apos;aptaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Arunaka qawqhch&apos;akansa ukhamraki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Jichha phichhu ist&apos;antaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Taqi phichhu jist&apos;antaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Taqi phichhu jist&apos;antaña, jichhakis ukax janiwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Phichhunaka jist&apos;arata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Machaq phichhu
 
 Pestaña nueva</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Mayjachañatak q&apos;ipi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menú uka wak&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Aka aru-pirwanakan jikita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Munat arunakar taqpach phichhunaka yapaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Aru-pirwanakan qillqat thaqhañataki. Comodines &apos;*&apos;, &apos;?&apos; ukhamaraki chimpunaka
@@ -3186,357 +3152,363 @@ Buscar texto en los diccionarios. Puede utilizar los comodines &apos;*&apos; y &
 los símbolos &apos;[...]&apos;. Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos; y &apos;]&apos;, utilice &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos; o &apos;\]&apos;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Tanta phichhunak jist&apos;araña
 
 Abrir lista de pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Munat arunakat jichha phichhu chhaqtayaña
 
 Eliminar la pestaña actual de favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Menú wak&apos;xa imantasiwa. Limt&apos;am %1 wasitampi uñachayañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Uñachayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Anqar apsuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>I&amp;mantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Thaqhat arunak wayaqar imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Qillqa wayaqanaka (*.txt);;Taqpacha wayaqanaka (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Wayaqan imantañaxa tukuyataxiwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Imañ ukjax pantjasiwa: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>A&amp;nqaxat apaniña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Thaqhat arunak wayaqat apaniña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Anqat apanisinxa pantjasiwa: wayaqat jan wali yatiyawinaka.
 
 Error de importación: datos incorrectos en el fichero.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Anqat apanitaxa tukuyataxiwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Anqat apanisinxa pantjasiwa: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Munat arunak wayaqar apsuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML wayaqanaka (*.txt);;Taqpacha wayaqanaka (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Munata arunak imañxa tukuyatawa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Munat arunak wayaqar apsuña, ukja q&apos;ala qillqjama</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Munat arunak wayaqat apaniña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Munat arunak apaniñxa tukuyatawa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Yatiyawinak ullasiñxa pantjasiwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Aru-pirwat yatiyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Aru-pirwat p&apos;iqi arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Aru-pirwa ukat q&apos;ipi jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Aru-pirwa askichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Taqpach qillqat thaqhawix ullasiskiwa: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Munat arunakatxa &quot;%1&quot; chhaqtayañ muntati?
 
 ¿Eliminar la palabra &quot;%1&quot; de favoritos?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Thaqhañataki kaja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Ji&amp;kitanaka kaja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Mu&amp;nat arunak kaja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Laphi liq&apos;suñataki &amp;uñjaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Wasitamp wayaqanak ullaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>Ma&amp;chaq phichhu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Uñjkayapuni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Uñjkayapuni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menu ukan wutuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>&amp;Laphin thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>&amp;Taqpach qillqan thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-ng y&amp;atichawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Uñachayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>&amp;Anqar apsuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>A&amp;nqaxat apaniña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>&amp;Yapaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Jichha phichhu ukax munata arunakar yapaña
 
 Añadir la pestaña actual a favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>&amp;Tanta arunak anqar apsuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Aru-pirwanak wak&apos;an &amp;sutinak uñachayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Irnaqañatak &amp;wak&apos;an jisk&apos;a saltanak uñachayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Tuyu&amp;wi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Qillqata, Taqi kunaniwa (*.hmtl)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Qillqata, HTML ukampiki (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Qillqatax imasiskiwa...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Nayrankir wintanax uñjkayapuniñapawa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>T&amp;haqhat arunak kaja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API jaqiwisanakataki janiw naktatakiti</translation>
     </message>
@@ -3544,12 +3516,12 @@ Añadir la pestaña actual a favoritos</translation>
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Wayaqa aru-pirwa pantjatawa</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Qillqata ullasinxa pantjiwa akat %1, kunalayku: %2</translation>
     </message>
@@ -3557,7 +3529,7 @@ Añadir la pestaña actual a favoritos</translation>
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML uyllaña pantja: %1 en %2,%3</translation>
     </message>
@@ -3573,22 +3545,22 @@ Añadir la pestaña actual a favoritos</translation>
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Web utjäwi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Naktata</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Salta</translation>
     </message>
@@ -3598,88 +3570,88 @@ Añadir la pestaña actual a favoritos</translation>
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>Arunak arsũnatakixa búfer de audio janiw jist&apos;aran atkiti.</translation>
+      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Phuqhañ laphi</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Aru-pirwanaka jan apnaqata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Suti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Qillqatanak jakhuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Jaqukipan akat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Jaqukipan ukaru:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Arunak jakhuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation>Qatatiyam ukat aru-pirwanak uskuña, kunjams jumax siqi siqi sarayañ munta. Jiwt&apos;ayañatakixa, aru-pirwanak jiwt&apos;at qutunakan ukan uskuña.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Nayraqat aka aru-pirwanakan thaqham:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Aka aru-pirwan wayaqanaka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Aru-pirwan yatiyawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Qillqatax kunjamasa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Suti sutitjam siqichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Arunakjamat siqichaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Aru-pirwat p&apos;iqi arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Aru-pirwanaka naktata: %1, jiwayata: %2</translation>
     </message>
@@ -3687,12 +3659,12 @@ Añadir la pestaña actual a favoritos</translation>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Thakhi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Muytañataki</translation>
     </message>
@@ -3700,69 +3672,67 @@ Añadir la pestaña actual a favoritos</translation>
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Wak&apos;a sistema ukan qalltaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Chiqaki JACH&apos;A QILLQA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Windows jan ukjax Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Wak&apos;a sistema ukanxa salta naktayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Anfitrión:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Punku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>JACH&apos;A QILLQA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Kasta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Apnaqiri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Uñstir wintanampi ullaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3773,47 +3743,47 @@ Akax naktayatakis ukjaxa, machaq phichhu jist&apos;araskis ukjaxa,
 jichha phicchun qhiparasi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Servidor proxy apnaqaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Aka teclampi portapapeles ukat aru jaqukipañatakiwa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows jan ukjax Meta tecla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Nayrir wintanan justupak arunak arst&apos;awi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Sistemampi qalltaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Chiqaki ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Phichhutjam phicchutjam tuyuri</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
-      <translation>Kupiki JACH&apos;A QILLQA</translation>
+      <translation type="unfinished">Right Shift only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Cerrar en la bandeja del sistema.
@@ -3822,12 +3792,12 @@ Akamp naktayataxa, nayrir wintan jist&apos;antasinixa, wintanax imantasiniwa.
 Aplicación ukatxa janiw mistkaniti.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Ist&apos;añataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Ak naktayaña, jumati servidor proxy apnaqañ
@@ -3837,47 +3807,47 @@ Activar si desea utilizar un servidor proxy
 para todos los accesos a la red del programa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Interfaz aru:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Chiqaki CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Manqhajanx machaq phichhunak jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Llika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Kupiki CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation type="unfinished">Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Kupi JACH&apos;A QILLQA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Chiqa JACH&apos;A QILLQA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Mostrar la ventana emergente sólo si todas las teclas 
@@ -3887,32 +3857,32 @@ Akamp naktayataxa, taqpach teclanak limt&apos;atakis ukjakiw
 uñstiri wintanaxa uñstaraki, ajllit aru mayjt&apos;i ukja.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Uñstiri wintanan justupak arunak arst&apos;awi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Jiccha phichhu ukjaruxa, machaq phichhunak jist&apos;araña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Mayat programa aktayan sun apñaqañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>ALT tecla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Sapa kuti uñakipaña machaq jakhu programa utjiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3922,18 +3892,17 @@ Phantat layku, mach&apos;aq phicchunaka tukuwin uskutawa listata.
 Akampi machaq phichhunakawa phichhu chiqan ist&apos;aratatawal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Wak&apos;a sistema ukar jist&apos;antaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Sistemaw phanti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Activar icono de bandeja del sistema
@@ -3942,7 +3911,7 @@ Naktatakis ukjaxa wak&apos;a sistema ukan mä salta uñsti, ukax nayrir wintana
  jist&apos;arañatakiw apnaqasispawa, ukjmaraki yaqha lurawinak lurasispawa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3954,87 +3923,87 @@ Programa ist&apos;arasisa GoldenDict yantam apaqañataki.
 Apnaqañatakispa apaqanataki yatiyatam.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Qalltawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Mantawi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Phanta layku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Programa ajanu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Aru turkawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>CTRL tecla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Aka jank&apos;a teclanakampi apnaqam, nayrir wintana uñachayañataki jan ukjax imantañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Chiqa ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Kupiki JACH&apos;A QILLQA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Ajlliñanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Chiqa CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>ALT qhiqata</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
       <translation>Kunayman programampi jank&apos;a teclanakax apnaqasi, GoldenDict apnaqasiski ukja.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Kupi CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Jank&apos;a teclanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Mä uñstiri wintananxa escaneo uk naktayaña, qalltkis ukja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Iniciar en bandeja del sistema
@@ -4043,17 +4012,17 @@ Ak naktataxa, aplicación ukaxa wak&apos;a sistema ukan qallti,
 nayrir wintanap jani uñachasa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>JACH&apos;A QILLQA tecla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>GoldenDict-ng sapitakiw qaltani .</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Habilitar escaneo en una ventana emergente cuando inicia.
@@ -4062,17 +4031,17 @@ Jisa uskum thaqhañataki jan walikitaki janiwa.
 Akasti marcado, thaqhawi ist&apos;araskaniwa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Ajllit qillqata mayjt&apos;yasi GoldenDict uka wintana ukjax, janiw uñstir wintana uñachaykiti</translation>
+      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>GoldenDict-ng ukan ajllit qillqataxa, ukhamaraki mayjt&apos;ayat portapapeles, janiw yäqañakiti</translation>
+      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Utilizar el audio interno:
 
@@ -4081,65 +4050,61 @@ Sistema ist&apos;añataki ukampi, ist&apos;añataki wayaqanak arst&apos;ayaña.
 Reproducir archivos de audio con el audio por defecto del sistema.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Manqhax ist&apos;awi apnaqaña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Arst&apos;ayiri ist&apos;añataki ajllim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Ist&apos;añataki arst&apos;ayañatakixa, comando uk qillqam</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>No permitir la descarga de contenido desde otros sitios (oculta la 
-mayoría de los anuncios).
-
-Aka naktatampixa GoldenDict ukaxa kunayman yityawikanaka 
-jarkt&apos;aniwa utjirinaka jiwt&apos;ayasa (jamuqa, marcos, etc.) yaqha 
-web laphi jutirinaka. Janiti mayninak web laphi lurkan ukjax, 
-aka jiwt&apos;ayañ yant&apos;am.</translation>
+      <translation type="unfinished">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.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Yaqha web laphinakat janiw apaqañakiti (yatiyanaka imantañataki)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Arstawi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Arst&apos;awi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Anqat programa apnaqaña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Pä klik aru jaqukipañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Taxpach wakist&apos;awi arunakax apnakaskaniwa </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>La tecla ESC oculta la ventana principal.
@@ -4148,48 +4113,46 @@ Aktixa naktayataxa, ESC tiklaxa nayrankir wintana imantani.
 Janitix naktayatanixa, ESC tiklaxa jaquqipayiri ukaruw ixtayi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Tecla ESC ukax nayrankir wintan imanti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Ocultar pestaña cuando sólo hay una.
-
-Ak ajlliña wak&apos;a phichhunak jan uñjañataki, utjkis mä phichhuki ukja.</translation>
+      <translation type="unfinished">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Mä phichhukisa ukjaxa imantaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Límite de diccionarios para el menú contextual:
 
 Aka jakhu mayjacham jach&apos;a menus jithiqañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Qawqha aru-pirwanakas menú ukan uñachayi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Enviar palabra traducida a la ventana principal
 
 Jaqukipat aru uk nayrankiri wintanaru apayaña, uñstir wintanar uka lanti.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Nayrankir wintana ukar aru jaquikipata apayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Mostrar el icono del escaneo cuando una palabra es seleccionada.
 
@@ -4197,7 +4160,7 @@ GoldenDict ukan thaqhañatakiwa salta uñachaña.
 Uñstir wintana uñachañatakixa salta ukan mä klik luram. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4208,142 +4171,142 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation type="unfinished">Dark Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Escaneo ukan saltapa uñachaña, mä aru ajllitakis ukja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personalizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Ajlliñanaka, kunjams munta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation type="unfinished">Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation type="unfinished">http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation type="unfinished">Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation type="unfinished">Word</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation type="unfinished">Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation>Impedir la identificación de GoldenDict a partir de las cabeceras HTTP.
@@ -4352,93 +4315,93 @@ Yaqhiq web laphi GoldenDict uk uñt&apos;apxi HTTP p&apos;iqi laphi kuampi
 mayiwinakap jakt&apos;rakiwa. Jani wali utjañapatakixa, ak naktayam.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>GoldenDict-ng janiw uskañakiti HTTP p&apos;iqi tuqi laphina</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Llika cachep ukax kawkch&apos;akamasa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>taqi disco ukaxa cache de red de GoldenDict ukampiwa phuqasiski ukana
+      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
-0 ukaninixa, cache de red ukaxa jiwt&apos;ayataniwa.</translation>
+If set to 0 the network disk cache will be disabled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation type="unfinished"> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Programa ukat mistusinxa, GoldenDict
 ukax llikat cachep chhaqtayi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Mistjani ukjax llika cache uk chhaqtayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Taqi qillqan thaqhaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Taqpach qillqan thaqhawi uk lurayakiña kunataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Aru-pirwanakanxa janiw thaqhkiti, kunati utjki uka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>qillqatanaka (0 ukax janix tukuwinikiti)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Nayrankaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation type="unfinished">When using clipboard,strip everything after newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Munat arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Guardar cada N minutos.
 
@@ -4446,82 +4409,82 @@ Qawqha pachas munat arunaka imañataki.
 0 ukanixa, munat arunakaxa mistjan ukjaw imasini.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Confirmar cuando borra items.
 
 Aka naktayaña jiskht&apos;awitaki janir chhaqtayañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Jiskt&apos;awi janir chhaqtayañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Ak naktayaña jach&apos;a mantir qillqat jan yäqañataki achakut jutki
 uka ajlliwi, portapapeles jan ukjax siqi comando</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Janiw apnaqaña qillqata mantiri juk&apos;amp jach&apos;a ukata</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Qillqatanaka akat juk&apos;amp jach&apos;anixa, janiw yäqataniti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Ignorar marcas diacríticas en búsquedas.
 
 Ak naktayaña qillqat chimpunaka (´`¨˜¯) jan yaqaña thaqhkis ukja.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Qillqat chimpunaka (´`¨˜¯) jan yaqaña thaqhkis ukja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Desplegar partes opcionales.
 
 Aka naktayaña taqpach t&apos;aqanak janatatañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>&amp;T&apos;aqanak janatataña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Colapsar artículos con más que N caracteres.
 
 Ak naktayam, jach&apos;a qillqatanaka justupaki suk&apos;asiñataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Qillqatanak suk&apos;aña juk&apos;ampi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Juk&apos;amp jach&apos;a qillqatanakaxa suk&apos;ataniwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Búsqueda extra con sinónimos.
@@ -4531,50 +4494,49 @@ Aka naktayaña juk&apos;amp thaqhañataki tanta kikpa amuyuninakampi (sinónimos
 Activar esta opción para realizar búsquedas adicionales con listas de sinónimos en diccionarios de StarDict, Babylon y GLS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Juk&apos;amp thaqhañataki kikpa amuyuninakampi (sinónimos)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>qillqanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl+Tab phichhut phichhut sari MRU siqichawjama</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation type="unfinished">Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Thaqhat arunaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Almacenar historial.
 
 Tantan jaqukipat arunakaxa imañatakixa uk naktayaña.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Thaqhat arunak imaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Qillqatanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Seleccionar palabra con un solo clic.
 
@@ -4582,29 +4544,29 @@ Mä klik ukampi arunaka ajlliñataki, aka naktayaña.
 Active esta opción para seleccionar palabras con un clic del ratón.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Aru ajlliña mä klik ukampi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Kasta yapt&apos;ata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Tamaño máximo del historial:
 
 Jakhu qillqatanakata uskuña imañataki.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Thaqhat arunak qawqhch&apos;asa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Guardar cada N minutos.
 
@@ -4612,67 +4574,110 @@ Kunapachanakas thaqhat arunaka imt&apos;aña.
 0 ukanixa thaqhat arunakaxa imt&apos;asiniwa mistxani ukja.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Imaña sapa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>k&apos;atanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation type="unfinished">Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation type="unfinished">Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation type="unfinished">Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Larama</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation type="unfinished"> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapian ukan frase thaqhañamp NEAR operador ukamp apnaqañatakix posición ukan yatiyawipax wakisiwa, ukampis base de datos ukan tamapax juk’amp jach’äniwa. Machaq mantanir aru pirwanakatakikiwa.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Ist&apos;añataki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Q&apos;ala qillqa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation type="unfinished">Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Saphi nayrt&apos;irinaka (prefijos) thaqhañataki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Jan uñt&apos;ata</translation>
     </message>
@@ -4680,45 +4685,45 @@ Kunapachanakas thaqhat arunaka imt&apos;aña.
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Programa sutipax janiw churaskiti.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Programa ukax pantjiwa, janiw unxtkiti.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
-      <translation>Mistur chimpu %1 programa uka kutt&apos;ayiwa.</translation>
+      <translation type="unfinished">The program has returned exit code %1.</translation>
     </message>
   </context>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Naktata</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Kasta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Siqi comando</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Salta</translation>
     </message>
@@ -4726,99 +4731,114 @@ Kunapachanakas thaqhat arunaka imt&apos;aña.
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Qillqata (artículo) uñachasinxa pantjiwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Qillqata (artículo) ullasinxa pantjiwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Qillqirini kamachi: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Jakhu uñjawi: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Qillqiri: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation type="unfinished">E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Qillqa suti: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Web laphi: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Uru jakhu: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation type="unfinished">A dictionary lookup program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Aru-pirwan thaqhawi / susuña</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Thaqhawi chhaqtayaña</translation>
     </message>
@@ -4826,22 +4846,22 @@ Kunapachanakas thaqhat arunaka imt&apos;aña.
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>PANTJATA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Yatiyawi jalsu imasisinxa pantjasiwa: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Internet ukat apaqasinxa pantjiwa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>UKATARAKI: %1</translation>
     </message>
@@ -4870,72 +4890,77 @@ Kunapachanakas thaqhat arunaka imt&apos;aña.
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Tantachaw aru</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Aru arstaña (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Munat arunakar yapaña (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Aru pirwa uñjam jan ukat imantam</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Aka wintanaxa yaqhipatxa nayrankiripuniwa</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Nayrankir wintanar aru apayaña (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Nayriri
 
 Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Jutiri
 
 Posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4978,17 +5003,17 @@ Posterior</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Thakhi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Salta</translation>
     </message>
@@ -4996,62 +5021,62 @@ Posterior</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Wayaqanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Kunjams qillqaña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>¿&lt;b&gt;%1&lt;/b&gt; utjawi tantat chhaqtayañ muntati?&lt;br&gt;&lt;br&gt;
 ¿Quiere eliminar el sitio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation type="unfinished">Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabario de Japonés Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Ist&apos;añataki wayaqanakampi aru-pirwanak uñstayañataki, thakhinak yapam:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>¿&lt;b&gt;%1&lt;/b&gt; q&apos;ipi uk tantat chhaqtayañ muntati?&lt;br&gt;&lt;br&gt;
 ¿Quiere eliminar el directorio &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonés Roma arunimpi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -5061,84 +5086,84 @@ Estandarizado como ISO 3602
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) web laphinaka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Ist&apos;añataki q&apos;ipinaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation type="unfinished">Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Japonés aru qillqañataki,
 ingles arusutampiwa lurata</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabario de Japonés Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Yaqha qillqat qillqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -5148,22 +5173,22 @@ Su estándar es ISO-3602.
 Todavia no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Rusa arut qillqata</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Arunakat t&apos;aqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Apakipaña...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5172,94 +5197,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation type="unfinished">Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Q&apos;ipit thakhi Hunspell jan ukjax Myspell aru-pirwanakampi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Jichha &amp;ullaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Alemana arut qillqata</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Web laphi kawkirsa. Mä qillqata %GDWORD% aru thaqhata ukampiwa turkasini:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Yapaña...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Mä q&apos;ipi ajllim</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Chhakjaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Web laphinaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Aru-pirwa thaqhañataki thakhinaka:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Chhaqtayapunitati</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Arsull-pirwa (silabario):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Arunakat-t&apos;aqa pirwa (diccionarios morfológicos) apnaqañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Romano aru uskum japonesa arut qillqañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5280,88 +5295,88 @@ Añada diccionarios apropiados al final
 de los grupos apropiados para utilizarlos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation type="unfinished">Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation type="unfinished">Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT servidores</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT servidores:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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; ukampi arunak arst&apos;awi. Akampixa imasmawa ukhamaraki arunak jaljasmawa. GoldenDict ukan Forvo ukampi ist&apos;asmawa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvompi arst&apos;ayasiña</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API chimpu (clave):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Aru chimpunaka (comas ukampi jaljtata):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Arunaka jumatak apnaqañamataki. akhama: &quot;en, ru, es&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Aru chimpunaka tanta &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;akankiwa&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Griega arut qillqata</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(móvil ukan janiw lurkiti)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programanaka</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>¿&lt;b&gt;%1&lt;/b&gt; programa tantat apaqañ muntati?&lt;br&gt;&lt;br&gt;
 ¿Quiere eliminar el programa &lt;b&gt;%1&lt;/b&gt; de la lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Beloruso arut qillqata</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Jan ukjax apnaqam %GD1251% aka lanti CP1251, %GDISO1%...%GDISO16% aka lanti ISO-8859-1...ISO-8859-16, %GDBIG5% aka lanti Big-5,
@@ -5371,7 +5386,7 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
 %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK y GB18030, y %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Qillqat aru arsuri</translation>
     </message>
@@ -5387,42 +5402,42 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Arsuyirinaka ajllita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Yapaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Chhaqtayaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Nayraqata uñjañataki</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Arsuyirinaka apnaqañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Nayraqata qillqa uñjañataki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Nayraqat uñjañataki uk akan qillqaña.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Nayraqata uñjañataki</translation>
     </message>
@@ -5448,17 +5463,17 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
       <translation>TTS arst&apos;ayirix janiw jikiñjamakiti.&lt;br&gt;Computadoramanxa TTS arst&apos;ayirixa utjapuniñapawa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Ajlliñanaka</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Qawqha arsuña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Qawqha jalaña:</translation>
     </message>
@@ -5466,12 +5481,12 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Aru-pirwanakan thaqhañatakix mä aru qillqaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Janatatasispawa</translation>
     </message>
@@ -5491,7 +5506,7 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation>Chimpu uñt&apos;añataki</translation>
+      <translation type="unfinished">Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5502,35 +5517,35 @@ También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1..
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Web utjäwi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Naktata</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>&lt;iframe&gt; manqhanxa chinuñjam qillqat unchataña.
 
 Insertar artículo como un enlace adentro de un &lt;iframe&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Chinuñjama</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Salta</translation>
     </message>
@@ -5538,17 +5553,9 @@ Insertar artículo como un enlace adentro de un &lt;iframe&gt;.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Phantjiw aru pirwa thaqhawi.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>UKATARAKI: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/be_BY.ts b/locale/be_BY.ts
index 6bc1c2e5..73958a1e 100644
--- a/locale/be_BY.ts
+++ b/locale/be_BY.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Пра праграму</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng — праграма для прагляду слоўнікаў, версія </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Ліцэнзія GNU GPLv3 або пазнейшая</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Скапіяваць звесткі пра версію</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Скапіяваць спіс слоўнікаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Падзякі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Невядома]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>На аснове Qt %1 (%2, %3 бітаў)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>На аснове Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: можна&apos;t стварыць картку без слова</translation>
+      <translation>anki: Вы не можаце стварыць картку без слова</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;, і заціснуць кнопку &apos;Выплыўныя вокны&apos; ў галоўным акне або пстрыкнуць правай кнопкай мышы па значку на прасторы апавяшчэнняў і абраць адпаведны пункт у меню. </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Разгарнуць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Згарнуць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Апрацоўванне ў выплыўных вокнах</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без назвы)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Вітаем!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;p&gt;Каб наладзіць праграму, перайдзіце ў &lt;b&gt;Рэдагаванне|Налады&lt;/b&gt;. Для ўсіх налад ёсць апісанне. Абавязкова прачытайце апісанне, перш чым нешта змяняць.&lt;p&gt;Калі ўзніклі пытанні, прапановы, або проста захацелася пачытаць меркаванні іншых людзей, то наведайце &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;форум&lt;/a&gt;.&lt;p&gt;Новыя версіі праграмы можна знайсці на &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;сайце&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Ліцэнзія GPLv3 або пазнейшая.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(выява)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Разгарнуць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>З </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Згарнуць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Стварыць новую нататку Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Памылка запыту: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Падобныя словы: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Словазлучэнні: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Словы паасобку: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Не ўдалося стварыць часовы файл.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Шукаць &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Шукаць &quot;%1&quot; у &amp;новай укладцы</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Рэсурс па спасылцы не існуе.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Не ўдалося аўтаматычна адкрыць файл рэсурсу, паспрабуйце адкрыць уласнаручна: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Шукаць &quot;%1&quot; у %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Абраць бягучы артыкул</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Скапіяваць як тэкст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Інспектаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Шукаць &quot;%1&quot; у %2 у &amp;новай укладцы</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Адкрыць спасылку ў новай &amp;укладцы</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Адкрыць спасылку ў &amp;вонкавым браўзеры</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Рэсурс</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аўдыё</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Сінтэз маўлення</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Выява</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Відэа</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Відэа: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Азначэнне са слоўніка &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Азначэнне: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Праграма па спасылцы не існуе.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Ад&amp;крыць спасылку</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Захаваць &amp;закладку &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>УВАГА: аўдыяпрайгравальнік: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ПАМЫЛКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Захавць гук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Захаваць выяву</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Файлы выяў (*.bmp *.jpg *.png *.tif);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Захаваць &amp;выяву...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Фраза не знойдзена</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 з %2 супадзенняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Захаваць &amp;гук...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Адправіць &quot;%1&quot; у радок уводу</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Дадаць &quot;%1&quot; у гісторыю</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Адправіць бягучы артыкул у Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Адправіць абраны тэкст у Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Гукавыя файлы (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Усе файлы (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Гукавыя файлы (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Не ўдалося прайграць гукавы файл: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Канверсія кітайскай мовы</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Уключыць канверсію паміж знакамі спрошчанага і традыцыйнага кітайскага пісьма</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Канверсія &amp;кітайскай мовы</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Уключыць канверсію са знакаў спрошчанага кітайскага пісьма ў знакі традыцыйнага пісьма (тайванскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>Спрошчаныя ў традыцыйныя (тайванскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Уключыць канверсію са знакаў спрошчанага кітайскага пісьма ў знакі традыцыйнага пісьма (ганконгскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Спрошчаныя ў традыцыйныя (ганконгскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Уключыць канверсію са знакаў традыцыйнага кітайскага пісьма ў знакі спрошчанага пісьма</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>Традыцыйныя ў спрошчаныя</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Канверсія знакаў спрошчанага кітайскага пісьма ў знакі традыцыйнага пісьма (тайванскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Канверсія знакаў спрошчанага кітайскага пісьма ў знакі традыцыйнага пісьма (ганконгскі варыянт)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Канверсія знакаў традыцыйнага кітайскага пісьма ў знакі спрошчанага пісьма</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>карыстацкая транслітарацыя</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Патрабуецца аўтэнтыфікацыя проксі</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Каб атрымаць доступ з дапамогай проксі-сервера, вам неабходна ўвесці імя карыстальніка і пароль</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Імя карыстальніка:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Значок групы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Спалучэнне клавіш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Каталог улюбёнага:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Выявы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Усе файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Памылка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Не ўдалося прачытаць вызначаны файл выявы.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Пацвярджэнне</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Сапраўды хочаце стварыць набор групаў згодна з моўнымі парамі?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation>Сапраўды хочаце стварыць набор групаў на аснове metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Спалучыць групы паводле зыходнай мовы &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Спалучыць групы паводле мэтавай мовы &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>Не ўдалося выканаць групаванне па каталогах.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Немагчыма дасягнуць бацькоўскага каталога %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>Сапраўды хочаце стварыць набор групаў на аснове каталогаў, якія змяшчаюцца?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Стварыць групу двухбаковага перакладу &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Спалучыць групы з &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Слоўнікі: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Рэжым пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Гэты элемент вызначае тлумачэнне радка спіса</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Калі адзначаны рэгістр сімвалаў, ён будзе ўлічвацца пры фільтраванні</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Зважаць на рэгістр</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Экспартаванне загалоўных слоў у файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Экспартаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Даведка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Добра</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Націсніце гэтую кнопку, каб ужыць фільтр да спіса загалоўных слоў</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Ужыць</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Калі адзначана, любыя змены фільтра будуць неадкладна ўжывацца да спіса загалоўных слоў</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Аўтаматычнае ўжыванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Фільтр:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Радок фільтра (фіксаваны радок, знакі падстаноўкі або рэгулярны выраз)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Тэкст</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Знакі падстаноўкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Рэгулярны выраз</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Загрузка загалоўных слоў...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Агулам унікальных загалоўных слоў: %1, адфільтравана: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Захаваць загалоўныя словы ў файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Тэкставыя файлы (*.txt);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Немагчыма адкрыць экспартаваны файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Экспартаваць загалоўныя словы...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Скасаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Працэс экспартавання перарваны</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Экспартаванне завершана</translation>
     </message>
@@ -769,66 +764,76 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Агулам артыкулаў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Зыходная мова:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Агулам слоў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Мэтавая мова:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Адкрыць каталог</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Рэдагаваць слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлы, з якіх складаецца слоўнік:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Апісанне:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Паказваць усе ўнікальны загалоўныя словы слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Загалоўныя словы</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Рэдагаваць слоўнік з дапамогай загаду: %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Імя індэкснага файла:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Адкрыць індэксную тэчку</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 запісаў</translation>
     </message>
@@ -859,44 +864,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Уключана</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Адрас</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Базы даных</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Правілы</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Спіс базаў даных, падзеленых коскамі
 (пусты радок або &quot;*&quot; - базы даных)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Спіс правіл, падзеленых коскамі
@@ -906,37 +911,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Пашыранае меню з усімі слоўнікамі...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Рэдагаваць гэтую групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Загалоўныя словы слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Адкрыць каталог слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Рэдагаваць слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Панэль слоўнікаў</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Слоўнікі</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Слоўнікі</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Ухваліць</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Скасаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Крыніцы змяніліся</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Групы</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Некаторыя крыніцы змяніліся. Хочаце ўхваліць змены?</translation>
     </message>
@@ -1010,75 +1015,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Паўнатэкставы пошук</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Цэлыя словы</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Просты тэкст</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Знакі падстаноўкі</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Рэгулярны выраз</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Слова запыту не можа быць пустым.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>падтрымка пошукавага сінтаксісу xapian, напрыклад AND OR +/-</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Максімальная адлегласць паміж словамі (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Па змаўчанні</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Максімальная колькасць артыкулаў у слоўніку (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Знойдзена артыкулаў: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Зараз індэксуецца: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Няма</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Радок пошуку павінен змяшчаць прынамсі адно слова, якое змяшчае </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> або больш сімвалаў</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Няма слоўнікаў для паўнатэкставага пошуку</translation>
     </message>
@@ -1086,7 +1071,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Памылка ў файле ўлюбёнага</translation>
     </message>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>з</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1173,68 +1158,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Зважаць на рэгістр</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Рэжым:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Не зважаць на парадак слоў</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Не зважаць на дыякрытычныя знакі</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Знойдзена артыкулаў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Даступныя слоўнікі ў групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Чакаюць індэксацыі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Даведка</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Агулам:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Індэксаваныя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Зараз індэксуюцца: няма</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Скасаваць</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Укладка 2</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Дайце новую назву групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Даступныя слоўнікі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Дадаць групу</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Дадаць групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Стварыць новую групу слоўнікаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation>Групаваць па мове</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Стварэнне груп на аснове тэчак.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Група па тэчках</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Групаванне па метададзеных</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Перацягвайце слоўнікі ў групы або з іх. Размяркоўвайце іх унутры групы з дапамогай мышы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Змяніць назву бягучай групы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Выдаліць бягучую групу слоўнікаў</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Дайце назву новай групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Выдаліць усе групы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Выдаліць абраныя слоўнікі з групы (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Дадаць абраныя слоўнікі ў групу (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Выдаліць групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Групы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Змяніць назву групы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Выдаліць усе групы слоўнікаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Стварыць групы на падставе мовы</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Гісторыя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Памер гісторыі: %1 запісаў з %2 магчымых</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Арфаграфічныя прапановы: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Марфалогія %1</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Уключана</translation>
     </message>
@@ -1484,1031 +1453,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Індэксацыя: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Назва слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - ініцыялізацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Пачакайце завяршэння індэксавання слоўнікаў</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Калі ласка, пачакайце...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Ідзе індэксацыя...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Эве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Іда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лаоская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тві</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Акан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кры</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ігба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Комі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Мэнская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Палі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тайская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чэшская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Галандская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Грэчаская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хаўса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хіндзі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Ірландская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кхмерская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Лацінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маары</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Орыя</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Арома</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Шона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таджыкская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамільская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свазі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Інупяк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Валійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Валоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Коса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Італьянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Рэтараманская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонг-кэ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Канада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Паўночная ндэбеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Кіргізская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Кірундзі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Гаэльская (Шатландыя)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латышская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малаялам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Балгарская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лінгала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Мальтыйская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Маратхі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арабская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Басконская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Біхары</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймара</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Брэтонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Сунданская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Дацкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Дывехі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фіджыйская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Венгерская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Французская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Нямецкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Мангольская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Іўрыт</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Герэра</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембургская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Кануры</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казахская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кікую</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Карэйская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Наваха</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Аджыбва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пушту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Польская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Аксітанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Сіндхі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Славацкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Самалійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Тэлугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйгурская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Сербскахарвацкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Ёруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румынская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Інданезійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панджабі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Паўднёвая сота</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Карсіканская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Эсперанта</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Персідская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Славенская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Заходнефрызская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таіцянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Малагасійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галісійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербайджанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрыт</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Японская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамбара</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Грэнландская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкірская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Беларуская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашміры</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардзінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хіры-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Яванская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестыйская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Кіньяруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Афрыканс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Біслама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Армянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Нарвежская (Букмал)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Харвацкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Баснійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Інтэрлінгва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Інтэрлінгвэ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Сербская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бірманская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Расійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лімбургская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Нарвежская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чачэнская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Кітайская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Сінгальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Іспанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Асамская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Асецінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Эстонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахілі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тыбецкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>В'етнамская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Партугальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турэцкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуджараці</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Ісландская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Інукцітут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Англійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Царкоўнаславянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарэрская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Фінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Валапюк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваньяма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Паўночнасаамская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Гаіцянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чамора</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Нарвежская (нюнорск)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуарані</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Паўднёвая ндэбеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Ньянджа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Летувіская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Носу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тыгрынья</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Ідыш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Кітайская традыцыйная</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Кітайская спрошчаная</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Іншая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Іншыя дыялекты спрошчанай кітайскай</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Іншыя дыялекты традыцыйнай кітайскай</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Іншыя ўсходнееўрапейскія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Іншыя заходнееўрапейскія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Іншыя расійскія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Іншыя японскія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Іншыя балцкія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Іншыя грэчаскія мовы</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Іншыя карэйскія дыялекты</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Іншыя турэцкія дыялекты</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Іншыя тайскія дыялекты</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Тамазігхт</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
@@ -2516,207 +2489,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>Французская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>Іспанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>Беларуская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>Балгарская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>Чэшская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>Нямецкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>Грэчаская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>Фінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>Італьянская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>Японская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>Карэйская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>Летувіская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>Македонская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>Галандская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>Польская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>Партугальская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>Расійская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>Славацкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>Албанская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>Сербская (кірыліца)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>Шведская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>Турэцкая</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>Украінская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>Кітайская спрошчаная</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>Кітайская традыцыйная</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>В'етнамская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>Партугальская, Бразілія</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>Персідская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>Іспанская, Аргентына</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>Хіндзі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>Эсперанта</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>Нямецкая, Швейцарыя</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>Іспанская, Балівія</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>Таджыкская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>Аймара</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>Арабская, Саудаўская Аравія</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>Туркменская</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>Інтэрлінгвэ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>Англійская</translation>
     </message>
@@ -2724,7 +2697,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Не ўдалося загрузіць слоўнікі</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Памылка ў файле канфігурацыі. Працягнуць з прадвызначанымі наладамі?</translation>
     </message>
@@ -2740,702 +2713,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Улю&amp;бёнае</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Усе</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 слоўнікаў, %2 артыкулаў, %3 слоў</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Рэдагаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Даведка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Выйсці</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Памылка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Выйсці з праграмы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>Згарнуць на &amp;прастору апавяшчэнняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Не ўдалося захаваць артыкул: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Павялічыць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Слоўнікі...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Пра праграму</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Друкаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Захаваць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Захаваць артыкул як</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Згортванне акна на прастору апавяшчэнняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Налады &amp;старонкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Хатняя старонка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Дастуны новы выпуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Шукаць:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Паменшыць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Паказаць &amp;галоўнае акно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Пра GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Спампаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Налады старонкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Шукаць у:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Звычайны памер</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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-ng версіі &lt;b&gt;%1&lt;/b&gt; даступны для спампоўвання.&lt;br&gt;Пстрыкніце па &lt;b&gt;Спампаваць&lt;/b&gt;, каб перайсці на старонку спампоўвання.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Загрузка...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(без назвы)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Налады...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Вітаем!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Вымавіць слова (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Захаваць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Прапусціць гэты выпуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Далей</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Надрукаваць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Няма даступных прынтараў. Спачатку наладзьце хоць адзін.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Выгляд</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Гісторыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Ачысціць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Маштабаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Павялічыць радок пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Паменшыць радок пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Звычайны памер радка пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Закрыць бягучую ўкладку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Закрыць усе ўкладкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Закрыць усе ўкладкі апроч бягучай</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Адкрытыя ўкладкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Новая ўкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Каталог &amp;канфігурацыі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Панэль &amp;меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Знойдзена ў наступных слоўніках:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Дадаць усе ўкладкі ва ўлюбёнае</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ПАПЯРЭДЖАННЕ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Адкрыць спіс укладак</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Выдаліць бягучую ўкладку з улюбёнага</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Панэль меню схаваная. Скарыстайцеся %1, каб вярнуць яе назад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Паказваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Экспартаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>С&amp;хаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Экспартаваць гісторыю ў файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Тэкставыя файлы (*.txt);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Экспартаванне гісторыі скончылася</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Не ўдалося экспартаваць: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Імпартаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Імпартаваць гісторыю з файла</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Не ўдалося імпартаваць: хібныя даныя ў файле</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Імпартаванне гісторыі скончылася</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Не ўдалося імпартаваць: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Экспартаваць улюбёнае ў файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Файлы XML (*.xml);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Экспартаванне ўлюбёнага скончылася</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Экспарт улюбёнага ў файл як звычайны спіс</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Імпартаваць улюбёнае з файла</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Файлы XML (*.xml);;Тэкставыя файлы (*.txt);;Усе файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Імпартаванне ўлюбёнага скончылася</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Не ўдалося разабраць даныя</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Загалоўныя словы слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Адкрыць каталог слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Рэдагаваць слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Зараз індэксуюцца для паўнатэкставага пошуку: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Выдаліць загалоўнае слова &quot;%1&quot; з улюбёнана?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Панэль по&amp;шуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Панэль &amp;навігацыі ў выніках</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Па&amp;нэль улюбёнага</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Папярэдні п&amp;рагляд друку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Пера&amp;сканаваць файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Новая ўкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Заўсёды наверсе</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Заўсёды наверсе</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Кнопка меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Пошук на старонцы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Паўнатэкставы пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Спасылка на GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Паказваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Экспартаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Імпартаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Дадаць</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Дадаць бягучую ўкладку ва ўлюбёнае</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Экспартаваць у спіс</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Паказваць &amp;назвы на панэлі слоўнікаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Паказваць малыя значкі на панэлі &amp;інструментаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навігацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Уключыць сканаванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Артыкул цалкам (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Артыкул, толькі HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Захаванне артыкула...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Захаванне артыкула завершана</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Галоўнае акно цяпер заўсёды будзе знаходзіцца вышэй за іншыя.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Панэль &amp;гісторыі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Accessibility API не ўключаны</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Файл слоўніка быў падроблены або пашкоджаны</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Не ўдалося загрузіць артыкул з %1, прычына: %2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Не ўдалося разабраць файл XML: %1 у %2, %3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адрас</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Уключана</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -3503,82 +3476,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Неактыўныя (адключаныя) слоўнікі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Назва:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Агулам артыкулаў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Зыходная мова:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Мэтавая мова:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Агулам слоў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Парадак слоўнікаў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлы, з якіх складаецца слоўнік:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Інфармацыя пра слоўнік</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Апісанне:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Сартаваць па назве</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Сартаваць па мовах</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Загалоўныя словы слоўніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Актыўныя слоўнікі: %1, адключаныя: %2</translation>
     </message>
@@ -3586,12 +3559,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Шлях</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рэкурсіўна</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Запускаць на прасторы апавяшчэнняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Толькі левы Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Уключыць значок на прасторы апавяшчэнняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Хост:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тып:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Карыстальнік:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Апрацоўванне ў выплыўных вокнах</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,160 +3640,159 @@ switching to them.</source>
 Калі ўключыць гэты параметр, не будзе выконвацца пераход у новыя адкрытыя ўкладкі.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Выкарыстоўваць проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Выкарыстоўваць наступнае спалучэнне клавіш для перакладу слова з буфера абмену:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Клавіша Windows або клавіша Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Аўтаматычна вымаўляць словы ў галоўным акне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Запускаць разам з сістэмай</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Толькі левы Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Кіраванне ўкладкамі</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Толькі правы Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аўдыё</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Уключыце, каб выкарыстоўваць проксі-сервер для ўсіх сеткавых запытаў праграмы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Мова інтэрфейсу:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Толькі левы Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Адкрываць новыя ўкладкі ў фоне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Сетка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Толькі правы Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Правы Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Левы Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Аўтаматычна вымаўляць словы ў выплыўных вокнах</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Адкрываць новыя ўкладкі пасля бягучай</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Каб ужыць новую мову, перазапусціце праграму.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Клавіша Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Правяраць наяўнасць новых выпускаў праграмы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Закрываць на прастору апавяшчэнняў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Сістэмная</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Калі ўключана, на прасторы апавяшчэнняў з'явіцца значок, які можна
 выкарыстоўваць для адкрыцця галоўнага акна і выканання іншых задач.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3834,140 +3804,140 @@ download page.</source>
 і прапануе наведаць старонку для спампоўвання абнаўлення.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Запуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Прадвызначана</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Інтэрфейс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Змена мовы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Клавіша Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Выкарыстоўваць наступнае спалучэнне клавіш для паказу або хавання галоўнага акна:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Левы Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Толькі правы Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Налады</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Левы Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Правы Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Правы Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Спалучэнні клавіш</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Запускаць з уключанай функцыяй апрацоўвання ў выплыўных вокнах</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Калі параметр уключаны, праграма будзе запускацца згорнутай на прастору апавяшчэнняў, галоўнае акно не будзе адкрывацца.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Клавіша Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Аўтаматычна запвскаць GoldenDict пасля запуску аперацыйнай сістэмы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Не паказваць выплыўное акно пры змене абранага слова або слова з буфера абмену ў вокнах GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Не зважаць на змену абранага і змены ў буферы абмену ў вокнах GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Прайграваць аўдыяфайлы з дапамогай убудаваных сродкаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Выкарыстоўваць унутраны прайгравальнік:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Абраць гукавы рухавіх</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Увайсці ў загадны радок аўдыяпрайгравальніка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3976,84 +3946,84 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 Калі нейкія сайты не працуюць, паспрабуйце адключыць гэты параметр.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Забараніць загрузку змесціва з іншых сайтаў (хавае большасць рэкламы)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Вымаўленне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Прайграванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Прайграваць у вонкавай праграме:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Перакладаць абранае слова падвойным пстрыканнем</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Выкарыстоўваць вонкавую праграму для прайгравання аўдыяфайлаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Клавіша ESC хавае галоўнае акно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Хаваць панэль пры адной ўкладцы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Падладзьце гэтае значэнне, каб пазбегнуць вялікіх кантэкстных меню.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Абмежаванне колькасці слоўнікаў у кантэкстным меню:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Адпраўляць слова для перакладу ў галоўнае акно замест выплыўнога</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Адпраўляць слова для перакладу ў галоўнае акно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Паказваць акно са сцягам перад паказам выплыўнона акна. Каб паказалася акно, трэба пстрыкнуць па сцягу. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4062,159 +4032,159 @@ however, the article from the topmost dictionary is shown.</source>
 выконваецца пракручванне да артыкула з таго ж слоўніка. Калі гэты параметр адключаны, паказваецца артыкул з самага верхняга слоўніка.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Аўтаматычнае пракручванне да мэтавага артыкула</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Шрыфт слоўніка: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>вызначыць рэзервовае сямейства шрыфтоў для слоўніка</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Стыль паказу слоўнікаў:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Пераключыць інтэрфейс у цёмны рэжым.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Цёмны рэжым</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Пераключыць стыль паказу артыкулаў на цёмны.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Цёмны рэжым чытання</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Парадак MRU: апошні выкарыстаны парадак.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Сачэнне за зменамі ў буферы абмену, калі ўключана апрацоўванне ў выплыўных вокнах. Увага! Гэты параметр павінен быць заўсёды ўключаны, калі вы выкарыстоўваеце не Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Сачыць за зменамі ў буферы абмену</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Сачыць за зменамі абірання тэксту</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Сачыць за абіраннем тэксту толькі націсканні ўсіх наступных клавіш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Паказваць сцяг сканавання пры выбары слова</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Час затрымкі</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Сістэмны проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Адвольны проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Адвольныя налады</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Падлучэнне Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Калода:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Мадэль:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Слова</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Поле слоўніка...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Тэкст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Поле азначэння...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Сказ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Поле сказа (можа быць пустым)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Не пазначаць GoldenDict у HTTP-загалоўках</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Максімальны памер сеткавага кэшу:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4223,282 +4193,324 @@ If set to 0 the network disk cache will be disabled.</source>
  Калі 0, кэш сеткавага дыска будзе адключаны.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> Міб</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Калі гэты параметр уключаны, GoldenDict падчас выхаду будзе ачышчаць свой сеткавы кэш.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Ачышчаць сеткавы кэш падчас выхаду</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Паўнатэкставы пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Дазволіць паўнатэкставы пошук для:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Не шукаць у слоўніках, якія змяшчаюць больш за</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>артыкул(аў) (0 - не абмежавана)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Дадаткова</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Падчас выканання паслядоўных пошукаў, калі адзін слоўнік згортваецца ўручную, ён застанецца згорнутым пры выкананні наступнага пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Згарнуць сеанс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Пры выкарыстанні буфера абмену не зважаць на тэкст пасля пераносу радка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>Пры выкананні новага пошуку факусавацца на галоўным або выплыўным акне, нават калі яно бачнае</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Улюбёнае</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Інтэрвал захавання ўлюбёнага. Калі 0, то будзе захоўвацца толькі падчас выхаду.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Уключыце гэты параметр, каб пацвярджаць кожную аперацыю па выдаленні элементаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Пацвярджэнне выдалення элементаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Уключыце гэты параметр, каб ігнараваць неапраўдана доўгі тэкст, якія атрымліваецца
 пры навядзенні мышы, выбары, з буфера абмену або загаднага радка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Не зважаць на фразы, даўжэйшыя за</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Фразы, якія перавышаюць гэты памер, будуць ігнаравацца</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Уключыце гэты параметр, каб не зважаць на дыякрытычныя знакі падчас пошуку артыкулаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Не зважаць на дыякрытычныя знакі падчас пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Уключыце гэты параметр, каб дадатковыя раздзелы артыкулаў заўсёды разгортваліся</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Разгортваць дадатковыя &amp;раздзелы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Уключыце гэты параметр, каб вялікія артыкулы аўтаматычна згортваліся</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Згортваць артыкулы, якія маюць больш за</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Артыкулы, памер якіх большы за гэтае значэнне, будуць згортвацца</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Не зважаць на пунктуацыю падчас пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Уключыце гэты параметр, каб уключыць дадатковы пошук артыкулаў па спісах сінонімаў са слоўнікаў Stardict, Babylon і GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Дадатковы пошук сінонімаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>сімвалаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab пераключае ўкладкі ў парадку выкарыстання</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Гісторыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Уключыце гэты параметр, каб захоўваць гісторыю слоў</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Захоўваць &amp;гісторыю</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Артыкулы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Уключыце гэты параметр, калі хочаце абіраць словы адным пстрыканнем мышшу</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Абіраць словы адным пстрыканнем</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Стыль дапаўнення:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Вызначае максімальную колькасць запісаў у гісторыі.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максімальны памер гісторыі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Інтэрвал захавання гісторыі. Калі 0, гісторыя будзе захоўвацца толькі перад выхадам.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Захоўваць кожныя</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>хв</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Класічная</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Сучасны</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> Мб</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Для выкарыстання фразавага пошуку Xapian і аператара NEAR патрабуецца пазіцыйная інфармацыя, але памер базы дадзеных будзе значна большым. Прымяняецца толькі да новых уваходных слоўнікаў.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Уключыць індэкс з пазіцыйнай інфармацыяй</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандартны шрыфт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Монашырынны шрыфт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Шрыфт з засечкамі</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Шрыфт без засечак</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Знешні выгляд</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Гэтыя шрыфты будуць прымяняцца, калі шрыфты, указаныя ў слоўніку, не знойдзены.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Запасныя шрыфты</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аўдыё</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Просты тэкст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Паводле прэфікса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Невядома</translation>
     </message>
@@ -4506,17 +4518,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Не пададзена назва праграмы.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Праграма аварыйна завяршыла працэс.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Праграма вярнула код %1.</translation>
     </message>
@@ -4524,27 +4536,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Уключана</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тып</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Загадны радок</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -4552,99 +4564,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Не ўдалося загрузіць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Не ўдалося дэкадаваць артыкул</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Аўтарскія правы: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Версія: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Аўтар: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Электронная пошта: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Назва: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Вэб-сайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Дата: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Праграму для пошуку ў слоўніках.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Слова або фраза для запыту.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Захоўваць адладачныя паведамленні ў gd_log.txt у каталозе канфігурацыі.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Скінуць стан акна.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Адключыць tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Змяніць групу галоўнага акна.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Змяніць групу выплыўных акон.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Уключыць або адключыць апрацоўванне ў выплыўных вокнах.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Версія для друку і інфармацыя пра дыягназ.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Пошук/фільтраванне слоўнікаў (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Ачысціць пошук</translation>
     </message>
@@ -4652,22 +4679,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ПАМЫЛКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Не ўдалося захаваць рэсурс: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Не ўдалося спампаваць пазначаны рэсурс.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>УВАГА: %1</translation>
     </message>
@@ -4696,67 +4723,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Дыялогавае акно</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Вымавіць слова (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Дадаць слова ва ўлюбёнае (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Паказаць або схаваць панэль слоўнікаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Заўсёды пакідаць па-над іншымі вокнамі</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Адправіць слова ў галоўнае акно (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Далей</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ПАПЯРЭДЖАННЕ: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4768,7 +4800,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4778,7 +4810,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4799,17 +4831,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Шлях</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -4817,60 +4849,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хірагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Сістэмы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Ніхон-сікі</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Вікіпедыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Японскае складовае пісьмо Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Стварыць слоўнікі з некалькіх аўдыяфайлаў па дададзеных шляхах:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Японская раманізацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4881,84 +4913,84 @@ Not implemented yet in GoldenDict.</source>
 У GoldenDict яшчэ не падтрымліваецца.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Сайты Вікіпедыі (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Каталогі гукавых файлаў</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Любыя вонкавыя праграмы. %GDWORD% заменіцца на запытанае слова. Радок %GDSEARCH% будзе заменены тэкстам у радку пошуку. Калі абодва параметры не вызначаныя, загалоўнае слова будзе адпраўлена ў стандартны ўвод.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вымаўленне пададзена &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, - сумесная лінгвістычная бібліятэка Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Уключыць Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Код мовы ў фармаце ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Каб карыстацца Forvo, патрэбны API-ключ. Зарэгіструйцеся на сайце, каб атрымаць свой уласны ключ.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Атрымайце свой уласны ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;тут&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Найбольш распаўсюджаны метад транскрыпцыі японскай мовы
 на базе англійскай фаналогіі</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Японскае складовае пісьмо Хірагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Карыстальніцкая транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Гэта прымяняецца толькі ў пошукавай фразе, дзе кожны радок уяўляе сабой транслітарацыю, падзеленую кропкай з коскай. Напрыклад, ae;æ, карыстальнікі могуць увесці ae, каб прадставіць æ у мэтавым слове.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #гэта прыклад</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4969,118 +5001,108 @@ Not implemented yet in GoldenDict.</source>
 У GoldenDict яшчэ не падтрымліваецца.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Расійская транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Марфалогія</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Змяніць...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Прыклады:  &amp;quot;eng&amp;quot; для англійскай, &amp;quot;fra&amp;quot; для французскай &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Поўны спіс даступных моў можна знайсці &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; тут &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Шлях да каталога са слоўнікамі Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Пера&amp;сканаваць</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Нямецкая транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Любыя вэб-сайты. %GDWORD% заменіцца на запытанае слова:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Дадаць...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Абраць каталог</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Выдаліць</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Вэб-сайты</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Шляхі для пошуку файлаў слоўнікаў:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Пацвярджэнне выдалення</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Складовае пісьмо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Даступныя марфалагічныя слоўнікі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Уключае лацінскі алфавіт для японскай мовы</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5091,94 +5113,94 @@ of the appropriate groups to use them.</source>
 Дадавайце слоўнікі ў канцы адпаведных групаў.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хэпбёрн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Кунрэй-сікі</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Серверы DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Серверы DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Уключыць вымаўленне з Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Ключ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Коды моў (праз коску):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Пералік кодаў моў. Прыклад: &quot;en, be&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Грэчаская транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(недаступна ў пераноснай версіі)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Праграмы</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Беларуская транслітарацыя</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Сінтэз маўлення</translation>
     </message>
@@ -5194,42 +5216,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Абраныя сістэмы маўлення:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Дадаць</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Выдаліць</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Праслухоўванне</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Даступныя сістэмы маўлення:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Тэкст для праслухоўвання:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Упішыце сюды тэкст, каб праслухаць.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Праслухаць</translation>
     </message>
@@ -5254,17 +5276,17 @@ of the appropriate groups to use them.</source>
       <translation>Не ўдалося знайсці сістэмы сінтэзу маўлення.&lt;br&gt;Пераканайся, што на камп'ютары ўсталяваная прынамсі адна сістэма.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Налады</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Гучнасць:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Хуткасць:</translation>
     </message>
@@ -5272,12 +5294,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Упішыце слова ці выраз для пошуку ў слоўніках</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Выплыўны спіс</translation>
     </message>
@@ -5297,7 +5319,7 @@ of the appropriate groups to use them.</source>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation>Ідэнтыфікатар</translation>
+      <translation>ідэнтыфікатар</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5308,33 +5330,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Адрас</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Уключана</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Устаўце артыкул як спасылку ўнутры пазнакі</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Як спасылка</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -5342,17 +5364,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Не ўдалося выканаць запыт у некаторых слоўніках.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>УВАГА: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/bg_BG.ts b/locale/bg_BG.ts
index 9e160139..5ffea79d 100644
--- a/locale/bg_BG.ts
+++ b/locale/bg_BG.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Относно</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Речник GoldenDict, версия </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Лицензирана за GNU GPLv3 или следващи</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Копирайте информацията за версията</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Копиране на списък с речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Заслуги:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Неизвестно]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Базирана на Qt %1 (%2, %3 битова)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2019 Константин Исаков (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Въз основа на Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: не мога да създам карта без дума</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki търсене: AnkiConnect не е активиран.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: публикуването в anki не бе успешно</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: публикувайте в anki успех</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Инспектирайте</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Разгъни статията</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Свий статията</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Работа с изскачащ прозорец</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без име)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Добре дошли!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Няма превод за &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; в група &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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.berlios.de/forum/&quot;&gt;форума&lt;/a&gt; на програмата.&lt;p&gt;Проверете &lt;a href=&quot;http://goldendict.berlios.de/&quot;&gt;уеб страницата&lt;/a&gt; за обновления. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Лицензирано под GPLv3 или следваща версия.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(картинка)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Разгъни статията</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>От </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Свий статията</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Направете нова бележка на Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Грешка при търсенето: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Близки думи: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Сложни изрази: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Отделни думи: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Неуспех при създаването на временен файл.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Търсене в &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Търсене в &quot;%1&quot;в нов &amp;подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Даденият ресурс не съществува.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Неуспех при автоматично отваряне на ресурсен файл, опитай ръчно: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Търсене на &quot;%1&quot; в %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Избери текуща статия</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Копирай като текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Инспектор</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Търсене на &quot;%1&quot; в %2 в нов &amp;подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Отваряне на връзката в нов &amp;подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Отваряне на връзката във &amp;външен уеб четец</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ресурс</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Синтезатор глас</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Картинка</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Видео</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Видео: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Определение от речника «%1»: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Определение: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Указаната аудио-програма липсва.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Отвори линк</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Запазване &amp;отметка &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ПРЕДУПРЕЖДЕНИЕ: Аудио-плеер: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Запиши звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Запиши изображение</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Файлови изображения (*.bmp *.jpg *.png *.tif);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Запиши &amp;изображение...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Фразата не е намерена</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 от %2 съвпадения</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Запиши &amp;звук...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Съвмести «%1» в реда на въвеждане</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Добави &quot;%1&quot; в История</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Изпратете текущата статия на Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Изпратете избран текст на Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Звукови файлове (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Всички файлове (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Грешка възпроизвеждане на звуков файла: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Създаване на бележка на Anki</translation>
     </message>
   </context>
   <context>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Преобразуване на китайски иероглифи</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Преобразуване между опростени и класически китайски иероглифи</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Прео&amp;бразуване на китайски иероглифи</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Преобразуване на опростени иероглифи в класически (Тайвански вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>Опростени в класически (Тайвански вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Преобразуване на опростени иероглифи в класически (Хонконгски вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Опростени в класически (Хонконгски вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Преобразуване на класически иероглифи в опростени</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>Класически в опростени</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Преобразуване на опростени иероглифи в класически (Тайвански вариант)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Преобразуване на опростени иероглифи в класические (Хонконгски вариант)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Преобразуване на класически иероглифи в опростени</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>персонализирана транслитерация</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Прокси-Сървъра изисква авторизация</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>За достъп към прокси-Сървъра се въвежда име и парола</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Имя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Парола:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Икона на групата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Бърз клавиш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Папка в Любими:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Изображения</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Всички файлове</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Посоченият файл с изображение не може да бъде прочетен.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Потвърждаване</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Сигурни ли сте, че желаете да генерирате нов комплект от групи, на база езикови двойки?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Сигурни ли сте, че искате да генерирате набор от групи въз основа на metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Комбинирай групите по език на източника до &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Комбинирай групите по целеви език до &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Неуспешно автоматично групиране по папка.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Родителската директория на %1 не може да бъде достигната.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Сигурни ли сте, че искате да генерирате набор от групи въз основа на съдържащи папки?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Направи двустранна група за превод &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Комбинирайте групи с &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Речниците: </translation>
     </message>
@@ -635,201 +630,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Режим търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Този елемент определя, как ще интерпретира реда от филтъра</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Ако този флаг е поставен, филтрацията ще се осъществява според регистър символи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Регистър символи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Експортирай заглавията във файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Експортирай</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Помощ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>ОК</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Натисни този бутон да приложи филтъра  към списък заглавия</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Приложи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Ако този флаг е поставен , всякакви промени на филтъра ще се приложат към списък заглавия веднага</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Автоприлагане</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Филтър:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Ред на филтъра (обикн. текст, шаблон или регулярни изрази)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Шаблон</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Рег.изрази</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Зареждат се заглавни думи...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Неповторящи се заглавия общо: %1, филтрирани: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Запиши заглавията в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстовие файлове (*.txt);;Всички файлове (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Експортираният файл не може да се отвори</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Експортират се заглавията...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Отказ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Процесът на експортиране е прекъснат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Експортирането приключи</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Брой статии:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Превод от:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Брой думи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Превод на:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Отвори папката</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Редактирай речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлове, включени в речника:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Описание:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Покажи всички неповтарящи се заглавия на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Заглавия</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Редакция на речник чрез команда:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Име на индексния файл:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Отворете индексната папка</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 записа</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Бази</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Стратегии</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Иконка</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Разделен от запетая списък база данни
 (празен ред или &quot;*&quot; съответства на всички бази данни)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Разделен от запетая списък стратегии търсене
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Разширено Меню за всички речници...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Редактиране на тази група</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Информация за речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Заглавие на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Отвори папката на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Редактирай речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Панел речници</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Приемане</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Отмяна</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Източниците са променени</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Някои източници бяха променени. Приемате ли промените?</translation>
     </message>
@@ -992,12 +997,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Предишна страница</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Следваща страница</translation>
     </message>
   </context>
   <context>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Цялотекстово търсене</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Цели думи</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Обикновен текст</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Шаблони</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Рег. изрази</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Заявената дума не може да бъде празна.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>поддържа синтаксис за търсене на xapian, като И ИЛИ +/- и т.н</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Максимално разстояние между думите (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>По подразбиране</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Статии за речник, не повече от (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Намерени статии: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Индексиращи се: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Няма</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Редът за търсене трябва да съдържа поне една дума </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> или повече символи</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Няма речници за цялотекстово търсене</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Грешка в  избрания файл</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>от</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1163,79 +1148,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Предишен</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следващия</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Намери</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Отчитайки регистър</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Режим:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Игнорирайте реда на думите</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Игнорирай диакритика</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Статии намерени:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Налични речници в групата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Изчакващи индексация:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Помощ</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Всичко:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Индексирани:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Индексиращи се: Без</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Отмяна</translation>
     </message>
@@ -1267,29 +1236,29 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Дел</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Инс</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Раздел 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Дайте ново име за групата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Налични речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Добавяне на група</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Добавяне на група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Създаване на нова речникова група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Групиране по езици</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Създавайте групи, базирани на папки.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Групиране по папки</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Групиране по метаданни</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Преименуване на текущата речникова група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Премахване на текущата речникова група</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Дайте име на новата група:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Премахване на всички групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Премахване на избраните речници от групата (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Добавяне на избраните речници към групата (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Премахване на групата</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Групи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Преименуване</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Премахване на всички речникови групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Създаване на групи на база езика</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>История:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Размер История: %1 записи от %2 максимално допустими</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Варианти за проверка на правописа: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Морфология</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Индексиране: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Име на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - инициализиране</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Моля изчакайте докато се индексира речника</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Моля изчакайте...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Индексиране...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Еве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
-      <translation type="unfinished">Twi</translation>
+      <translation>Туи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Акан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кри</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Игбо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Коми</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Пали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тайски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Холандски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Гръцки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Ирландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кхмерски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Латински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маори</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Ория</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Шона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таджикски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамилски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свази</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
-      <translation type="unfinished">Inupiaq</translation>
+      <translation>Инупиак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Уелски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Волоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кхоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Италиански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
-      <translation type="unfinished">Raeto-Romance</translation>
+      <translation>Рето-Романс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонгкха</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Каннада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Сев. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Кирунди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Галски (Шотландия)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латвийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малаялам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Кюрдски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Български</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Малтийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Марати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арабски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Сундански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Датски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Малдивски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиджи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Унгарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Френски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Германски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Монголски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Иврит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Хереро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембургски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канури</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казахски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикую</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Корейски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджибва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пашто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Полски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Френски (диалект Occitan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словашки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Цонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйгурски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Сърбо-хърватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Йоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Жуанг</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румънски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Индонезийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панджаби</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Юж. Сото</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсикански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Есперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Персийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словенски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таитянски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Малгашки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галисийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербайджански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Японски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамара</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалисут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Белоруски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Явански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестийски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Киняруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Африкаанс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Арменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвежки букмол</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хърватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Босненски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Оксидентал</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталунски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Сръбски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бирмански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Руски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбургски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвежки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Китайски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Синхала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Испански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнуолски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалог</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Асамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Естонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахили</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Виетнамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуджарати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Исландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Английски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Църковно-славянски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарьорски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Финландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапюк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваняма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Сев. Сами</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Хаитянски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Норвежки Нинорск</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуарани</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Юж. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичеуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литовски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
-      <translation type="unfinished">Sichuan Yi</translation>
+      <translation>Съчуан И</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигриня</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Идиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Китайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Опростен китайски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Другой</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Диалекти опростен китайски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Китайски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Други източноевропейски езици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Други западноевропейски езици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Руски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Японски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Други прибалтийски езици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Гръцки диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Корейски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Турски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Тайски диалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Берберски езици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
@@ -2517,215 +2490,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Френски</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>испански</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>белоруски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>български</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>чешки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Немски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Гръцки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>финландски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Италиански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>японски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>корейски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>литовски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>македонски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>холандски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>полски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>португалски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Руски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>словашки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>албански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>сръбски (кирилица)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>шведски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Турски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>украински</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Опростен китайски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Традиционен китайски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>виетнамски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>португалски, бразилски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>персийски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Испански, Аржентина</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>хинди</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Есперанто</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Немски, Швейцария</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Испански, Боливия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>таджикски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>кечуа</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>аймара</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Арабски, Саудитска Арабия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>туркменски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Ложбан</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Английски</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Грешка при зареждане на речниците</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Грешка в файл конфигурация. Да продължи с настройки по подразбиране?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Люб&amp;ими</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Всички</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 речници, %2 статии, %3 думи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Редактиране</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Помощ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Изход</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Излизане от приложението</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Затваряне в системната област за известяване</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Статията не може да бъде запазена: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Увеличаване</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Речници...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Относно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Печат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Запазване на статията</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Запазване на статията като</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Минимизира прозореца в системната област за известяване</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Настройки на страницата</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Домашна страница</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Налично е ново издание</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Търсене:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Намаляване</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Показване на &amp;главния прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Относно GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Изтегляне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Настройки на страницата</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Търсене в:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Нормален размер</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Зареждане...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(без име)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Настройки...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Добре дошли!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Произнасяне на думата (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Запазване на статията</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Пропускане на това издание</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Печат на статията</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Няма инсталиран принтер.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>И&amp;зглед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;История</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Из&amp;чисти</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Мащаб</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Увеличаване на думите</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Намаляване на думите</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Нормален размер на думите</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Затваряне на текущия подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Затваряне на всички подпрозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Затваряне на всички подпрозорци без текущия</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Отворени подпрозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Нов подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Папка конфигурации</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Главно меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Намерено в речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Добави всички подпрозорци към Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ПРЕДУПРЕЖДЕНИЕ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Ред за търсене в речници. wildcards &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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Отвори списък подпрозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Изтрий текущия подпрозорец от Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Затворили сте главното меню. За да се върне, използвайте %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Покажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Експортирай</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Скрий</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Експорт на История във файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстови файлове (*.txt);;Всички файлове (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Експорта на История приключи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Грешка при експорт: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Импортирай</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Импорт История от файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Грешка импорт: некоректни файлови данни</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Импорта на История приключи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Грешка импорт: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Експортирай Любими в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Файлове XML (*.xml);;Всички файлове (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Експорта на Любими завърши</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Експортирай Любими във файл като обикнов. списък</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Импортирай Любими от файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML файлове (*.xml);;Txt файлове (*.txt);;Всички файлове (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Импорта на Любими завърши</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Грешка при анализ данни</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Информация за речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Заглавия на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Отвори папката на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Редактирай речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Индексират се за Цялотекстово търсене: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Да изтрие заглавието &quot;%1&quot; от Любими?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Панел търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Панел на&amp;вигация по превода</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Панел &amp;Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Пр&amp;едварителен преглед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Пр&amp;есканирай файлове</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Нов подпрозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Винаги отгоре</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Винаги отгоре</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Бутон Меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Търси в страница</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Цялотекстово търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Помощ за GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Покажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Експортирай</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Импортирай</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Добави</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Добави текущия подпрозорец към Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Експортирай в обикнов. списък</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>По&amp;казвай името в панел речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>&amp;Малки икони в панел инструменти</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навигация</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Активиране на сканирането</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Статията цялостно (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Статия, само в HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Запази статията...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Запазването на статията е завършено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Главен прозорец винаги отгоре.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Панел История</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Интерфейс Accessibility не включён</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Речниковия файл е  повреден</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Грешка при зареждане на статията от %1, причина: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Грешка при обработката на XML: %1 на %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Иконка</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Неактивни (изключени) речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Брой статии:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Превод от:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Превод на:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Брой думи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Подредба на речниците:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлове, включващи се в речника:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Информация за речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Описание:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Сортировать по имени</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Сортиране по езици</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Заглавие на речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Активни речници:%1, неактивни:%2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Път</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рекурсивно</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Пускане в системната област за уведомяване</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>При натискане на ляв Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Win/Мета</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Икона в системната област за уведомяване</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тип:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Потребител:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Изскачащ прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ switching to them.</source>
 ще се отварят без да се превключва към тях.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Използване на сървър-посредник</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Използване на следните бързи клавиши за превод на дума от системния буфер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Клавиш Windows или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Автоматично произнасяне на думите в главния прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Автоматично стартиране</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>При натискане на ляв Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Преглеждане в подпрозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>При натискане на десен Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Включете, ако желаете да използвате сървър-посредник
 при всички обръщания на програмата към мрежата.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Език на интерфейса:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>При натискане на ляв Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Отваряне на нови подпрозорци на заден план</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Мрежа</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>При натискане на десен Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Десен Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Ляв Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Автоматично произнасяне на думите в изскачащия прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Отваряне на новите подпрозорци след текущия</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Рестартирайте програмата, за да се приложи смяната на езика.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Клавиш Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Периодична проверка за нови издания</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 на последно място.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Затваряне в системната област за уведомяване</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Системен</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Когато това е включено, в системната област за уведомяване се показва икона, чрез
 която може да се отваря главния прозорец или да се извършнат други дейности.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,141 +3811,141 @@ download page.</source>
 и предлага да отвори страница за изтегляне.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Пускане</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Парола:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>По подразбиране</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Интерфейс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Промяна на езика</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Клавиш Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Използване на следните бързи клавиши за показване/скриване на главния прозорец:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Ляв Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>При натискане на десен Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ляв Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Десен Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Десен Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Бързи клавиши</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Пускане с включен изскачащ прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Приложението се пуска директно в системната област за уведомяване,
 без да се показва главния прозорец.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Клавиш Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Пуска GoldenDict автоматично след зареждане на системата.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Не показвай изскачащ прозорецо при избиране/копиране на текст в някой от подпрозорците на GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Игнорирайте собствения избор и промени в клипборда на GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Воспроизводить аудио-файлы через встроенный плеер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Използвай встроен  плеер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Избор на плеер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Команден ред за старт на аудио-плеера</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3984,533 +3954,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 който разглеждате. Ако някой сайтове се повреждат от това изключете го.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Забрани зареждане на съдържание от други сайтове (скрива повечето реклами)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Произнасяне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Възпроизвеждане</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Използване на външна програма:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Двойното натискане превежда думата</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Използване на външна програма за възпроизвеждане на аудио файловете</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Скрий главния прозорец с ESC</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Скрий подпрозорците</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Установете стойност,за избягване на голямо контекстно меню.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Максимален брой речници в контекстно меню:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Изпрати превежданата дума в главния окно прозорец вместо превод в изскачащ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Изпращай превежданата дума към главния прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Показвай флаг  вместо изскачащ прозорец. Ако само изскачащ прозорец, кликнете по флага. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Обикновено щракването върху връзка, двукратното щракване върху дума или търсенето на
+избор в статия зарежда превода и почти веднага
+превърта до статията от същия речник. При изключена тази опция
+обаче се показва статията от най-горния речник.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Автоматично превъртане до целевата статия</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Стил на показване на статията:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Завъртете потребителския интерфейс на тъмен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Тъмен режим</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Превърнете стила на показване на статията на тъмен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Тъмен режим на четене</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU поръчка: Най-скоро използваната поръчка.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Проследяване на промените в клипборда, когато сканирането е активирано. Забележете! Винаги трябва да активирате това, освен ако не сте на Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Проследяване на промените в клипборда</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Промяна на избора на песен</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Избиране на халки само когато всички избрани клавиши са натиснати:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Показвай флаг, когато е избрана дума</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Закъснение</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Използвай системните настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Използвай свои настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Потребителски настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Палуба:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Модел:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Слово</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Речниково поле...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Дефиниционно поле...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Изречение</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Полето за изречение (може да е празно)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Не посочвай GoldenDict в заглавия HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Максимален размер на мрежовия кеш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Максимално дисково пространство, заето от мрежовия кеш на GoldenDict
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Ако е зададено на 0, кешът на мрежовия диск ще бъде деактивиран.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Когато тази опция е активирана, GoldenDict
+изчиства своя мрежов кеш от диска по време на излизане.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Изчистване на мрежовия кеш при излизане</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Цялотекстово търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Разреши цялотекстово търсене за:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Не търси в речници, съдържащи повече от</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>статии (0 - неограничено)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Доп&amp;ълнително</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>По време на последователни търсения, ако един речник бъде свит ръчно, той ще остане свит при следващото търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Срив на сесията</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Когато използвате клипборда, премахнете всичко след нов ред</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>При ново търсене фокусирайте главния или изскачащия прозорец, дори ако е видим</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Интервал сзапазване в Любими. Ако е 0, Историята ще се запише само при Излизане.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Включете тази опция, за потвърждаване на всяка операция за изтриване на елементи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Потвърждавай изтриване на елементи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Включете тази опция, за да игнорирате неоправдано дълъг въведен текст
+от курсора на мишката, избора, клипборда или командния ред</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Игнориране на входни фрази, по-дълги от</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Въвеждането на фрази, по-дълги от този размер, ще бъде игнорирано</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Включете тази опция, да се игнорира диакритика при търсене на статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Игнорирай диакритика при търсене</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Включи тази опция, ако искате да отваря допълнителни области от статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Раскривай допълнителни &amp;области</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Включи тази опция,автоматически да свива повече статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Свивай статии по-големи от</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Статии над този размер ще са свити</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Игнорирайте препинателните знаци, докато търсите</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Включването на опцията разрешава търсене през списък синоними
 от Stardict, Babylon и GLS речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Допълнително търсене за синоними</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>символи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab превключва подпрозорци в реда на използване</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Вавилон</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>История</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Включите эту опцию, чтобы вести журнал переведённых слов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Записвай  &amp;История</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Включете тази опция, ако искате да изберете думи с едно кликване на мишката</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Избирай думата с еднократен клик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Допълнителен стил:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Определя максимално количество записи в История.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максимален размер История:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Интервал запазване на История. Ако не е 0, Историята ще се запазва само при Излизане.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Запазвай на всеки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>минути</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Класически</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Модерен</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Линго</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Син</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Необходима е информация за позицията, за да се използва търсенето по фраза на Xapian и оператора NEAR, но размерът на базата данни ще бъде много по-голям. Прилага се само за нови входящи речници.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Активиране на индекс с информация за позицията</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандартен шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Монопространствен шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Серифен шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Безсерифен шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Външен вид</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Тези шрифтове ще бъдат приложени, когато шрифтовете, зададени от речник, не бъдат намерени.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Резервни шрифтове</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>По префиксу</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Неизвестно</translation>
     </message>
@@ -4518,17 +4530,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Програмата не е указана.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Програмата се затвори с грешка.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Програмата се върна след затваряне %1.</translation>
     </message>
@@ -4536,27 +4548,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тип</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Команден ред</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Иконка</translation>
     </message>
@@ -4564,99 +4576,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Грешка при зареждане на статия</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Грешка декодиране на статия</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Копирайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Версия: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Автор: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>Имейл: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Название: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Сайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Дата: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Програма за търсене в речник.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Дума или изречение за запитване.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Запазете съобщенията за отстраняване на грешки в gd_log.txt в папката config.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Нулирайте състоянието на прозореца.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Деактивирайте tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Променете групата на главния прозорец.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Променете групата изскачащи прозорци.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Превключване на изскачащия прозорец за сканиране.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Печатна версия и информация за диагностика.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Търси по име на речника (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Изчисти</translation>
     </message>
@@ -4664,22 +4691,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Грешка запис данни: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Указаният ресурс не успя да се свали.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>Внимание: %1</translation>
     </message>
@@ -4689,12 +4716,12 @@ from Stardict, Babylon and GLS dictionaries</source>
     <message>
       <location filename="../src/dict/romaji.cc" line="117"/>
       <source>Hepburn Romaji for Katakana</source>
-      <translation type="unfinished">Hepburn Romaji for Katakana</translation>
+      <translation>Хепбърн Ромаджи за катакана</translation>
     </message>
     <message>
       <location filename="../src/dict/romaji.cc" line="108"/>
       <source>Hepburn Romaji for Hiragana</source>
-      <translation type="unfinished">Hepburn Romaji for Hiragana</translation>
+      <translation>Хепбърн Ромаджи за Хирагана</translation>
     </message>
   </context>
   <context>
@@ -4708,67 +4735,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Диалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Произнасяне на думата (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Добави думата към Любими</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Показва или скрива лентата Речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Над всички прозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Изпрати думата в главния прозорец (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ПРЕДУПРЕЖДЕНИЕ: %1</translation>
     </message>
   </context>
   <context>
@@ -4776,53 +4808,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Предишен</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следващия</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Маркирайте &amp;всички</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Различаващ главни от малки букви</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Намирам:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Път</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Иконка</translation>
     </message>
@@ -4830,61 +4862,61 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Файлове</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Нихон-шики</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Уикипедия</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
-      <translation type="unfinished">Katakana Japanese syllabary</translation>
+      <translation>Японска сричкова буква катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Създаване на речници от различни звукови файлове, чрез добавяне
  на пътищата им за достъп тук:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
-      <translation type="unfinished">Japanese Romaji</translation>
+      <translation>японски Ромаджи</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict засега не реализирано.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Страници Уикипедия (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Папки със звуци</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Всякакви външни програми. Низ %GDWORD% ще бъде заменен с думата за заявка. Низ %GDSEARCH% ще бъде заменен с текста в лентата за търсене. Ако и двата параметъра не са предоставени, заглавната дума ще бъде въведена в стандартния вход.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Лингва Либре</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Произношенията са предоставени от &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, съвместна лингвистична медийна библиотека на Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Активирайте Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 езиков код</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Използването на Forvo в момента изисква API ключ, регистрирайте се на сайта, за да получите свой собствен ключ.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вземете свой собствен ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;тук&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Най-широко използваният метод за транскрипция на Японски,
 на основата на  Английската фонология</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
-      <translation type="unfinished">Hiragana Japanese syllabary</translation>
+      <translation>Японска сричкова буква хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Персонализирана транслитерация</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Това се прилага само във фраза за търсене, като всеки ред представлява транслитерация, разделена с точка и запетая. Например ae;æ, потребителите могат да въведат ae, за да представят æ в целевата дума.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #това е пример</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслитерация</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict засега не реализирано.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Транслитерация (Руски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфология</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Промяна...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Примери:  &amp;quot;eng&amp;quot; за английски, &amp;quot;fra&amp;quot; за френски &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Пълният списък с налични езици може да бъде намерен &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; тук &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Път към речниците Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Повторно &amp;сканиране</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Транслитерация (Германски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Произволни уеб страници. Низът %GDWORD% ще бъде заменен с думата за търсене:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Добавяне...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Избор на папка</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Премахване</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Уеб страници</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Пътища за търсене на файлове в речници:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Потвърждаване на премахването</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Сричкови азбуки:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Достъпни морфологични речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Позволява да се използва Латинската азбука, за да се пише на Японски</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5112,94 +5134,94 @@ of the appropriate groups to use them.</source>
 в края на съответните групи.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Хепбърн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Кунрей-шики</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Сървъри DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Сървъри DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Включване на произношенията от Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Ключ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Езикови кодове (разделени със запетая):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Списък с желани езикови кодове. Пример: &quot;en, bg&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Гръцка транслитерация</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(не е налично в преносимата версия)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Програми</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Транслитерация (Белоруски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Синтез говор</translation>
     </message>
@@ -5215,42 +5237,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Избор на глас:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Добави</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Премахване</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Прослушване</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Налични гласове:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Текст за прослушване:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Въведете текст за прослушване.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Прослушай</translation>
     </message>
@@ -5275,17 +5297,17 @@ of the appropriate groups to use them.</source>
       <translation>Не може да намери наличния TTS глас.&lt;br&gt; Моля, уверете се, че поне един TTS вече е инсталиран на вашия компютър.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Сила звук:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Темп:</translation>
     </message>
@@ -5293,12 +5315,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Въведете дума или фраза за търсене на речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Падащ списък</translation>
     </message>
@@ -5318,7 +5340,7 @@ of the appropriate groups to use them.</source>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Документ за самоличност</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5329,33 +5351,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Вмъквай статията като линк в тага &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Като линк</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Иконка</translation>
     </message>
@@ -5363,17 +5385,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Неуспех при търсенето в някои речници.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>Внимание: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/crowdin.ts b/locale/crowdin.ts
index bd4c7d93..52c74df6 100644
--- a/locale/crowdin.ts
+++ b/locale/crowdin.ts
@@ -4,50 +4,45 @@
 <context>
     <name>About</name>
     <message>
-        <location filename="../src/ui/about.ui" line="17"/>
+        <location filename="../src/ui/about.ui"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
     <message>
-        <location filename="../src/ui/about.ui" line="66"/>
+        <location filename="../src/ui/about.ui"/>
         <source>GoldenDict-ng dictionary lookup program, version </source>
         <translation>GoldenDict-ng 电子词典程序，版本 </translation>
     </message>
     <message>
-        <location filename="../src/ui/about.ui" line="101"/>
+        <location filename="../src/ui/about.ui"/>
         <source>Licensed under GNU GPLv3 or later</source>
         <translation>授权基于 GNU 公共授权 GPLv3 或更高版本</translation>
     </message>
     <message>
-        <location filename="../src/ui/about.ui" line="129"/>
+        <location filename="../src/ui/about.ui"/>
         <source>Copy version info</source>
         <translation>复制版本信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/about.ui" line="142"/>
+        <location filename="../src/ui/about.ui"/>
         <source>Copy dictionaries list</source>
         <translation>复制词典列表</translation>
     </message>
     <message>
-        <location filename="../src/ui/about.ui" line="168"/>
+        <location filename="../src/ui/about.ui"/>
         <source>Credits:</source>
         <translation>致谢名单：</translation>
     </message>
     <message>
-        <location filename="../src/ui/about.cc" line="20"/>
-        <source>[Unknown]</source>
-        <translation>[未知]</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/about.cc" line="35"/>
-        <source>Based on Qt %1 (%2, %3 bit)</source>
-        <translation>基于 Qt %1 (%2, %3 位)</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/about.ui" line="91"/>
+        <location filename="../src/ui/about.ui"/>
         <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
         <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+        <location filename="../src/ui/about.cc" line="19"/>
+        <source>Based on Qt %1 (%2, %3)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
 <context>
     <name>ArticleMaker</name>
     <message>
-        <location filename="../src/article_maker.cc" line="311"/>
+        <location filename="../src/article_maker.cc" line="318"/>
         <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="../src/article_maker.cc" line="304"/>
+        <location filename="../src/article_maker.cc" line="311"/>
         <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="../src/article_maker.cc" line="138"/>
+        <location filename="../src/article_maker.cc" line="143"/>
         <source>Expand article</source>
         <translation>展开文章</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="138"/>
+        <location filename="../src/article_maker.cc" line="143"/>
         <source>Collapse article</source>
         <translation>收起文章</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="232"/>
-        <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="../src/article_maker.cc" line="302"/>
+        <location filename="../src/article_maker.cc" line="309"/>
         <source>Working with popup</source>
         <translation>使用屏幕取词功能</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="392"/>
+        <location filename="../src/article_maker.cc" line="399"/>
         <source>(untitled)</source>
         <translation>（未命名）</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="284"/>
+        <location filename="../src/article_maker.cc" line="291"/>
         <source>Welcome!</source>
         <translation>欢迎使用！</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="314"/>
+        <location filename="../src/article_maker.cc" line="321"/>
         <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="../src/article_maker.cc" line="236"/>
+        <location filename="../src/article_maker.cc" line="243"/>
         <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="../src/article_maker.cc" line="286"/>
+        <location filename="../src/article_maker.cc" line="236"/>
+        <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/article_maker.cc" line="293"/>
         <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;a href=&quot;使用屏幕取词功能&quot;&gt;直接从其它程序中抓词查询&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要改变设置，可以在&lt;b&gt;编辑 | 首选项&lt;/b&gt;菜单中查看一下可用的系统设置。所有的设置都有鼠标指针提示信息，如果有不明之处，请仔细阅读提示信息。如果你需要更多帮助，有任何疑问、建议，或者仅仅想了解其他人的想法，欢迎访问此程序的&lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;官方论坛&lt;/a&gt;。访问此程序的&lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+        <location filename="../src/article_maker.cc" line="411"/>
         <source>(picture)</source>
         <translation>（图片）</translation>
     </message>
@@ -148,42 +143,42 @@
 <context>
     <name>ArticleRequest</name>
     <message>
-        <location filename="../src/article_maker.cc" line="672"/>
+        <location filename="../src/article_maker.cc" line="678"/>
         <source>Expand article</source>
         <translation>展开文章</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="673"/>
+        <location filename="../src/article_maker.cc" line="679"/>
         <source>From </source>
         <translation>来自</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="676"/>
+        <location filename="../src/article_maker.cc" line="682"/>
         <source>Collapse article</source>
         <translation>收起文章</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="691"/>
+        <location filename="../src/article_maker.cc" line="694"/>
         <source>Make a new Anki note</source>
         <translation>创建新的 Anki 笔记</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="704"/>
+        <location filename="../src/article_maker.cc" line="708"/>
         <source>Query error: %1</source>
         <translation>查询错误：%1</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="832"/>
+        <location filename="../src/article_maker.cc" line="836"/>
         <source>Close words: </source>
         <translation>相近词条：</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="899"/>
+        <location filename="../src/article_maker.cc" line="903"/>
         <source>Compound expressions: </source>
         <translation>复合短语：</translation>
     </message>
     <message>
-        <location filename="../src/article_maker.cc" line="927"/>
+        <location filename="../src/article_maker.cc" line="931"/>
         <source>Individual words: </source>
         <translation>单个词汇：</translation>
     </message>
@@ -191,197 +186,197 @@
 <context>
     <name>ArticleView</name>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2087"/>
+        <location filename="../src/ui/articleview.cc" line="1929"/>
         <source>Failed to create temporary file.</source>
         <translation>创建临时文件失败。</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1798"/>
+        <location filename="../src/ui/articleview.cc" line="1640"/>
         <source>&amp;Look up &quot;%1&quot;</source>
         <translation>查找 &quot;%1&quot;(&amp;L)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1806"/>
+        <location filename="../src/ui/articleview.cc" line="1648"/>
         <source>Look up &quot;%1&quot; in &amp;New Tab</source>
         <translation>在新标签页中查找 &quot;%1&quot;(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1358"/>
-        <location filename="../src/ui/articleview.cc" line="1542"/>
+        <location filename="../src/ui/articleview.cc" line="1215"/>
+        <location filename="../src/ui/articleview.cc" line="1392"/>
         <source>The referenced resource doesn&apos;t exist.</source>
         <translation>所引用的资源不存在。</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2098"/>
+        <location filename="../src/ui/articleview.cc" line="1940"/>
         <source>Failed to auto-open resource file, try opening manually: %1.</source>
         <translation>自动打开资源文件时失败，请尝试手动打开：%1.</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1832"/>
+        <location filename="../src/ui/articleview.cc" line="1674"/>
         <source>Look up &quot;%1&quot; in %2</source>
         <translation>在 %2 中查找 &quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="321"/>
+        <location filename="../src/ui/articleview.cc" line="199"/>
         <source>Select Current Article</source>
         <translation>选择当前文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="326"/>
+        <location filename="../src/ui/articleview.cc" line="204"/>
         <source>Copy as text</source>
         <translation>复制为文本</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="331"/>
+        <location filename="../src/ui/articleview.cc" line="209"/>
         <source>Inspect</source>
         <translation>审查元素</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1840"/>
+        <location filename="../src/ui/articleview.cc" line="1682"/>
         <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="../src/ui/articleview.cc" line="1750"/>
+        <location filename="../src/ui/articleview.cc" line="1598"/>
         <source>Open Link in New &amp;Tab</source>
         <translation>在新标签页中打开链接(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1757"/>
+        <location filename="../src/ui/articleview.cc" line="1605"/>
         <source>Open Link in &amp;External Browser</source>
         <translation>在外部浏览器中打开链接(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="995"/>
+        <location filename="../src/ui/articleview.cc" line="855"/>
         <source>Resource</source>
         <translation>资源</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1000"/>
+        <location filename="../src/ui/articleview.cc" line="860"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1005"/>
+        <location filename="../src/ui/articleview.cc" line="865"/>
         <source>TTS Voice</source>
         <translation>TTS 音频</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1010"/>
+        <location filename="../src/ui/articleview.cc" line="870"/>
         <source>Picture</source>
         <translation>图片</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1017"/>
+        <location filename="../src/ui/articleview.cc" line="877"/>
         <source>Video</source>
         <translatorcomment>视频: %1</translatorcomment>
         <translation>视频</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1026"/>
+        <location filename="../src/ui/articleview.cc" line="886"/>
         <source>Video: %1</source>
         <translation>视频：%1</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1043"/>
+        <location filename="../src/ui/articleview.cc" line="903"/>
         <source>Definition from dictionary &quot;%1&quot;: %2</source>
         <translation>定义：&quot;%1&quot;: %2</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1051"/>
+        <location filename="../src/ui/articleview.cc" line="911"/>
         <source>Definition: %1</source>
         <translation>定义：%1</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1397"/>
+        <location filename="../src/ui/articleview.cc" line="1250"/>
         <source>The referenced audio program doesn&apos;t exist.</source>
         <translation>引用的音频播放程序不存在。</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1744"/>
+        <location filename="../src/ui/articleview.cc" line="1592"/>
         <source>Op&amp;en Link</source>
         <translation>打开链接(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1851"/>
+        <location filename="../src/ui/articleview.cc" line="1693"/>
         <source>Save &amp;Bookmark &quot;%1...&quot;</source>
         <translation>保存为书签（&amp;S）“%1...”</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2128"/>
+        <location filename="../src/ui/articleview.cc" line="1970"/>
         <source>WARNING: Audio Player: %1</source>
         <translation>警告：音频播放器：%1</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1283"/>
-        <location filename="../src/ui/articleview.cc" line="1318"/>
-        <location filename="../src/ui/articleview.cc" line="1542"/>
+        <location filename="../src/ui/articleview.cc" line="1140"/>
+        <location filename="../src/ui/articleview.cc" line="1175"/>
+        <location filename="../src/ui/articleview.cc" line="1392"/>
         <source>ERROR: %1</source>
         <translation>错误： %1</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2000"/>
+        <location filename="../src/ui/articleview.cc" line="1842"/>
         <source>Save sound</source>
         <translation>保存音频文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2015"/>
+        <location filename="../src/ui/articleview.cc" line="1857"/>
         <source>Save image</source>
         <translation>保存图片</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2017"/>
+        <location filename="../src/ui/articleview.cc" line="1859"/>
         <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
         <translation>图片文件 (*.bmp *.jpg *.png *.tif);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1773"/>
+        <location filename="../src/ui/articleview.cc" line="1621"/>
         <source>Save &amp;image...</source>
         <translation>保存图片(&amp;I)...</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="192"/>
+        <location filename="../src/ui/articleview.cc" line="70"/>
         <source>Phrase not found</source>
         <translation>没找到词组</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="200"/>
+        <location filename="../src/ui/articleview.cc" line="78"/>
         <source>%1 of %2 matches</source>
         <translation>匹配（%1/%2）</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1780"/>
+        <location filename="../src/ui/articleview.cc" line="1628"/>
         <source>Save s&amp;ound...</source>
         <translation>保存音频文件(&amp;O)...</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1811"/>
+        <location filename="../src/ui/articleview.cc" line="1653"/>
         <source>Send &quot;%1&quot; to input line</source>
         <translation>将 &quot;%1&quot; 发送到输入框</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1817"/>
-        <location filename="../src/ui/articleview.cc" line="1869"/>
+        <location filename="../src/ui/articleview.cc" line="1659"/>
+        <location filename="../src/ui/articleview.cc" line="1711"/>
         <source>&amp;Add &quot;%1&quot; to history</source>
         <translation>将 &quot;%1&quot; 添加到历史(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1859"/>
+        <location filename="../src/ui/articleview.cc" line="1701"/>
         <source>&amp;Send Current Article to Anki</source>
         <translation>发送当前文章到 Anki(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="1860"/>
+        <location filename="../src/ui/articleview.cc" line="1702"/>
         <source>&amp;Send selected text to Anki</source>
         <translation>发送选中文本到 Anki(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2002"/>
-        <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-        <translation>声音文件 (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;所有文件 (*.*)</translation>
+        <location filename="../src/ui/articleview.cc" line="1844"/>
+        <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+        <translation>声音文件 (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2072"/>
+        <location filename="../src/ui/articleview.cc" line="1914"/>
         <source>Failed to play sound file: %1</source>
         <translation>播放音频文件失败：%1</translation>
     </message>
@@ -413,62 +408,62 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>ChineseConversion</name>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="20"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Chinese Conversion</source>
         <translation>中文转换</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="23"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Enable conversion between simplified and traditional Chinese characters</source>
         <translation>启用简体中文与繁体/正体中文字符之间的转换</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="26"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Chinese Con&amp;version</source>
         <translation>中文转换(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="35"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
         <translation>启用从简体中文字符转换为正体中文（台湾）字符</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="38"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>SC to TC (Taiwan variant)</source>
         <translation>简体转正体（台湾）</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="45"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
         <translation>启用从简体中文字符转换为繁体中文（香港）字符</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="48"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>SC to TC (Hong Kong variant)</source>
         <translation>简体转繁体（香港）</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="55"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>Enable conversion from traditional characters to simplified characters</source>
         <translation>启用从繁体中文字符转换为简体中文字符</translation>
     </message>
     <message>
-        <location filename="../src/ui/chineseconversion.ui" line="58"/>
+        <location filename="../src/ui/chineseconversion.ui"/>
         <source>TC to SC</source>
         <translation>繁体转简体</translation>
     </message>
     <message>
-        <location filename="../src/dict/chinese.cc" line="129"/>
+        <location filename="../src/dict/chinese.cc" line="128"/>
         <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
         <translation>简体中文至正体中文（台湾）转换</translation>
     </message>
     <message>
-        <location filename="../src/dict/chinese.cc" line="136"/>
+        <location filename="../src/dict/chinese.cc" line="135"/>
         <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
         <translation>简体中文至繁体中文（香港）转换</translation>
     </message>
     <message>
-        <location filename="../src/dict/chinese.cc" line="143"/>
+        <location filename="../src/dict/chinese.cc" line="142"/>
         <source>Traditional to simplified Chinese conversion</source>
         <translation>繁体中文至简体中文转换</translation>
     </message>
@@ -476,7 +471,7 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>CustomTranslit</name>
     <message>
-        <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+        <location filename="../src/dict/customtransliteration.cc" line="52"/>
         <source>custom transliteration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -484,22 +479,22 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Dialog</name>
     <message>
-        <location filename="../src/ui/authentication.ui" line="14"/>
+        <location filename="../src/ui/authentication.ui"/>
         <source>Proxy authentication required</source>
         <translation>代理服务器要求身份验证</translation>
     </message>
     <message>
-        <location filename="../src/ui/authentication.ui" line="20"/>
+        <location filename="../src/ui/authentication.ui"/>
         <source>You need to supply a Username and a Password to access via proxy</source>
         <translation>您需要提供代理服务器的用户名和密码</translation>
     </message>
     <message>
-        <location filename="../src/ui/authentication.ui" line="30"/>
+        <location filename="../src/ui/authentication.ui"/>
         <source>Username:</source>
         <translation>用户名：</translation>
     </message>
     <message>
-        <location filename="../src/ui/authentication.ui" line="40"/>
+        <location filename="../src/ui/authentication.ui"/>
         <source>Password:</source>
         <translation>密码：</translation>
     </message>
@@ -507,22 +502,22 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictGroupWidget</name>
     <message>
-        <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+        <location filename="../src/ui/dictgroupwidget.ui"/>
         <source>Form</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+        <location filename="../src/ui/dictgroupwidget.ui"/>
         <source>Group icon:</source>
         <translation>群组图标：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+        <location filename="../src/ui/dictgroupwidget.ui"/>
         <source>Shortcut:</source>
         <translation>快捷键：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+        <location filename="../src/ui/dictgroupwidget.ui"/>
         <source>Favorites folder:</source>
         <translation>收藏文件夹：</translation>
     </message>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
         <translation>图像</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="99"/>
+        <location filename="../src/ui/groups_widgets.cc" line="98"/>
         <source>All files</source>
         <translation>所有文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="106"/>
+        <location filename="../src/ui/groups_widgets.cc" line="104"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="106"/>
+        <location filename="../src/ui/groups_widgets.cc" line="104"/>
         <source>Can&apos;t read the specified image file.</source>
         <translation>无法读取指定的图像文件。</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictGroupsWidget</name>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="691"/>
-        <location filename="../src/ui/groups_widgets.cc" line="789"/>
-        <location filename="../src/ui/groups_widgets.cc" line="890"/>
+        <location filename="../src/ui/groups_widgets.cc" line="695"/>
+        <location filename="../src/ui/groups_widgets.cc" line="781"/>
+        <location filename="../src/ui/groups_widgets.cc" line="881"/>
         <source>Confirmation</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="692"/>
+        <location filename="../src/ui/groups_widgets.cc" line="696"/>
         <source>Are you sure you want to generate a set of groups based on language pairs?</source>
         <translation>你确定要产生基于语言配对的群组吗？</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="891"/>
+        <location filename="../src/ui/groups_widgets.cc" line="882"/>
         <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+        <location filename="../src/ui/groups_widgets.cc" line="990"/>
         <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
         <translation>根据源语言合并群组&quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1007"/>
         <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
         <translation>根据目标语言合并群组&quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="784"/>
+        <location filename="../src/ui/groups_widgets.cc" line="776"/>
         <source>Auto group by folder failed.</source>
         <translation>根据文件分组失败</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="785"/>
+        <location filename="../src/ui/groups_widgets.cc" line="777"/>
         <source>The parent directory of %1 can not be reached.</source>
         <translation>%1 的父目录可以达到。</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="790"/>
+        <location filename="../src/ui/groups_widgets.cc" line="782"/>
         <source>Are you sure you want to generate a set of groups based on containing folders?</source>
         <translation>您确定根据文件夹结构生成词组吗？</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1025"/>
         <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
         <translation>建立双向群组&quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-        <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1060"/>
         <source>Combine groups with &quot;%1&quot;</source>
         <translation>与群组&quot;%1&quot;合并</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="592"/>
-        <location filename="../src/ui/groups_widgets.cc" line="666"/>
-        <location filename="../src/ui/groups_widgets.cc" line="985"/>
-        <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+        <location filename="../src/ui/groups_widgets.cc" line="579"/>
+        <location filename="../src/ui/groups_widgets.cc" line="675"/>
+        <location filename="../src/ui/groups_widgets.cc" line="973"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1134"/>
         <source>Dictionaries: </source>
         <translation>词典：</translation>
     </message>
@@ -634,133 +629,133 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictHeadwords</name>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="67"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Search mode</source>
         <translation>搜索模式</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="73"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>This element determines how filter string will be interpreted</source>
         <translation>在这里可以选择过滤器字符串的执行方式</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="80"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>If checked on the symbols case will be take in account when filtering</source>
         <translation>若勾选则大小写不同的词条均计入总数</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="83"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Match case</source>
         <translation>区分大小写</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="93"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Exports headwords to file</source>
         <translation>将词条导出至文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="96"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="119"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="129"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>OK</source>
         <translation>确定</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="35"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Press this button to apply filter to headwords list</source>
         <translation>点击此按钮启用词条列表过滤器</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="38"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Apply</source>
         <translation>过滤</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="22"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>If checked any filter changes will we immediately applied to headwords list</source>
         <translation>若勾选则词条列表过滤器的修改即时生效</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="25"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Auto apply</source>
         <translation>自动过滤</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="58"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Filter:</source>
         <translation>过滤器：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.ui" line="51"/>
+        <location filename="../src/ui/dictheadwords.ui"/>
         <source>Filter string (fixed string, wildcards or regular expression)</source>
         <translation>过滤器字符串（可以是固定的字符串、通配符或者正则表达式）</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="42"/>
+        <location filename="../src/ui/dictheadwords.cc" line="44"/>
         <source>Text</source>
         <translation>纯文本</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="43"/>
+        <location filename="../src/ui/dictheadwords.cc" line="45"/>
         <source>Wildcards</source>
         <translation>通配符</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="44"/>
+        <location filename="../src/ui/dictheadwords.cc" line="46"/>
         <source>RegExp</source>
         <translation>正则表达式</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="246"/>
+        <location filename="../src/ui/dictheadwords.cc" line="250"/>
         <source>Loading headwords...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="281"/>
+        <location filename="../src/ui/dictheadwords.cc" line="285"/>
         <source>Unique headwords total: %1, filtered: %2</source>
         <translation>总共有%1个不同的词条，已过滤%2个</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="338"/>
+        <location filename="../src/ui/dictheadwords.cc" line="342"/>
         <source>Save headwords to file</source>
         <translation>保存词条至文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="340"/>
+        <location filename="../src/ui/dictheadwords.cc" line="344"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="348"/>
+        <location filename="../src/ui/dictheadwords.cc" line="352"/>
         <source>Can not open exported file</source>
         <translation>无法打开导出的文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="357"/>
+        <location filename="../src/ui/dictheadwords.cc" line="361"/>
         <source>Export headwords...</source>
         <translation>导出词条...</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="246"/>
-        <location filename="../src/ui/dictheadwords.cc" line="357"/>
+        <location filename="../src/ui/dictheadwords.cc" line="250"/>
+        <location filename="../src/ui/dictheadwords.cc" line="361"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="400"/>
+        <location filename="../src/ui/dictheadwords.cc" line="404"/>
         <source>Export process is interrupted</source>
         <translation>导出过程被中断</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictheadwords.cc" line="408"/>
+        <location filename="../src/ui/dictheadwords.cc" line="412"/>
         <source>Export finished</source>
         <translation>导出完成</translation>
     </message>
@@ -768,66 +763,76 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictInfo</name>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="83"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Total articles:</source>
         <translation>文章总数：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="52"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Translates from:</source>
         <translation>词条语言：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="59"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Total words:</source>
         <translation>词条总数：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="66"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Translates to:</source>
         <translation>释义语言：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="36"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Open folder</source>
         <translation>打开文件夹</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="76"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Edit dictionary</source>
         <translation>编辑词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="130"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Files comprising this dictionary:</source>
         <translation>此词典包含的文件：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="174"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Description:</source>
         <translation>描述：</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="196"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Show all unique dictionary headwords</source>
         <translation>显示所有不同的词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.ui" line="199"/>
+        <location filename="../src/ui/dictinfo.ui"/>
         <source>Headwords</source>
         <translation>词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictinfo.cc" line="30"/>
+        <location filename="../src/ui/dictinfo.cc" line="31"/>
         <source>Edit the dictionary via command:
 %1</source>
         <translation>编辑词典信息的命令行：%1</translation>
     </message>
+    <message>
+        <location filename="../src/ui/dictinfo.ui"/>
+        <source>Index filename:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/dictinfo.ui"/>
+        <source>Open index folder</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>DictListModel</name>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="243"/>
+        <location filename="../src/ui/groups_widgets.cc" line="238"/>
         <source>%1 entries</source>
         <translation>%1 条记录</translation>
     </message>
@@ -858,44 +863,44 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictServersModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="823"/>
+        <location filename="../src/dict/sources.cc" line="824"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="825"/>
+        <location filename="../src/dict/sources.cc" line="826"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="827"/>
+        <location filename="../src/dict/sources.cc" line="828"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="829"/>
+        <location filename="../src/dict/sources.cc" line="830"/>
         <source>Databases</source>
         <translation>数据库</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="831"/>
+        <location filename="../src/dict/sources.cc" line="832"/>
         <source>Strategies</source>
         <translation>策略</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="833"/>
+        <location filename="../src/dict/sources.cc" line="834"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="866"/>
+        <location filename="../src/dict/sources.cc" line="867"/>
         <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
         <translation>逗号分隔的数据库列表
 （使用空字符串或者“*”可以匹配所有数据库）</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="869"/>
+        <location filename="../src/dict/sources.cc" line="870"/>
         <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
         <translation>逗号分隔的搜索策略列表
@@ -905,37 +910,37 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>DictionaryBar</name>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="22"/>
+        <location filename="../src/ui/dictionarybar.cc" line="21"/>
         <source>Extended menu with all dictionaries...</source>
         <translation>展开菜单以包含所有词典……</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="96"/>
+        <location filename="../src/ui/dictionarybar.cc" line="95"/>
         <source>Edit this group</source>
         <translation>编辑此群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="120"/>
+        <location filename="../src/ui/dictionarybar.cc" line="119"/>
         <source>Dictionary info</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="125"/>
+        <location filename="../src/ui/dictionarybar.cc" line="124"/>
         <source>Dictionary headwords</source>
         <translation>词典词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="127"/>
+        <location filename="../src/ui/dictionarybar.cc" line="126"/>
         <source>Open dictionary folder</source>
         <translation>打开词典文件夹</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="134"/>
+        <location filename="../src/ui/dictionarybar.cc" line="133"/>
         <source>Edit dictionary</source>
         <translation>编辑词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/dictionarybar.cc" line="14"/>
+        <location filename="../src/ui/dictionarybar.cc" line="13"/>
         <source>&amp;Dictionary Bar</source>
         <translation>词典栏(&amp;D)</translation>
     </message>
@@ -944,27 +949,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
         <location filename="../src/ui/editdictionaries.cc" line="45"/>
-        <location filename="../src/ui/editdictionaries.cc" line="251"/>
+        <location filename="../src/ui/editdictionaries.cc" line="243"/>
         <source>&amp;Dictionaries</source>
         <translation>词典(&amp;D)</translation>
     </message>
     <message>
-        <location filename="../src/ui/editdictionaries.ui" line="14"/>
+        <location filename="../src/ui/editdictionaries.ui"/>
         <source>Dictionaries</source>
         <translation>词典</translation>
     </message>
     <message>
-        <location filename="../src/ui/editdictionaries.cc" line="134"/>
+        <location filename="../src/ui/editdictionaries.cc" line="129"/>
         <source>Accept</source>
         <translation>接受</translation>
     </message>
     <message>
-        <location filename="../src/ui/editdictionaries.cc" line="136"/>
+        <location filename="../src/ui/editdictionaries.cc" line="131"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../src/ui/editdictionaries.cc" line="130"/>
+        <location filename="../src/ui/editdictionaries.cc" line="124"/>
         <source>Sources changed</source>
         <translation>词典文件所在目录已变更</translation>
     </message>
@@ -975,12 +980,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
         <location filename="../src/ui/editdictionaries.cc" line="46"/>
-        <location filename="../src/ui/editdictionaries.cc" line="253"/>
+        <location filename="../src/ui/editdictionaries.cc" line="244"/>
         <source>&amp;Groups</source>
         <translation>群组(&amp;G)</translation>
     </message>
     <message>
-        <location filename="../src/ui/editdictionaries.cc" line="131"/>
+        <location filename="../src/ui/editdictionaries.cc" line="125"/>
         <source>Some sources were changed. Would you like to accept the changes?</source>
         <translation>某些词典文件的所在目录已变更，是否接受变更？</translation>
     </message>
@@ -1009,75 +1014,55 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="232"/>
+        <location filename="../src/fulltextsearch.cc" line="217"/>
         <source>Full-text search</source>
         <translation>全文搜索</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="241"/>
-        <source>Whole words</source>
-        <translation>全字匹配</translation>
-    </message>
-    <message>
-        <location filename="../src/fulltextsearch.cc" line="242"/>
+        <location filename="../src/fulltextsearch.cc" line="231"/>
         <source>Plain text</source>
         <translation>纯文本</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="243"/>
+        <location filename="../src/fulltextsearch.cc" line="232"/>
         <source>Wildcards</source>
         <translation>通配符</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="245"/>
-        <source>RegExp</source>
-        <translation>正则表达式</translation>
+        <location filename="../src/fulltextsearch.cc" line="339"/>
+        <source>The querying word can not be empty.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="255"/>
+        <location filename="../src/fulltextsearch.cc" line="234"/>
         <source>support xapian search syntax,such as AND OR +/- etc</source>
         <translation>支持 xapian 搜索语法，例如 AND OR +/- 等</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="261"/>
-        <source>Max distance between words (%1-%2):</source>
-        <translation>最大词间距 (%1-%2)：</translation>
+        <location filename="../src/fulltextsearch.cc" line="230"/>
+        <source>Default</source>
+        <translation type="unfinished">默认</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="270"/>
-        <source>Max articles per dictionary (%1-%2):</source>
-        <translation>每个词典最大词条数 (%1-%2)：</translation>
-    </message>
-    <message>
-        <location filename="../src/fulltextsearch.cc" line="309"/>
-        <location filename="../src/fulltextsearch.cc" line="443"/>
-        <location filename="../src/fulltextsearch.cc" line="564"/>
-        <location filename="../src/fulltextsearch.cc" line="577"/>
+        <location filename="../src/fulltextsearch.cc" line="243"/>
+        <location filename="../src/fulltextsearch.cc" line="334"/>
+        <location filename="../src/fulltextsearch.cc" line="439"/>
+        <location filename="../src/fulltextsearch.cc" line="452"/>
         <source>Articles found: </source>
         <translation>搜索到的词条：</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="396"/>
+        <location filename="../src/fulltextsearch.cc" line="323"/>
         <source>Now indexing: </source>
         <translation>正在索引：</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="397"/>
+        <location filename="../src/fulltextsearch.cc" line="324"/>
         <source>None</source>
         <translation>无</translation>
     </message>
     <message>
-        <location filename="../src/fulltextsearch.cc" line="454"/>
-        <source>The search line must contains at least one word containing </source>
-        <translation>搜索关键词至少包含</translation>
-    </message>
-    <message>
-        <location filename="../src/fulltextsearch.cc" line="455"/>
-        <source> or more symbols</source>
-        <translation>个或更多字符</translation>
-    </message>
-    <message>
-        <location filename="../src/fulltextsearch.cc" line="466"/>
+        <location filename="../src/fulltextsearch.cc" line="350"/>
         <source>No dictionaries for full-text search</source>
         <translation>没有可供全文搜索的词典</translation>
     </message>
@@ -1085,7 +1070,7 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>FavoritesModel</name>
     <message>
-        <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+        <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
         <source>Error in favorities file</source>
         <translation>收藏文件中存在错误</translation>
     </message>
@@ -1151,7 +1136,7 @@ between classic and school orthography in cyrillic)</source>
         <translation>来自</translation>
     </message>
     <message>
-        <location filename="../src/dict/forvo.cc" line="309"/>
+        <location filename="../src/dict/forvo.cc" line="303"/>
         <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>
     </message>
@@ -1172,68 +1157,52 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>FullTextSearchDialog</name>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-        <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Search</source>
         <translation>搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-        <source>Match case</source>
-        <translation>区分大小写</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Mode:</source>
         <translation>模式：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-        <source>Ignore words order</source>
-        <translation>忽略单词顺序</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-        <source>Ignore diacritics</source>
-        <translation>忽略变音符号</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Articles found:</source>
         <translation>搜索到的词条：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Available dictionaries in group:</source>
         <translation>群组中的可用词典：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Wait for indexing:</source>
         <translation>等候索引：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Help</source>
         <translation>帮助</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Total:</source>
         <translation>总计：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Indexed:</source>
         <translation>已索引：</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Now indexing: None</source>
         <translation>正在索引：无</translation>
     </message>
     <message>
-        <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+        <location filename="../src/ui/fulltextsearch.ui"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
@@ -1265,27 +1234,27 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Groups</name>
     <message>
-        <location filename="../src/ui/groups.ui" line="92"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>&lt;</source>
         <translation>&lt;</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="67"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>&gt;</source>
         <translation>&gt;</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="95"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Del</source>
         <translation>Del</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="70"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Ins</source>
         <translation>Ins</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="133"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Tab 2</source>
         <translation>标签页 2</translation>
     </message>
@@ -1325,12 +1294,12 @@ between classic and school orthography in cyrillic)</source>
         <translation>为群组起一个新名字：</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="22"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Dictionaries available:</source>
         <translation>可用词典：</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="146"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>&amp;Add group</source>
         <translation>添加群组(&amp;A)</translation>
     </message>
@@ -1340,42 +1309,42 @@ between classic and school orthography in cyrillic)</source>
         <translation>添加群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="143"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Create new dictionary group</source>
         <translation>创建新的词典群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="203"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Group by Languages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="210"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Create folder-based groups.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="213"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Group by Folders</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="220"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Group by Metadata</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="244"/>
+        <location filename="../src/ui/groups.ui"/>
         <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>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="153"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Rename current dictionary group</source>
         <translation>重命名当前词典群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="163"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Remove current dictionary group</source>
         <translation>移除词典群组</translation>
     </message>
@@ -1385,43 +1354,43 @@ between classic and school orthography in cyrillic)</source>
         <translation>为新群组命名：</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="176"/>
+        <location filename="../src/ui/groups.ui"/>
         <location filename="../src/ui/groups.cc" line="173"/>
         <source>Remove all groups</source>
         <translation>移除全部群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="89"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Remove selected dictionaries from group (Del)</source>
         <translation>将所选词典从群组中移除(Del)</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="64"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Add selected dictionaries to group (Ins)</source>
         <translation>将所选词典添加进群组(Ins)</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="166"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>&amp;Remove group</source>
         <translation>移除群组(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="119"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Groups:</source>
         <translation>群组：</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="156"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Re&amp;name group</source>
         <translation>重命名群组(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="173"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Remove all dictionary groups</source>
         <translation>移除全部词典群组</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups.ui" line="200"/>
+        <location filename="../src/ui/groups.ui"/>
         <source>Create language-based groups</source>
         <translation>创建基于语言的群组</translation>
     </message>
@@ -1444,12 +1413,12 @@ between classic and school orthography in cyrillic)</source>
         <translation>历史：</translation>
     </message>
     <message>
-        <location filename="../src/ui/historypanewidget.cc" line="215"/>
+        <location filename="../src/ui/historypanewidget.cc" line="217"/>
         <source>%1/%2</source>
         <translation>%1/%2</translation>
     </message>
     <message>
-        <location filename="../src/ui/historypanewidget.cc" line="219"/>
+        <location filename="../src/ui/historypanewidget.cc" line="221"/>
         <source>History size: %1 entries out of maximum %2</source>
         <translation>历史条数：%1/%2</translation>
     </message>
@@ -1457,12 +1426,12 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Hunspell</name>
     <message>
-        <location filename="../src/dict/hunspell.cc" line="259"/>
+        <location filename="../src/dict/hunspell.cc" line="256"/>
         <source>Spelling suggestions: </source>
         <translation>拼写建议：</translation>
     </message>
     <message>
-        <location filename="../src/dict/hunspell.cc" line="780"/>
+        <location filename="../src/dict/hunspell.cc" line="768"/>
         <source>%1 Morphology</source>
         <translation>%1 构词法</translation>
     </message>
@@ -1470,12 +1439,12 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>HunspellDictsModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="1404"/>
+        <location filename="../src/dict/sources.cc" line="1405"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1402"/>
+        <location filename="../src/dict/sources.cc" line="1403"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
@@ -1483,1031 +1452,1035 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Initializing</name>
     <message>
-        <location filename="../src/ui/initializing.ui" line="44"/>
+        <location filename="../src/ui/initializing.ui"/>
+        <source>Indexing: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/initializing.ui"/>
         <source>Dictionary Name</source>
         <translation>词典名称</translation>
     </message>
     <message>
-        <location filename="../src/ui/initializing.ui" line="22"/>
+        <location filename="../src/ui/initializing.ui"/>
         <source>GoldenDict-ng - Initializing</source>
         <translation>初始化 GoldenDict-ng</translation>
     </message>
     <message>
-        <location filename="../src/ui/initializing.ui" line="28"/>
-        <location filename="../src/initializing.cc" line="31"/>
-        <source>Please wait while indexing dictionary</source>
-        <translation>正在索引词典，请稍候</translation>
-    </message>
-    <message>
-        <location filename="../src/initializing.cc" line="22"/>
+        <location filename="../src/initializing.cc" line="18"/>
         <source>Please wait...</source>
         <translation>请稍候...</translation>
     </message>
+    <message>
+        <location filename="../src/initializing.cc" line="27"/>
+        <source>Indexing...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Language</name>
     <message>
-        <location filename="../src/language.cc" line="153"/>
+        <location filename="../src/language.cc" line="151"/>
         <source>Ewe</source>
         <translation>埃维语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="188"/>
+        <location filename="../src/language.cc" line="186"/>
         <source>Ido</source>
         <translation>伊多语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="214"/>
+        <location filename="../src/language.cc" line="212"/>
         <source>Lao</source>
         <translation>老挝语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="286"/>
+        <location filename="../src/language.cc" line="284"/>
         <source>Twi</source>
         <translation>维特语（加纳）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="118"/>
+        <location filename="../src/language.cc" line="116"/>
         <source>Afar</source>
         <translation>阿法尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="122"/>
+        <location filename="../src/language.cc" line="120"/>
         <source>Akan</source>
         <translation>阿肯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="144"/>
+        <location filename="../src/language.cc" line="142"/>
         <source>Cree</source>
         <translation>克里语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="185"/>
+        <location filename="../src/language.cc" line="183"/>
         <source>Igbo</source>
         <translation>伊博语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="206"/>
+        <location filename="../src/language.cc" line="204"/>
         <source>Komi</source>
         <translation>科米语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="172"/>
+        <location filename="../src/language.cc" line="170"/>
         <source>Manx</source>
         <translation>曼岛语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="245"/>
+        <location filename="../src/language.cc" line="243"/>
         <source>Pali</source>
         <translation>巴利语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="277"/>
+        <location filename="../src/language.cc" line="275"/>
         <source>Thai</source>
         <translation>泰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="290"/>
+        <location filename="../src/language.cc" line="288"/>
         <source>Urdu</source>
         <translation>乌尔都语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="302"/>
+        <location filename="../src/language.cc" line="300"/>
         <source>Zulu</source>
         <translation>祖鲁语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="145"/>
+        <location filename="../src/language.cc" line="143"/>
         <source>Czech</source>
         <translation>捷克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="233"/>
+        <location filename="../src/language.cc" line="231"/>
         <source>Dutch</source>
         <translation>荷兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="211"/>
+        <location filename="../src/language.cc" line="209"/>
         <source>Ganda</source>
         <translation>卢甘达语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="161"/>
+        <location filename="../src/language.cc" line="159"/>
         <source>Fulah</source>
         <translation>富拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="154"/>
+        <location filename="../src/language.cc" line="152"/>
         <source>Greek</source>
         <translation>希腊语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="173"/>
+        <location filename="../src/language.cc" line="171"/>
         <source>Hausa</source>
         <translation>豪萨语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="175"/>
+        <location filename="../src/language.cc" line="173"/>
         <source>Hindi</source>
         <translation>印地语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="167"/>
+        <location filename="../src/language.cc" line="165"/>
         <source>Irish</source>
         <translation>爱尔兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="200"/>
+        <location filename="../src/language.cc" line="198"/>
         <source>Khmer</source>
         <translation>高棉语（柬埔寨语）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="195"/>
+        <location filename="../src/language.cc" line="193"/>
         <source>Kongo</source>
         <translation>刚果语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="209"/>
+        <location filename="../src/language.cc" line="207"/>
         <source>Latin</source>
         <translation>拉丁语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="225"/>
+        <location filename="../src/language.cc" line="223"/>
         <source>Malay</source>
         <translation>马来语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="220"/>
+        <location filename="../src/language.cc" line="218"/>
         <source>Maori</source>
         <translation>毛利语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="228"/>
+        <location filename="../src/language.cc" line="226"/>
         <source>Nauru</source>
         <translation>瑙鲁语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="242"/>
+        <location filename="../src/language.cc" line="240"/>
         <source>Oriya</source>
         <translation>奥里亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="241"/>
+        <location filename="../src/language.cc" line="239"/>
         <source>Oromo</source>
         <translation>奥洛莫语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="259"/>
+        <location filename="../src/language.cc" line="257"/>
         <source>Sango</source>
         <translation>桑戈语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="265"/>
+        <location filename="../src/language.cc" line="263"/>
         <source>Shona</source>
         <translation>绍纳语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="276"/>
+        <location filename="../src/language.cc" line="274"/>
         <source>Tajik</source>
         <translation>塔吉克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="274"/>
+        <location filename="../src/language.cc" line="272"/>
         <source>Tamil</source>
         <translation>泰米尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="285"/>
+        <location filename="../src/language.cc" line="283"/>
         <source>Tatar</source>
         <translation>鞑靼语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="269"/>
+        <location filename="../src/language.cc" line="267"/>
         <source>Swati</source>
         <translation>斯瓦特语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="282"/>
+        <location filename="../src/language.cc" line="280"/>
         <source>Tonga</source>
         <translation>东加语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="187"/>
+        <location filename="../src/language.cc" line="185"/>
         <source>Inupiaq</source>
         <translation>伊努庇克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="292"/>
+        <location filename="../src/language.cc" line="290"/>
         <source>Venda</source>
         <translation>文达语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="291"/>
+        <location filename="../src/language.cc" line="289"/>
         <source>Uzbek</source>
         <translation>乌兹别克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="148"/>
+        <location filename="../src/language.cc" line="146"/>
         <source>Welsh</source>
         <translation>威尔士语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="296"/>
+        <location filename="../src/language.cc" line="294"/>
         <source>Wolof</source>
         <translation>沃洛夫语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="297"/>
+        <location filename="../src/language.cc" line="295"/>
         <source>Xhosa</source>
         <translation>科萨语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="190"/>
+        <location filename="../src/language.cc" line="188"/>
         <source>Italian</source>
         <translation>意大利语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="250"/>
+        <location filename="../src/language.cc" line="248"/>
         <source>Raeto-Romance</source>
         <translation>罗曼斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="152"/>
+        <location filename="../src/language.cc" line="150"/>
         <source>Dzongkha</source>
         <translation>宗喀语（不丹语）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="201"/>
+        <location filename="../src/language.cc" line="199"/>
         <source>Kannada</source>
         <translation>卡纳达语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="230"/>
+        <location filename="../src/language.cc" line="228"/>
         <source>North Ndebele</source>
         <translation>北恩德贝勒语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="119"/>
+        <location filename="../src/language.cc" line="117"/>
         <source>Abkhazian</source>
         <translation>阿布哈西亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="208"/>
+        <location filename="../src/language.cc" line="206"/>
         <source>Kirghiz</source>
         <translation>吉尔吉斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="251"/>
+        <location filename="../src/language.cc" line="249"/>
         <source>Kirundi</source>
         <translation>科隆地语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="168"/>
+        <location filename="../src/language.cc" line="166"/>
         <source>Scottish Gaelic</source>
         <translation>苏格兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="267"/>
+        <location filename="../src/language.cc" line="265"/>
         <source>Albanian</source>
         <translation>阿尔巴尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="217"/>
+        <location filename="../src/language.cc" line="215"/>
         <source>Latvian</source>
         <translation>拉脱维亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="222"/>
+        <location filename="../src/language.cc" line="220"/>
         <source>Malayalam</source>
         <translation>马拉雅拉姆语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="205"/>
+        <location filename="../src/language.cc" line="203"/>
         <source>Kurdish</source>
         <translation>库尔德语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="132"/>
+        <location filename="../src/language.cc" line="130"/>
         <source>Bulgarian</source>
         <translation>保加利亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="213"/>
+        <location filename="../src/language.cc" line="211"/>
         <source>Lingala</source>
         <translation>林加拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="226"/>
+        <location filename="../src/language.cc" line="224"/>
         <source>Maltese</source>
         <translation>马耳他语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="224"/>
+        <location filename="../src/language.cc" line="222"/>
         <source>Marathi</source>
         <translation>马拉地语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="125"/>
+        <location filename="../src/language.cc" line="123"/>
         <source>Arabic</source>
         <translation>阿拉伯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="159"/>
+        <location filename="../src/language.cc" line="157"/>
         <source>Basque</source>
         <translation>巴斯克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="127"/>
+        <location filename="../src/language.cc" line="125"/>
         <source>Avaric</source>
         <translation>阿瓦尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="133"/>
+        <location filename="../src/language.cc" line="131"/>
         <source>Bihari</source>
         <translation>比哈尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="128"/>
+        <location filename="../src/language.cc" line="126"/>
         <source>Aymara</source>
         <translation>艾马拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="138"/>
+        <location filename="../src/language.cc" line="136"/>
         <source>Breton</source>
         <translation>布列塔尼语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="271"/>
+        <location filename="../src/language.cc" line="269"/>
         <source>Sundanese</source>
         <translation>巽他语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="149"/>
+        <location filename="../src/language.cc" line="147"/>
         <source>Danish</source>
         <translation>丹麦语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="151"/>
+        <location filename="../src/language.cc" line="149"/>
         <source>Divehi</source>
         <translation>迪维希语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="216"/>
+        <location filename="../src/language.cc" line="214"/>
         <source>Luba-Katanga</source>
         <translation>卢巴卡丹加语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="163"/>
+        <location filename="../src/language.cc" line="161"/>
         <source>Fijian</source>
         <translation>斐济语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="179"/>
+        <location filename="../src/language.cc" line="177"/>
         <source>Hungarian</source>
         <translation>匈牙利语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="165"/>
+        <location filename="../src/language.cc" line="163"/>
         <source>French</source>
         <translation>法语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="150"/>
+        <location filename="../src/language.cc" line="148"/>
         <source>German</source>
         <translation>德语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="223"/>
+        <location filename="../src/language.cc" line="221"/>
         <source>Mongolian</source>
         <translation>蒙古语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="174"/>
+        <location filename="../src/language.cc" line="172"/>
         <source>Hebrew</source>
         <translation>希伯来语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="181"/>
+        <location filename="../src/language.cc" line="179"/>
         <source>Herero</source>
         <translation>赫雷罗语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="210"/>
+        <location filename="../src/language.cc" line="208"/>
         <source>Luxembourgish</source>
         <translation>卢森堡语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="203"/>
+        <location filename="../src/language.cc" line="201"/>
         <source>Kanuri</source>
         <translation>卡努里语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="198"/>
+        <location filename="../src/language.cc" line="196"/>
         <source>Kazakh</source>
         <translation>哈萨克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="196"/>
+        <location filename="../src/language.cc" line="194"/>
         <source>Kikuyu</source>
         <translation>基库尤语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="202"/>
+        <location filename="../src/language.cc" line="200"/>
         <source>Korean</source>
         <translation>韩语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="237"/>
+        <location filename="../src/language.cc" line="235"/>
         <source>Navajo</source>
         <translation>纳瓦霍语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="232"/>
+        <location filename="../src/language.cc" line="230"/>
         <source>Ndonga</source>
         <translation>恩敦加语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="231"/>
+        <location filename="../src/language.cc" line="229"/>
         <source>Nepali</source>
         <translation>尼泊尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="240"/>
+        <location filename="../src/language.cc" line="238"/>
         <source>Ojibwa</source>
         <translation>奥吉布瓦语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="247"/>
+        <location filename="../src/language.cc" line="245"/>
         <source>Pashto</source>
         <translation>普什图语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="246"/>
+        <location filename="../src/language.cc" line="244"/>
         <source>Polish</source>
         <translation>波兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="264"/>
+        <location filename="../src/language.cc" line="262"/>
         <source>Samoan</source>
         <translation>萨摩亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="239"/>
+        <location filename="../src/language.cc" line="237"/>
         <source>Occitan</source>
         <translation>奥西坦语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="257"/>
+        <location filename="../src/language.cc" line="255"/>
         <source>Sindhi</source>
         <translation>信德语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="262"/>
+        <location filename="../src/language.cc" line="260"/>
         <source>Slovak</source>
         <translation>斯洛伐克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="266"/>
+        <location filename="../src/language.cc" line="264"/>
         <source>Somali</source>
         <translation>索马里语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="275"/>
+        <location filename="../src/language.cc" line="273"/>
         <source>Telugu</source>
         <translation>泰卢固语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="284"/>
+        <location filename="../src/language.cc" line="282"/>
         <source>Tsonga</source>
         <translation>颂加语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="281"/>
+        <location filename="../src/language.cc" line="279"/>
         <source>Tswana</source>
         <translation>茨瓦纳语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="288"/>
+        <location filename="../src/language.cc" line="286"/>
         <source>Uighur</source>
         <translation>维吾尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="260"/>
+        <location filename="../src/language.cc" line="258"/>
         <source>Serbo-Croatian</source>
         <translation>塞尔维亚-克罗地亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="299"/>
+        <location filename="../src/language.cc" line="297"/>
         <source>Yoruba</source>
         <translation>约鲁巴语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="300"/>
+        <location filename="../src/language.cc" line="298"/>
         <source>Zhuang</source>
         <translation>壮语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="252"/>
+        <location filename="../src/language.cc" line="250"/>
         <source>Romanian</source>
         <translation>罗马尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="183"/>
+        <location filename="../src/language.cc" line="181"/>
         <source>Indonesian</source>
         <translation>印度尼西亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="244"/>
+        <location filename="../src/language.cc" line="242"/>
         <source>Panjabi</source>
         <translation>旁遮普语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="270"/>
+        <location filename="../src/language.cc" line="268"/>
         <source>Southern Sotho</source>
         <translation>梭托语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="143"/>
+        <location filename="../src/language.cc" line="141"/>
         <source>Corsican</source>
         <translation>科西嘉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="156"/>
+        <location filename="../src/language.cc" line="154"/>
         <source>Esperanto</source>
         <translation>世界语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="160"/>
+        <location filename="../src/language.cc" line="158"/>
         <source>Persian</source>
         <translation>波斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="263"/>
+        <location filename="../src/language.cc" line="261"/>
         <source>Slovenian</source>
         <translation>斯洛文尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="166"/>
+        <location filename="../src/language.cc" line="164"/>
         <source>Western Frisian</source>
         <translation>西弗里西语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="124"/>
+        <location filename="../src/language.cc" line="122"/>
         <source>Aragonese</source>
         <translation>阿拉贡语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="287"/>
+        <location filename="../src/language.cc" line="285"/>
         <source>Tahitian</source>
         <translation>塔希提语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="218"/>
+        <location filename="../src/language.cc" line="216"/>
         <source>Malagasy</source>
         <translation>马达加斯加语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="169"/>
+        <location filename="../src/language.cc" line="167"/>
         <source>Galician</source>
         <translation>加利西亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="129"/>
+        <location filename="../src/language.cc" line="127"/>
         <source>Azerbaijani</source>
         <translation>阿塞拜疆语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="123"/>
+        <location filename="../src/language.cc" line="121"/>
         <source>Amharic</source>
         <translation>阿姆哈拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="255"/>
+        <location filename="../src/language.cc" line="253"/>
         <source>Sanskrit</source>
         <translation>梵语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="192"/>
+        <location filename="../src/language.cc" line="190"/>
         <source>Japanese</source>
         <translation>日语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="289"/>
+        <location filename="../src/language.cc" line="287"/>
         <source>Ukrainian</source>
         <translation>乌克兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="135"/>
+        <location filename="../src/language.cc" line="133"/>
         <source>Bambara</source>
         <translation>班巴拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="199"/>
+        <location filename="../src/language.cc" line="197"/>
         <source>Kalaallisut</source>
         <translation>格陵兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="130"/>
+        <location filename="../src/language.cc" line="128"/>
         <source>Bashkir</source>
         <translation>巴什基尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="131"/>
+        <location filename="../src/language.cc" line="129"/>
         <source>Belarusian</source>
         <translation>白俄罗斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="204"/>
+        <location filename="../src/language.cc" line="202"/>
         <source>Kashmiri</source>
         <translation>克什米尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="256"/>
+        <location filename="../src/language.cc" line="254"/>
         <source>Sardinian</source>
         <translation>撒丁语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="176"/>
+        <location filename="../src/language.cc" line="174"/>
         <source>Hiri Motu</source>
         <translation>希里莫图语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="249"/>
+        <location filename="../src/language.cc" line="247"/>
         <source>Quechua</source>
         <translation>科察语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="136"/>
+        <location filename="../src/language.cc" line="134"/>
         <source>Bengali</source>
         <translation>孟加拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="193"/>
+        <location filename="../src/language.cc" line="191"/>
         <source>Javanese</source>
         <translation>爪哇语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="120"/>
+        <location filename="../src/language.cc" line="118"/>
         <source>Avestan</source>
         <translation>阿维斯陀语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="254"/>
+        <location filename="../src/language.cc" line="252"/>
         <source>Kinyarwanda</source>
         <translation>卢旺达语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="121"/>
+        <location filename="../src/language.cc" line="119"/>
         <source>Afrikaans</source>
         <translation>南非语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="134"/>
+        <location filename="../src/language.cc" line="132"/>
         <source>Bislama</source>
         <translation>比斯拉马语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="180"/>
+        <location filename="../src/language.cc" line="178"/>
         <source>Armenian</source>
         <translation>亚美尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="229"/>
+        <location filename="../src/language.cc" line="227"/>
         <source>Norwegian Bokmal</source>
         <translation>波克默尔语（挪威）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="177"/>
+        <location filename="../src/language.cc" line="175"/>
         <source>Croatian</source>
         <translation>克罗地亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="139"/>
+        <location filename="../src/language.cc" line="137"/>
         <source>Bosnian</source>
         <translation>波斯尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="182"/>
+        <location filename="../src/language.cc" line="180"/>
         <source>Interlingua</source>
         <translation>国际语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="184"/>
+        <location filename="../src/language.cc" line="182"/>
         <source>Interlingue</source>
         <translation>西方国际语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="140"/>
+        <location filename="../src/language.cc" line="138"/>
         <source>Catalan</source>
         <translation>加泰罗尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="268"/>
+        <location filename="../src/language.cc" line="266"/>
         <source>Serbian</source>
         <translation>塞尔维亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="227"/>
+        <location filename="../src/language.cc" line="225"/>
         <source>Burmese</source>
         <translation>缅甸语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="253"/>
+        <location filename="../src/language.cc" line="251"/>
         <source>Russian</source>
         <translation>俄语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="212"/>
+        <location filename="../src/language.cc" line="210"/>
         <source>Limburgish</source>
         <translation>林堡语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="235"/>
+        <location filename="../src/language.cc" line="233"/>
         <source>Norwegian</source>
         <translation>挪威语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="141"/>
+        <location filename="../src/language.cc" line="139"/>
         <source>Chechen</source>
         <translation>车臣语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="301"/>
+        <location filename="../src/language.cc" line="299"/>
         <source>Chinese</source>
         <translation>汉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="147"/>
+        <location filename="../src/language.cc" line="145"/>
         <source>Chuvash</source>
         <translation>楚瓦什语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="261"/>
+        <location filename="../src/language.cc" line="259"/>
         <source>Sinhala</source>
         <translation>僧加罗语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="157"/>
+        <location filename="../src/language.cc" line="155"/>
         <source>Spanish</source>
         <translation>西班牙语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="207"/>
+        <location filename="../src/language.cc" line="205"/>
         <source>Cornish</source>
         <translation>凯尔特语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="280"/>
+        <location filename="../src/language.cc" line="278"/>
         <source>Tagalog</source>
         <translation>他加禄语（菲律宾）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="126"/>
+        <location filename="../src/language.cc" line="124"/>
         <source>Assamese</source>
         <translation>阿萨姆语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="243"/>
+        <location filename="../src/language.cc" line="241"/>
         <source>Ossetian</source>
         <translation>奥塞梯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="158"/>
+        <location filename="../src/language.cc" line="156"/>
         <source>Estonian</source>
         <translation>爱沙尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="273"/>
+        <location filename="../src/language.cc" line="271"/>
         <source>Swahili</source>
         <translation>斯瓦希里语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="272"/>
+        <location filename="../src/language.cc" line="270"/>
         <source>Swedish</source>
         <translation>瑞典语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="137"/>
+        <location filename="../src/language.cc" line="135"/>
         <source>Tibetan</source>
         <translation>西藏语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="293"/>
+        <location filename="../src/language.cc" line="291"/>
         <source>Vietnamese</source>
         <translation>越南语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="221"/>
+        <location filename="../src/language.cc" line="219"/>
         <source>Macedonian</source>
         <translation>马其顿语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="248"/>
+        <location filename="../src/language.cc" line="246"/>
         <source>Portuguese</source>
         <translation>葡萄牙语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="283"/>
+        <location filename="../src/language.cc" line="281"/>
         <source>Turkish</source>
         <translation>土耳其语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="279"/>
+        <location filename="../src/language.cc" line="277"/>
         <source>Turkmen</source>
         <translation>土库曼语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="171"/>
+        <location filename="../src/language.cc" line="169"/>
         <source>Gujarati</source>
         <translation>古吉拉特语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="189"/>
+        <location filename="../src/language.cc" line="187"/>
         <source>Icelandic</source>
         <translation>冰岛语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="191"/>
+        <location filename="../src/language.cc" line="189"/>
         <source>Inuktitut</source>
         <translation>因纽特语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="155"/>
+        <location filename="../src/language.cc" line="153"/>
         <source>English</source>
         <translation>英语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="194"/>
+        <location filename="../src/language.cc" line="192"/>
         <source>Georgian</source>
         <translation>格鲁吉亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="146"/>
+        <location filename="../src/language.cc" line="144"/>
         <source>Church Slavic</source>
         <translation>教会斯拉夫语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="164"/>
+        <location filename="../src/language.cc" line="162"/>
         <source>Faroese</source>
         <translation>法罗语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="162"/>
+        <location filename="../src/language.cc" line="160"/>
         <source>Finnish</source>
         <translation>芬兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="294"/>
+        <location filename="../src/language.cc" line="292"/>
         <source>Volapuk</source>
         <translation>沃拉普克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="295"/>
+        <location filename="../src/language.cc" line="293"/>
         <source>Walloon</source>
         <translation>华隆语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="197"/>
+        <location filename="../src/language.cc" line="195"/>
         <source>Kwanyama</source>
         <translation>宽亚玛语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="219"/>
+        <location filename="../src/language.cc" line="217"/>
         <source>Marshallese</source>
         <translation>马绍尔语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="258"/>
+        <location filename="../src/language.cc" line="256"/>
         <source>Northern Sami</source>
         <translation>北萨莫斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="178"/>
+        <location filename="../src/language.cc" line="176"/>
         <source>Haitian</source>
         <translation>海地语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="142"/>
+        <location filename="../src/language.cc" line="140"/>
         <source>Chamorro</source>
         <translation>查莫罗语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="234"/>
+        <location filename="../src/language.cc" line="232"/>
         <source>Norwegian Nynorsk</source>
         <translation>尼诺斯克语（挪威）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="170"/>
+        <location filename="../src/language.cc" line="168"/>
         <source>Guarani</source>
         <translation>瓜拉尼语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="236"/>
+        <location filename="../src/language.cc" line="234"/>
         <source>South Ndebele</source>
         <translation>南恩德贝勒语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="238"/>
+        <location filename="../src/language.cc" line="236"/>
         <source>Chichewa</source>
         <translation>奇契瓦语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="215"/>
+        <location filename="../src/language.cc" line="213"/>
         <source>Lithuanian</source>
         <translation>立陶宛语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="186"/>
+        <location filename="../src/language.cc" line="184"/>
         <source>Sichuan Yi</source>
         <translation>四川彝语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="278"/>
+        <location filename="../src/language.cc" line="276"/>
         <source>Tigrinya</source>
         <translation>提格里尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="298"/>
+        <location filename="../src/language.cc" line="296"/>
         <source>Yiddish</source>
         <translation>意第绪语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="439"/>
+        <location filename="../src/language.cc" line="437"/>
         <source>Traditional Chinese</source>
         <translation>繁体中文</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="440"/>
+        <location filename="../src/language.cc" line="438"/>
         <source>Simplified Chinese</source>
         <translation>简体中文</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="441"/>
+        <location filename="../src/language.cc" line="439"/>
         <source>Other</source>
         <translation>其它</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="442"/>
+        <location filename="../src/language.cc" line="440"/>
         <source>Other Simplified Chinese dialects</source>
         <translation>简体中文其它方言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="443"/>
+        <location filename="../src/language.cc" line="441"/>
         <source>Other Traditional Chinese dialects</source>
         <translation>繁体中文其它方言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="444"/>
+        <location filename="../src/language.cc" line="442"/>
         <source>Other Eastern-European languages</source>
         <translation>东欧其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="445"/>
+        <location filename="../src/language.cc" line="443"/>
         <source>Other Western-European languages</source>
         <translation>西欧其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="446"/>
+        <location filename="../src/language.cc" line="444"/>
         <source>Other Russian languages</source>
         <translation>俄罗斯其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="447"/>
+        <location filename="../src/language.cc" line="445"/>
         <source>Other Japanese languages</source>
         <translation>日本其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="448"/>
+        <location filename="../src/language.cc" line="446"/>
         <source>Other Baltic languages</source>
         <translation>波罗地海其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="449"/>
+        <location filename="../src/language.cc" line="447"/>
         <source>Other Greek languages</source>
         <translation>希腊其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="450"/>
+        <location filename="../src/language.cc" line="448"/>
         <source>Other Korean dialects</source>
         <translation>其他韩国方言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="451"/>
+        <location filename="../src/language.cc" line="449"/>
         <source>Other Turkish dialects</source>
         <translation>土尔其其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="452"/>
+        <location filename="../src/language.cc" line="450"/>
         <source>Other Thai dialects</source>
         <translation>泰国其它语言</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="453"/>
+        <location filename="../src/language.cc" line="451"/>
         <source>Tamazight</source>
         <translation>塔马塞特语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="303"/>
+        <location filename="../src/language.cc" line="301"/>
         <source>Lojban</source>
         <translation>逻辑语</translation>
     </message>
@@ -2515,207 +2488,207 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Language::Db</name>
     <message>
-        <location filename="../src/language.cc" line="41"/>
+        <location filename="../src/language.cc" line="39"/>
         <source>French</source>
         <translation>法语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="42"/>
+        <location filename="../src/language.cc" line="40"/>
         <source>Spanish</source>
         <translation>西班牙语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="43"/>
+        <location filename="../src/language.cc" line="41"/>
         <source>Belarusian</source>
         <translation>白俄罗斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="44"/>
+        <location filename="../src/language.cc" line="42"/>
         <source>Bulgarian</source>
         <translation>保加利亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="45"/>
+        <location filename="../src/language.cc" line="43"/>
         <source>Czech</source>
         <translation>捷克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="46"/>
+        <location filename="../src/language.cc" line="44"/>
         <source>German</source>
         <translation>德语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="47"/>
+        <location filename="../src/language.cc" line="45"/>
         <source>Greek</source>
         <translation>希腊语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="48"/>
+        <location filename="../src/language.cc" line="46"/>
         <source>Finnish</source>
         <translation>芬兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="49"/>
+        <location filename="../src/language.cc" line="47"/>
         <source>Italian</source>
         <translation>意大利语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="50"/>
+        <location filename="../src/language.cc" line="48"/>
         <source>Japanese</source>
         <translation>日语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="51"/>
+        <location filename="../src/language.cc" line="49"/>
         <source>Korean</source>
         <translation>韩语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="52"/>
+        <location filename="../src/language.cc" line="50"/>
         <source>Lithuanian</source>
         <translation>立陶宛语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="53"/>
+        <location filename="../src/language.cc" line="51"/>
         <source>Macedonian</source>
         <translation>马其顿语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="54"/>
+        <location filename="../src/language.cc" line="52"/>
         <source>Dutch</source>
         <translation>荷兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="55"/>
+        <location filename="../src/language.cc" line="53"/>
         <source>Polish</source>
         <translation>波兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="56"/>
+        <location filename="../src/language.cc" line="54"/>
         <source>Portuguese</source>
         <translation>葡萄牙语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="57"/>
+        <location filename="../src/language.cc" line="55"/>
         <source>Russian</source>
         <translation>俄语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="58"/>
+        <location filename="../src/language.cc" line="56"/>
         <source>Slovak</source>
         <translation>斯洛伐克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="59"/>
+        <location filename="../src/language.cc" line="57"/>
         <source>Albanian</source>
         <translation>阿尔巴尼亚语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="60"/>
+        <location filename="../src/language.cc" line="58"/>
         <source>Serbian (Cyrillic)</source>
         <translation>塞尔维亚语（西里尔文）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="61"/>
+        <location filename="../src/language.cc" line="59"/>
         <source>Swedish</source>
         <translation>瑞典语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="62"/>
+        <location filename="../src/language.cc" line="60"/>
         <source>Turkish</source>
         <translation>土耳其语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="63"/>
+        <location filename="../src/language.cc" line="61"/>
         <source>Ukrainian</source>
         <translation>乌克兰语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="64"/>
+        <location filename="../src/language.cc" line="62"/>
         <source>Chinese Simplified</source>
         <translation>中文（简体）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="65"/>
+        <location filename="../src/language.cc" line="63"/>
         <source>Chinese Traditional</source>
         <translation>中文（繁体）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="66"/>
+        <location filename="../src/language.cc" line="64"/>
         <source>Vietnamese</source>
         <translation>越南语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="67"/>
+        <location filename="../src/language.cc" line="65"/>
         <source>Portuguese, Brazilian</source>
         <translation>葡萄牙语（巴西）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="68"/>
+        <location filename="../src/language.cc" line="66"/>
         <source>Persian</source>
         <translation>波斯语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="69"/>
+        <location filename="../src/language.cc" line="67"/>
         <source>Spanish, Argentina</source>
         <translation>西班牙语（阿根廷）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="70"/>
+        <location filename="../src/language.cc" line="68"/>
         <source>Hindi</source>
         <translation>印地语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="71"/>
+        <location filename="../src/language.cc" line="69"/>
         <source>Esperanto</source>
         <translation>世界语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="72"/>
+        <location filename="../src/language.cc" line="70"/>
         <source>German, Switzerland</source>
         <translation>德语（瑞士）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="73"/>
+        <location filename="../src/language.cc" line="71"/>
         <source>Spanish, Bolivia</source>
         <translation>西班牙语（玻利维亚）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="74"/>
+        <location filename="../src/language.cc" line="72"/>
         <source>Tajik</source>
         <translation>塔吉克语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="75"/>
+        <location filename="../src/language.cc" line="73"/>
         <source>Quechua</source>
         <translation>科察语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="76"/>
+        <location filename="../src/language.cc" line="74"/>
         <source>Aymara</source>
         <translation>艾马拉语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="77"/>
+        <location filename="../src/language.cc" line="75"/>
         <source>Arabic, Saudi Arabia</source>
         <translation>阿拉伯语（沙特阿拉伯）</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="78"/>
+        <location filename="../src/language.cc" line="76"/>
         <source>Turkmen</source>
         <translation>土库曼语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="79"/>
+        <location filename="../src/language.cc" line="77"/>
         <source>Interlingue</source>
         <translation>国际语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="80"/>
+        <location filename="../src/language.cc" line="78"/>
         <source>Lojban</source>
         <translation>逻辑语</translation>
     </message>
     <message>
-        <location filename="../src/language.cc" line="81"/>
+        <location filename="../src/language.cc" line="79"/>
         <source>English</source>
         <translation>英语</translation>
     </message>
@@ -2723,7 +2696,7 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>LoadDictionaries</name>
     <message>
-        <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+        <location filename="../src/dict/loaddictionaries.cc" line="210"/>
         <source>Error loading dictionaries</source>
         <translation>读取词典出错</translation>
     </message>
@@ -2731,7 +2704,7 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>Main</name>
     <message>
-        <location filename="../src/main.cc" line="368"/>
+        <location filename="../src/main.cc" line="443"/>
         <source>Error in configuration file. Continue with default settings?</source>
         <translation>配置文件错误，使用默认配置并继续？</translation>
     </message>
@@ -2739,703 +2712,703 @@ between classic and school orthography in cyrillic)</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="553"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="388"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="143"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Favo&amp;rites</source>
         <translation>收藏(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="299"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>F3</source>
         <translation>F3</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="314"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>F4</source>
         <translation>F4</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1495"/>
+        <location filename="../src/ui/mainwindow.cc" line="1560"/>
         <source>All</source>
         <translation>全部</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="198"/>
+        <location filename="../src/ui/mainwindow.cc" line="224"/>
         <source>Back</source>
         <translation>回退</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1466"/>
+        <location filename="../src/ui/mainwindow.cc" line="1533"/>
         <source>%1 dictionaries, %2 articles, %3 words</source>
         <translation>词典数：%1，文章数：%2，词条数：%3</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="95"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Edit</source>
         <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="78"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;File</source>
         <translation>文件(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="102"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="136"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Search</source>
         <translation>搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="341"/>
-        <location filename="../src/ui/mainwindow.cc" line="389"/>
+        <location filename="../src/ui/mainwindow.ui"/>
+        <location filename="../src/ui/mainwindow.cc" line="407"/>
         <source>&amp;Quit</source>
         <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3371"/>
+        <location filename="../src/ui/mainwindow.cc" line="3305"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="344"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Quit from application</source>
         <translation>退出程序</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="363"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Close To Tray</source>
         <translation>关闭至系统托盘(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3371"/>
+        <location filename="../src/ui/mainwindow.cc" line="3305"/>
         <source>Can&apos;t save article: %1</source>
         <translation>无法保存文章：%1</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="244"/>
+        <location filename="../src/ui/mainwindow.cc" line="270"/>
         <source>Zoom In</source>
         <translation>放大</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="296"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Dictionaries...</source>
         <translation>词典(&amp;D)...</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="330"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;About</source>
         <translation>关于(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="355"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Forum</source>
         <translation>论坛(&amp;F)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="400"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Print</source>
         <translation>打印(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="382"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Save Article</source>
         <translation>保存文章(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3353"/>
+        <location filename="../src/ui/mainwindow.cc" line="3288"/>
         <source>Save Article As</source>
         <translation>文章另存为</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="403"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+P</source>
         <translation>Ctrl+P</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="347"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+Q</source>
         <translation>Ctrl+Q</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="366"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Minimizes the window to tray</source>
         <translation>最小化窗口至系统托盘</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="411"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Page Set&amp;up</source>
         <translation>页面设置(&amp;U)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="322"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Homepage</source>
         <translation>主页(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3039"/>
+        <location filename="../src/ui/mainwindow.cc" line="2987"/>
         <source>New Release Available</source>
         <translation>有新版本可用</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1477"/>
-        <source>Look up:</source>
-        <translation>查找：</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/mainwindow.cc" line="250"/>
+        <location filename="../src/ui/mainwindow.cc" line="274"/>
         <source>Zoom Out</source>
         <translation>缩小</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="382"/>
+        <location filename="../src/ui/mainwindow.cc" line="400"/>
         <source>Show &amp;Main Window</source>
         <translation>显示主窗口(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="333"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>About GoldenDict-ng</source>
         <translation>关于 GoldenDict-ng</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3045"/>
+        <location filename="../src/ui/mainwindow.cc" line="2994"/>
         <source>Download</source>
         <translation>下载</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3250"/>
+        <location filename="../src/ui/mainwindow.cc" line="3183"/>
         <source>Page Setup</source>
         <translation>页面设置</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="306"/>
-        <location filename="../src/ui/mainwindow.cc" line="1477"/>
-        <source>Look up in:</source>
-        <translation>查找于：</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/mainwindow.cc" line="254"/>
+        <location filename="../src/ui/mainwindow.cc" line="278"/>
         <source>Normal Size</source>
         <translation>正常大小</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="2888"/>
+        <location filename="../src/ui/mainwindow.cc" line="2837"/>
         <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="../src/ui/mainwindow.cc" line="3040"/>
+        <location filename="../src/ui/mainwindow.cc" line="2988"/>
         <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="../src/ui/mainwindow.ui" line="369"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+F4</source>
         <translation>Ctrl+F4</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="430"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+F5</source>
         <translation>Ctrl+F5</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="581"/>
+        <location filename="../src/ui/mainwindow.cc" line="607"/>
         <source>Loading...</source>
         <translation>加载中……</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1666"/>
+        <location filename="../src/ui/mainwindow.cc" line="1719"/>
         <source>(untitled)</source>
         <translation>（未命名）</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="311"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Preferences...</source>
         <translation>首选项(&amp;P)...</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="46"/>
-        <location filename="../src/ui/mainwindow.cc" line="732"/>
+        <location filename="../src/ui/mainwindow.ui"/>
+        <location filename="../src/ui/mainwindow.cc" line="757"/>
         <source>Welcome!</source>
         <translation>欢迎使用！</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="231"/>
+        <location filename="../src/ui/mainwindow.cc" line="257"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="385"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Save Article</source>
         <translation>保存文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3046"/>
+        <location filename="../src/ui/mainwindow.cc" line="2995"/>
         <source>Skip This Release</source>
         <translation>忽略此次升级</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="200"/>
+        <location filename="../src/ui/mainwindow.cc" line="226"/>
         <source>Forward</source>
         <translation>前进</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3272"/>
+        <location filename="../src/ui/mainwindow.cc" line="3205"/>
         <source>Print Article</source>
         <translation>打印文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3251"/>
+        <location filename="../src/ui/mainwindow.cc" line="3184"/>
         <source>No printer is available. Please install one first.</source>
         <translation>找不到可用的打印机，请先安装一个打印机。</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="115"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;View</source>
         <translation>查看(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="126"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>H&amp;istory</source>
         <translation>历史(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="438"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Clear</source>
         <translation>清除(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="119"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Zoom</source>
         <translation>缩放(&amp;Z)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="368"/>
+        <location filename="../src/ui/mainwindow.cc" line="388"/>
         <source>Words Zoom In</source>
         <translation>单词列表 - 放大</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="372"/>
+        <location filename="../src/ui/mainwindow.cc" line="390"/>
         <source>Words Zoom Out</source>
         <translation>单词列表 - 缩小</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="374"/>
+        <location filename="../src/ui/mainwindow.cc" line="392"/>
         <source>Words Normal Size</source>
         <translation>单词列表 - 正常大小</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="421"/>
+        <location filename="../src/ui/mainwindow.cc" line="449"/>
         <source>Close current tab</source>
         <translation>关闭当前标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="429"/>
+        <location filename="../src/ui/mainwindow.cc" line="457"/>
         <source>Close all tabs</source>
         <translation>关闭所有标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="436"/>
+        <location filename="../src/ui/mainwindow.cc" line="464"/>
         <source>Close all tabs except current</source>
         <translation>关闭其它标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="411"/>
+        <location filename="../src/ui/mainwindow.cc" line="439"/>
         <source>Opened tabs</source>
         <translation>已打开的标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="590"/>
+        <location filename="../src/ui/mainwindow.cc" line="616"/>
         <source>New Tab</source>
         <translation>新建标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="453"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="464"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Configuration Folder</source>
         <translation>配置文件夹(&amp;C)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="121"/>
+        <location filename="../src/ui/mainwindow.cc" line="147"/>
         <source>&amp;Menubar</source>
         <translation>菜单栏(&amp;M)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="344"/>
+        <location filename="../src/ui/mainwindow.cc" line="364"/>
         <source>Found in Dictionaries:</source>
         <translation>在以下词典中找到：</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="456"/>
+        <location filename="../src/ui/mainwindow.cc" line="484"/>
         <source>Add all tabs to Favorites</source>
         <translation>将全部标签页添加至收藏</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1011"/>
+        <location filename="../src/ui/mainwindow.cc" line="971"/>
+        <source>WARNING: %1</source>
+        <translation type="unfinished">警告： %1</translation>
+    </message>
+    <message>
+        <location filename="../src/ui/mainwindow.cc" line="1101"/>
         <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>词典搜索中的字符串：可以使用通配符“*”、“?”和符号分组“[...]”。
 如需查找“*”、“?”、“[”和“]”字符，请对应使用“\*”、“\?”、“\[”和“\]”</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1609"/>
+        <location filename="../src/ui/mainwindow.cc" line="1668"/>
         <source>Open Tabs List</source>
         <translation>打开标签页列表</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1866"/>
-        <location filename="../src/ui/mainwindow.cc" line="1944"/>
-        <location filename="../src/ui/mainwindow.cc" line="4457"/>
-        <location filename="../src/ui/mainwindow.cc" line="4485"/>
-        <location filename="../src/ui/mainwindow.cc" line="4524"/>
+        <location filename="../src/ui/mainwindow.cc" line="1915"/>
+        <location filename="../src/ui/mainwindow.cc" line="1979"/>
+        <location filename="../src/ui/mainwindow.cc" line="4344"/>
+        <location filename="../src/ui/mainwindow.cc" line="4372"/>
+        <location filename="../src/ui/mainwindow.cc" line="4411"/>
         <source>Remove current tab from Favorites</source>
         <translation>从收藏中删除当前标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="1897"/>
+        <location filename="../src/ui/mainwindow.cc" line="1939"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3150"/>
+        <location filename="../src/ui/mainwindow.cc" line="3089"/>
         <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
         <translation>你选择了隐藏菜单栏，使用 %1 再次显示。</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3151"/>
+        <location filename="../src/ui/mainwindow.cc" line="3091"/>
         <source>Ctrl+M</source>
         <translation>Ctrl+M</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="472"/>
-        <location filename="../src/ui/mainwindow.cc" line="3744"/>
-        <location filename="../src/ui/mainwindow.cc" line="3756"/>
+        <location filename="../src/ui/mainwindow.ui"/>
+        <location filename="../src/ui/mainwindow.cc" line="3651"/>
+        <location filename="../src/ui/mainwindow.cc" line="3661"/>
         <source>&amp;Show</source>
         <translation>显示(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="483"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Export</source>
         <translation>导出(&amp;E)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3740"/>
-        <location filename="../src/ui/mainwindow.cc" line="3752"/>
+        <location filename="../src/ui/mainwindow.cc" line="3647"/>
+        <location filename="../src/ui/mainwindow.cc" line="3658"/>
         <source>&amp;Hide</source>
         <translation>隐藏(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3798"/>
+        <location filename="../src/ui/mainwindow.cc" line="3699"/>
         <source>Export history to file</source>
         <translation>导出历史记录到文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3800"/>
-        <location filename="../src/ui/mainwindow.cc" line="3862"/>
-        <location filename="../src/ui/mainwindow.cc" line="3976"/>
+        <location filename="../src/ui/mainwindow.cc" line="3701"/>
+        <location filename="../src/ui/mainwindow.cc" line="3762"/>
+        <location filename="../src/ui/mainwindow.cc" line="3877"/>
         <source>Text files (*.txt);;All files (*.*)</source>
         <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3839"/>
+        <location filename="../src/ui/mainwindow.cc" line="3745"/>
         <source>History export complete</source>
         <translation>历史记录导出完成</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3842"/>
-        <location filename="../src/ui/mainwindow.cc" line="3957"/>
-        <location filename="../src/ui/mainwindow.cc" line="4006"/>
+        <location filename="../src/ui/mainwindow.cc" line="3710"/>
+        <location filename="../src/ui/mainwindow.cc" line="3723"/>
+        <location filename="../src/ui/mainwindow.cc" line="3740"/>
+        <location filename="../src/ui/mainwindow.cc" line="3846"/>
+        <location filename="../src/ui/mainwindow.cc" line="3854"/>
+        <location filename="../src/ui/mainwindow.cc" line="3885"/>
+        <location filename="../src/ui/mainwindow.cc" line="3893"/>
+        <location filename="../src/ui/mainwindow.cc" line="3903"/>
         <source>Export error: </source>
         <translation>导出错误：</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="475"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="491"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Import</source>
         <translation>导入(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3860"/>
+        <location filename="../src/ui/mainwindow.cc" line="3760"/>
         <source>Import history from file</source>
         <translation>导入历史文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3909"/>
+        <location filename="../src/ui/mainwindow.cc" line="3809"/>
         <source>Import error: invalid data in file</source>
         <translation>导入失败：无效数据</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3913"/>
+        <location filename="../src/ui/mainwindow.cc" line="3815"/>
         <source>History import complete</source>
         <translation>历史导入成功</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3916"/>
-        <location filename="../src/ui/mainwindow.cc" line="4058"/>
+        <location filename="../src/ui/mainwindow.cc" line="3772"/>
+        <location filename="../src/ui/mainwindow.cc" line="3803"/>
+        <location filename="../src/ui/mainwindow.cc" line="3935"/>
         <source>Import error: </source>
         <translation>导入错误：</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3933"/>
+        <location filename="../src/ui/mainwindow.cc" line="3835"/>
         <source>Export Favorites to file</source>
         <translation>导出收藏记录到文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3935"/>
+        <location filename="../src/ui/mainwindow.cc" line="3837"/>
         <source>XML files (*.xml);;All files (*.*)</source>
         <translation>XML 文件 (*.xml);;所有文件 (*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3954"/>
-        <location filename="../src/ui/mainwindow.cc" line="4003"/>
+        <location filename="../src/ui/mainwindow.cc" line="3859"/>
+        <location filename="../src/ui/mainwindow.cc" line="3908"/>
         <source>Favorites export complete</source>
         <translation>收藏导出完成</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3974"/>
+        <location filename="../src/ui/mainwindow.cc" line="3875"/>
         <source>Export Favorites to file as plain list</source>
         <translation>以纯列表形式导出收藏列表到文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4023"/>
+        <location filename="../src/ui/mainwindow.cc" line="3923"/>
         <source>Import Favorites from file</source>
         <translation>导入收藏文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4025"/>
+        <location filename="../src/ui/mainwindow.cc" line="3925"/>
         <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
         <translation>XML文件(*.xml);;文本文件(*.txt);;所有文件(*.*)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4054"/>
+        <location filename="../src/ui/mainwindow.cc" line="3955"/>
         <source>Favorites import complete</source>
         <translation>收藏导入完成</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4060"/>
+        <location filename="../src/ui/mainwindow.cc" line="3943"/>
+        <location filename="../src/ui/mainwindow.cc" line="3949"/>
         <source>Data parsing error</source>
         <translation>数据解析错误</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4270"/>
+        <location filename="../src/ui/mainwindow.cc" line="4162"/>
         <source>Dictionary info</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4274"/>
+        <location filename="../src/ui/mainwindow.cc" line="4166"/>
         <source>Dictionary headwords</source>
         <translation>词典词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4276"/>
+        <location filename="../src/ui/mainwindow.cc" line="4168"/>
         <source>Open dictionary folder</source>
         <translation>打开词典文件夹</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4282"/>
+        <location filename="../src/ui/mainwindow.cc" line="4174"/>
         <source>Edit dictionary</source>
         <translation>编辑词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4428"/>
+        <location filename="../src/ui/mainwindow.cc" line="4319"/>
         <source>Now indexing for full-text search: </source>
         <translation>正在为全文搜索进行索引：</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="4470"/>
+        <location filename="../src/ui/mainwindow.cc" line="4357"/>
         <source>Remove headword &quot;%1&quot; from Favorites?</source>
         <translation>从收藏中删除标题字“%1”？</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="162"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Search Pane</source>
         <translation>查询面板(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="208"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Results Navigation Pane</source>
         <translation>查询结果导航面板(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="235"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Favor&amp;ites Pane</source>
         <translation>收藏面板(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="419"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Print Pre&amp;view</source>
         <translation>打印预览(&amp;V)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="427"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Rescan Files</source>
         <translation>重新扫描文件(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="450"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;New Tab</source>
         <translation>新建标签页(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="502"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;Always on Top</source>
         <translation>总在最前(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="505"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Always on Top</source>
         <translation>总在最前</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="508"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+O</source>
         <translation>Ctrl+O</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="517"/>
-        <location filename="../src/ui/mainwindow.ui" line="520"/>
-        <location filename="../src/ui/mainwindow.cc" line="298"/>
+        <location filename="../src/ui/mainwindow.ui"/>
+        <location filename="../src/ui/mainwindow.cc" line="322"/>
         <source>Menu Button</source>
         <translation>菜单按钮</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="525"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Search in page</source>
         <translation>页内搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="528"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="536"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Full-text search</source>
         <translation>全文搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="539"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+Shift+F</source>
         <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="550"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>GoldenDict reference</source>
         <translation>GoldenDict-ng 帮助</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="558"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Show</source>
         <translation>显示</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="566"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="571"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Import</source>
         <translation>导入</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="576"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Add</source>
         <translation>添加</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="579"/>
-        <location filename="../src/ui/mainwindow.cc" line="269"/>
-        <location filename="../src/ui/mainwindow.cc" line="1871"/>
-        <location filename="../src/ui/mainwindow.cc" line="1949"/>
-        <location filename="../src/ui/mainwindow.cc" line="4477"/>
+        <location filename="../src/ui/mainwindow.ui"/>
+        <location filename="../src/ui/mainwindow.cc" line="293"/>
+        <location filename="../src/ui/mainwindow.cc" line="1919"/>
+        <location filename="../src/ui/mainwindow.cc" line="1983"/>
+        <location filename="../src/ui/mainwindow.cc" line="4364"/>
         <source>Add current tab to Favorites</source>
         <translation>将当前标签页添加至收藏</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="582"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="587"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>Export to list</source>
         <translation>导出至列表</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="119"/>
+        <location filename="../src/ui/mainwindow.cc" line="145"/>
         <source>Show Names in Dictionary &amp;Bar</source>
         <translation>在词典栏中显示词典名称(&amp;B)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="120"/>
+        <location filename="../src/ui/mainwindow.cc" line="146"/>
         <source>Show Small Icons in &amp;Toolbars</source>
         <translation>在工具栏上显示小图标(&amp;T)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="195"/>
+        <location filename="../src/ui/mainwindow.cc" line="221"/>
         <source>&amp;Navigation</source>
         <translation>导航栏(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="223"/>
+        <location filename="../src/ui/mainwindow.cc" line="249"/>
         <source>Enable Scanning</source>
         <translation>取词弹窗</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3348"/>
+        <location filename="../src/ui/mainwindow.cc" line="3283"/>
         <source>Article, Complete (*.html)</source>
         <translation>文章, 完整 (*.html)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3349"/>
+        <location filename="../src/ui/mainwindow.cc" line="3284"/>
         <source>Article, HTML Only (*.html)</source>
         <translation>文章, 仅 HTML (*.html)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3435"/>
+        <location filename="../src/ui/mainwindow.cc" line="3363"/>
         <source>Saving article...</source>
         <translation>文章保存中……</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3448"/>
+        <location filename="../src/ui/mainwindow.cc" line="3376"/>
         <source>Save article complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="3499"/>
+        <location filename="../src/ui/mainwindow.cc" line="3424"/>
         <source>The main window is set to be always on top.</source>
         <translation>主窗口已设置为总在最前。</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.ui" line="262"/>
+        <location filename="../src/ui/mainwindow.ui"/>
         <source>&amp;History Pane</source>
         <translation>历史面板(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/ui/mainwindow.cc" line="780"/>
-        <location filename="../src/ui/mainwindow.cc" line="863"/>
+        <location filename="../src/ui/mainwindow.cc" line="799"/>
+        <location filename="../src/ui/mainwindow.cc" line="878"/>
         <source>Accessibility API is not enabled</source>
         <translation>无障碍API未启用</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-        <location filename="../src/dict/mdx.cc" line="625"/>
+        <location filename="../src/dict/mdx.cc" line="618"/>
         <source>Dictionary file was tampered or corrupted</source>
         <translation>词典文件被修改或已损坏</translation>
     </message>
     <message>
-        <location filename="../src/dict/mdx.cc" line="636"/>
+        <location filename="../src/dict/mdx.cc" line="629"/>
         <source>Failed loading article from %1, reason: %2</source>
         <translation>从 %1 加载文章失败：%2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-        <location filename="../src/dict/mediawiki.cc" line="485"/>
+        <location filename="../src/dict/mediawiki.cc" line="486"/>
         <source>XML parse error: %1 at %2,%3</source>
         <translation>XML 解析失败：%1 于 %2, %3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>MediaWikisModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="481"/>
+        <location filename="../src/dict/sources.cc" line="482"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="483"/>
+        <location filename="../src/dict/sources.cc" line="484"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="479"/>
+        <location filename="../src/dict/sources.cc" line="480"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="485"/>
+        <location filename="../src/dict/sources.cc" line="486"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -3503,82 +3476,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>OrderAndProps</name>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="14"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Form</source>
         <translation>表单</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="53"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Inactive (disabled) dictionaries:</source>
         <translation>未启用（已禁用）的词典：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="75"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Name:</source>
         <translation>名称：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="105"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Total articles:</source>
         <translation>文章总数：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="129"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Translates from:</source>
         <translation>词条语言：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="136"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Translates to:</source>
         <translation>释义语言：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="112"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Total words:</source>
         <translation>词条总数：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="251"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <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="../src/ui/orderandprops.ui" line="37"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Dictionary order:</source>
         <translation>词典排序：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="208"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Files comprising this dictionary:</source>
         <translation>此词典包含的文件：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="67"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Dictionary information</source>
         <translation>词典信息</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.ui" line="165"/>
+        <location filename="../src/ui/orderandprops.ui"/>
         <source>Description:</source>
         <translation>描述：</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.cc" line="263"/>
+        <location filename="../src/ui/orderandprops.cc" line="267"/>
         <source>Sort by name</source>
         <translation>按名称排序</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.cc" line="265"/>
+        <location filename="../src/ui/orderandprops.cc" line="269"/>
         <source>Sort by languages</source>
         <translation>按语言排序</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.cc" line="259"/>
+        <location filename="../src/ui/orderandprops.cc" line="263"/>
         <source>Dictionary headwords</source>
         <translation>词典词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/orderandprops.cc" line="288"/>
+        <location filename="../src/ui/orderandprops.cc" line="292"/>
         <source>Dictionaries active: %1, inactive: %2</source>
         <translation>激活的词典：%1，未激活的词典：%2</translation>
     </message>
@@ -3586,12 +3559,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>PathsModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="1183"/>
+        <location filename="../src/dict/sources.cc" line="1184"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1185"/>
+        <location filename="../src/dict/sources.cc" line="1186"/>
         <source>Recursive</source>
         <translation>递归搜索</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
 <context>
     <name>Preferences</name>
     <message>
-        <location filename="../src/ui/preferences.ui" line="495"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Alt</source>
         <translation>Alt</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="85"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Start to system tray</source>
         <translation>启动至系统托盘</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="552"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Shift only</source>
         <translation>仅限左 Shift</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="505"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ctrl</source>
         <translation>Ctrl</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="565"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Win/Meta</source>
         <translation>Win/Meta</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="63"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Enable system tray icon</source>
         <translation>启用系统托盘图标</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="904"/>
-        <location filename="../src/ui/preferences.ui" line="984"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Host:</source>
         <translation>主机：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="914"/>
-        <location filename="../src/ui/preferences.ui" line="1001"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Port:</source>
         <translation>端口：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="525"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Shift</source>
         <translation>Shift</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="891"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Type:</source>
         <translation>类型：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="935"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>User:</source>
         <translation>用户名：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="371"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>&amp;Scan Popup</source>
         <translation>屏幕取词(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="295"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,137 +3640,137 @@ switching to them.</source>
 启用此选项将会在打开新标签页时不自动选定。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="854"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use proxy server</source>
         <translation>使用代理服务器</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="680"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use the following hotkey to translate a word from clipboard:</source>
         <translation>使用下列热键翻译剪贴板中的单词：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="562"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Windows key or Meta key</source>
         <translation>Windows 键或 Meta 键</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="763"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Auto-pronounce words in main window</source>
         <translation>自动朗读主窗口中的词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="191"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Start with system</source>
         <translation>随系统启动</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="512"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Alt only</source>
         <translation>仅限左 Alt</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="289"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Tabbed browsing</source>
         <translation>标签页浏览</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="482"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Shift only</source>
         <translation>仅限右 Shift</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="92"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="751"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>&amp;Audio</source>
         <translation>音频(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="850"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
         <translation>如果你希望通过代理服务器执行程序的网络查
 询功能，启用此选项。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="201"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Interface language:</source>
         <translation>界面语言：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="472"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Ctrl only</source>
         <translation>仅限左 Ctrl</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="300"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Open new tabs in background</source>
         <translation>在后台打开新标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="844"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>&amp;Network</source>
         <translation>网络(&amp;N)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="542"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Ctrl only</source>
         <translation>仅限右 Ctrl</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="118"/>
+        <location filename="../src/ui/preferences.cc" line="133"/>
         <source>Lingvo</source>
         <translation>Lingvo</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="485"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Shift</source>
         <translation>右 Shift</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="555"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Shift</source>
         <translation>左 Shift</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="420"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="770"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Auto-pronounce words in scan popup</source>
         <translation>自动朗读屏幕取词弹出窗口中的词条</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="312"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Open new tabs after the current one</source>
         <translation>在当前页之后打开新标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="624"/>
+        <location filename="../src/ui/preferences.cc" line="585"/>
         <source>Restart the program to apply the language change.</source>
         <translation>变更界面语言需要重新启动程序才能生效。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="492"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Alt key</source>
         <translation>Alt 键</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1202"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Check for new program releases periodically</source>
         <translation>定期检查可用版本</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="307"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3807,24 +3778,23 @@ be the last ones.</source>
 打开此选项，新标签页将会自动添加到末尾。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="96"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Close to system tray</source>
         <translation>关闭至系统托盘</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="59"/>
-        <location filename="../src/ui/preferences.cc" line="60"/>
+        <location filename="../src/ui/preferences.cc" line="61"/>
         <source>System default</source>
         <translation>系统默认</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="59"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
         <translation>启用此选项，将会启用系统托盘图标。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1195"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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
@@ -3835,139 +3805,139 @@ download page.</source>
 页面。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="182"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Startup</source>
         <translation>开机自动启动</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="945"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Password:</source>
         <translation>密码：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="115"/>
+        <location filename="../src/ui/preferences.cc" line="130"/>
         <source>Default</source>
         <translation>默认</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="50"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>&amp;Interface</source>
         <translation>界面(&amp;I)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="623"/>
+        <location filename="../src/ui/preferences.cc" line="584"/>
         <source>Changing Language</source>
         <translation>变更界面语言</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="502"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ctrl key</source>
         <translation>Ctr l键</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="653"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use the following hotkey to show or hide the main window:</source>
         <translation>使用下列热键显示或隐藏主窗口：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="515"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Alt</source>
         <translation>左 Alt</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="532"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Alt only</source>
         <translation>仅限右 Alt</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="14"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Preferences</source>
         <translation>首选项</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="475"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Left Ctrl</source>
         <translation>左 Ctrl</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="535"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Alt</source>
         <translation>右 Alt</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="723"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="545"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Right Ctrl</source>
         <translation>右 Ctrl</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="647"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Hotkeys</source>
         <translation>热键</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="381"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Start with scan popup turned on</source>
         <translation>启动程序时同时启动屏幕取词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="81"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
         <translation>启用此选项，程序启动时将直接最小化至系统托盘。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="522"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Shift key</source>
         <translation>Shift 键</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="188"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Automatically starts GoldenDict after operation system bootup.</source>
         <translation>开机自动启动 GoldenDict.</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="377"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="616"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
         <translation>在 GoldenDict 自身窗口口内选择或进行剪贴板操作时不要弹出窗口</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="619"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
         <translation>忽略 GoldenDict 自身的选择和剪贴板变更</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="786"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Play audio files via built-in audio support</source>
         <translation>使用内建音频支持播放音频文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="789"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use internal player:</source>
         <translation>使用内部播放器：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="796"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Choose audio back end</source>
         <translation>选择音频后端</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="816"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Enter audio player command line</source>
         <translation>输入音频播放器命令行</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1119"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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>
@@ -3976,83 +3946,83 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 用此选项。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1124"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Disallow loading content from other sites (hides most advertisements)</source>
         <translation>禁止载入来自其它站点的内容（封杀广告）</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="757"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Pronunciation</source>
         <translation>朗读</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="780"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Playback</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="806"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use external program:</source>
         <translation>使用外部程序播放：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="282"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Double-click translates the word clicked</source>
         <translation>双击翻译词条（在主界面中）</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="803"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Use any external program to play audio files</source>
         <translation>使用外部程序播放音频文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="106"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="110"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>ESC key hides main window</source>
         <translation>ESC 键隐藏主窗口</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="319"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="322"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Hide single tab</source>
         <translation>隐藏单标签页</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="141"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Adjust this value to avoid huge context menus.</source>
         <translation>避免右键菜单出现过多词典条目。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="144"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Context menu dictionaries limit:</source>
         <translation>右键菜单词典数目限制：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="388"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Send translated word to main window instead of to show it in popup window</source>
         <translation>将翻译词条发送至主窗口，而非在取词窗口中显示</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="391"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Send translated word to main window</source>
         <translation>发送翻译词条到主窗口</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="606"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
         <translation>显示弹出窗口之前先显示一个旗标窗口，点击旗标以显示弹出窗口。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="117"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4060,158 +4030,158 @@ however, the article from the topmost dictionary is shown.</source>
         <translation>单击link或双击翻译的时候是否自动定位到当前正在浏览的词典。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="123"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Automatically scroll to target article</source>
         <translation>自动定位到当前词典</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="208"/>
-        <source>Dictionary Font: </source>
-        <translation>词典字体：</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/preferences.ui" line="275"/>
-        <source>set the fallback font family for dictionary</source>
-        <translation>设置词典的备用字体</translation>
-    </message>
-    <message>
-        <location filename="../src/ui/preferences.ui" line="344"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Article Display style:</source>
         <translation>文章显示风格</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="230"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn the UI to dark.</source>
         <translation>启用暗色界面</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="233"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Dark Mode</source>
         <translation>深色模式</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="240"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn the article display style to dark.</source>
         <translation>将文章以暗色风格显示</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="243"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Dark Reader Mode</source>
         <translation>深色阅读模式</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="329"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>MRU order: Most recently used order.</source>
         <translation>排序：最近使用优先</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="398"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
         <translation>剪贴板取词。注意！非Linux系统，这个选项必须打开</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="401"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Track Clipboard change</source>
         <translation>剪贴板取词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="408"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Track Selection change</source>
         <translation>选择文本取词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="424"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Only tack selection when all selected keys are kept pressed:</source>
         <translation>仅当指定按钮被按时，文本取词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="609"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Show scan flag when word is selected</source>
         <translation>单词被选中时显示扫描旗标</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="866"/>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Delay time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source> ms</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
         <source>System proxy</source>
         <translation>系统代理</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="873"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Custom proxy</source>
         <translation>自定义代理</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="883"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Custom settings</source>
         <translation>自定义设置</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="970"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Anki Connect</source>
         <translation>Anki连接</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="991"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>http://</source>
         <translation>http:///</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1035"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Deck:</source>
         <translation>牌组：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1045"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Model:</source>
         <translation>模板：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1072"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Word</source>
         <translation>单词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1079"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Vocabulary field...</source>
         <translation>对应anki里面的变量名，如设置word，则用{{Word}}引用</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1086"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Text</source>
         <translation>释义</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1093"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Definition field...</source>
         <translation>释义的变量字段</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1100"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Sentence</source>
         <translation>句子</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1107"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Sentence field (can be empty)...</source>
         <translation>句子的变量（可选）</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1131"/>
+        <location filename="../src/ui/preferences.ui"/>
         <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="../src/ui/preferences.ui" line="1135"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Do not identify GoldenDict in HTTP headers</source>
         <translation>不使用 GoldenDict 浏览器标识（UA）</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1144"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Maximum network cache size:</source>
         <translation>允许的最大网络缓存：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1151"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4219,282 +4189,324 @@ If set to 0 the network disk cache will be disabled.</source>
 如果设置为0，磁盘缓存会被禁用。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1156"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source> MiB</source>
         <translation> MB</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1169"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
         <translation>GoldenDict退出时清空网络缓存。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1173"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Clear network cache on exit</source>
         <translation>退出时清空网络缓存</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1227"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Full-text search</source>
         <translation>全文搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1233"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Allow full-text search for:</source>
         <translation>允许对以下格式词典进行全文搜索：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1331"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Don&apos;t search in dictionaries containing more than</source>
         <translation>不要在词条数多于</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1348"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>articles (0 - unlimited)</source>
         <translation>个 (0 - 无限制) 的词典中进行搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1391"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ad&amp;vanced</source>
         <translation>高级(&amp;v)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1717"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
         <translation>如果用户折叠了词典，下次搜索的时候，保持折叠状态。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1720"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Session collapse</source>
         <translation>搜索期间保持折叠</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1741"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>When using clipboard,strip everything after newline</source>
         <translation>当使用剪贴板时，忽略剪贴板中换行之后的内容</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1748"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
         <translation>查询时，窗口获取焦点</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1511"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Favorites</source>
         <translation>收藏</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1528"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
         <translation>收藏内容保存周期。若为 0 则只在程序退出时保存。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1560"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to confirm every operation of items deletion</source>
         <translation>开启此选项以在每次进行删除操作时进行确认</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1563"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Confirmation for items deletion</source>
         <translation>删除条目时确认</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1634"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
         <translation>启用后，避免过长的输入（来自鼠标选择，剪贴板或命令行）</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1638"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ignore input phrases longer than</source>
         <translation>忽略大于</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1601"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Input phrases longer than this size will be ignored</source>
         <translation>忽略超过设置长度的字符</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1694"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to ignore diacritics while searching articles</source>
         <translation>启用该选项以在搜索文章时忽略变音符号</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1697"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ignore diacritics while searching</source>
         <translation>搜索时忽略变音符号</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1684"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to always expand optional parts of articles</source>
         <translation>开启此选项以自动展开文章的可选部分</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1687"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Expand optional &amp;parts</source>
         <translation>展开可选部分(&amp;P)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1624"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Select this option to automatic collapse big articles</source>
         <translation>开启此选项以自动收起过长的文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1627"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Collapse articles more than</source>
         <translation>收起大于</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1668"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Articles longer than this size will be collapsed</source>
         <translation>大于此大小的文章将被收起</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1594"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ignore punctuation while searching</source>
         <translation>搜索时忽略标点符号</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1730"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
         <translation>启用该选项可以激活基于同义词列表的额外搜索功能
 列表可以来源于星际翻王、Babylon 和 GLS 的词典</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1734"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Extra search via synonyms</source>
         <translation>基于同义词的额外搜索</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1617"/>
-        <location filename="../src/ui/preferences.ui" line="1661"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>symbols</source>
         <translation>字符的文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="332"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Ctrl-Tab navigates tabs in MRU order</source>
         <translation>用 Ctrl-tab 浏览标签页时，以“最近使用”为序</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="119"/>
+        <location filename="../src/ui/preferences.cc" line="134"/>
         <source>Babylon</source>
         <translation>巴比伦文</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1399"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>History</source>
         <translation>历史</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1405"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on to store history of the translated words</source>
         <translation>开启此选项以保存查询历史</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1408"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Store &amp;history</source>
         <translation>保存历史(&amp;H)</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1588"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Articles</source>
         <translation>文章</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="252"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Turn this option on if you want to select words by single mouse click</source>
         <translation>开启此选项以启用单击选择单词功能</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="255"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Select word by single click</source>
         <translation>单击选择单词</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="354"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Add-on style:</source>
         <translation>附加样式：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1423"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Specify the maximum number of entries to keep in history.</source>
         <translation>指定历史最大条数。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1426"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Maximum history size:</source>
         <translation>最大历史条数：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1463"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>History saving interval. If set to 0 history will be saved only during exit.</source>
         <translation>历史保存周期。若为 0 则只在程序退出时保存。</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1469"/>
-        <location filename="../src/ui/preferences.ui" line="1531"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>Save every</source>
         <translation>保存周期：</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.ui" line="1486"/>
-        <location filename="../src/ui/preferences.ui" line="1551"/>
+        <location filename="../src/ui/preferences.ui"/>
         <source>minutes</source>
         <translation>分钟</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="116"/>
+        <location filename="../src/ui/preferences.cc" line="131"/>
         <source>Classic</source>
         <translation>经典</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="117"/>
+        <location filename="../src/ui/preferences.cc" line="132"/>
         <source>Modern</source>
         <translation>现代</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="120"/>
+        <location filename="../src/ui/preferences.cc" line="135"/>
         <source>Lingoes</source>
         <translation>灵格斯</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="121"/>
+        <location filename="../src/ui/preferences.cc" line="136"/>
         <source>Lingoes-Blue</source>
         <translation>灵格斯-蓝色调</translation>
     </message>
     <message>
-        <location filename="../src/ui/preferences.cc" line="132"/>
+        <location filename="../src/ui/preferences.cc" line="147"/>
         <source> MB</source>
         <translation> MB</translation>
     </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Enable index with positional information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Standard Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Monospace Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Serif Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Sans-serif Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ui/preferences.ui"/>
+        <source>Fallback Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ProgramTypeEditor</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="1091"/>
+        <location filename="../src/dict/sources.cc" line="1092"/>
         <source>Audio</source>
         <translation>音频</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1093"/>
+        <location filename="../src/dict/sources.cc" line="1094"/>
         <source>Plain Text</source>
         <translation>纯文本</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1095"/>
+        <location filename="../src/dict/sources.cc" line="1096"/>
         <source>Html</source>
         <translation>Html</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1097"/>
+        <location filename="../src/dict/sources.cc" line="1098"/>
         <source>Prefix Match</source>
         <translation>匹配前缀</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1099"/>
+        <location filename="../src/dict/sources.cc" line="1100"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
@@ -4502,17 +4514,17 @@ from Stardict, Babylon and GLS dictionaries</source>
 <context>
     <name>Programs::RunInstance</name>
     <message>
-        <location filename="../src/dict/programs.cc" line="182"/>
+        <location filename="../src/dict/programs.cc" line="179"/>
         <source>No program name was given.</source>
         <translation>未指定程序名。</translation>
     </message>
     <message>
-        <location filename="../src/dict/programs.cc" line="198"/>
+        <location filename="../src/dict/programs.cc" line="195"/>
         <source>The program has crashed.</source>
         <translation>程序已崩溃。</translation>
     </message>
     <message>
-        <location filename="../src/dict/programs.cc" line="201"/>
+        <location filename="../src/dict/programs.cc" line="198"/>
         <source>The program has returned exit code %1.</source>
         <translation>程序返回，退出代码为 %1.</translation>
     </message>
@@ -4520,27 +4532,27 @@ from Stardict, Babylon and GLS dictionaries</source>
 <context>
     <name>ProgramsModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="999"/>
+        <location filename="../src/dict/sources.cc" line="1000"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1001"/>
+        <location filename="../src/dict/sources.cc" line="1002"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1003"/>
+        <location filename="../src/dict/sources.cc" line="1004"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1005"/>
+        <location filename="../src/dict/sources.cc" line="1006"/>
         <source>Command Line</source>
         <translation>命令行</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1007"/>
+        <location filename="../src/dict/sources.cc" line="1008"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -4548,99 +4560,114 @@ from Stardict, Babylon and GLS dictionaries</source>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/dict/aard.cc" line="430"/>
-        <location filename="../src/dict/dsl.cc" line="1691"/>
+        <location filename="../src/dict/aard.cc" line="419"/>
+        <location filename="../src/dict/dsl.cc" line="1671"/>
         <source>Article loading error</source>
         <translation>文章加载错误</translation>
     </message>
     <message>
-        <location filename="../src/dict/aard.cc" line="522"/>
-        <location filename="../src/dict/slob.cc" line="801"/>
+        <location filename="../src/dict/aard.cc" line="511"/>
+        <location filename="../src/dict/slob.cc" line="800"/>
         <source>Article decoding error</source>
         <translation>文章解码错误</translation>
     </message>
     <message>
-        <location filename="../src/dict/aard.cc" line="563"/>
-        <location filename="../src/dict/bgl.cc" line="394"/>
-        <location filename="../src/dict/sdict.cc" line="685"/>
-        <location filename="../src/dict/stardict.cc" line="1102"/>
+        <location filename="../src/dict/aard.cc" line="552"/>
+        <location filename="../src/dict/bgl.cc" line="381"/>
+        <location filename="../src/dict/sdict.cc" line="671"/>
+        <location filename="../src/dict/stardict.cc" line="1101"/>
         <source>Copyright: %1%2</source>
         <translation>版权：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/aard.cc" line="567"/>
-        <location filename="../src/dict/sdict.cc" line="701"/>
+        <location filename="../src/dict/aard.cc" line="556"/>
+        <location filename="../src/dict/sdict.cc" line="687"/>
         <source>Version: %1%2</source>
         <translation>版本：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/bgl.cc" line="401"/>
-        <location filename="../src/dict/gls.cc" line="550"/>
-        <location filename="../src/dict/stardict.cc" line="1110"/>
+        <location filename="../src/dict/bgl.cc" line="388"/>
+        <location filename="../src/dict/gls.cc" line="543"/>
+        <location filename="../src/dict/stardict.cc" line="1109"/>
         <source>Author: %1%2</source>
         <translation>作者：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/bgl.cc" line="408"/>
-        <location filename="../src/dict/stardict.cc" line="1118"/>
+        <location filename="../src/dict/bgl.cc" line="395"/>
+        <location filename="../src/dict/stardict.cc" line="1117"/>
         <source>E-mail: %1%2</source>
         <translation>电子邮件：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/sdict.cc" line="653"/>
+        <location filename="../src/dict/sdict.cc" line="639"/>
         <source>Title: %1%2</source>
         <translation>标题：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/stardict.cc" line="1126"/>
+        <location filename="../src/dict/stardict.cc" line="1125"/>
         <source>Website: %1%2</source>
         <translation>网站：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/dict/stardict.cc" line="1134"/>
+        <location filename="../src/dict/stardict.cc" line="1133"/>
         <source>Date: %1%2</source>
         <translation>日期：%1%2</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="150"/>
+        <location filename="../src/main.cc" line="179"/>
         <source>A dictionary lookup program.</source>
         <translation>一款电子词典程序。</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="153"/>
+        <location filename="../src/main.cc" line="182"/>
         <source>Word or sentence to query.</source>
         <translation>单词或句子查询。</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="157"/>
+        <location filename="../src/main.cc" line="186"/>
         <source>Save debug messages to gd_log.txt in the config folder.</source>
         <translation>在配置文件夹中将调试消息保存到 gd_log.txt。</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="161"/>
+        <location filename="../src/main.cc" line="190"/>
+        <source>Reset window state.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cc" line="192"/>
+        <source>Disable tts.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/main.cc" line="196"/>
         <source>Change the group of main window.</source>
         <translation>更改主窗口组。</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="165"/>
+        <location filename="../src/main.cc" line="200"/>
         <source>Change the group of popup.</source>
         <translation>更改弹出窗口组。</translation>
     </message>
     <message>
-        <location filename="../src/main.cc" line="170"/>
+        <location filename="../src/main.cc" line="205"/>
         <source>Toggle scan popup.</source>
         <translation>切换扫描弹出窗口。</translation>
     </message>
+    <message>
+        <location filename="../src/main.cc" line="209"/>
+        <source>Print version and diagnosis info.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QuickFilterLine</name>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1143"/>
         <source>Dictionary search/filter (Ctrl+F)</source>
         <translation>词典查询/过滤 (Ctrl+F)</translation>
     </message>
     <message>
-        <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+        <location filename="../src/ui/groups_widgets.cc" line="1148"/>
         <source>Clear Search</source>
         <translation>清除查询结果</translation>
     </message>
@@ -4648,22 +4675,22 @@ from Stardict, Babylon and GLS dictionaries</source>
 <context>
     <name>ResourceToSaveHandler</name>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2706"/>
+        <location filename="../src/ui/articleview.cc" line="2474"/>
         <source>ERROR: %1</source>
         <translation>错误： %1</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2706"/>
+        <location filename="../src/ui/articleview.cc" line="2474"/>
         <source>Resource saving error: </source>
         <translation>资源保存失败：</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2732"/>
+        <location filename="../src/ui/articleview.cc" line="2500"/>
         <source>The referenced resource failed to download.</source>
         <translation>所引用的资源下载失败。</translation>
     </message>
     <message>
-        <location filename="../src/ui/articleview.cc" line="2732"/>
+        <location filename="../src/ui/articleview.cc" line="2500"/>
         <source>WARNING: %1</source>
         <translation>警告： %1</translation>
     </message>
@@ -4692,67 +4719,72 @@ from Stardict, Babylon and GLS dictionaries</source>
 <context>
     <name>ScanPopup</name>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="142"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Alt+S</source>
         <translation>Alt+S</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="14"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Dialog</source>
         <translation>对话框</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="135"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Pronounce Word (Alt+S)</source>
         <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="166"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Add word to Favorites (Ctrl+E)</source>
         <translation>将词条添加至收藏 (Ctrl+E)</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="193"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Shows or hides the dictionary bar</source>
         <translation>显示或隐藏词典栏</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="213"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Always stay on top of all other windows</source>
         <translation>总是位于其它窗口上方</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="230"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <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="../src/ui/scanpopup.ui" line="152"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Send word to main window (Alt+W)</source>
         <translation>将词条发送到主窗口 (Alt+W)</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="159"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Alt+W</source>
         <translation>Alt+W</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="113"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Back</source>
         <translation>回退</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.ui" line="124"/>
+        <location filename="../src/ui/scanpopup.ui"/>
         <source>Forward</source>
         <translation>前进</translation>
     </message>
     <message>
-        <location filename="../src/ui/scanpopup.cc" line="604"/>
-        <location filename="../src/ui/scanpopup.cc" line="1000"/>
+        <location filename="../src/ui/scanpopup.cc" line="587"/>
+        <location filename="../src/ui/scanpopup.cc" line="981"/>
         <source>%1 - %2</source>
         <translation>%1 - %2</translation>
     </message>
+    <message>
+        <location filename="../src/ui/scanpopup.cc" line="943"/>
+        <source>WARNING: %1</source>
+        <translation type="unfinished">警告： %1</translation>
+    </message>
 </context>
 <context>
     <name>SearchPanel</name>
@@ -4795,17 +4827,17 @@ could be resized or managed in other ways.</source>
 <context>
     <name>SoundDirsModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="1291"/>
+        <location filename="../src/dict/sources.cc" line="1292"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1289"/>
+        <location filename="../src/dict/sources.cc" line="1290"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="1293"/>
+        <location filename="../src/dict/sources.cc" line="1294"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -4813,60 +4845,60 @@ could be resized or managed in other ways.</source>
 <context>
     <name>Sources</name>
     <message>
-        <location filename="../src/ui/sources.ui" line="40"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Files</source>
         <translation>文件</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="813"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Hiragana</source>
         <translation>平假名</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="753"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Systems:</source>
         <translation>方案：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="780"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Nihon-shiki</source>
         <translation>日本式</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="262"/>
-        <location filename="../src/dict/sources.cc" line="286"/>
-        <location filename="../src/dict/sources.cc" line="310"/>
+        <location filename="../src/dict/sources.cc" line="263"/>
+        <location filename="../src/dict/sources.cc" line="287"/>
+        <location filename="../src/dict/sources.cc" line="311"/>
         <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="../src/ui/sources.ui" line="227"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Wikipedia</source>
         <translation>维基百科</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="820"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Katakana Japanese syllabary</source>
         <translation>日语的片假名</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="109"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
         <translation>如果要批量添加音频文件，请把路径添加在这里：</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="195"/>
-        <location filename="../src/dict/sources.cc" line="222"/>
+        <location filename="../src/dict/sources.cc" line="196"/>
+        <location filename="../src/dict/sources.cc" line="223"/>
         <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="../src/ui/sources.ui" line="741"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Japanese Romaji</source>
         <translation>日文罗马字</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="790"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4877,83 +4909,83 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支持此方案。</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="233"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Wikipedia (MediaWiki) sites:</source>
         <translation>维基百科（MediaWik）站点：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="103"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Sound Dirs</source>
         <translation>音频文件目录</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="412"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
         <translation>任何外部程序。一个字符串 %GDWORD% 将被替换为查询单词。 一个字符串 %GDSEARCH% 将被搜索栏中的文本替换。 如果不提供这两项参数，将把标题输入标准输入。</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="465"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Lingua Libre</source>
         <translation>Lingua Libre</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="471"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;由 &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;法国维基百科合作语言媒体图书馆 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="481"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Enable Lingua Libre</source>
         <translation>启用 Lingua Libre</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="490"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>ISO 639-3 language code</source>
         <translation>ISO 639-3 语言代码</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="582"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>使用 Forvo 需要一个 API key，请在该网站注册以获取你自己的 key.</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="605"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>从&lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;这里&lt;/a&gt;获取自己的API Key。</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="760"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
         <translation>以英文语音学为基础建立的，最常用的日文转写方案</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="810"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Hiragana Japanese syllabary</source>
         <translation>日语的平假名</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="835"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Custom transliteration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="844"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="854"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>ae;æ #this is an example</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="681"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Transliteration</source>
         <translation>转写</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="774"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4964,116 +4996,106 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支持此方案。</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="703"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Russian transliteration</source>
         <translation>俄文转写</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="159"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Morphology</source>
         <translation>构词法规则库</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="181"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&amp;Change...</source>
         <translation>变更(&amp;C)...</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="500"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="823"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Katakana</source>
         <translation>片假名</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="165"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
         <translation>储存 Hunspell/Myspell 拼写检查词库文件的路径：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="87"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Re&amp;scan now</source>
         <translation>重新扫描(&amp;S)</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="714"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>German transliteration</source>
         <translation>德文转写</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="292"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
         <translation>任意网站。%GDWORD% 字符串将会被搜索关键词替换：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="60"/>
-        <location filename="../src/ui/sources.ui" line="123"/>
-        <location filename="../src/ui/sources.ui" line="247"/>
-        <location filename="../src/ui/sources.ui" line="306"/>
-        <location filename="../src/ui/sources.ui" line="370"/>
-        <location filename="../src/ui/sources.ui" line="429"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&amp;Add...</source>
         <translation>添加(&amp;A)...</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="180"/>
-        <location filename="../src/dict/sources.cc" line="207"/>
-        <location filename="../src/dict/sources.cc" line="234"/>
+        <location filename="../src/dict/sources.cc" line="181"/>
+        <location filename="../src/dict/sources.cc" line="208"/>
+        <location filename="../src/dict/sources.cc" line="235"/>
         <source>Choose a directory</source>
         <translation>选择目录</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="67"/>
-        <location filename="../src/ui/sources.ui" line="130"/>
-        <location filename="../src/ui/sources.ui" line="254"/>
-        <location filename="../src/ui/sources.ui" line="313"/>
-        <location filename="../src/ui/sources.ui" line="377"/>
-        <location filename="../src/ui/sources.ui" line="436"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>&amp;Remove</source>
         <translation>移除(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="286"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Websites</source>
         <translation>网站</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="46"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Paths to search for the dictionary files:</source>
         <translation>词典文件所在目录：</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="194"/>
-        <location filename="../src/dict/sources.cc" line="221"/>
-        <location filename="../src/dict/sources.cc" line="261"/>
-        <location filename="../src/dict/sources.cc" line="285"/>
-        <location filename="../src/dict/sources.cc" line="309"/>
-        <location filename="../src/dict/sources.cc" line="333"/>
+        <location filename="../src/dict/sources.cc" line="195"/>
+        <location filename="../src/dict/sources.cc" line="222"/>
+        <location filename="../src/dict/sources.cc" line="262"/>
+        <location filename="../src/dict/sources.cc" line="286"/>
+        <location filename="../src/dict/sources.cc" line="310"/>
+        <location filename="../src/dict/sources.cc" line="334"/>
         <source>Confirm removal</source>
         <translation>确认移除</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="803"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Syllabaries:</source>
         <translation>音节：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="190"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Available morphology dictionaries:</source>
         <translation>可用的构词法规则库：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="738"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Enables to use the Latin alphabet to write the Japanese language</source>
         <translation>启用日文罗马字转写</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="202"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5086,94 +5108,94 @@ of the appropriate groups to use them.</source>
 最下面。</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="764"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Hepburn</source>
         <translation>黑本式</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="796"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Kunrei-shiki</source>
         <translation>训令式</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="533"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Forvo</source>
         <translation>Forvo</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="350"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>DICT servers</source>
         <translation>词典服务器</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="356"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>DICT servers:</source>
         <translation>词典服务器：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="545"/>
+        <location filename="../src/ui/sources.ui"/>
         <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="../src/ui/sources.ui" line="558"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Enable pronunciations from Forvo</source>
         <translation>启用来自 Forvo 的发音功能</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="575"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>API Key:</source>
         <translation>API 密钥：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="618"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Language codes (comma-separated):</source>
         <translation>语言代码（用逗号分隔）：</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="625"/>
+        <location filename="../src/ui/sources.ui"/>
         <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="../src/ui/sources.ui" line="648"/>
+        <location filename="../src/ui/sources.ui"/>
         <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="../src/ui/sources.ui" line="692"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Greek transliteration</source>
         <translation>希腊文转写</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="143"/>
+        <location filename="../src/dict/sources.cc" line="144"/>
         <source>(not available in portable version)</source>
         <translation>（便携版中不可用）</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="406"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Programs</source>
         <translation>程序</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="334"/>
+        <location filename="../src/dict/sources.cc" line="335"/>
         <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="../src/ui/sources.ui" line="725"/>
+        <location filename="../src/ui/sources.ui"/>
         <source>Belarusian transliteration</source>
         <translation>白俄罗斯语转写</translation>
     </message>
     <message>
-        <location filename="../src/ui/sources.ui" line="337"/>
+        <location filename="../src/ui/sources.ui"/>
         <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="../src/dict/sources.cc" line="128"/>
+        <location filename="../src/dict/sources.cc" line="129"/>
         <source>Text to Speech</source>
         <translation>语音合成</translation>
     </message>
@@ -5189,42 +5211,42 @@ of the appropriate groups to use them.</source>
 <context>
     <name>TextToSpeechSource</name>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Selected voice engines:</source>
         <translation>语音引擎列表：</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>&amp;Add</source>
         <translation>添加(&amp;A)</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>&amp;Remove</source>
         <translation>移除(&amp;R)</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Preview</source>
         <translation>预览</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Available voice engines:</source>
         <translation>可用语音引擎：</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Text to be previewed:</source>
         <translation>预览以下文本：</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Type text to be previewed here.</source>
         <translation>在这里输入要预览的文本。</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>&amp;Preview</source>
         <translation>预览(&amp;P)</translation>
     </message>
@@ -5249,17 +5271,17 @@ of the appropriate groups to use them.</source>
         <translation>无可用 TTS 引擎。&lt;br&gt;请确保 TTS 引擎已正确安装在计算机上。</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Preferences</source>
         <translation>选项</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Volume:</source>
         <translation>音量：</translation>
     </message>
     <message>
-        <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+        <location filename="../src/ui/texttospeechsource.ui"/>
         <source>Rate:</source>
         <translation>频率：</translation>
     </message>
@@ -5267,12 +5289,12 @@ of the appropriate groups to use them.</source>
 <context>
     <name>TranslateBox</name>
     <message>
-        <location filename="../src/ui/translatebox.cc" line="108"/>
+        <location filename="../src/ui/translatebox.cc" line="31"/>
         <source>Type a word or phrase to search dictionaries</source>
         <translation>输入单词或短语以搜索字典</translation>
     </message>
     <message>
-        <location filename="../src/ui/translatebox.cc" line="120"/>
+        <location filename="../src/ui/translatebox.cc" line="38"/>
         <source>Drop-down</source>
         <translation>下拉菜单</translation>
     </message>
@@ -5303,33 +5325,33 @@ of the appropriate groups to use them.</source>
 <context>
     <name>WebSitesModel</name>
     <message>
-        <location filename="../src/dict/sources.cc" line="650"/>
+        <location filename="../src/dict/sources.cc" line="651"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="652"/>
+        <location filename="../src/dict/sources.cc" line="653"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="646"/>
+        <location filename="../src/dict/sources.cc" line="647"/>
         <source>Enabled</source>
         <translation>已启用</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="637"/>
-        <location filename="../src/dict/sources.cc" line="670"/>
+        <location filename="../src/dict/sources.cc" line="638"/>
+        <location filename="../src/dict/sources.cc" line="671"/>
         <source>Insert article as link inside &lt;iframe&gt; tag</source>
         <translation>将文章在 &lt;iframe&gt; 标签中作为链接插入</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="648"/>
+        <location filename="../src/dict/sources.cc" line="649"/>
         <source>As link</source>
         <translation>作为链接</translation>
     </message>
     <message>
-        <location filename="../src/dict/sources.cc" line="654"/>
+        <location filename="../src/dict/sources.cc" line="655"/>
         <source>Icon</source>
         <translation>图标</translation>
     </message>
@@ -5337,17 +5359,9 @@ of the appropriate groups to use them.</source>
 <context>
     <name>WordFinder</name>
     <message>
-        <location filename="../src/wordfinder.cc" line="200"/>
+        <location filename="../src/wordfinder.cc" line="194"/>
         <source>Failed to query some dictionaries.</source>
         <translation>在某些词典中进行查询时失败。</translation>
     </message>
 </context>
-<context>
-    <name>WordList</name>
-    <message>
-        <location filename="../src/wordlist.cc" line="82"/>
-        <source>WARNING: %1</source>
-        <translation>警告： %1</translation>
-    </message>
-</context>
 </TS>
diff --git a/locale/cs_CZ.ts b/locale/cs_CZ.ts
index 88a557e4..cb4e2fe5 100644
--- a/locale/cs_CZ.ts
+++ b/locale/cs_CZ.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>О programu</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Prohledávač slovníků GoldenDict, verze </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencováno pod GNU GPLv3 nebo novější</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Kopírovat informace o verzi</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Kopírovat seznam slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Zásluhy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Neznámý]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Založeno na Qt %1 (%2, %3 bit) </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Na základě Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: může&apos;t vytvořit kartu bez slova</translation>
+      <translation>anki: Nelze vytvořit kartu beze slova</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Pak jenom zastavte kurzorem nad slovem v jiné aplikaci, které chcete vyhledat, a vyskočí okno které vám jej popíše.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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áce s vyskakovacím oknem&lt;/h3&gt;Abyst mohli vyhledávat slova z jiných aplikací, potřebujete zapnout &lt;i&gt;&quot;Vyskakovací okno&quot;&lt;/i&gt; v položce &lt;b&gt;Předvolby&lt;/b&gt; a pak jej kdykoliv povolte buďto kliknutím na &apos;Vyskakovací&apos; ikonu výše, nebo kliknutím na ikonu v systémové liště pravým tlačítkem myši a povolením v objevivší se nabídce. </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Rozbalit článek</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Sbalit článek</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Pro &lt;b&gt;%1&lt;/b&gt; nebyl nalezen překlad ve skupině &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Práce s vyskakovacím oknem</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(nepojmenovaný)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Vítejte!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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>Pak jenom myší vyberte jakékoliv slovo v jiné aplikaci, které chcete vyhledat (dvojklikem nebo označením tažením myší) a vyskočí okno, které vám to slovo popíše.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Ve skupině &lt;b&gt;%1&lt;/b&gt; nebyl nalezen žádný překlad.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Ve skupině &lt;b&gt;%2&lt;/b&gt;nebyl nalezen žádný překlad pro &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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ítejte v programu  &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Práci s programem začněte v &lt;b&gt;Upravit|Slovníky&lt;/b&gt;, kde můžete přidat cesty ke složkám, kde budou vyhledávány soubory slovníků, nastavíte různé stránky Wikipedie a jiné zdroje, upravíte pořadí adresářů nebo vytvoříte skupiny slovníků.&lt;p&gt;Pak budete moci vyhledávat slovíčka! To můžete provádět v tomto okně použitím pasnelu vlevo, nebo můžete &lt;a href=&quot;Working with popup&quot;&gt;vyhledávat slova z jiných aktivních aplikací&lt;/a&gt;. &lt;p&gt;Upravení vlastností programu provedete v &lt;b&gt;Upravit|Předvolby&lt;/b&gt;. Všechna nastavení mají nápovědu, která vám pomůže v případě, že máte o něčem pochybnosti.&lt;p&gt;Budete-li potřebovat další pomoc, budete mít nějaké návrhy nebo jenom budete chtít vědět co si myslí jiní, budete vítání na stránkách &lt;a href=&quot;http://goldendict.berlios.de/forum/&quot;&gt;diskuse&lt;/a&gt; o programu.&lt;p&gt;Aktualizace programu hledejte na &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;jeho stránkách&lt;/a&gt;.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencováno pod GPLv3 nebo novější.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(obrázek)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Rozbalit článek</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Od</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Sbalit článek</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Vytvořit novou Anki poznámku</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Chyba dotazu: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Blízká slova: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Složené výrazy:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Jednotlivá slova:</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Nepovedlo se vytvořit dočasný soubor.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>Vyh&amp;ledat &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Vyhledat &quot;%1&quot; v &amp;nové kartě</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Odkazovaný zdroj neexistuje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Nepovedlo se automaticky otevřít zdrojový soubor, zkuste jej otevřít manuálně: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Vyhledat &quot;%1&quot; v %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Vybrat aktuální článek</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopírovat jako text</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Projít</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Vyhledat &quot;%1&quot; v %2 v &amp;nové kartě</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Otevřít odkaz v nové kar&amp;tě</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Otevřít odkaz v &amp;externím prohlížeči</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Zdroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Zvuk TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Obrázek</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definice ze slovníku &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definice: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Odkazovaný audio program neexistuje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Otevřít odkaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Uložit &amp;záložku &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>VAROVÁNÍ: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>CHYBA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Uložit zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Uložit obrázek</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Soubory obrázků (*.bmp *.jpg *.png *.tif);;Všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Ulož&amp;it obrázek...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Fráze nenalezena</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 z %2 shod</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Ul&amp;ožit zvuk...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Poslat &quot;%1&quot; na vstupní řádek</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Přid&amp;at &quot;%1&quot; do historie</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Odeslat aktuální článek do Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Odeslat vybraný text do Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Zvukové soubory (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Všechny soubory (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Zvukové soubory (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Nepodařilo se přehrát zvukový soubor: %1</translation>
     </message>
@@ -414,62 +409,62 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Čínský konverze</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Povolit převod mezi zjednodušenými a tradičními čínskými znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Čínská konverze</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Povolit převod ze zjednodušených znaků na tradiční (varianta) znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC až TC (Taiwan varianta)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Povolit převod ze zjednodušených znaků na tradiční (Hong Kong varianta) znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC až TC (Hong Kong varianta)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Povolit převod z tradičních znaků na zjednodušené znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC až SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Zjednodušený na tradiční čínskou (Taiwan varianta)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Zjednodušený přechod na tradiční čínskou (Hong Kong varianta)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Tradiční zjednodušený čínský převod</translation>
     </message>
@@ -477,30 +472,30 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>vlastní přepis</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Je vyžadováno ověření proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Musíte zadat uživatelské jméno a heslo pro přístup přes proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Uživatelské jméno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Heslo:</translation>
     </message>
@@ -508,22 +503,22 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulář</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ikona skupiny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Zkratka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Složka Oblíbených položek:</translation>
     </message>
@@ -548,17 +543,17 @@ a školní ortografií v cyrilici)</translation>
       <translation>Obrázky</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Všechny soubory</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Chyba</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Zvolený obrázek nelze přečíst.</translation>
     </message>
@@ -566,63 +561,63 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Potvrzení</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Opravdu chcete vygenerovat set skupin založený na párech jazyků?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Opravdu chcete vygenerovat sadu skupin na základě metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Sloučit skupiny podle zdrojového jazyka do &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Sloučit skupiny podle cílového jazyka do &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automatické seskupování podle složky se nezdařilo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Nadřazený adresář %1 není dostupný.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Opravdu chcete vygenerovat sadu skupin na základě složek, které obsahují?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Vytvořit dvoustrannou skupinu překladů &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Sloučit skupiny s &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Slovníky:</translation>
     </message>
@@ -635,133 +630,133 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Režim vyhledávání</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Tento prvek určuje, jak bude filtr interpretován</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Je-li zaškrtnuto v případě symbolů, bude brán v úvahu při filtrování</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Porovnat velikost písmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Exportuje headwords do souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Nápověda</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Stiskněte toto tlačítko pro použití filtru v seznamu sluchátek</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Použít</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Je-li zaškrtnuto, jakákoli změna filtru bude okamžitě použita na seznam hlavních slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Automaticky použít</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtr:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filtrovat řetězec (fixní řetězec, zástupné znaky nebo regulární výraz)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Zástupné znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Načítání hesel...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unikátní hlavní slova celkem: %1, filtrováno: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Uložit headwords do souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textové soubory (*.txt);;Všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Nelze otevřít exportovaný soubor</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportovat headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Zrušit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Proces exportu je přerušen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Export dokončen</translation>
     </message>
@@ -769,67 +764,77 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Celkem článků:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Překládá z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Celkem slov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Překládá do:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Otevřít složku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Upravit slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Soubory obsažené v tomto slovníku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Popis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Zobrazit všechna unikátní slova slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Záhlaví</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Upravit slovník příkazem:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Indexový název souboru:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Otevřete složku indexu</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 záznamů</translation>
     </message>
@@ -860,44 +865,44 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Povoleno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Název</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Databáze</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategie</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Seznam databází oddělených čárkami
 (prázdný řetězec nebo &quot;*&quot; odpovídá všem databázím)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Seznam strategií vyhledávání oddělených čárkami
@@ -907,37 +912,37 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Rozšířit nabídku se všemi slovníky...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Upravit tuto skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informace o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Slovníková hlavička</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Otevřít složku slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Upravit slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Pru&amp;h slovníků</translation>
     </message>
@@ -946,27 +951,27 @@ a školní ortografií v cyrilici)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Slovníky</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Slovníky</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Přijmout</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Zrušit</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Změněny zdroje</translation>
     </message>
@@ -977,12 +982,12 @@ a školní ortografií v cyrilici)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>S&amp;kupiny</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Některé zdroje byly změněny. Chcete přijmout změny?</translation>
     </message>
@@ -1011,75 +1016,55 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Celotextové vyhledávání</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Celá slova</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Prostý text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Zástupné znaky</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Dotazované slovo nemůže být prázdné.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>podporovat xapian syntaxe, jako A NEBO +/- atd.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Maximální vzdálenost mezi slovy (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Výchozí</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Maximální počet článků ve slovníku (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Nalezené články: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Nyní indexuje: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Žádná</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Vyhledávací řádek musí obsahovat alespoň jedno slovo obsahující </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> nebo více symbolů</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Žádné slovníky pro fulltextové vyhledávání</translation>
     </message>
@@ -1087,7 +1072,7 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Chyba v souboru s oblíbeními</translation>
     </message>
@@ -1153,7 +1138,7 @@ a školní ortografií v cyrilici)</translation>
       <translation>od</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Pro odstranění této chyby přejděte do Upravit|Slovníky|Zdroje|Forvo a aplikuje na vlasní klíč API.</translation>
     </message>
@@ -1174,68 +1159,52 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Hledat</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Porovnat velikost písmen</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Režim:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorovat pořadí slov</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorovat diakritiku</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Nalezené články:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dostupné slovníky ve skupině:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Čekat na indexování:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Nápověda</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Celkem:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexováno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Nyní indexováno: žádný</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Zrušit</translation>
     </message>
@@ -1267,27 +1236,27 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ a školní ortografií v cyrilici)</translation>
       <translation>Dejte skupině nové jméno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dostupné slovníky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Přid&amp;at skupinu</translation>
     </message>
@@ -1342,42 +1311,42 @@ a školní ortografií v cyrilici)</translation>
       <translation>Přidat skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Vytvořit novou skupinu slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Seskupit podle jazyků</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Vytvořte skupiny založené na složkách.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Seskupit podle složek</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Seskupit podle metadat</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Chytněte a přetáhnete slovníky do a ze skupin, posunujte je uvnitř skupin, měňte pořa&amp;dí skupin pomocí myši.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Přejmenovat tuto skupinu slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Odstranit tuto skupinu slovníků</translation>
     </message>
@@ -1387,43 +1356,43 @@ a školní ortografií v cyrilici)</translation>
       <translation>Pojmenujte novou skupinu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Odstranit všechny skupiny</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Odstranit ze skupiny vybrané slovníky (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Přidejte vybrané slovníky do skupinty (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Odst&amp;ranit skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Skupiny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Přejme&amp;novat skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Odstranit všechny skupiny slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Vytvořit skupiny založené na jazycích</translation>
     </message>
@@ -1446,12 +1415,12 @@ a školní ortografií v cyrilici)</translation>
       <translation>Historie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Velikost historie: %1 položek z maximálně %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Návrhy výslovností: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologie</translation>
     </message>
@@ -1472,12 +1441,12 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Jméno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Povoleno</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexování: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Název slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Načítám GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Prosím počkejte na dokončení indexace slovníku</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Prosím počkejte...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexování...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laoština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afarština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tahjština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Čeština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Gandština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulah</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Řečtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmérština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malajština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maorština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Naurština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Šona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tajičtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatarština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swatština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbečtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Welština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Reto-Románština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Severní Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abcházština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgizština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Skotská Gaelština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Lotyšština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulharština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Maráthština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskičtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihárština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijijština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Maďarština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francouzština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Němčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mangolština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebrejština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Lucemburština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazaština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Korejština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepálština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pastho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoiština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovenština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somálština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigurština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Srbo-Chorvatština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumunština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonézština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjábština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Jižní Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsičtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Perština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovinština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Západní Frýština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgaština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicijština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Ázerbajdžánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrajinština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Baškirština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Běloruština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardinština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengálština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Arménština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norština (Bokmal)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Chorvatština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosenština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalánština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Srbština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Barmština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Čečenština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Čínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvash</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Sinhaština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Španělština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Kornština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Ássamština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Svahilština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Švédština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Makedonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugalština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turečtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmenština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Angličtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gruzínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Církevní Slovanština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faerština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Walonština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Severní Sami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Čamorština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norština (Nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Jižní Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chicheva</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litevština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jiddih</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Tradiční čínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Zjednodušená čínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Jiné</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Jiné zjednodušené čínské dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Jiné tradiční čínské dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Jiné východoevropské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Jiné západoevropské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Jiné ruské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Jiné japonské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Jiné pobaltské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Jiné řecké jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Jiné korejské dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Jiné turecké dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Jiné thajské dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Úžasný</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Francouzština</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Španělština</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Běloruština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bulharština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Čeština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Němčina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Řečtina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Finština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japonština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Korejština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litevština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Makedonština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Holandština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugalština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Ruština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slovenština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albánština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Srbština (Cyrilice)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Švédština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turečtina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukrajinština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Čínština (zjednodušená)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Čínština (tradiční)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugalština (brazilská)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Perština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Španělština, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Němčina, Švýcarsko</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Španělština, Bolívie</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tajičtina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabština, Saúdská Arábie</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmenština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Angličtina</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Chyba při načítání slovníků</translation>
     </message>
@@ -2733,7 +2706,7 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Chyba v konfiguračním souboru. Pokračovat s výchozím nastavením?</translation>
     </message>
@@ -2741,702 +2714,702 @@ a školní ortografií v cyrilici)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Zabraň se</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Vše</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Zpět</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Slovníků: %1, článků: %2, slov: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Upravit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Soubor</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Nápověda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Hledat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>U&amp;končit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Chyba</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Ukončit aplikaci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>Minimalizovat do systémového &amp;panelu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Nemohu uložit článek: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Přiblížit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>A&amp;dresáře...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;O programu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Fórum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Vy&amp;tisknout</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Uložit článe&amp;k</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Uložit článek jako</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl + P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl + Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimalizuje do systémové lišty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Nastavení st&amp;ránky</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Domovská stránka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Je dostupné nové vydání</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Vyhledat:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Oddálit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Zobrazit hlav&amp;ní okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>О programu GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Stáhnout</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Nastavení stránky</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Hledat v:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normální velikost</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation>Nepovedlo se inicializovat klávesové zkratky monitorujícícho mechanismu.&lt;br&gt;Ujistěte se, že má XServer zapnuto rozšíření RECORD.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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>Verze&lt;b&gt;%1&lt;/b&gt; programuGoldenDict je dostupná ke stažení.&lt;br&gt;Kliknutím na&lt;b&gt;Stáhnout&lt;/b&gt; se přesunete na stránku souborů ke stažení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl + F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl + F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Načítám...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(nepojmenovaný)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Předvolby...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Vítejte!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Vyslovit slovo (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Uložit článek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Přeskočit toto výdání</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Vpřed</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Vytisknout článek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Není dostupná tiskárna. Prosím, přidejte nějakou.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Pohled</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>H&amp;istorie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Vypráz&amp;dnit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Přib&amp;lížení</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Přiblížit slova</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Oddálit slova</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Normální velikost slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Zavřít současnou kartu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Zavřít všechny karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Zavřít všechny karty kromě současné</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Otevřené karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nová karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl + T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Složka s nas&amp;tavením</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Pruh &amp;nabídky</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Nalezeno ve slovnících:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Přidat všechny záložky do Oblíbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>UPOZORNĚNÍ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Řetězec pro hledání ve slovnících. Jsou povoleny zástupné znaky &apos;*&apos;, &apos;?&apos; a sady symbolů &apos;[...]&apos; .
 Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolů použít &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Otevřít v seznamu karet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Odstranit aktuální kartu z oblíbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Rozhodli jste se skrýt pruh nabídky. Použijte %1 pro jeho zpětné zobrazení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl + M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Zo&amp;brazit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>S&amp;krýt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportovat historii do souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textové soubory (*.txt);;Všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export historie byl dokončen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Chyba exportu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl + H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importovat historii ze souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Chyba importu: neplatná data v souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import historie byl dokončen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Chyba importu: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportovat Oblíbené do souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML soubory (*.xml);;;všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Export Oblíbených dokončen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportovat Oblíbené do souboru jako prostý seznam</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importovat Oblíbené ze souboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML soubory (*.xml);;Txt soubory (*.txt);; všechny soubory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Import Oblíbených dokončen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Chyba analýzy dat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informace o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Slovníková hlavička</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Otevřít složku slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Upravit slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexování pro fulltextové vyhledávání: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Odstranit headword &quot;%1&quot; z oblíbených položek?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Vyhledávací pan&amp;el</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Panel p&amp;ro procházení výsledků</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>&amp;Oblíbený panel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Vytisknout náhled</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Znovu p&amp;rojít soubory</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nová karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Vždy n&amp;ahoře</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Vždy nahoře</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl + O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Tlačítko nabídky</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Hledat na stránce</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl + F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Celotextové vyhledávání</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict reference</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Zobrazit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Přidat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Přidat aktuální kartu do oblíbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl + E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportovat do seznamu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Zo&amp;brazit názvy v pruhu slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Zobrazi&amp;t malé ikony v nástrojových lištách</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Procháze&amp;ní</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Povolit skenování</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Článek, Kompletní (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Článek, Pouze HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Ukládá se článek...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Uložit článek hotový</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Hlavní okno je nastaveno vždy nahoře.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Panel historie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API pro zpřístupnění není povoleno</translation>
     </message>
@@ -3444,12 +3417,12 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Soubor slovníku byl změněn nebo poškozen</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Selhalo načtení článku z %1, důvod: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Chyba při zpracování XML: %1 v %2, %3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Jméno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Povoleno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -3498,88 +3471,88 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>Nelze&apos;otevřít vyrovnávací paměť zvuku pro čtení.</translation>
+      <translation>Nelze otevřít vyrovnávací paměť zvuku pro čtení.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulář</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Neaktivní (vypnuté) slovníky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Jméno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Celkem článků:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Překládá z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Překládá do:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Celkem slov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation>Upravte pořadí uchopením a přesunutím na požadované místo. Pšesuňte slovníky do neaktivní skupiny pro zakázání jejich použití.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Pořadí slovníků:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Soubory obsažené v tomto slovníku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informace o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Popis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Seřadit podle názvu</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Seřadit podle jazyků</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Slovníková hlavička</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Aktivní slovníky: %1, neaktivní: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Cesta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekurzívně</translation>
     </message>
@@ -3600,69 +3573,67 @@ Pro zjištění &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbo
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Spustit se v systémovém panelu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Pouze levý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Povolit ikonu v systémovém panelu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Hostitel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Přístav:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Přesunout</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Uživatel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Vy&amp;skakovací okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3670,138 +3641,138 @@ switching to them.</source>
 Takto se budou nové karty otevírat bez přepnutí.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Použít proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Použijte následující klávesu pro přeložení slova ze schránky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Klávesa Windows nebo Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Automaticky vyslovovat slova v hlavním okně</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Spustit se systémem</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Pouze levý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Prohlížení v kartách</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Pouze pravý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>S touto volbou pokus o zavření hlavního okna jej pouze skryje namísto 
 ukončení aplikace.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Povolit pokud chcete použít proxy server
 pro všechny síťové požadavky programu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Jazyk rozhraní:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Pouze levý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Otevřít nové karty na pozadí</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Síť</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Pouze pravý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Pravý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Levý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Pokud toto zapnete, vyskakovací okno se zobrazí pouze pokud jsou
 zvolené klávesy stisknuty při změně výběru.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Automaticky vyslovovat slova ve vyskakovacím okně</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Otevírat nové karty za současnou</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Restartujte program aby se provedla změna jazyka.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Klávesa Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Periodicky kontrolovat dostupnost nových verzí</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 kartou. Jinak jsou otevřeny jako poslední.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Minimalizovat do systémové lišty</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Výchozí systému</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Pokud zapnuto, zobrazí se v systémovém panelu ikona, která pak může 
 být použita pro otevření hlavního okna a k provádění jiných úloh.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,141 +3809,141 @@ Pokud se tak stalo, program informuje uživatele
 a nabídne otevření stránky s aktualizací ke stažení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Spuštění</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Heslo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Výchozí</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Rozhraní</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Měním jazyk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Klávesa Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Použijte následující klávesovou zkratku pro zobrazení nebo zkrytí hlavního okna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Levý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Pouze pravý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Předvolby</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Levý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Pravý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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é zkratky jsou globální a fungují z jakéhokoliv programu a v jakémkoliv kontextu dokud GoldenDict běží na pozadí.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Pravý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Klávesové zkratky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Spouštět s povoleným vyskakovacím oknem</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>S touto volbou se aplikace spustí rovnou do systémové lišty bez zobrazení 
 hlavního okna.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Klávesa Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Automaticky spustí GoldenDict po spuštění systému.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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, zda je vyskakovací okno automaticky povoleno nebo zakázáno. Pokud
 zaškrtnuto, program bude automaticky startovat s aktivovaným vyskakovacím oknem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Nezobrazovat vyskakovací okna, když se změní výběr nebo schránka v jednom z oken Zlatého Dict&apos;</translation>
+      <translation>Nezobrazovat vyskakovací okno, když se změní výběr nebo schránka v jednom z vlastních oken GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Ignorovat změny vlastního výběru a schránky GoldenDict&apos;</translation>
+      <translation>Ignorujte vlastní výběr a změny schránky GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Přehrávat zvukové soubory pomocí podpory vestavěného zvuku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Použít interní přehrávač:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Vybrat konec zvuku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Zadejte příkazový řádek pro audio přehrávač</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3982,84 +3952,84 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 Pokud se kvůli tomuto některé stránky rozbijí, zkuste toto vypnout.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Zakázat načítání obsahu z jiných stránek (skryje většinu reklam)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Výslovnost</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Přehrání</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Použít externí program:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Dvojklik přeloží označené slovo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Pro přehrání audio souborů použít externí program</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Stisk ESC obvykle přepne na hlavní řádek překladu.
 S touto volbou ale sryje hlavní okno.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Klávesa ESC skryje hlavní okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Vyberte tuto volbu pokud chcete aby se zobrazoval pruh s kartami ikdyž je otevřena jenom jedna karta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Skrýt jednu kartu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Upravte tuto hodnotu abyste se vyhnuli velkým kontextovm nabídkám.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limit slovníků kontextové nabídky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Poslat přeložené slovo do hlavního okna namísto zobrazení ve vyskakovacím okně</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Poslat přeložené slovo do hlavního okna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Zobrazit vlajkové okno před zobrazením vyskakovacího okna, klikněte na vlajku pro zobrazení vyskakovacího okna. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4070,445 +4040,487 @@ posouvá článek ze stejného slovníku. S touto možností vypnuto,
 ale článek z nejhornějšího slovníku je zobrazen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Automaticky přejít na cílový článek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Písmo slovníku: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>nastaví záložní rodinu fontů pro slovník</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Styl zobrazení článku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Otočit UI a ztmavit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Tmavý režim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Otočit styl zobrazení článku na tmavou.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Tmavý čtecí režim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU objednávky: Naposledy použité objednávky.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Pokud je povoleno skenování, schránka se změní. Upozornění! Toto byste měli vždy povolit, pokud nejste v Linuxu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Změna schránky trasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Změna výběru trasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Výběr sady pouze, když jsou stisknuty všechny vybrané klávesy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Zobrazit znak skenování, když je zvoleno slovo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Zpoždění</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Systémové proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Vlastní proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Vlastní nastavení</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki připojení</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Balíček:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Vzor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Slovo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Pole slovníku...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Pole definice...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Věta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Pole věty (může být prázdné)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation>Některé stránky detekují GoldenDict přes hlavičky HTTP a blokují jeho požadavky.
 Povolením této volby problém obejdete.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Neidentifikovat GoldenDict v lavičkách HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximální velikost síťové mezipaměti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Maximální místo na disku obsazené síťovou mezipamětí GoldenDict&apos;v
+      <translation>Maximální místo na disku obsazené mezipamětí sítě GoldenDict
 %1
-Pokud je nastaveno na 0 síťová mezipaměť bude vypnuta.</translation>
+Pokud je nastaveno na 0, mezipaměť síťového disku bude zakázána.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Pokud je tato volba povolena, GoldenDict
 vymaže její síťovou mezipaměť při ukončení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Vymazat síťovou mezipaměť při ukončení</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Celotextové vyhledávání</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Povolit fulltextové vyhledávání:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation>Don&apos;t vyhledávání ve slovnících obsahujících více než</translation>
+      <translation>Nehledejte ve slovnících obsahujících více než</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>články (0 - neomezeně)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Pok&amp;ročilé</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Při postupném vyhledávání,pokud je jeden slovník zřícený manuálně, zůstane zkrachován při příštím hledání</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Sbalování relace</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Při používání schránky odstraňte vše po nové lince</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>Při novém vyhledávání zaostřit hlavní okno nebo vyskakovací okno, i když je viditelné&apos;s</translation>
+      <translation>Při novém hledání zaměřte hlavní nebo vyskakovací okno, i když je viditelné</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Oblíbené</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Interval ukládání Oblíbených položek. Je-li nastaveno na 0 Oblíbených bude uloženo pouze při ukončení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Zapněte tuto možnost pro potvrzení každé operace odstranění položek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Potvrzení pro odstranění položek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Zapněte tuto možnost pro ignorování nepřiměřeně dlouhého textu
 od přejetí myší, výběru, schránky nebo příkazové řádky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorovat vstupní fráze delší než</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Vstupní fráze delší než tato velikost bude ignorována</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Zapněte tuto možnost pro ignorování diakritiky při hledání článků</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorovat diakritiku při hledání</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Zapněte tuto volbu aby byly vždy rozbalovány volitelné části článků</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>&amp;Rozbalovat volitelné části</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Vyberte tuto volbu pro automatické sbalení článků</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Sbalit čláky delší než</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Články delší než tato velikost budou sbaleny</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Při hledání ignorovat interpunkci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Zapněte tuto možnost pro povolení hledání dalších článků přes seznamy synonym
 ze Stardict, Babylon a GLS slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Další hledání pomocí synonym</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>symboly</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab přepíná na naposled použité karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Zapněte tuto volbu pro ukládání historie překládaných slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Ukládat &amp;historii</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Články</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Zapněte tuto volbu pokud chcete vybírat slova jedním kliknutím myši</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Vybírat slovo jedním kliknutím</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Styl doplňku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Určete maximální počet záznamů, jenž se má uchovávat v historii.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maximální velikost historie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Interval ukládání historie. Pokud nastaven na 0, historie bude uložena při ukončení.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Uložit každých</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minut</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klasický</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderní</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Pór</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes modrá</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Informace o poloze jsou vyžadovány pro použití frázového vyhledávání Xapian a operátoru NEAR, ale velikost databáze bude mnohem větší. Platí pouze pro nové příchozí slovníky.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Povolit index s informacemi o poloze</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standardní písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Jednoprostorové písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Patkové písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Bezpatkové písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Vzhled</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Tato písma budou použita, pokud nebudou nalezena písma určená slovníkem.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Záložní písma</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Čistý text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Předpona zápas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Neznámý</translation>
     </message>
@@ -4516,17 +4528,17 @@ ze Stardict, Babylon a GLS slovníků</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nebyl poskytnut název programu.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Program spadnul.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Program vrátil návratový kód %1.</translation>
     </message>
@@ -4534,27 +4546,27 @@ ze Stardict, Babylon a GLS slovníků</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Povoleno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Název</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Příkazový řádek</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4562,99 +4574,114 @@ ze Stardict, Babylon a GLS slovníků</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Chyba při načítání článku</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Chyba při rekódování článku</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Verze: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Název: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Webová stránka: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Datum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Slovníkový vyhledávací program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Slovo nebo věta k dotazu.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Uložte zprávy ladění do gd_log.txt do složky konfigurace.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Resetovat stav okna.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Zakázat tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Změnit skupinu hlavního okna.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Změnit skupinu vyskakovacích oken.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Přepnout vyskakovací okno.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Tisk verze a diagnostické informace.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Hledání-filtrování slovníků (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Vymazat hledání</translation>
     </message>
@@ -4662,22 +4689,22 @@ ze Stardict, Babylon a GLS slovníků</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>CHYBA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Chyba při upkládání zdroje: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Odkázaný zdroj se nepovedlo stáhnout.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>VAROVÁNÍ: %1</translation>
     </message>
@@ -4706,68 +4733,73 @@ ze Stardict, Babylon a GLS slovníků</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt + S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Vyslovit slovo (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Přidat slovo do oblíbených (Ctrl + E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Zobrazí nebo zkryje pruh slovníků</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Vždy zůstat nad všemi ostatními okny</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
       <translation>Toto použijte pro připíchnutí okna, aby zůstalo na obrazovce.
 Lze měnit jeho velikost a může s ním být i jinak manipulováno.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Poslat slovo do hlavního okna (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Zpět</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Vpřed</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>UPOZORNĚNÍ: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4779,7 +4811,7 @@ Lze měnit jeho velikost a může s ním být i jinak manipulováno.</translatio
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4789,7 +4821,7 @@ Lze měnit jeho velikost a může s ním být i jinak manipulováno.</translatio
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4810,17 +4842,17 @@ Lze měnit jeho velikost a může s ním být i jinak manipulováno.</translatio
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Jméno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Cesta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4828,60 +4860,60 @@ Lze měnit jeho velikost a může s ním být i jinak manipulováno.</translatio
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Soubory</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systémy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Odstranit stránky &lt;b&gt;%1&lt;/b&gt; ze seznamu?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japonský slabikář Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Vytvořit ze skupin audio souborů slovníky tak, že zde vložíte jejich cesty:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Odstranit adresář &lt;b&gt;%1&lt;/b&gt; ze seznamu?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonština (Romaji)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4892,84 +4924,84 @@ standardizovanou jako ISO 3602.
 V GoldenDictu ještě není implementován.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Stránky Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Adresáře se zvukem</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Všechny externí programy. Řetězec %GDWORD% bude nahrazen slovem dotazu. Řetězec %GDSEARCH% bude nahrazen textem v panelu vyhledávání. Pokud nejsou uvedeny oba parametry, bude záhlaví vloženo do standardního vstupu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prokázané &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, kooperativní jazyková mediální knihovna Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Povolit Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Kód jazyka podle ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Použití Forvo v současné době vyžaduje API klíč, zaregistrujte se na stránkách, abyste získali svůj vlastní klíč.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Získejte vlastní klíč &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;zde&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Nejčastěji používaná metoda přepisu Japonštiny,
 založená na Anglické fonologii</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japonský slabokář Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Vlastní přepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>To platí pouze ve vyhledávací frázi, přičemž každý řádek představuje přepis, oddělený středníkem. Například ae;æ, uživatelé mohou vložit ae reprezentovat æ v cílovém slově.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #toto je příklad</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Přepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ systémem kana. Standardizován jako ISO 3602.
 V GoldenDictu ještě není implementován.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Ruský přepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>Z&amp;měnit...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Příklady:  &amp;quot;eng&amp;quot; pro angličtinu, &amp;quot;fra&amp;quot; pro francouzštinu &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Úplný seznam dostupných jazyků naleznete &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; zde &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Cesta k adresáři se slovníky Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Znovu &amp;projít</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Německý přepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Kteroukoliv stránku. Řetězec %GDWORD% bude nahrazen hledaným slovem:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>Přid&amp;at...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Vyberte adresář</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>Odeb&amp;rat</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Webové stránky</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Cesty k vyhledávání souborů slovníků:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Potvrdit odebrání</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Slabikáře:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dostupné slovníky morfologie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Zapne psaní japonského jazyka Latinkou</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5106,94 +5128,94 @@ Přidejte si pro jejich použitií vhodné adresáře
 na spodek vhodných skupin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT servery</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT servery:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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ýslovnost z &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Stránky umožňují lidem nahrávat a sdílet výslovnosti slov. V GoldenDictu si je můžete poslechnout.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Povolit výslovnost z Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Klíč API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Kódy jazyků (oddělené čárkou):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Seznam kódů jazyků, které byste chtěli. Např.: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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ý seznam jazyků je dostupný &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;zde&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Řecký přepis</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(nedostupné v portabilní verzi)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programy</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Odstranit program &lt;b&gt;%1&lt;/b&gt; ze seznamu?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Běloruský přepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Případně použijte %GD1251% pro CP1251, %GDISO1%...%GDISO16% pro ISO 8859-1...ISO 8859-16, nebo
 %GDBIG5% pro Big-5, %GDBIG5HKSCS% pro Big5-HKSCS, %GDGBK% pro GBK a GB18030, %GDSHIFTJIS% pro Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Zvuková syntéza</translation>
     </message>
@@ -5209,42 +5231,42 @@ na spodek vhodných skupin.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Zvolené syntetizátory hlasu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>Přid&amp;at</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Odeb&amp;rat</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Náhled</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Nedostupné syntetizátory hlasu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Text pro náhled:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Zde napište text, jenž poslouží jako náhled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>Náhle&amp;d</translation>
     </message>
@@ -5269,17 +5291,17 @@ na spodek vhodných skupin.</translation>
       <translation>Nelze najít dostupný hlas TTS.&lt;br&gt;Prosím, ujistěte se, že aspoň jeden hlas TTS je již na vašem počítači nainstalován.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Předvolby</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Hlasitost:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Vzorkovací frekvence:</translation>
     </message>
@@ -5287,12 +5309,12 @@ na spodek vhodných skupin.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Napište slovo nebo frázi pro hledání ve slovnících</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Rozbalovací</translation>
     </message>
@@ -5323,33 +5345,33 @@ na spodek vhodných skupin.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Jméno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Povoleno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Vložit článek jako odkaz do &lt;iframe&gt; tagu</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Jako odkaz</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -5357,17 +5379,9 @@ na spodek vhodných skupin.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Některé slovníky se nepovedlo zpracovat.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>VAROVÁNÍ: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/de_CH.ts b/locale/de_CH.ts
index f7817371..efcf1e78 100644
--- a/locale/de_CH.ts
+++ b/locale/de_CH.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Über</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng Programm-Version: </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Lizensiert unter der GNU GPLv3 oder neuer.</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Versionsinfo kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Wörterbücher kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Danksagungen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Unbekannt]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basiert auf Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,58 +80,58 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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 dem Mauszeiger über das Wort in der Applikation fahren, welches nachgeschlagen werden soll. Ein Fenster wird danach sichtbar mit der gefundenen Übersetzung.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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; unter &lt;b&gt;Bearbeiten » Einstellungen...&lt;/b&gt; aktiviert werden. &lt;br /&gt;
 Dies kann zu jeder Zeit über das &quot;Popup-Symbol&quot; in der Werkzeugleiste oder mittels Kontextmenü des Symboles in der Symbolleiste geschehen.&lt;br /&gt;</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Artikel aufklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Artikel einklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Mit Popups arbeiten</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(unbenannt)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Willkommen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Kein Eintrag, Übersetzung in Gruppe &lt;b&gt;%1&lt;/b&gt; gefunden.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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 &lt;h3 align=&quot;center&quot;&gt;Willkommen zu &lt;b&gt;GoldenDict&lt;/b&gt;&lt;/h2&gt;&lt;p&gt;Das sind die ersten Schritte um mit dem Programm arbeiten zu können. &lt;p&gt; Gehen Sie zunächst auf &lt;b&gt;Bearbeiten » Wörterbücher...&lt;/b&gt; um die Pfade zu abgespeicherten Wörterbüchern hinzuzufügen sowie um Wikipedia und andere Seiten einzurichten oder die Wörterbücher anzuordnen bzw. in Gruppen zu unterteilen.&lt;/p&gt;
 &lt;p&gt;Nun sind Sie bereit das erste Wort nachzuschlagen. Dies können Sie im Eingabe-Fenster machen oder &lt;a href=&quot;Mit Popups arbeiten&quot;&gt;mittels der Popup-Funktion in anderen Applikationen.&lt;/a&gt;&lt;/p&gt;
@@ -155,7 +150,7 @@ href=&quot;https://github.com/xiaoyifang/goldendict/&quot;&gt;Webseite von XIAO.
 </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(Bild)</translation>
     </message>
@@ -163,42 +158,42 @@ href=&quot;https://github.com/xiaoyifang/goldendict/&quot;&gt;Webseite von XIAO.
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Artikel aufklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Von </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Artikel einklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Neue Anki-Notiz erstellen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Abfragefehler: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Ähnliche Wörter: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Zusammengesetzte Treffer: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Einzelne Wörter: </translation>
     </message>
@@ -206,197 +201,197 @@ href=&quot;https://github.com/xiaoyifang/goldendict/&quot;&gt;Webseite von XIAO.
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Konnte keine temporäre Datei anlegen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Schlage &quot;%1&quot; nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Schlage &quot;%1&quot; in &amp;neuem Tab nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Die angegebene Ressource existiert nicht.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Schlage &quot;%1&quot; in %2 nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Aktuellen Artikel auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Als Text kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Betrachten</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Schlage &quot;%1&quot; in %2 in &amp;neuem Tab nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Link in neuem Rei&amp;ter öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Link in &amp;externen Browser öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ressource</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Stimme</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Bild</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definition vom Wörterbuch &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Das angegebene Audioprogramm existiert nicht.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Link öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Speichere &amp;Lesezeichen &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>WARNUNG: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>FEHLER: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Klang speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Bild speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Bilder (*.bmp *.jpg *.png *.tif);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Bild &amp;speichern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Satz nicht gefunden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 von %2 übereinstimmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>&amp;Klang speichern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Sende &quot;%1&quot; an die Eingabezeile</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Füge &quot;%1&quot; zum Verlauf &amp;hinzu </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>Aktuellen Artikel &amp;an Anki senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Ausgewählten Text an Anki senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Sounddateien (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle Dateien (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Sounddateien (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Konnte folgende Audio Datei nicht abspielen: %1</translation>
     </message>
@@ -428,62 +423,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Chinesische Konvertierung</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Aktiviere Konvertierung zwischen Chinesischen Charakterzeichen Simpel (SC) und Traditionell (TC).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Chinesische Konvertierung (SC=Simpel, TC=Traditionell)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Aktiviere Konvertierung von Chinesischen Charakterzeichen Simpel zu Traditionell (Taiwan).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC zu TC (Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Aktiviere Konvertierung von Chinesischen Charakterzeichen Simpel zu Traditionell (Hongkong).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC zu TC (Hongkong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Aktiviere Konvertierung von Chinesischen Charakterzeichen Traditionell zu Simpel.</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC zu SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Konvertierung von Chinesischen Charakterzeichen Simpel zu Traditionell (Hongkong).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Konvertierung von Chinesischen Charakterzeichen Simpel zu Traditionell (Hongkong).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Konvertierung von Chinesischen Charakterzeichen Traditionell (TC) zu Simpel (SC).</translation>
     </message>
@@ -491,30 +486,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>benutzerdefinierte Transliteration</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Proxy Authentifizierung erforderlich</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Sie müssen Benutzernamen und Passwort eingeben für den Proxy Zugang</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Benutzername:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Passwort:</translation>
     </message>
@@ -522,22 +517,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formular</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Gruppensymbol:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tastenkürzel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Lesezeichen Ordner:</translation>
     </message>
@@ -562,17 +557,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Bilder</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Alle Dateien</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Fehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Konnte die angegebene Bilddatei nicht lesen.</translation>
     </message>
@@ -580,63 +575,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Bestätigung</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Möchten Sie wirklich eine Reihe von Gruppen basierend auf den Sprachpaaren erstellen?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Sind Sie sicher, dass Sie eine Serie von Gruppen auf der Grundlage von metadata.toml erstellen möchten?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kombiniere Gruppen nach Quellsprache nach &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kombiniere Gruppen nach Zielsprache nach &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>Automatische Gruppierung nach Ordner fehlgeschlagen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Das übergeordnete Verzeichnis von %1 kann nicht erreicht werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>Sind Sie sicher, dass Sie eine Serie von Gruppen basierend auf den enthaltenen Ordnern erstellen möchten?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Doppelseitige Übersetzungsgruppen erstellen: &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Gruppen kombinieren mit &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Anzahl Wörterbücher: </translation>
     </message>
@@ -649,133 +644,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Suchmodus</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Dieses Element definiert wie der Filter interpretiert wird</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Falls Symbole aktiviert, wird das Ergebnis in die Filter Berechnung miteinbezogen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Vergleich Ergebnis</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Stichwörter in Datei exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Ok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Knopf drücken um den Suchfilter auf die Stichwortliste anzuwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Anwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Falls aktiviert, wird das Ergebnis des Suchfilters ständig aktuell gehalten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Auto-Filter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Suchfilter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Suchfilter eingeben (als feststehende Zeichenfolge, Wildcards oder regulären Ausdruck)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Beliebige Zeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Stichwörter werden geladen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unterschiedliche Stichwörter insgesamt: %1, gefiltert: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Stichwörter in Datei speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textdateien(*.txt);;Alle Dateien(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Exportierte Datei kann nicht geöffnet werden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Stichwörter exportieren...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Exportprozess wird unterbrochen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Export abgeschlossen</translation>
     </message>
@@ -783,67 +778,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Artikel gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Übersetzt von:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Wörter gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Übersetzt nach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Wörterbuch zusammengesetzt aus diesen Dateien:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Beschreibung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Zeige alle Stichwörter des Wörterbuches</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Stichwörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Das Wörterbuch mit folgendem Zeilenkommando bearbeiten:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 Einträge</translation>
     </message>
@@ -874,43 +879,43 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Aktiviert</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Datenbanken</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Planungen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Komma geteilte Liste von Datenbanken (leeres Zeichen oder &quot;*&quot; wählt alle Datenbanken)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Komma geteilte Liste von Datenplanungen (leeres Zeichen oder &quot;*&quot; wählt alle Datenbanken)</translation>
@@ -919,37 +924,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Erweitertes Menü mit allen Wörterbüchern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Diese Gruppe bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbuch Stichwörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Wörterbuchleiste</translation>
     </message>
@@ -958,27 +963,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Wörterbücher</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Wörterbücher</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Übernehmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Quellen geändert</translation>
     </message>
@@ -989,12 +994,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Gruppen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1023,75 +1028,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Ganze Wörter</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Nur Text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Beliebige Zeichen</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>unterstützt xapian Suchsyntax, wie AND ODER +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max. Abstand zwischen Wörtern (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max. Artikel pro Wörterbuch (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Artikel gefunden: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indexiere:</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Keine</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Die Suchzeile muss zumindest ein Wort enthalten, bestehend aus </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> oder mehr Zeichen</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Keine Wörterbücher für Volltextsuche</translation>
     </message>
@@ -1099,7 +1084,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Fehler in Lesezeichen Datei</translation>
     </message>
@@ -1165,7 +1150,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>aus</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Damit dieser Fehler verschwindet sollten Sie Bearbeiten » Wörterbücher » Forvo auswählen und ihren eigenen API-Schlüssel eintragen.</translation>
     </message>
@@ -1186,68 +1171,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Vergleiche Ergebnis</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Wortreihenfolge ignorieren</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Diakritika ignorieren</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Gefundene Artikel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Verfügbare Wörterbücher in Gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Warte auf Vergleichsergebnisse</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexiert:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Indexiere aktuell: Keine</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
@@ -1279,27 +1248,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>DEL</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>INS</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1339,12 +1308,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Geben Sie den neuen Namen der Gruppe ein:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Vorhandene Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Gruppe &amp;hinzufügen</translation>
     </message>
@@ -1354,42 +1323,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Eine neue Gruppe von Wörterbüchern erzeugen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Nach Sprachen gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Erstellen Sie ordnerbasierte Gruppen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Nach Ordnern gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Nach Metadaten gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Benutzen Sie Drag &amp; Drop um Wörterbücher zwischen oder innerhalb von Gruppen zu verschieben oder um die Reihenfolge zu verändern.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Die ausgewählte Wörterbuchgruppe umbenennen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Die ausgewählte Wörterbuchgruppe entfernen.</translation>
     </message>
@@ -1399,43 +1368,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Geben Sie den Namen der neuen Gruppe ein:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Alle Gruppen entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Ausgewählte Wörterbücher von der Gruppe entfernen (DEL).</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Ausgewählte Wörterbücher zur Gruppe hinzufügen (DEL).</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Gruppe &amp;entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Gruppen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Gruppe &amp;umbenennen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Alle Gruppen von Wörterbüchern entfernen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Erzeugt sprachenbasierte Gruppen.</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Verlauf:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Verlaufsgrösse: %1 von maximal %2 Einträgen</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Rechtschreibvorschläge:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morphologie</translation>
     </message>
@@ -1484,12 +1453,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
@@ -1497,1031 +1466,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Name des Wörterbuches</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Initialisierung</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Bitte warten Sie während die Wörterbücher initialisiert werden</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Bitte warten...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thailändisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tschechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Gordon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulfulde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latein</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malaysisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadschikisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tongaisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Tshivenda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Usbekisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Walisisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italienisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Rätoromanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Nord-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abkhazisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirghizstan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Schottisch-Gälisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Magahi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dänisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Kiluba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Ungarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Französisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Deutsch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebräisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kasachisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Paschto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Okzitanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slowakisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Xitsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigurisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbokroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumänisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Süd-Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Westfriesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Madagassisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galizisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Aserbaijanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Baschkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Weissrussisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardinisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norwegisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tschetschenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tschuwasch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singhalesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Schwedisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Mazedonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugiesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Türkisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Isländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Englisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Kirchenslawisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Färöisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Wallonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Oshivambo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Nordsamisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Süd-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jiddisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinesisch traditionell</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinesisch vereinfacht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Andere</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Andere vereinfacht Chinesische Dialekte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Andere traditionell Chinesische Dialekte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Andere osteuropäische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Andere westeuropäische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Andere russische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Andere japanische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Andere baltische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Andere griechische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Andere koreanische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Andere türkische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Andere thai Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2529,207 +2502,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>Französisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>Spanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>Belarussisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>Bulgarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>Tschechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>Deutsch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>Griechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>Finnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>Italienisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>Japanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>Koreanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>Mazedonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>Niederländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>Polnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>Portugiesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>Slowakisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>Albanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>Serbisch (Kyrillisch)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>Schwedisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>Türkisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>Ukrainisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>Chinesisch (vereinfacht)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>Chinesisch (traditionell)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>Vietnamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>Portugiesisch, Brasilien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>Persisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>Spanisch, Argentinien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>Deutsch, Schweiz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>Spanisch, Bolivien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>Tadschikisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>Arabisch, Saudi-Arabien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>Turkmenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>Englisch</translation>
     </message>
@@ -2737,7 +2710,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Fehler beim Laden der Wörterbücher</translation>
     </message>
@@ -2745,7 +2718,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Fehler in der Konfigurationsdatei. Mit Standardeinstellungen fortfahren?</translation>
     </message>
@@ -2753,702 +2726,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Lesezeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Alle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Zurück</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 Wörterbücher, %2 Artikel, %3 Wörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>&amp;Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>B&amp;eenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Fehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Applikation beenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>In die &amp;Symbolleiste schliessen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Kann Artikel nicht speichern: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Ver&amp;grössern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Wörterbücher...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Über</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Drucken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Artikel &amp;speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Artikel speichern als</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>CTRL+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>CTRL+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>In the Symbolleiste minimieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Seite einrichten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Webseite</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Neue Version verfügbar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Nachschlagen:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Ver&amp;kleinern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Im &amp;Hauptfenster zeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Über GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Herunterladen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Seite einrichten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Suche in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normale Grösse</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>CTRL+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>CTRL+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Lade...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(unbenannt)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Willkommen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wort aussprechen (ALT+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Artikel speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Diese Version überspringen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Vorwärts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Drucke Artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Ansicht</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Verlauf</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>&amp;Suchwörter vergrössern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>S&amp;uchwörter verkleinern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Suchwörter in normaler &amp;Grösse</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Aktuellen Tab schliessen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Alle Tabs schliessen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Alle anderen Tabs schliessen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Offene Reiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Neuer Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>CTRL+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Konfigurationsordner</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menüleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>In Wörterbüchern gefunden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Alle Tabs als Lesezeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Begriff für die Suche in Wörterbüchern. Wildcards &apos;*&apos;, &apos;?&apos; und Symbole &apos;[...]&apos; sind erlaubt.
 Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; benutze wie folgt &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Liste der Reiter öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Aktuellen Tab von Lesezeichen entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>CTRL+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Verbergen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Verlauf in eine Datei exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textdateien(*.txt);;All Dateien(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Exportfehler: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>CTRL+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Verlauf von Datei importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Importfehler: ungültige Daten in Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Importfehler: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportiere Lesezeichen in Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML Dateien (*.xml);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Lesezeichen Export beendet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportiere Lesezeichen in Datei als Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importiere Lesezeichen von Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-Dateien (*.xml);;;Txt-Dateien (*.txt);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Lesezeichen Import beendet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Datenanalyse Fehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexiere Volltextsuche: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Entferne Überschrift &quot;%1&quot; von Lesezeichen ?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Suchformular</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Ergebnisliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>&amp;Lesezeichenliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Druck&amp;vorschau</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Dateien neu ein&amp;lesen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>Neuer Rei&amp;ter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Immer im Vordergrund</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Immer im Vordergrund</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>CTRL+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menüschaltfläche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>&amp;Tab durchsuchen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>CTRL+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>&amp;Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>CTRL+Umschalt+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>&amp;GoldenDict Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Zeige</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>&amp;Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Im&amp;portieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Aktuellen Tab als Lesezeichen hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>CTRL+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportieren als &amp;Liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Namen in &amp;Wörterbuchleiste anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Kleine Symbole in der &amp;Toolbar anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Scannen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikel, komplett (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artikel, nur HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Artikel wird gespeichert...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Artikel speichern abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Verlaufsliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Barrierefreiheit-API ist nicht aktiviert </translation>
     </message>
@@ -3456,12 +3429,12 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Die Wörterbuchdatei war manipuliert oder korrupt</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Konnte den Artikel von %1 nicht laden, Grund: %2</translation>
     </message>
@@ -3469,7 +3442,7 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Fehler beim XML-parsen: %1 bei %2,%3</translation>
     </message>
@@ -3485,22 +3458,22 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -3516,82 +3489,82 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formular</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Inaktive (deaktivierte) Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Name:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Artikel insgesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Übersetzt von:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Übersetzt nach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Wörter insgesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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 &amp; Drop. Lassen Sie ein Wörterbuch mittels Drag &amp; Drop in die &quot;inaktive Gruppe&quot; fallen um es zu deaktivieren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Reihenfolge der Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Wörterbuch zusammengesetzt aus diesen Dateien:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informationen des ausgewählten Wörterbuches:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Beschreibung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sortieren nach Name</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sortieren nach Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbucheinträge</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Anzahl Wörterbücher aktiv: %1 | inaktiv: %2</translation>
     </message>
@@ -3599,12 +3572,12 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Pfad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursiv</translation>
     </message>
@@ -3612,69 +3585,67 @@ Um folgende Symbole zu finden &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>In die Symbolleiste starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Nur Umschalttaste Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Aktiviert das Symbol in der Symbolleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Gastgeber:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Umschalttaste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Benutzer:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Popup &amp;scannen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3683,135 +3654,135 @@ Mit dieser Option werden neue Reiter im Hintergrund geöffnet ohne
 diese zu selektionieren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proxyserver verwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows/Meta-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Wörter im Hauptfenster automatisch aussprechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Mit Betriebssystem starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Nur ALT Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Reiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Nur Umschalttaste Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Hiermit wird das Hauptfenster verborgen, falls die Applikation geschlossen wird.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Sprache der Oberfläche:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Nur CTRL Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Neue Reiter im Hintergrund öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Netzwerk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Nur CTRL Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Umschalttaste Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Umschalttaste Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Wörter im Scan Popup automatisch aussprechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Neue Reiter nach dem aktuellen öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Starten Sie das Programm neu um die neue Sprache zu aktivieren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>ALT-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Periodisch auf neue Programmversionen prüfen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3819,24 +3790,23 @@ be the last ones.</source>
 Andernfalls werden diese ans Ende hinzugefügt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>In die Symbolleiste schliessen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Systemvorgabe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Falls aktiviert, erscheint ein Symbol in der Symbolleiste, mit welchem das Hauptfenster geöffnet und andere Aufgaben getätigt werden können.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3846,140 +3816,140 @@ download page.</source>
 Sollte eine neuere Version verfügbar sein informiert GoldenDict den Benutzer und öffnet eventuell die Download-Seite.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Start</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Passwort:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Oberfläche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Sprache ändern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>CTRL-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>ALT Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Nur ALT Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>CTRL Links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>ALT Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 funktionieren global und in jedem Programm und Kontext, sofern GoldenDict im Hintergrund läuft.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>CTRL Rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Tastenkürzel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Mit aktiviertem Scan Popup starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Hiermit startet die Applikation direkt in die Symbolleiste ohne das Hauptfenster zu zeigen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Umschalttaste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Startet GoldenDict automatisch nach jedem Systemstart.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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ässig aktiviert ist oder nicht. 
 Falls aktiviert, wird das Programm immer mit aktiviertem Modus gestartet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Zeige kein Popup während Selektion oder Zwischenablage Änderungen von GoldenDict eigenem Fenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignoriere eigene Selektion oder Zwischenablage Änderungen von GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Wähle Audio Hintergrund Applikation aus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Internen Abspieler verwenden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Wähle Audio Hintergrund Applikation aus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Kommandozeile für Audio Player eingeben</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3988,84 +3958,84 @@ aus Seiten blockiert werden, die nicht der jeweils angezeigten entsprechen.
 Sollten einige Seiten nicht mehr funktionieren, kann das Deaktivieren dieser Option helfen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Aussprache</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Abspielen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Externes Programm benutzen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Doppelklick übersetzt das angeklickte Wort</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Ein externes Programm zum Abspielen der Audiodaten benutzen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Beim Betätigen der ESC-Taste wird normalerweise der Fokus an die Übersetzungszeile übertragen. 
 Mit dieser Option wird jedoch das Hauptfenster verborgen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC-Taste verbirgt das Hauptfenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Wählen Sie diese Option, falls Sie die Reiterleiste bei einem offenem Reiter nicht sehen möchten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Einzelnen Tab ausblenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Mit der Anpassung dieses Wertes können riesige Kontextmenüs vermieden werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Wörterbuchlimit im Kontextmenü:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Übersetzte Wörter ans Hauptfenster senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Zeige ein Flaggen Fenster bevor Popup Fenster erscheint, auf Flagge klicken um Popup anzuzeigen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4075,159 +4045,159 @@ dann lädt die Übersetzung und scrollt direkt zum selben Artikel im Wörterbuch
 Wenn diese Option deaktiviert ist, dann wird das zuoberst erscheinende Wörterbuch angezeigt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Automatisch zum Zielartikel scrollen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Wörterbuch Font</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>Wörterbuch Font auf Standart zurücksetzen.</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Artikel-Anzeige-Stil:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Drehe das UI in Dunkelheit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Dunkler Modus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Stellen Sie den Anzeigestil des Artikels in den dunklen Modus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Dunkler Lesemodus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU-Order: Zuletzt verwendete Bestellung.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Änderungen der Zwischenablage verfolgen, wenn das Scannen aktiviert ist. Achtung! Sie sollten dies immer aktivieren, wenn Sie nicht unter Linux sind.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Zwischenablageänderung verfolgen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Trackauswahl ändern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Auswahl nur antippen, wenn alle ausgewählten Tasten gedrückt bleiben:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Zeige Flagge scannen wenn Wort selektiert wurde</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>System Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Kunden Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Kunden-Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Mit Anki verbinden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Sammlung (Deck):</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Wort</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Vokabular Feld...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Definitionsfeld...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Satz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Satzfeld (kann leer sein)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>GoldenDict-ng nicht in HTTP-Kopfzeilen identifizieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximale Netwerk Cache Grösse:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4236,283 +4206,325 @@ If set to 0 the network disk cache will be disabled.</source>
 Wenn auf 0 gesetzt, wird Netzwerk Cache deaktiviert.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Wenn diese Option aktiviert ist, löscht GoldendDict den Netzwerk Cache während dem Beenden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Netzwerk Cache löschen während dem Beenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Erlaube Volltext Suche für:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Nicht in Wörterbüchern suchen, die mehr als</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>Einträge enthalten (0 -&gt; unbegrenzt)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Erweitert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Wenn bei aufeinanderfolgenden Suchvorgängen ein Wörterbuch manuell reduziert wird, bleibt es auch bei der nächsten Suche reduziert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Zusammenbruch der Sitzung</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Wenn Sie die Zwischenablage verwenden, entfernen Sie alles nach dem Zeilenumbruch</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Fokussieren Sie bei einer neuen Suche das Haupt- oder Popup-Fenster, auch wenn es&apos;sichtbar ist</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Lesezeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Automatischer Speicherintervall für Lesezeichen. Falls der Wert 0 eingetragen wird, erfolgt die Speicherung nur bei Beendigung des Programms.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Wird diese Option aktiviert, erfolgt jegliche Entfernung von Lesezeichen nur nach vorheriger Sicherheitsabfrage.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Sicherheitsabfrage</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Aktivieren Sie diese Option um sehr lange Eingabetexte zu ignorieren, welche via 
 Maus, Selektionen, Zwischenspeicher, Kommandozeile eingegeben werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignoriere Eingabe Sätze welche länger sind als </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Eingabe Sätze welche länger sind als diese Grösse werden ignoriert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Option einschalten um diakritische Zeichen (Punkte, Striche, Häkchen, Bögen etc.) während der Artikelsuche zu ignorieren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignoriere Diakritische Zeichen während der Suche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Aktivieren Sie diese Option, um optionale Abschnitte von Artikeln immer auszuklappen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Optionale &amp;Abschnitte ausklappen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Wählen Sie diese Option, falls Sie automatisch grosse Artikel einklappen möchten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Artikel einklappen mit mehr als</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Artikel welche diese Grösse überschreiten werden eingeklappt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignoriere Satzzeichen während der Suche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Wählen Sie diese Option, falls Sie eine Zusatzsuche mit den Synonymlisten von 
 Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Zusatzsuche mit Hilfe von Synonymen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>Zeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>CTRL+TAB wechselt zwischen den zuletzt verwendeten Reitern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Verlauf</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Verlauf speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Aktivieren Sie diese Option, falls Sie Wörter mit einem einfachem Mausklick auswählen möchten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Wort mit einfachem Klick auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on Stil:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maximale Verlaufgrösse:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Speichern alle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>Minuten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klassisch</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
+      <translation>Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blau</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation type="unfinished">Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Klartext</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Präfixtreffer</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Unbekannt</translation>
     </message>
@@ -4520,17 +4532,17 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Kein Programmname wurde eingegeben.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Das Programm ist abgestürzt.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Das Program hat mit %1 beendet.</translation>
     </message>
@@ -4538,27 +4550,27 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Aktiviert</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
-      <translation type="unfinished">Name</translation>
+      <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Kommandozeile</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -4566,99 +4578,114 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Fehler beim Laden des Artikels</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Fehler beim Dekodieren des Artikels</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Urheberrecht: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-Mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titel: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Webseite: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Datum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Ein Wörterbuch-Suchprogramm.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Wort oder Satz zur Abfrage.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Speichern Sie Debug-Meldungen in gd_log.txt im Konfigurationsordner.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Ändern Sie die Gruppe des Hauptfensters.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Ändern Sie die Popup-Gruppe.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Scan-Popup umschalten.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Wörterbuch suchen/filtern (CTRL+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Suche zurücksetzen</translation>
     </message>
@@ -4666,22 +4693,22 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>FEHLER: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Fehler beim speichern der Ressource: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Die Ressource konnte nicht heruntergeladen werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>WARNUNG: %1</translation>
     </message>
@@ -4710,67 +4737,72 @@ Stardict, Babylon und GLS Wörterbüchern wünschen.</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>ALT+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
-      <translation type="unfinished">Dialog</translation>
+      <translation>Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wort aussprechen (ALT+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Wort zu Lesezeichen hinzufügen (CTRL+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Zeigt oder versteckt die Wörterbuchleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Immer im Vordergrund aller Windows Fenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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,
 es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Wort an das Hauptfenster senden (ALT+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>ALT+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Zurück</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Weiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
     </message>
   </context>
   <context>
@@ -4778,17 +4810,17 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Vorherige</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Strg+Umschalt+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Nächste</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
@@ -4798,33 +4830,33 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>&amp;Alles hervorheben</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Gross und Kleinschreibung beachten</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Finden:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
-      <translation type="unfinished">Name</translation>
+      <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Pfad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -4832,60 +4864,60 @@ es in der Grösse verändert, oder andersweitig verwaltet werden kann.</translat
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Dateien</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systeme:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nippon</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japanische Katakana Silbenschrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Wörterbücher von Audiodateien erstellen, indem hier die Verzeichnisse eingefügt werden:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japanisch Rōmaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4896,83 +4928,83 @@ Standardisiert als ISO 3602.
 (Noch nicht in GoldenDict implementiert.)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) Seiten:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Audioverzeichnis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Alle externen Programme. Eine Zeichenfolge %GDWORD% wird durch das Abfragewort ersetzt. In der Suchleiste wird die Zeichenfolge %GDSEARCH% durch den Text ersetzt. Wenn beide Parameter nicht angegeben werden, wird das Stichwort in die Standardeingabe eingegeben.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations bereitgestellt von &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, einer gemeinschaftlichen linguistischen Medienbibliothek von Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Lingua Libre aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 Sprachcode</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Nutzung von Forvo erfordert derzeit einen API-Schlüssel, registrieren Sie sich auf der Seite, um Ihren eigenen Schlüssel zu erhalten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Holen Sie sich Ihren eigenen Schlüssel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;hier&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japanische Hiragana Silbenschrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Benutzerdefinierte Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Dies gilt nur für Suchphrasen, wobei jede Zeile eine durch Semikolon getrennte Transliteration darstellt. Beispielsweise können Benutzer ae;æ,ae eingeben, um æ im Zielwort darzustellen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #das ist ein Beispiel</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
-      <translation type="unfinished">Transliteration</translation>
+      <translation>Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ Standardisiert als ISO 3602.
 (Noch nicht in GoldenDict implementiert.)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Russische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morphologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>Än&amp;dern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Beispiele:  &amp;quot;eng&amp;quot; für Englisch, &amp;quot;fra&amp;quot; für Französisch &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Eine vollständige Liste der verfügbaren Sprachen finden Sie &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; hier &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ordnerpfad mit Hunspell/Myspell Wörterbüchern:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Neu ein&amp;lesen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Deutsche Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Auf jeder Webseite wird der Text %GDWORD% mit dem Suchwort ersetzt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Hinzufügen...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Verzeichnis auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Webseiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Pfad, um nach Wörterbuchdateien zu suchen:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Löschung bestätigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silbenschriften:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Verfügbare Morphologie Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5108,94 +5130,94 @@ falsch geschriebene Wörter bereitstellt.
 Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe ein.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT Server</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT Server:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Aussprachen von Forvo aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API Schlüssel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Sprach-Code (mit Komma getrennt):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Die Liste der Sprach-Code, welche Sie benutzen möchten wie zum Beispiel &quot;de, en&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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ändigen Listen der Sprach-Code finden Sie &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;hier&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Griechische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(Wird in der portablen Version nicht unterstützt !)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programme</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Weissrussische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Alternativ kann man folgenden String verwenden: %GD1251% für CP1251, %GDISO1%...%GDISO16% für ISO 8859-1...ISO 8859-16 oder auch 
 %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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Sprachausgabe</translation>
     </message>
@@ -5211,42 +5233,42 @@ Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe e
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Ausgewählte Sprachmodule:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Aussprechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Verfügbare Sprachmodule:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Text Aussprechen (Vorlesen):</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Text zum Vorlesen hier eingeben...</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Abspielen</translation>
     </message>
@@ -5271,30 +5293,30 @@ Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe e
       <translation>Konnte keine verfügbare TTS-Stimme finden.&lt;br&gt;Vergewissern Sie sich, dass mindestens ein TTS-Modul auf dem Computer installiert ist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Lautstärke:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
-      <translation type="unfinished">Rate:</translation>
+      <translation>Preis:</translation>
     </message>
   </context>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Ein Wort oder einen Satz eingeben um Wörterbücher zu durchsuchen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Dropdown</translation>
     </message>
@@ -5309,7 +5331,7 @@ Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe e
     <message>
       <location filename="../src/texttospeechsource.cc" line="282"/>
       <source>Name</source>
-      <translation type="unfinished">Name</translation>
+      <translation>Name</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
@@ -5325,33 +5347,33 @@ Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe e
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Artikel als Link innerhalb Reiter &quot;iframe&quot; einsetzen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Als Link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -5359,17 +5381,9 @@ Fügen Sie entsprechende Wörterbücher am besten am Ende der passenden Gruppe e
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Einige Wörterbücher konnten nicht abgefragt werden.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>WARNUNG: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/de_DE.ts b/locale/de_DE.ts
index 7609856f..9c9d4ca8 100644
--- a/locale/de_DE.ts
+++ b/locale/de_DE.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Über</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, ein Programm zum Nachschlagen in Wörterbüchern, Version </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Lizensiert unter der GNU GPLv3 oder neuer</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Versionsinfo kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Wörterbücher kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Danksagungen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Unbekannt]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basiert auf Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basierend auf Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,57 +80,57 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Artikel aufklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Artikel einklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Mit Popups arbeiten</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(unbenannt)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Willkommen!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>In der Gruppe &lt;b&gt;%2&lt;/b&gt; wurde keine Übersetzung für &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; gefunden.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;
@@ -143,7 +138,7 @@
 &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;hhttps://github.com/xiaoyifang/goldendict/discussions&quot;&gt;Forum&lt;/a&gt;. &lt;p&gt;Programmupdates sind auf der &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(Bild)</translation>
     </message>
@@ -151,42 +146,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Artikel aufklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Von </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Artikel einklappen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Neue Anki-Notiz erstellen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Abfragefehler: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Ähnliche Wörter: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Zusammengesetzte Treffer: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Einzelne Wörter: </translation>
     </message>
@@ -194,197 +189,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Konnte keine temporäre Datei anlegen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Schlage &quot;%1&quot; nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Schlage &quot;%1&quot; in &amp;neuem Tab nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Die angegebene Ressource existiert nicht.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Schlage &quot;%1&quot; in %2 nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Aktuellen Artikel auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Als Text kopieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Betrachten</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Schlage &quot;%1&quot; in %2 in &amp;neuem Tab nach</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Link in neuem Rei&amp;ter öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Link in &amp;externen Browser öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ressource</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Stimme</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Bild</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definition vom Wörterbuch &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Das angegebene Audioprogramm existiert nicht.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Link öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Lesezeichen &amp;speichern &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>WARNUNG: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>FEHLER: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Klang speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Bild speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Bilder (*.bmp *.jpg *.png *.tif);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Bild &amp;speichern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Ausdruck nicht gefunden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 von %2 Treffer</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>&amp;Klang speichern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Sende &quot;%1&quot; an die Eingabezeile</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Füge &quot;%1&quot; zum Verlauf &amp;hinzu </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>Aktuellen Artikel &amp;an Anki senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Ausgewählten Text an Anki senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Sounddateien (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle Dateien (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Sounddateien (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Konnte folgende Audio Datei nicht abspielen: %1</translation>
     </message>
@@ -416,62 +411,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Chinesische Konvertierung</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Konvertierung zwischen vereinfachten und traditionellen chinesischen Zeichen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Chinesische Konvertierung</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Konvertierung von vereinfachten Zeichen in traditionelle (Taiwan-Variante) Zeichen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC an TC (Taiwan-Variante)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Umwandlung von vereinfachten Zeichen in traditionelle (Hong Kong Variant) Zeichen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC nach TC (Hong Kong Variante)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Umwandlung von traditionellen Zeichen in vereinfachte Zeichen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC bis SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Vereinfacht auf traditionelle chinesische (Taiwan-Variante) Konvertierung</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Vereinfachte Umstellung auf traditionelle chinesische (Hong Kong Variante)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Traditionelle bis vereinfachte chinesische Konvertierung</translation>
     </message>
@@ -479,30 +474,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>benutzerdefinierte Transliteration</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Proxy-Authentifizierung erforderlich</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Sie müssen einen Benutzernamen und ein Passwort angeben, um über den Proxy zugreifen zu können</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Benutzername:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Passwort:</translation>
     </message>
@@ -510,22 +505,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formular</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Gruppensymbol:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tastenkürzel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Favoritenordner:</translation>
     </message>
@@ -550,17 +545,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Bilder</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Alle Dateien</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Fehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Konnte die angegebene Bilddatei nicht lesen.</translation>
     </message>
@@ -568,63 +563,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Bestätigung</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Möchten Sie wirklich eine Reihe von Gruppen basierend auf den Sprachpaaren erstellen?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Sind Sie sicher, dass Sie eine Reihe von Gruppen basierend auf metadata.toml generieren möchten?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kombiniere Gruppen nach Quellsprache nach &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kombiniere Gruppen nach Zielsprache nach &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>Automatische Gruppierung nach Ordner fehlgeschlagen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Das übergeordnete Verzeichnis von %1 kann nicht erreicht werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>Sind Sie sicher, dass Sie eine Serie von Gruppen basierend auf den enthaltenen Ordnern erstellen möchten?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Doppelseitige Übersetzungsgruppen erstellen: &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Gruppen kombinieren mit &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Wörterbücher: </translation>
     </message>
@@ -637,133 +632,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Suchmodus</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Dieses Element bestimmt, wie Filterstring interpretiert werden soll</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Wenn aktiviert, wird beim Filtern der Fall der Symbole berücksichtigt</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Treffer</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Stichwörter in Datei exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Ok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Knopf drücken um den Suchfilter auf die Stichwortliste anzuwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Anwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Falls aktiviert, wird das Ergebnis des Suchfilters ständig aktuell gehalten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Auto-Filter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Suchfilter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Suchfilter eingeben (als feststehende Zeichenfolge, Wildcards oder regulären Ausdruck)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Platzhalter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Stichwörter werden geladen …</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unterschiedliche Stichwörter insgesamt: %1, gefiltert: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Stichwörter in Datei speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textdateien(*.txt);;Alle Dateien(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Exportierte Datei kann nicht geöffnet werden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Stichwörter exportieren...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Exportprozess wird unterbrochen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Export abgeschlossen</translation>
     </message>
@@ -771,67 +766,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Artikel gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Übersetzt von:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Wörter gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Übersetzt nach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Wörterbuch zusammengesetzt aus diesen Dateien:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Beschreibung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Zeige alle Stichwörter des Wörterbuchs</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Stichwörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Das Wörterbuch mit folgendem Kommando bearbeiten:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Indexdateiname:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Indexordner öffnen</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 Einträge</translation>
     </message>
@@ -862,44 +867,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Aktiviert</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Datenbanken</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategien</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Komma-getrennte Liste von Datenbanken
 (leerer String oder &quot;*&quot; passt zu allen Datenbanken)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Komma-getrennte Liste der Suchstrategien
@@ -909,37 +914,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Erweitertes Menü mit allen Wörterbüchern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Diese Gruppe bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbuch Stichwörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Wörterbuchleiste</translation>
     </message>
@@ -948,27 +953,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Wörterbücher</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Wörterbücher</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Übernehmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Quellen geändert</translation>
     </message>
@@ -979,12 +984,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Gruppen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1013,75 +1018,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Ganze Wörter</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Nur Text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Platzhalter</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Das abfragende Wort darf nicht leer sein.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>unterstützt xapian Suchsyntax, wie AND ODER +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max. Abstand zwischen Wörtern (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max. Artikel pro Wörterbuch (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Artikel gefunden: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indizierung: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Keine</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Die Suchzeile muss zumindest ein Wort enthalten, bestehend aus </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> oder mehr Zeichen</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Keine Wörterbücher für Volltextsuche</translation>
     </message>
@@ -1089,7 +1074,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Fehler in Lesezeichen Datei</translation>
     </message>
@@ -1155,7 +1140,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>aus</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Damit dieser Fehler verschwindet sollten Sie Bearbeiten » Wörterbücher » Forvo auswählen und ihren eigenen API-Schlüssel eintragen.</translation>
     </message>
@@ -1176,68 +1161,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Treffer</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Wortreihenfolge ignorieren</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Diakritika ignorieren</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Gefundene Artikel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Verfügbare Wörterbücher in Gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Warten auf Indizierung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Gesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indiziert:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Jetzt indizieren: Keine</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Abbrechen</translation>
     </message>
@@ -1269,27 +1238,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Entf</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Einf</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1329,12 +1298,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Geben Sie den neuen Namen der Gruppe ein:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Vorhandene Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Gruppe &amp;hinzufügen</translation>
     </message>
@@ -1344,42 +1313,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Gruppe hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Eine neue Gruppe von Wörterbüchern erzeugen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Nach Sprachen gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Ordner basierte Gruppen erstellen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Nach Ordnern gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Nach Metadaten gruppieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Benutzen Sie &amp;Drag &amp; Drop um Wörterbücher zwischen oder innerhalb von Gruppen zu verschieben, oder um die Reihenfolge zu verändern.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Die ausgewählte Wörterbüchgruppe umbenennen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Die ausgewählte Wörterbuchgruppe entfernen</translation>
     </message>
@@ -1389,43 +1358,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Geben Sie den Namen der neuen Gruppe ein:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Alle Gruppen entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Ausgewählte Wörterbücher von der Gruppe entfernen (Entf)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Ausgewählte Wörterbücher zur Gruppe hinzufügen (Einf)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Gruppe &amp;entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Gruppen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Gruppe &amp;umbenennen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Alle Gruppen von Wörterbüchern entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Erzeugt sprachenbasierte Gruppen</translation>
     </message>
@@ -1448,12 +1417,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Verlauf:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Verlaufsgröße: %1 von maximal %2 Einträgen</translation>
     </message>
@@ -1461,12 +1430,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Rechtschreibvorschläge:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morphologie</translation>
     </message>
@@ -1474,12 +1443,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
@@ -1487,1031 +1456,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indizierung: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Name des Wörterbuchs</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Initialisierung</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Bitte warten Sie während die Wörterbücher initialisiert werden</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Bitte warten...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indizierung …</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thailändisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tschechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Gordon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulfulde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hannah</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latein</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malaysisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Senna</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadschikisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tongaisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Tshivenda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Usbekisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Walisisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italienisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Rätoromanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Nord-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abkhazisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirghizstan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Schottisch-Gälisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Magahi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dänisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Kiluba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Ungarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Französisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Deutsch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebräisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kasachisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Paschto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Okzitanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slowakisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Xitsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigurisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbokroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumänisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Süd-Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Westfriesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Madagassisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galizisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Aserbaijanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Baschkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Weißrussisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardinisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikaner</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norwegisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tschetschenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tschuwasch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singhalesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Schwedisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Mazedonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugiesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Türkisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Isländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Englisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Kirchenslawisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Färöisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Wallonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Oshivambo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Nordsamisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitianisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Süd-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jiddisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinesisch traditionell</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinesisch vereinfacht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Andere</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Andere vereinfacht Chinesische Dialekte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Andere traditionell Chinesische Dialekte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Andere osteuropäische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Andere westeuropäische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Andere russische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Andere japanische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Andere baltische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Andere griechische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Andere koreanische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Andere türkische Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Andere thai Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2519,207 +2492,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>Französisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>Spanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>Belarussisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>Bulgarisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>Tschechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>Deutsch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>Griechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>Finnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>Italienisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>Japanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>Koreanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>Litauisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>Mazedonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>Niederländisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>Polnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>Portugiesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>Slowakisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>Albanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>Serbisch (Kyrillisch)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>Schwedisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>Türkisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>Ukrainisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>Chinesisch (vereinfacht)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>Chinesisch (traditionell)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>Vietnamesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>Portugiesisch, Brasilien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>Persisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>Spanisch, Argentinien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>Deutsch, Schweiz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>Spanisch, Bolivien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>Tadschikisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>Arabisch, Saudi-Arabien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>Turkmenisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>Englisch</translation>
     </message>
@@ -2727,7 +2700,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Fehler beim Laden der Wörterbücher</translation>
     </message>
@@ -2735,7 +2708,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Fehler in der Konfigurationsdatei. Mit Standardeinstellungen fortfahren?</translation>
     </message>
@@ -2743,702 +2716,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Alle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Zurück</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 Wörterbücher, %2 Artikel, %3 Wörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Hilfe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>B&amp;eenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Fehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Applikation beenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>In die &amp;Symbolleiste schließen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Kann Artikel nicht speichern: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Vergrößern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Wörterbücher...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Über</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Drucken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Artikel &amp;speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Artikel speichern als</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Strg+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Strg+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>In the Symbolleiste minimieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Seite einrichten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Webseite</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Neue Version verfügbar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Nachschlagen:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Verkleinern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Im &amp;Hauptfenster zeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Über GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Herunterladen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Seite einrichten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Suche in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normale Größe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Strg+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Strg+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Lade...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(unbenannt)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Einstellungen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Willkommen!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wort aussprechen (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Artikel speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Diese Version überspringen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Vorwärts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Drucke Artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Ansicht</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Verlauf</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Zurücksetzen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Suchwörter vergrößern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Suchwörter verkleinern</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Suchwörter in normaler Größe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Aktuellen Tab schließen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Alle Tabs schließen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Alle anderen Tabs schließen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Offene Reiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Neuer Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Strg+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Konfigurationsordner</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menüleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>In Wörterbüchern gefunden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Alle Tabs als Lesezeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ACHTUNG: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Zeichenkette zum Suchen in Wörterbüchern. Die Platzhalter &apos;*&apos;, &apos;?&apos; und Sätze der Symbole &apos;[...]&apos; sind erlaubt.
 Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole verwenden &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Liste der Reiter öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Aktuellen Tab von Lesezeichen entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Strg+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Verbergen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Verlauf in eine Datei exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textdateien(*.txt);;All Dateien(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Exportfehler: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Strg+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Verlauf von Datei importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Importfehler: ungültige Daten in Datei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import des Verlaufes abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Importfehler: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Favoriten in Datei exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML-Dateien (*.xml);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Favoritenexport abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Favoriten als reine Liste exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Favoriten aus Datei importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-Dateien (*.xml);;;Txt-Dateien (*.txt);;Alle Dateien (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Favoritenimport abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Datenverarbeitungsfehler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Wörterbuchinfo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbuch-Schlagwörter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Wörterbuch-Ordner öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Wörterbuch bearbeiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexierung für Volltextsuche: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Schlagwort &quot;%1&quot; aus den Favoriten entfernen?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Suchformular</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Ergebnisliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Lesezeichenliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Druck&amp;vorschau</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Dateien neu ein&amp;lesen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>Neuer Rei&amp;ter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Immer im Vordergrund</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Immer im Vordergrund</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Strg+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menüschaltfläche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Tab durchsuchen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Strg+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Strg+Umschalt+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-ng Referenz</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Aktuellen Tab als Lesezeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Strg+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportieren als Liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Namen in &amp;Wörterbuchleiste anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Kleine Icons in der &amp;Toolbar anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Scannen aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikel, komplett (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artikel, nur HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Artikel wird gespeichert...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Abspeichern des Artikels abgeschlossen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Verlaufsliste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Barrierefreiheit-API ist nicht aktiviert </translation>
     </message>
@@ -3446,12 +3419,12 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Die Wörterbuchdatei war manipuliert oder korrupt</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Konnte den Artikel von %1 nicht laden, Grund: %2</translation>
     </message>
@@ -3459,7 +3432,7 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Fehler beim XML-parsen: %1 bei %2,%3</translation>
     </message>
@@ -3475,22 +3448,22 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -3506,82 +3479,82 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formular</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Inaktive (deaktivierte) Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Name:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Artikel insgesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Übersetzt von:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Übersetzt nach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Wörter insgesamt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Reihenfolge der Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Wörterbuch zusammengesetzt aus diesen Dateien:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informationen über das Wörterbuch</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Beschreibung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sortieren nach Name</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sortieren nach Sprachen</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Wörterbucheinträge</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Wörterbücher aktiv: %1, inaktiv: %2</translation>
     </message>
@@ -3589,12 +3562,12 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Pfad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursiv</translation>
     </message>
@@ -3602,69 +3575,67 @@ Um &apos;*&apos;, &apos;zu finden?&apos;, &apos;[&apos;, &apos;]&apos; Symbole v
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>In die Symbolleiste starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Nur Umschalttaste links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Strg</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Aktiviert das Symbol in der Symbolleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Gastgeber:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Umschalttaste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Benutzer:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Popup &amp;scannen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3673,135 +3644,135 @@ Mit dieser Option werden neue Reiter im Hintergrund geöffnet ohne
 sie zu selektionieren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proxyserver verwenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows/Meta-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Wörter im Hauptfenster automatisch aussprechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Mit Betriebssystem starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Nur Alt links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Reiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Nur Umschalttaste rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Hiermit wird das Hauptfenster verborgen, falls die Applikation geschlossen wird.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Sprache der Oberfläche:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Nur Strg links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Neue Reiter im Hintergrund öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Netzwerk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Nur Strg rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Umschalttaste rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Umschalttaste links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Wörter im Scan Popup automatisch aussprechen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Neue Reiter nach dem aktuellen öffnen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Starten Sie das Programm neu, um den Sprachwechsel abzuschließen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Periodisch auf neue Programmversionen prüfen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 Andernfalls werden sie ans Ende hinzugefügt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>In die Symbolleiste schließen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Systemvorgabe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Falls aktiviert, erscheint ein Symbol in der Symbolleiste, mit welchem das 
 Hauptfenster geöffnet und andere Aufgaben getätigt werden können.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,140 +3809,140 @@ informiert GoldenDict den Benutzer und öffnet eventuell die
 Download-Seite.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Start</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Passwort:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Oberfläche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Sprache ändern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Strg-Taste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Nur Alt rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Strg links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Strg rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Tastenkürzel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Mit aktiviertem Scan Popup starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Hiermit startet die Applikation direkt in die Symbolleiste ohne das Hauptfenster zu zeigen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Umschalttaste</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Startet GoldenDict automatisch nach jedem Systemstart.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Popup bei Auswahl oder Zwischenablage in einem von GoldenDict&apos;s eigenen Fensteränderungen nicht anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>GoldenDict&apos;s eigene Auswahl und Zwischenablage Änderungen ignorieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Audiodateien über integrierte Audio-Unterstützung wiedergeben</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Internen Spieler verwenden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Audio-Backend auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Befehlszeile für Audio-Player eingeben</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3981,84 +3951,84 @@ aus Seiten blockiert werden, die nicht der jeweils angezeigten entsprechen. Soll
 nicht mehr funktionieren, kann das Deaktivieren dieser Option helfen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Aussprache</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Abspielen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Externes Programm benutzen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Doppelklick übersetzt das angeklickte Wort</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Ein externes Program zum Abspielen der Audiodaten benutzen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Beim Betätigen der ESC-Taste wird normalerweise der Fokus an die Übersetzungszeile
 übertragen. Mit dieser Option wird jedoch das Hauptfenster verborgen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC-Taste verbirgt das Hauptfenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Wählen Sie diese Option, falls sie die Reiterleiste bei einem offenem Reiter nicht sehen möchten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Einzelnen Tab ausblenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Wörterbuchlimit im Kontextmenü:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Übersetzte Wörter ans Hauptfenster senden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Zeige ein Flaggenfenster, bevor es Popup-Fenster anzeigt. Klicken Sie auf die Flagge, um das Popup-Fenster anzuzeigen. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4069,159 +4039,159 @@ zu dem Artikel aus demselben Wörterbuch gescrollt wird. Wenn diese Option deakt
 wird jedoch der Artikel aus dem obersten Wörterbuch angezeigt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Automatisch zum Zielartikel scrollen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Schriftart des Wörterbuchs: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>setze die Fallback-Schriftfamilie für Wörterbuch</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Artikel-Anzeige-Stil:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Drehe das UI in Dunkelheit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Dunkler Modus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Stellen Sie den Anzeigestil des Artikels in den dunklen Modus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Dunkler Lesemodus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU-Order: Zuletzt verwendete Bestellung.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Änderungen der Zwischenablage verfolgen, wenn das Scannen aktiviert ist. Achtung! Sie sollten dies immer aktivieren, wenn Sie nicht unter Linux sind.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Zwischenablageänderung verfolgen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Trackauswahl ändern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Auswahl nur antippen, wenn alle ausgewählten Tasten gedrückt bleiben:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Scan-Markierung anzeigen, wenn Wort ausgewählt ist</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Verzögerungszeit</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>System-Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Eigener Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Eigene Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Wort</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Vokabular Feld...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Definitionsfeld...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Satz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Satzfeld (kann leer sein)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>GoldenDict-ng nicht in HTTP-Kopfzeilen identifizieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximale Netzwerk-Cache-Größe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4230,283 +4200,325 @@ If set to 0 the network disk cache will be disabled.</source>
 Wenn auf 0 gesetzt, wird der Netzwerk-Festplatten-Cache deaktiviert.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Wenn diese Option aktiviert ist, löscht GoldenDict
 den Netzwerk-Cache beim Beenden von der Festplatte.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Netzwerk-Cache beim Beenden löschen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Volltextsuche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Volltextsuche erlauben für:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Nicht in Wörterbüchern suchen, die mehr als</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>Einträge enthalten (0 - unbegrenzt)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Erweitert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Bei aufeinanderfolgenden Suchen, wenn ein Wörterbuch durch Handbuch zusammengebrochen ist, bleibt es bei der nächsten Suche eingeblendet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Sitzungsabbruch</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Bei Verwendung der Zwischenablage alles nach Zeilenumbruch entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>Fokussieren Sie bei einer neuen Suche das Haupt- oder Popup-Fenster, auch wenn es&apos;s sichtbar ist</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoriten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Automatischer Speicherintervall für Lesezeichen. Falls der Wert 0 eingetragen wird, erfolgt die Speicherung nur bei Beendigung des Programms.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Wird diese Option aktiviert, erfolgt jegliche Entfernung von Lesezeichen nur nach vorheriger Sicherheitsabfrage </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Sicherheitsabfrage</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Aktivieren Sie diese Option, um unangemessen langen Text zu ignorieren
 aus Maus überall, Auswahl, Zwischenablage oder Befehlszeile</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignoriere Eingabeausdrücke länger als</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Eingabeausdrücke, die länger als diese Größe sind, werden ignoriert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Aktivieren Sie diese Option, um Diakritik beim Suchen von Artikeln zu ignorieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Diakritik während der Suche ignorieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Aktivieren Sie diese Option, um optionale Abschnitte von Artikeln immer auszuklappen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Optionale &amp;Abschnitte ausklappen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Artikel einklappen mit mehr als</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Artikel welche diese Größe überschreiten werden eingeklappt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Während der Suche Satzzeichen ignorieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Wählen Sie diese Option, falls sie eine Zusatzsuche mit den Synonymlisten von Stardict, Babylon und GLS Wörterbüchern wünschen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Zusatzsuche mithilfe von Synonymen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>Zeichen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Strg+Tab wechselt zwischen den zuletzt verwendeten Reitern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Verlauf</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Verlauf speichern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Aktivieren Sie diese Option, falls Sie Wörter mit einem einfachem Mausklick auswählen möchten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Wort mit einfachem Klick auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on-Stil:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maximale Verlaufgröße:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Speichern alle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>Minuten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klassisch</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blau</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MN</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Für die Verwendung der Phrasensuche und des NEAR-Operators von Xapian sind Positionsinformationen erforderlich, aber die Datenbankgröße wird viel größer sein. Gilt nur für neu eingehende Wörterbücher.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Index mit Positionsinformationen aktivieren</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standardschriftart</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace-Schriftart</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serifenschrift</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Serifenlose Schriftart</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Aussehen</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Diese Schriftarten werden angewendet, wenn die in einem Wörterbuch angegebenen Schriftarten nicht gefunden werden.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fallback-Schriftarten</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Klartext</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Präfixtreffer</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Unbekannt</translation>
     </message>
@@ -4514,17 +4526,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Kein Programmname wurde eingegeben.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Das Programm ist abgestürzt.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Das Program hat mit %1 beendet.</translation>
     </message>
@@ -4532,27 +4544,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Aktiviert</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Kommandozeile</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -4560,99 +4572,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Fehler beim Laden des Artikels</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Fehler beim Dekodieren des Artikels</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-Mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titel: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Webseite: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Datum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Ein Wörterbuchsuchprogramm.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Wort oder Satz zum Abfragen.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Speichern Sie Debug-Meldungen in gd_log.txt im Konfigurationsordner.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Fensterstatus zurücksetzen.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>TTS deaktivieren.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Ändert die Gruppe des Hauptfensters.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Ändere die Gruppe des Popups.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Scan-Popup umschalten.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Druckversion und Diagnoseinformationen.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Wörterbuch suchen/filtern (Strg+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Suche zurücksetzen</translation>
     </message>
@@ -4660,22 +4687,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>FEHLER: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Fehler beim speichern der Ressource: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Die Ressource konnte nicht heruntergeladen werden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>WARNUNG: %1</translation>
     </message>
@@ -4704,68 +4731,73 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wort aussprechen (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Wort zu Favoriten hinzufügen (Strg+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Zeigt oder versteckt die Wörterbuchleiste</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Immer über allen anderen Fenstern anzeigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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,
 es in der Größe verändert, oder andersweitig verwaltet werden kann.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Wort an das Hauptfenster senden (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Zurück</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Weiter</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ACHTUNG: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4777,7 +4809,7 @@ es in der Größe verändert, oder andersweitig verwaltet werden kann.</translat
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Strg+Umschalt+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4787,7 +4819,7 @@ es in der Größe verändert, oder andersweitig verwaltet werden kann.</translat
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Strg+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4808,17 +4840,17 @@ es in der Größe verändert, oder andersweitig verwaltet werden kann.</translat
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Pfad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -4826,60 +4858,60 @@ es in der Größe verändert, oder andersweitig verwaltet werden kann.</translat
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Dateien</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systeme:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nippon</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japanische Katakana Silbenschrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Wörterbücher von Audiodateien erstellen, in dem hier Verzeichnis eingefügt werden:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japanisch Rōmaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4890,84 +4922,84 @@ Standardisiert als ISO 3602
 Noch nicht in GoldenDict implementiert.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) Seiten:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Audioverzeichnis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Alle externen Programme. Ein String %GDWORD% wird durch das Abfragewort ersetzt. Ein String %GDSEARCH% wird durch den Text in der Suchleiste ersetzt. Werden beide Parameter nicht angegeben, wird das Schlagwort in die Standardeingabe eingegeben.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations bereitgestellt von &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, einer gemeinschaftlichen linguistischen Medienbibliothek von Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Lingua Libre aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 Sprachcode</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Die Nutzung von Forvo erfordert derzeit einen API-Schlüssel, registrieren Sie sich auf der Seite, um Ihren eigenen Schlüssel zu erhalten.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Holen Sie sich Ihren eigenen Schlüssel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;hier&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japanische Hiragana Silbenschrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Benutzerdefinierte Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Dies gilt nur für Suchphrasen, wobei jede Zeile eine durch Semikolon getrennte Transliteration darstellt. Beispielsweise können Benutzer ae;æ,ae eingeben, um æ im Zielwort darzustellen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #das ist ein Beispiel</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4978,118 +5010,108 @@ Kana-Schrift-System. Standardisiert als ISO 3602
 Noch nicht in GoldenDict implementiert.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Russische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morphologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>Än&amp;dern...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Beispiele:  &amp;quot;eng&amp;quot; für Englisch, &amp;quot;fra&amp;quot; für Französisch &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Eine vollständige Liste der verfügbaren Sprachen finden Sie &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; hier &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ordnerpfad mit Hunspell/Myspell Wörterbüchern:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Neu ein&amp;lesen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Deutsche Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Jede Webseite. Der Text %GDWORD% wird mit dem Suchwort ersetzt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Hinzufügen...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Verzeichnis auswählen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Webseiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Pfad, um nach Wörterbuchdateien zu suchen:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Löschung bestätigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silbenschriften:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Verfügbare Morphologie Wörterbücher:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5105,94 +5127,94 @@ Fügen Sie passende Wörterbücher am Ende
 der passende Gruppe ein, um sie zu benutzen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT-Server</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT-Server:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Aussprachen von Forvo aktivieren</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API Schlüssel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Sprachkodes (mit Beistrich getrennt):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Griechische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(nicht in der portablen Version)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programme</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Weißrussische Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Alternativ verwenden kann man, %GD1251% für CP1251, %GDISO1%...%GDISO16% für ISO 8859-1...ISO 8859-16 respektive,
 %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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Sprachausgabe</translation>
     </message>
@@ -5208,42 +5230,42 @@ der passende Gruppe ein, um sie zu benutzen.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Ausgewählte Sprachmaschinen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Hinzufügen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Entfernen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Vorschau</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Verfügbare Sprachmaschinen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Text zur Vorschau:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Text für die Vorschau hier eingeben.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Vorschau</translation>
     </message>
@@ -5268,17 +5290,17 @@ der passende Gruppe ein, um sie zu benutzen.</translation>
       <translation>Konnte keine verfügbare TTS-Stimme finden.&lt;br&gt;Vergewissern Sie sich, dass bereits mindestens eine TTS-Maschine auf dem Computer installiert ist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Einstellungen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Lautstärke:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Preis:</translation>
     </message>
@@ -5286,12 +5308,12 @@ der passende Gruppe ein, um sie zu benutzen.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Ein Wort oder einen Satz eingeben um Wörterbücher zu durchsuchen</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Dropdown</translation>
     </message>
@@ -5322,33 +5344,33 @@ der passende Gruppe ein, um sie zu benutzen.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Name</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Artikel als Link in &lt;iframe&gt; Tag einfügen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Als Link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Symbol</translation>
     </message>
@@ -5356,17 +5378,9 @@ der passende Gruppe ein, um sie zu benutzen.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Einige Wörterbücher konnten nicht befragt werden.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>WARNUNG: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/el_GR.ts b/locale/el_GR.ts
index b3690823..bca4ed8f 100644
--- a/locale/el_GR.ts
+++ b/locale/el_GR.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Περί</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, πρόγραμμα αναζήτησης σε λεξικά, έκδοση </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Διανέμεται υπό τους όρους της GNU GPLv3 ή νεότερης</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Αντιγραφή πληροφοριών έκδοσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Αντιγραφή λίστας λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Μνεία:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Άγνωστο]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Βασίζεται στην Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008- 2013 Konstantin Isakov (ikm@ goldendict. org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Βασισμένο στο Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Εμφάνιση άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Απόκρυψη άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Χρήση αναδυόμενου παραθύρου</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(ανώνυμο)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Καλώς ήλθατε!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Δεν βρέθηκε μετάφραση για &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; στην ομάδα &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;φόρουμ&lt;/a&gt; του προγράμματος. &lt;p&gt;Ενημερώσεις μπορείτε να βρείτε στον &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;ιστότοπο&lt;/a&gt; του προγράμματος.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Διανέμεται υπό τους όρους της GNU GPLv3 ή νεότερης έκδοσής της.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(εικόνα)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Εμφάνιση άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Από </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Απόκρυψη άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Κάντε μια νέα σημείωση Ανκί</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Σφάλμα αναζήτησης: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Παρόμοια λήμματα: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Σύνθετες εκφράσεις: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Μεμονωμένες λέξεις: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Απέτυχε η δημιουργία προσωρινού αρχείου.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>Ανα&amp;ζήτηση του &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Αναζήτηση του &quot;%1&quot; σε &amp;νέα καρτέλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Δεν υπάρχει ο ζητούμενος πόρος.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Απέτυχε το αυτόματο άνοιγμα του αρχείου· δοκιμάστε να το ανοίξετε χειροκίνητα: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Αναζήτηση του &quot;%1&quot; στο %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Επιλογή τρέχοντος άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Αντιγραφή ως κείμενο</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Επιθεωρητής</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Αναζήτηση του &quot;%1&quot; στο %2 σε &amp;νέα καρτέλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Άνοιγμα συνδέσμου σε νέα &amp;καρτέλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Άνοιγμα συνδέσμου σε &amp;εξωτερικό περιηγητή</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Πόρος</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Ήχος</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Φωνή TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Εικόνα</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Βίντεο</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Βίντεο: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Ορισμός στο λεξικό &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Ορισμός: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Δεν υπάρχει το ζητούμενο πρόγραμμα ήχου.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Άνοιγμα Συνδέσμου</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Αποθήκευση σελιδοδείκτη &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Πρόγραμμα αναπαραγωγής ήχου: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ΣΦΑΛΜΑ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Αποθήκευση ήχου</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Αποθήκευση εικόνας</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Αρχείο εικόνας (*.bmp *.jpg *.png *.tif);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Αποθήκευση &amp;Εικόνας...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Η φράση δεν βρέθηκε</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 από %2 ταιριάσματα</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Αποθήκευση ή&amp;χου...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Αποστολή του &quot;%1&quot; στη γραμμή εισόδου</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Προσθήκη του &quot;%1&quot; στο ιστορικό</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Αποστολή τρέχοντος άρθρου στο Ανκί</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Αποστολή επιλεγμένου κειμένου στο Ανκί</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Αρχεία ήχου (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Όλα τα αρχεία (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Αρχεία ήχου (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Αποτυχία αναπαραγωγής αρχείου ήχου: %1</translation>
     </message>
@@ -416,62 +411,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Μετατροπή Κινέζικων</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Ενεργοποίηση μετατροπής μεταξύ απλουστευμένων και παραδοσιακών κινεζικών χαρακτήρων</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Μετατροπή Κινέζικων</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Ενεργοποίηση μετατροπής από απλοποιημένους χαρακτήρες σε παραδοσιακούς (παραλλαγή Ταϊβάν) χαρακτήρες</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC έως TC (παραλλαγή Ταϊβάν)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Ενεργοποίηση μετατροπής από απλοποιημένους χαρακτήρες σε παραδοσιακούς (παραλλαγή Χονγκ Κονγκ) χαρακτήρες</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC έως TC (παραλλαγή Χονγκ Κονγκ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Ενεργοποίηση μετατροπής από παραδοσιακούς χαρακτήρες σε απλοποιημένους χαρακτήρες</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC έως SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Απλουστευμένο στην παραδοσιακή κινεζική (παραλλαγή του Ταϊβάν) μετατροπή</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Μετατροπή απλουστευμένη στην παραδοσιακή κινεζική (παραλλαγή Χονγκ Κονγκ)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Παραδοσιακά στην απλουστευμένη κινεζική μετατροπή</translation>
     </message>
@@ -479,30 +474,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>προσαρμοσμένη μεταγραφή</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Απαιτείται έλεγχος ταυτότητας διακομιστή μεσολάβησης</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Πρέπει να δώσετε ένα όνομα χρήστη και έναν κωδικό πρόσβασης για πρόσβαση μέσω διακομιστή μεσολάβησης</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Όνομα Χρήστη:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Κωδικός:</translation>
     </message>
@@ -510,22 +505,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Μορφή</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Εικονίδιο ομάδας:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Συντόμευση:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Φάκελος αγαπημένων:</translation>
     </message>
@@ -550,17 +545,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Εικόνες</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Όλα τα αρχεία</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Σφάλμα</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Αδυναμία ανάγνωσης του επιλεγμένου αρχείου.</translation>
     </message>
@@ -568,63 +563,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Επιβεβαίωση</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Σίγουρα θέλετε να δημιουργήσετε ομάδες για όλα τα διαθέσιμα ζεύγη γλωσσών;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Είστε βέβαιοι ότι θέλετε να δημιουργήσετε ένα σύνολο ομάδων με βάση το metadata.toml;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Συνδυασμός ομάδων ανά γλώσσα πηγή ως &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Συνδυασμός ομάδων ανά γλώσσα στόχο ως &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Η αυτόματη ομαδοποίηση κατά φάκελο απέτυχε.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Δεν είναι δυνατή η πρόσβαση στον γονικό κατάλογο του %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Είστε βέβαιοι ότι θέλετε να δημιουργήσετε ένα σύνολο ομάδων με βάση τους φακέλους που περιέχουν;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Δημιουργία ομάδας αμφίδρομης μετάφρασης &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Συνδυασμός των ομάδων με &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Λεξικά: </translation>
     </message>
@@ -637,133 +632,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Λειτουργία αναζήτησης</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Αυτό το στοιχείο καθορίζει πώς θα ερμηνεύεται η συμβολοσειρά φίλτρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Αν επιλεγεί η θήκη συμβόλων θα ληφθεί υπόψη κατά το φιλτράρισμα</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Ταίριασμα πεζών-κεφαλαίων</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Εξαγωγή headwords σε αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Εξαγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Βοήθεια</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Εντάξει</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Πατήστε αυτό το κουμπί για εφαρμογή φίλτρου στη λίστα κεφαλίδων</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Εφαρμογή</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Εάν επιλεγεί οποιαδήποτε αλλαγή φίλτρου θα εφαρμόσουμε αμέσως στη λίστα κεφαλίδων</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Αυτόματη εφαρμογή</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Φίλτρο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Φίλτρο συμβολοσειράς (σταθερή συμβολοσειρά, μπαλαντέρ ή κανονική έκφραση)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Κείμενο</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Μπαλαντέρ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Φόρτωση κεφαλαίων...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Μοναδικό σύνολο κεφαλών: %1, φιλτραρισμένο: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Αποθήκευση κεφαλίδων στο αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Αρχεία κειμένου (*.txt);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Δεν μπορεί να ανοίξει το εξαγόμενο αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Εξαγωγή κεφαλίδων...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Ακύρωση</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Η διαδικασία εξαγωγής διακόπηκε</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Η εξαγωγή ολοκληρώθηκε</translation>
     </message>
@@ -771,66 +766,76 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Σύνολο άρθρων:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Μεταφράζει από:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Σύνολο λημμάτων:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Μεταφράζει σε:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Άνοιγμα φακέλου</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Επεξεργασία λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Αρχεία λεξικού:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Περιγραφή:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Εμφάνιση όλων των μοναδικών κεφαλών λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Κεφαλίδες</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Επεξεργασία του λεξικού με χρήση της εντολής: %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Όνομα αρχείου ευρετηρίου:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Άνοιγμα φακέλου ευρετηρίου</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 λήμματα</translation>
     </message>
@@ -861,44 +866,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Ενεργοποιημένο</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Διεύθυνση</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Βάσεις δεδομένων</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Στρατηγικές</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Εικονίδιο</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Οριοθετημένος με κόμματα κατάλογος βάσεων δεδομένων
 (κενό string ή &quot;*&quot; ταιριάζει με όλες τις βάσεις δεδομένων)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Οριοθετημένος με κόμματα κατάλογος στρατηγικών αναζήτησης
@@ -908,37 +913,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Πλήρες μενού με όλα τα λεξικά...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Επεξεργασία αυτής της ομάδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Λεξικό headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Άνοιγμα φακέλου λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Επεξεργασία λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Γραμμή &amp;λεξικών</translation>
     </message>
@@ -947,27 +952,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Λεξικά</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Λεξικά</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Αποδοχή</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Ακύρωση</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Οι πηγές άλλαξαν</translation>
     </message>
@@ -978,12 +983,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Ομάδες</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Ορισμένες πηγές άλλαξαν. Αποδέχεστε τις αλλαγές;</translation>
     </message>
@@ -1012,75 +1017,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Αναζήτηση πλήρους κειμένου</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Ολόκληρες λέξεις</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Απλό κείμενο</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Μπαλαντέρ</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Η λέξη ερωτήματος δεν μπορεί να είναι κενή.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>υποστήριξη xapian σύνταξη αναζήτησης, όπως ΚΑΙ Ή +/- κλπ</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Μέγιστη απόσταση μεταξύ λέξεων (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Προκαθορισμένο</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Μέγιστος αριθμός άρθρων ανά λεξικό (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Βρέθηκαν άρθρα: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Ευρετηρίαση τώρα: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Κανένα</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Η γραμμή αναζήτησης πρέπει να περιέχει τουλάχιστον μία λέξη που περιέχει </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ή περισσότερα σύμβολα</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Δεν υπάρχουν λεξικά για αναζήτηση πλήρους κειμένου</translation>
     </message>
@@ -1088,7 +1073,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Σφάλμα στο αρχείο ευνοιών</translation>
     </message>
@@ -1154,7 +1139,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>από</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1175,68 +1160,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Ταίριασμα πεζών-κεφαλαίων</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Λειτουργία:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Αγνόηση σειράς λέξεων</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Αγνόηση διακριτικών</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Βρέθηκαν άρθρα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Διαθέσιμα λεξικά στην ομάδα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Αναμονή για ευρετήριο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Βοήθεια</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Σύνολο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Ευρετήριο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Ευρετηρίαση τώρα: Κανένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Ακύρωση</translation>
     </message>
@@ -1268,27 +1237,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1328,12 +1297,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Εισάγετε το νέο όνομα της ομάδας:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Διαθέσιμα λεξικά:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Προσ&amp;θήκη ομάδας</translation>
     </message>
@@ -1343,42 +1312,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Προσθήκη ομάδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Δημιουργία νέας ομάδας λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Ομαδοποίηση ανά γλώσσες</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Δημιουργήστε ομάδες που βασίζονται σε φακέλους.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Ομάδα κατά φακέλους</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Ομάδα κατά Μεταδεδομένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Χρησιμοποιήστε το ποντίκι σας για να σύρετε λεξικά από και προς τις ομάδες, καθώς και για να αλλάξετε τη σειρά των λεξικών ή των ομάδων.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Μετονομασία τρέχουσας ομάδας λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Αφαίρεση τρέχουσας ομάδας λεξικών</translation>
     </message>
@@ -1388,43 +1357,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Εισάγετε το όνομα της νέας ομάδας:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Αφαίρεση όλων των ομάδων</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Αφαίρεση επιλεγμένων λεξικών από την ομάδα (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Προσθήκη των επιλεγμένων λεξικών στην ομάδα (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Α&amp;φαίρεση ομάδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Ομάδες:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Μετονομασία ομάδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Αφαίρεση όλων των ομάδων λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Δημιουργία ομάδων με βάση τις διαθέσιμες γλώσσες</translation>
     </message>
@@ -1447,12 +1416,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ιστορικό:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Μέγεθος ιστορικού: %1 λήμματα από μέγιστο αριθμό %2</translation>
     </message>
@@ -1460,12 +1429,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Προτάσεις ορθογραφίας:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Μορφολογία για %1</translation>
     </message>
@@ -1473,12 +1442,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Ενεργή</translation>
     </message>
@@ -1486,1031 +1455,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Ευρετηρίαση: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Όνομα λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Έναρξη</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Παρακαλώ περιμένετε να ολοκληρωθεί η δημιουργία ευρετηρίου</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Παρακαλώ περιμένετε...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Ευρετηρίαση...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Eʋegbe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Λαοτιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akanα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Nehiyaw</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Gaelg</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Ταϋλανδέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Ουρντού</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Ζουλού</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Τσεχικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Ολλανδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulfulde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Ελληνικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Ινδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Ιρλανδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Χμερ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Κονγκολέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Λατινικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Μαλαισιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Μαορί</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Ναουρού</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromoo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Σόνα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Τατζικικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Ταταρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Σουάτι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Iñupiak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Tshivenda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Ουζμπεκικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Ουαλλικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Ιταλικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Ρετο-ρωμανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Βόρεια Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Αμπκχαζικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Κιργιζικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Σκωτσέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Αλβανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Λετονικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Μαλαγιαλάμ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Κουρδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Βουλγαρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Μαλτέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Μαράθι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Αραβικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Βασκικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Αβαρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Μπιχάρι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Βρετάννης</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sunda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Δανέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Φίτζι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Ουγγρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Γαλλικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Γερμανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Μογγολικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Εβραϊκά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Λουξεμβούργου</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Καζακικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Κικούγιου</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Κορεατικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Νάβαχο</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Νεπαλέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Αφγανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Πολωνικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Σαμόας</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Οξιτανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Σλοβακικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Σομαλέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Xitsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ουιγουρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Σερβοκροατικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Ρουμανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Ινδονησιακά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Νότια Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Κορσικανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Εσπεράντο</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Περσικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Σλοβενικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frysk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Αραγόνας</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Ταϊτής</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Μαλγασικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Γαλικιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Αζέρικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Αμχαρικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Σανσκριτικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Ιαπωνικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ουκρανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bamanankan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Γροιλανδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bašqort</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Λευκορωσικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Κασμίρ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Σαρδηνίας</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Μπενγκάλι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Ιάβας</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avesta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Αφρικάανς</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Αρμενικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Νορβηγικά, Bokmal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Κροατικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Βοσνιακά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Καταλανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Σερβικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Βιρμανίας</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ρωσικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Λιμβούργου</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Νορβηγικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Τσετσενικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Κινέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Čăvašla</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Σινχάλα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Ισπανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Κορνουάλης</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Οσετικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Εσθονικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Σουαχίλι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Σουηδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Θιβετιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Βιετναμέζικα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Σλαβομακεδονικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Πορτογαλικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Τουρκικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Τουρκμενικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Ισλανδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Αγγλικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Γεωργιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Εκκλησιαστικά Σλαβικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Føroyskt</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Φιλανδικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Βαλονικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Κουανγιάμα</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Νήσων Μάρσαλ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Βόρεια Σάμι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Αϊτιανά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamoru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Νορβηγικά, Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Νότια Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Λιθουανικά</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Nuosu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Γίντις</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Κινέζικα (παραδοσιακά)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Κινέζικα (απλοποιημένα)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Άλλη</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Άλλες διάλεκτοι απλοποιημένων Κινέζικων</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Άλλες διάλεκτοι παραδοσιακών Κινέζικών</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Άλλες γλώσσες Ανατολική Ευρώπης</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Άλλες γλώσσες Δυτικής Ευρώπης</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Άλλες Ρωσικές γλώσσες</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Άλλες Ιαπωνικές γλώσσες</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Άλλες Βαλτικές γλώσσες</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Άλλες Ελληνικές γλώσσες</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Άλλες Κορεατικές διάλεκτοι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Άλλες Τουρκικές διάλεκτοι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Άλλες Ταϊλανδικές διάλεκτοι</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Εκπληκτική</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2518,215 +2491,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>γαλλική γλώσσα</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Ισπανικά</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Λευκορωσική</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Βούλγαρος</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Τσέχος</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Γερμανός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Ελληνικά</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>φινλανδικός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>ιταλικός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Ιαπωνικά</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>κορεάτης</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Λιθουανικά</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Μακεδόνας</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Ολλανδός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Στίλβωση</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Πορτογαλικά</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Ρωσική</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Σλοβάκος</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Αλβανός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Σερβικά (Κυριλλικά)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Σουηδικά</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>τούρκικος</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ουκρανός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Απλοποιημένα Κινέζικα</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Παραδοσιακά κινέζικα</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Βιετναμέζικο</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Πορτογαλικά, Βραζιλιάνα</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>περσικός</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Ισπανικά, Αργεντινή</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Χίντι</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>εσπεράντο</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Γερμανός, Ελβετία</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Ισπανικά, Βολιβία</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Τατζικιστάν</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Κέτσουα</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Αϊμάρα</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Αραβικά, Σαουδική Αραβία</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Τουρκμενιστάν</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Αγγλικά</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Σφάλμα κατά τη φόρτωση των λεξικών</translation>
     </message>
@@ -2734,7 +2707,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Σφάλμα στο αρχείο ρυθμίσεων. Συνέχεια με χρήση των προεπιλεγμένων ρυθμίσεων;</translation>
     </message>
@@ -2742,702 +2715,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Favo&amp;rites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Όλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Πίσω</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 λεξικά, %2 άρθρα, %3 λήμματα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Επεξεργασία</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Βοήθεια</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>Έ&amp;ξοδος</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Σφάλμα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Έξοδος εφαρμογής</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Ελαχιστοποίηση στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Αδύνατη η αποθήκευση του άρθρου: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Μεγέθυνση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Λεξικά...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Περί</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Φόρουμ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Εκ&amp;τύπωση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Αποθήκευση άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Αποθήκευση αποτελέσματος ως</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Ελαχιστοποιεί το παράθυρο ως εικονίδιο στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Διάταξη σελίδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Ιστοσελίδα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Νέα έκδοση διαθέσιμη</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Αναζήτηση:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Σμίκρυνση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Εμφάνιση &amp;κύριου παραθύρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Περί GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Λήψη</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Διάταξη σελίδας</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Αναζήτηση σε:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Κανονικό μέγεθος</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Φόρτωση...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(ανώνυμο)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Προτιμήσεις...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Καλώς ήλθατε!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Εκφώνηση λήμματος (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Αποθήκευση άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Παράβλεψη αυτής της έκδοσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Μπροστά</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Εκτύπωση αποτελέσματος</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Δε βρέθηκε εκτυπωτής. Παρακαλώ εγκαταστήστε έναν εκτυπωτή.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Προβολή</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Ιστορικό</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Εκκα&amp;θάριση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Με&amp;γέθυνση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Μεγέθυνση λημμάτων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Σμίκρυνση λημμάτων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Κανονικό μέγεθος λημμάτων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Κλείσιμο τρέχουσας καρτέλας</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Κλείσιμο όλων των καρτελών</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Κλείσιμο όλων των άλλων καρτελών</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Ανοιχτές καρτέλες</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Νέα καρτέλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Φάκελος &amp;ρυθμίσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Γραμμή &amp;μενού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Λεξικά:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Προσθήκη όλων των καρτελών στα αγαπημένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Λίστα ανοιχτών καρτελών</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Αφαίρεση τρέχουσας καρτέλας από τα αγαπημένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Επιλέξατε απόκρυψη μιας γραμμής εργαλείων. Πατήστε %1 για να την επαναφέρετε.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Εμ&amp;φάνιση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>Ε&amp;ξαγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Απόκρυψη</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Εξαγωγή ιστορικού σε αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Αρχεία κειμένου (*.txt);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Ολοκληρώθηκε η εξαγωγή του ιστορικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Σφάλμα εξαγωγής:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Εισαγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Εισαγωγή ιστορικού από αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Σφάλμα εισαγωγής: μη έγκυρα δεδομένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Ολοκληρώθηκε η εισαγωγή του ιστορικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Σφάλμα εισαγωγής:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Εξαγωγή αγαπημένων σε αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML αρχεία (*.xml);;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Η εξαγωγή αγαπημένων ολοκληρώθηκε</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Εξαγωγή Αγαπημένων σε αρχείο ως απλή λίστα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Εισαγωγή αγαπημένων από αρχείο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML αρχεία (*.xml);;Txt αρχεία (*.txt);;;Όλα τα αρχεία (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Η εισαγωγή αγαπημένων ολοκληρώθηκε</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Σφάλμα ανάλυσης δεδομένων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Λεξικό headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Άνοιγμα φακέλου λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Επεξεργασία λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Τώρα ευρετηρίαση για αναζήτηση πλήρους κειμένου: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Αφαίρεση κεφαλίδας &quot;%1&quot; από τα Αγαπημένα?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Στήλη ανα&amp;ζήτησης</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Στήλη περιήγησης αποτελε&amp;σμάτων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Πίνακας Αγαπημένων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Προεπισκόπηση εκτύπωσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Νέα &amp;σάρωση αρχείων</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Νέα καρτέλα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Πάντα στο &amp;προσκήνιο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Πάντα στο προσκήνιο</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Κουμπί μενού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Αναζήτηση στη σελίδα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Αναζήτηση πλήρους κειμένου</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict αναφορά</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Εμφάνιση</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Εξαγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Εισαγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Προσθήκη</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Προσθήκη τρέχουσας καρτέλας στα αγαπημένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Εξαγωγή στη λίστα</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Εμφάνιση &amp;ονομάτων λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Μι&amp;κρά εικονίδια</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Γραμμή &amp;αναζήτησης</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Ενεργοποίηση Σάρωσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Άρθρο, πλήρες (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Άρθρο, μόνο HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Αποθήκευση άρθρου...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Η αποθήκευση του άρθρου ολοκληρώθηκε</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Το κύριο παράθυρο βρίσκεται πάντα στο προσκήνιο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Στήλη &amp;ιστορικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Δεν είναι ενεργοποιημένο το API προσβασιμότητας</translation>
     </message>
@@ -3445,12 +3418,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Το αρχείο λεξικού είναι αλλοιωμένο ή κατεστραμμένο</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Απέτυχε η φόρτωση του άρθρου από το %1. Αιτία: %2</translation>
     </message>
@@ -3458,7 +3431,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Σφάλμα ανάλυσης XML: %1 στο %2,%3</translation>
     </message>
@@ -3474,22 +3447,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Διεύθυνση</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Ενεργή</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Εικονίδιο</translation>
     </message>
@@ -3505,82 +3478,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Μορφή</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Ανενεργά (απενεργοποιημένα) λεξικά:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Όνομα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Σύνολο άρθρων:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Μεταφράζει από:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Μεταφράζει σε:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Σύνολο λημμάτων:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Λίστα λεξικών:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Αρχεία λεξικού:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Πληροφορίες λεξικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Περιγραφή:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ταξινόμηση κατά όνομα</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ταξινόμηση κατά γλώσσα</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Λεξικό headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Ενεργά λεξικά: %1, ανενεργό: %2</translation>
     </message>
@@ -3588,12 +3561,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Διαδρομή</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Υποφάκελοι</translation>
     </message>
@@ -3601,69 +3574,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Εκκίνηση στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Μόνο το αριστερό Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Ενεργοποίηση εικονιδίου περιοχής ειδοποιήσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Διεύθυνση:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Θύρα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Τύπος:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Χρήστης:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Ανα&amp;δυόμενο παράθυρο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ switching to them.</source>
 Αν όμως σημειώσετε αυτή την επιλογή, δε θα εστιάζονται οι νέες καρτέλες.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Χρήση διαμεσολαβητή</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Συντόμευση για αναζήτηση λέξης που βρίσκεται στο πρόχειρο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Πλήκτρο Windows ή Meta (Μενού)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Αυτόματη εκφώνηση λημμάτων στο κύριο παράθυρο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Εκκίνηση μαζί με το σύστημα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Μόνο το αριστερό Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Καρτέλες</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Μόνο το δεξί Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>Ή&amp;χος</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Επιλέξτε το αν θέλετε να χρησιμοποιείτε
 διαμεσολαβητή για όλες τις ανάγκες της εφαρμογής.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Γλώσσα εφαρμογής:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Μόνο το αριστερό Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Άνοιγμα νέων καρτελών στο παρασκήνιο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Δίκτυο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Μόνο το δεξί Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Δεξί Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Αριστερό Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Αυτόματη εκφώνηση λημμάτων στο αναδυόμενο παράθυρο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Άνοιγμα νέων καρτελών δίπλα στην τρέχουσα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Απαιτείται επανεκκίνηση του προγράμματος για να εφαρμοστεί η αλλαγή γλώσσας.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Πλήκτρο Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Περιοδικός έλεγχος για νέες εκδόσεις/ενημερώσεις</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 Στην αντίθετη περίπτωση θα ανοίγουν στο τέλος.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Κλείσιμο στην περιοχή ειδοποιήσεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Συστήματος</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Αν ενεργοποιηθεί, θα εμφανίζεται ένα εικονίδιο στην περιοχή ειδοποιήσεων
 που θα σας παρέχει διάφορες δυνατότητες, π.χ. άνοιγμα κύριου παραθύρου.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,104 +3811,104 @@ GoldenDict. Αν ναι, το πρόγραμμα θα ειδοποιεί το
 χρήστη και θα παραπέμπει στην ιστοσελίδα λήψης.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Εκκίνηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Κωδικός:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Κλασική</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Εφαρμογή</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Αλλαγή γλώσσας</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Πλήκτρο Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Συντόμευση για εμφάνιση/απόκρυψη κύριου παραθύρου:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Αριστερό Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Μόνο το δεξί Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Προτιμήσεις</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Aριστερό Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Δεξί Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Δεξί Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Συντομεύσεις</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Εκκίνηση με το αναδυόμενο παράθυρο ενεργοποιημένο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Αν ενεργοποιηθεί, η εφαρμογή θα εκκινείται απευθείας στην περιοχή ειδοποιήσεων,
 και δε θα εμφανίζεται το κύριο παράθυρο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Πλήκτρο Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Εκκινεί αυτόματα το GoldenDict κατά την εκκίνηση του συστήματος.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Καθορίζει αν θα είναι προεπιλεγμένη η λειτουργία αναδυόμενου παραθύρου.
@@ -3946,37 +3916,37 @@ the program would always start with the scan popup active.</source>
 παράθυρο ενεργοποιημένο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Να μην εμφανίζεται αναδυόμενο παράθυρο όταν η επιλογή ή το πρόχειρο σε ένα από τα GoldenDict&apos;s τα δικά του παράθυρα αλλάζουν</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Παράβλεψη της επιλογής GoldenDict&apos;s και αλλαγές στο πρόχειρο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Αναπαραγωγή αρχείων ήχου μέσω ενσωματωμένης υποστήριξης ήχου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Χρήση εσωτερικού παίκτη:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Επιλέξτε πίσω τέλος ήχου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Εισάγετε γραμμή εντολών προγράμματος αναπαραγωγής ήχου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3986,84 +3956,84 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 προβλήματα με κάποιους ιστοτόπους, δοκιμάστε να το αποεπιλέξετε.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Φραγή περιεχομένου από άλλους ιστοτόπους (εξαφανίζει τις περισσότερες διαφημίσεις)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Προφορά</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Αναπαραγωγή</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Χρήση εξωτερικού προγράμματος:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Μετάφραση λέξεων με διπλό κλικ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Χρήση οποιουδήποτε εξωτερικού προγράμματος για την αναπαραγωγή αρχείων ήχου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Κανονικά, όταν πατάτε ESC, ενεργοποιείται το πεδίο αναζήτησης. 
 Αντιθέτως, με αυτή την επιλογή το ESC κρύβει το κύριο παράθυρο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Απόκρυψη κύριου παραθύρου με ESC</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Απόκρυψη μοναδικής καρτέλας</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Προσαρμόστε αυτήν την τιμή για να μειώσετε το μέγεθος του μενού περιεχομένου.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Αριθμός λεξικών μενού περιεχομένου:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Εμφάνιση της μετάφρασης στο κύριο παράθυρο αντί για το αναδυόμενο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Εμφάνιση μετάφρασης στο κύριο παράθυρο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Εμφάνιση παραθύρου σημαίας πριν εμφανιστεί το αναδυόμενο παράθυρο, κάντε κλικ στην σημαία για να εμφανίσετε αναδυόμενο παράθυρο. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4074,159 +4044,159 @@ however, the article from the topmost dictionary is shown.</source>
 ωστόσο, εμφανίζεται το άρθρο από το πιο πάνω λεξικό.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Αυτόματη κύλιση στο στόχο του άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Γραμματοσειρά Λεξικού: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>όρισε την εφεδρική γραμματοσειρά για το λεξικό</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Στυλ εμφάνισης άρθρου:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Στρίψτε την διεπαφή στο σκοτάδι.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Σκοτεινή Λειτουργία</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Γυρίστε το στυλ εμφάνισης του άρθρου στο σκοτάδι.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Σκοτεινή Λειτουργία Ανάγνωσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Σειρά MRU: Πιο πρόσφατα χρησιμοποιημένη διαταγή.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Παρακολούθηση clipboard αλλαγές όταν η σάρωση είναι ενεργοποιημένη. Ειδοποίηση! Θα πρέπει πάντα να το ενεργοποιήσετε εκτός αν είστε στο Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Αλλαγή πρόχειρου ίχνους</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Αλλαγή επιλογής κομματιού</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Επιλογή μόνο όταν όλα τα επιλεγμένα πλήκτρα διατηρούνται πατημένα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Εμφάνιση σημαίας σάρωσης όταν είναι επιλεγμένη η λέξη</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Χρόνος καθυστέρησης</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Διαμεσολαβητής συστήματος</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Προσαρμοσμένος διαμεσολαβητής</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Προσαρμοσμένες ρυθμίσεις</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Σύνδεση Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Τράπουλα:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Μοντέλο:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Λέξη</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Πεδίο λεξιλογίου...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Κείμενο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Πεδίο ορισμού...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Πρόταση</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Πεδίο πρότασης (μπορεί να είναι κενό)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Μη ταυτοποίηση του GoldenDict στις κεφαλίδες HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Μέγιστο μέγεθος προσωρινής μνήμης δικτύου:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4235,285 +4205,327 @@ If set to 0 the network disk cache will be disabled.</source>
 Εάν οριστεί στο 0, η μνήμη cache στο δίσκο δικτύου θα απενεργοποιηθεί.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Όταν αυτή η επιλογή είναι ενεργοποιημένη, το GoldenDict
 καθαρίζει την προσωρινή μνήμη δικτύου από το δίσκο κατά την έξοδο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Εκκαθάριση προσωρινής μνήμης δικτύου κατά την έξοδο</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Αναζήτηση πλήρους κειμένου</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Να επιτρέπεται η αναζήτηση πλήρους κειμένου για:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Don&apos;t αναζήτηση σε λεξικά που περιέχουν περισσότερα από</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>άρθρα (0 - απεριόριστο)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Για &amp;προχωρημένους</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Κατά τη διάρκεια διαδοχικών αναζητήσεων, αν ένα λεξικό καταρρεύσει με το χέρι, θα παραμείνει καταρρέει στην επόμενη αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Σύμπτυξη συνεδρίας</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Όταν χρησιμοποιείτε το πρόχειρο, λουρίδα τα πάντα μετά από newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>Σε μια νέα αναζήτηση, εστιάστε το κύριο ή αναδυόμενο παράθυρο ακόμα κι αν είναι ορατό&apos;s</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Αγαπημένα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Αγαπημένα διάστημα αποθήκευσης. Αν οριστεί στα 0 Αγαπημένα θα αποθηκευτεί μόνο κατά την έξοδο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Ενεργοποιήστε αυτήν την επιλογή για να επιβεβαιώσετε κάθε λειτουργία διαγραφής στοιχείων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Επιβεβαίωση για διαγραφή στοιχείων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Ενεργοποιήστε αυτήν την επιλογή για να αγνοήσετε το παράλογα μεγάλο κείμενο εισόδου
 από το ποντίκι, την επιλογή, το πρόχειρο ή τη γραμμή εντολών</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Παράβλεψη φράσεων εισόδου μεγαλύτερο από</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Εισαγωγή φράσεων μεγαλύτερες από αυτό το μέγεθος θα αγνοηθεί</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Ενεργοποιήστε αυτήν την επιλογή για να αγνοήσετε τη διακριτική κατά την αναζήτηση άρθρων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Παράβλεψη διακριτικών κατά την αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Αν ενεργοποιηθεί, θα εμφανίζονται πάντα τα προαιρετικά τμήματα των άρθρων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Εμφάνιση &amp;προαιρετικών τμημάτων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Αν σημειώσετε αυτήν την επιλογή, τα μεγάλα άρθρα θα αποκρύπτονται αυτόματα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Απόκρυψη άρθρων με περισσότερα από</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Αποκρύψη των άρθρων που υπερβαίνουν αυτό το μέγεθος</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Αγνόηση στίξης κατά την αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Ενεργοποιήστε αυτή την επιλογή για να ενεργοποιήσετε την αναζήτηση επιπλέον άρθρων μέσω λιστών συνώνυμου
 από τα λεξικά Stardict, Babylon και GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Επιπλέον αναζήτηση μέσω συνώνυμων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>σύμβολα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Το Ctrl-Tab εμφανίζει τις πιο πρόσφατες καρτέλες</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Βαβυλώνα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Ιστορικό</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Αν ενεργοποιηθεί, θα αποθηκεύεται το ιστορικό των μεταφρασμένων λέξεων</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Αποθήκευση &amp;ιστορικού</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Άρθρα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Αν ενεργοποιηθεί, θα επιλέγετε λέξεις με μονό κλικ πάνω τους</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Επιλογή λέξεων με μονό κλικ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Στιλ πρόσθετων:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Ορίστε το μέγιστο αριθμό λημμάτων που θα αποθηκεύονται στο ιστορικό.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Μέγιστο μέγεθος ιστορικού:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Συχνότητα αποθήκευσης ιστορικού. Αν χρησιμοποιήσετε 0, 
 το ιστορικό θα αποθηκεύεται μόνο κατά την έξοδο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Αποθήκευση κάθε</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>λεπτά</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Κλασικό</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Μοντέρνα</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Μπίνγκο-μπλε</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Απαιτούνται πληροφορίες θέσης για τη χρήση της αναζήτησης φράσης του Xapian και του τελεστή NEAR, αλλά το μέγεθος της βάσης δεδομένων θα είναι πολύ μεγαλύτερο. Ισχύει μόνο για νέα εισερχόμενα λεξικά.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Ενεργοποίηση ευρετηρίου με πληροφορίες θέσης</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Τυπική γραμματοσειρά</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Γραμματοσειρά Monospace</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Γραμματοσειρά Serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Γραμματοσειρά Sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Εμφάνιση</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Αυτές οι γραμματοσειρές θα εφαρμοστούν όταν δεν βρεθούν οι γραμματοσειρές που καθορίζονται από ένα λεξικό.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Εναλλακτικές γραμματοσειρές</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Ήχος</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Απλό κείμενο</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Ανάλογα με την επέκταση</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Άγνωστο</translation>
     </message>
@@ -4521,17 +4533,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Δεν ορίστηκε όνομα προγράμματος.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Το πρόγραμμα κατέρρευσε.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Το πρόγραμμα επέστρεψε κωδικό εξόδου %1.</translation>
     </message>
@@ -4539,27 +4551,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Ενεργό</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Τύπος</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Γραμμή εντολών</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Εικονίδιο</translation>
     </message>
@@ -4567,99 +4579,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Σφάλμα φόρτωσης άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Σφάλμα αποκωδικοποίησης άρθρου</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Πνευματική ιδιοκτησία: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Έκδοση: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Συγγραφέας: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Τίτλος: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Ιστοσελίδα: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Ημερομηνία: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Ένα πρόγραμμα αναζήτησης λεξικού.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Λέξη ή πρόταση για ερώτηση.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Αποθήκευση μηνυμάτων αποσφαλμάτωσης στο gd_log.txt στο φάκελο ρυθμίσεων.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Επαναφορά κατάστασης παραθύρου.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Απενεργοποιήστε το tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Αλλαγή της ομάδας του κύριου παραθύρου.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Αλλαγή της ομάδας των αναδυόμενων παραθύρων.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Εναλλαγή αναδυόμενου παραθύρου σάρωσης.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Εκτυπωμένη έκδοση και πληροφορίες διάγνωσης.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Εύρεση λεξικού/φίλτρο (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Εκκαθάριση αναζήτησης</translation>
     </message>
@@ -4667,22 +4694,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ΣΦΑΛΜΑ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Σφάλμα αποθήκευσης:</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Απέτυχε η λήψη του ζητούμενου πόρου.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ΠΡΟΣΟΧΗ: %1</translation>
     </message>
@@ -4711,67 +4738,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Διάλογος</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Εκφώνηση λήμματος (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Προσθήκη λέξης στα αγαπημένα (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Εμφάνιση ή απόκρυψη της γραμμής λεξικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Να παραμένει πάντα στην κορυφή όλων των άλλων παραθύρων</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Εμφάνιση στο κύριο παράθυρο (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Πίσω</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Μπροστά</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4783,7 +4815,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4793,7 +4825,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4814,17 +4846,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Διαδρομή</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Εικονίδιο</translation>
     </message>
@@ -4832,60 +4864,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Αρχεία</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Μέθοδοι:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Βικιπαίδεια</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Ιαπωνικοί χαρακτήρες Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Δημιουργήστε λεξικά χρησιμοποιώντας ομάδες αρχείων ήχου, προσθέτοντας τις διαδρομές τους εδώ:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ιαπωνικά Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4896,84 +4928,84 @@ Not implemented yet in GoldenDict.</source>
 Δεν υποστηρίζεται ακόμη από το GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Ιστοσελίδες τύπου Βικιπαίδειας (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Φάκελοι ήχων</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Οποιαδήποτε εξωτερικά προγράμματα. Μια συμβολοσειρά %GDWORD% θα αντικατασταθεί με τη λέξη ερωτήματος. Μια συμβολοσειρά %GDSEARCH% θα αντικατασταθεί με το κείμενο στη γραμμή αναζήτησης. Εάν και οι δύο παράμετροι δεν παρέχονται, η κεφαλίδα θα τροφοδοτηθεί με την τυπική είσοδο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Προτάσεις που προωθούνται από &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, μια συνεργατική βιβλιοθήκη γλωσσικών μέσων της Wikimedia Γαλλίας. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Ενεργοποίηση Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Κωδικός γλώσσας ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Η χρήση του Forvo απαιτεί αυτή τη στιγμή ένα κλειδί API, εγγραφείτε στην ιστοσελίδα για να πάρετε το δικό σας κλειδί.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Αποκτήστε το δικό σας κλειδί &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;εδώ&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Η πιο διαδεδομένη μέθοδος μεταγραφής Ιαπωνικών,
 βασισμένη στην αγγλική φωνολογία</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Ιαπωνικοί χαρακτήρες Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Προσαρμοσμένη μεταγραφή</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Αυτό εφαρμόζεται μόνο στη φράση αναζήτησης, με κάθε γραμμή να αντιπροσωπεύει μια μεταγραφή, ερωτηματικό διαχωρισμένο. Για παράδειγμα, ae;æ, οι χρήστες μπορούν να εισάγουν ae για να αντιπροσωπεύουν το æ στη λέξη-στόχο.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #αυτό είναι ένα παράδειγμα</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Μεταγραφή</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4984,118 +5016,108 @@ Not implemented yet in GoldenDict.</source>
 Δεν υποστηρίζεται ακόμη από το GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Ρωσικά</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Μορφολογία</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>Αλλα&amp;γή...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Παραδείγματα:  &amp;quot;eng&amp;quot; για τα αγγλικά, &amp;quot;fra&amp;quot; για τα γαλλικά &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Η πλήρης λίστα των διαθέσιμων γλωσσών βρίσκεται &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; εδώ &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Φάκελος με λεξικά Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Νέα &amp;σάρωση</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Γερμανικά</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Προσθέστε οποιαδήποτε ιστοσελίδα. Οι χαρακτήρες %GDWORD% αντικαθίστανται από τη ζητούμενη λέξη:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>Προσ&amp;θήκη...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Επιλογή φακέλου</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>Α&amp;φαίρεση</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Ιστοσελίδες</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Διαδρομές αναζήτησης αρχείων λεξικών:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Επιβεβαίωση αφαίρεσης</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Χαρακτήρες:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Διαθέσιμες μορφολογίες:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Επιτρέπει τη χρήση του Λατινικού αλφαβήτου για τη μεταγραφή Ιαπωνικών</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ of the appropriate groups to use them.</source>
 μορφολογίας στο τέλος κάθε ομάδας λεξικών.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Διακομιστές DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Διακομιστές DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Ενεργοποίηση προφορών από το Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Κλειδί API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Κωδικοί γλωσσών (χωρισμένοι με κόμματα):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Ελληνικά</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(μη διαθέσιμο στη φορητή έκδοση)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Προγράμματα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Λευκορωσικά</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Εκφώνηση κειμένου</translation>
     </message>
@@ -5212,42 +5234,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Επιλεγμένες μηχανές εκφώνησης:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>Προσ&amp;θήκη</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Α&amp;φαίρεση</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Προεπισκόπηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Διαθέσιμες μηχανές εκφώνησης:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Κείμενο προεπισκόπησης:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Εδώ προσθέτετε το κείμενο που θα εκφωνηθεί στην προεπισκόπηση.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Προεπισκόπηση</translation>
     </message>
@@ -5272,17 +5294,17 @@ of the appropriate groups to use them.</source>
       <translation>Δε βρέθηκαν διαθέσιμες φωνές TTS.&lt;br&gt;Βεβαιωθείτε ότι έχετε εγκαταστήσει μία τουλάχιστον μηχανή TTS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Προτιμήσεις</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Ένταση:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Ταχύτητα:</translation>
     </message>
@@ -5290,12 +5312,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Εισάγετε λέξη ή φράση για να ξεκινήσετε την αναζήτηση</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Λίστα</translation>
     </message>
@@ -5326,33 +5348,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Όνομα</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Διεύθυνση</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Ενεργή</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Εισαγωγή άρθρου ως σύνδεσμος μέσα στην ετικέτα &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Ως σύνδεσμος</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Εικονίδιο</translation>
     </message>
@@ -5360,17 +5382,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Απέτυχε η αναζήτηση σε ορισμένα λεξικά.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ΠΡΟΣΟΧΗ: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/eo_UY.ts b/locale/eo_UY.ts
index 7d409445..4a5428af 100644
--- a/locale/eo_UY.ts
+++ b/locale/eo_UY.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Pri</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>La vortaro-programo GoldenDict, versio </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Disponebla laŭ la permesilo GNU GPLv3 kaj poste</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Kopiu informoj pri versio</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Kopii liston de vortaroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Kontribuantoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Nekonata]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Bazita sur Qt %1 (%2, %3-bita)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Surbaze de Qt %1 (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: ne povas fari karton sen vorto</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki-serĉo: AnkiConnect ne estas ebligita.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: post al anki malsukcesis</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: post al anki sukceso</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Inspekti</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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">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.</translation>
+      <translation>Tiam simple haltigu la kursoron super la vorto, kiun vi volas serĉi en alia aplikaĵo, kaj aperos fenestro, kiu priskribus ĝin al vi.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;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. </translation>
+      <translation>&lt;h3 align=&quot;center&quot;&gt;Laborante kun la ŝprucfenestro&lt;/h3&gt;Por serĉi vortojn de aliaj aktivaj aplikaĵoj, vi devus unue aktivigi la &lt;i&gt;&quot;Skani ŝprucfenestron&quot;&lt;/i&gt; en &lt;b&gt;Preferoj&lt;/b&gt;, kaj tiam ebligu ĝin iam ajn aŭ per ekfunkciigo de la &apos;Popup&apos; piktogramo supre, aŭ alklakante la pletikonon sube per via dekstra musbutono kaj elektante tion en la menuo, kiun vi aperis.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Etendi artikolon</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Maletendi artikolon</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Neniu traduko por &lt;b&gt;%1&lt;/b&gt; estis trovita en grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
-      <translation type="unfinished">Working with popup</translation>
+      <translation>Laborante kun ŝprucfenestro</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sentitola)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Bonvenon!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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">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.</translation>
+      <translation>Tiam simple elektu iun ajn vorton, kiun vi volas serĉi en alia aplikaĵo per via muso (duoble alklaku ĝin aŭ glitu ĝin per muso kun la butono premita), kaj aperos fenestro, kiu priskribus la vorton al vi.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Neniu traduko estis trovita en grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
-      <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</translation>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Neniu traduko por &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; estis trovita en grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="293"/>
+      <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;Bonvenon al &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Por komenci labori kun la programo, unue vizitu &lt;b&gt;Redaktu|Vortarojn&lt;/ b&gt; aldoni kelkajn dosierujojn kie serĉi la vortarajn dosierojn, agordi diversajn Vikipediajn retejojn aŭ aliajn fontojn, ĝustigi vortaran ordon aŭ krei vortarajn grupojn.&lt;p&gt;Kaj poste vi pretas serĉi viajn vortojn! Vi povas fari tion en ĉi tiu fenestro uzante panelon maldekstre, aŭ vi povas &lt;a href=&quot;Laborante kun ŝprucfenestro&quot;&gt;serĉi vortojn de aliaj aktivaj aplikaĵoj&lt;/a&gt;. &lt;p&gt;Por personecigi programon, kontrolu la disponeblajn preferojn ĉe &lt;b&gt;Redaktu|Preferoj&lt;/b&gt;. Ĉiuj agordoj tie havas konsiletojn, nepre legu ilin se vi dubas pri io ajn.&lt;p&gt;Se vi bezonas plian helpon, havas demandojn, sugestojn aŭ simple scivolas, kion pensas la aliaj, vi estas bonvena ĉe la programo &lt; a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forumo&lt;/a&gt;.&lt;p&gt;Kontrolu la &lt;a href=&quot; de programo https://github.com/xiaoyifang/ goldendict&quot;&gt;retejo&lt;/a&gt; por la ĝisdatigoj. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licencite laŭ GPLv3 aŭ poste.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(bildo)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Etendi artikolon</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>El </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Maletendi artikolon</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Faru novan Anki-noton</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Informpeta eraro: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Proksimaj vortoj: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Kompundaj esprimoj: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Apartaj vortoj: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
-      <translation type="unfinished">Failed to create temporary file.</translation>
+      <translation>Malsukcesis krei provizoran dosieron.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
-      <translation type="unfinished">&amp;Look up &quot;%1&quot;</translation>
+      <translation>&amp;Serĉu &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
-      <translation type="unfinished">Look up &quot;%1&quot; in &amp;New Tab</translation>
+      <translation>Kontrolu &quot;%1&quot; en &amp;Nova Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
-      <translation type="unfinished">The referenced resource doesn&apos;t exist.</translation>
+      <translation>La referencita rimedo ne ekzistas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
-      <translation type="unfinished">Failed to auto-open resource file, try opening manually: %1.</translation>
+      <translation>Malsukcesis aŭtomate malfermi rimedan dosieron, provu malfermi permane: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
-      <translation type="unfinished">Look up &quot;%1&quot; in %2</translation>
+      <translation>Kontrolu &quot;%1&quot; en %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Elekti aktualan artikolon</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopii kiel teksto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspekti</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
-      <translation type="unfinished">Look up &quot;%1&quot; in %2 in &amp;New Tab</translation>
+      <translation>Kontrolu &quot;%1&quot; en %2 en &amp;Nova langeto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Malfermi ligilon en nova &amp;tabo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Malfermi ligilon en &amp;ekstera retumilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Risurco</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Aŭdio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Parolsintezo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Bildo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
-      <translation type="unfinished">Video</translation>
+      <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
-      <translation type="unfinished">Video: %1</translation>
+      <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Difino el vortaro &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Difino: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
-      <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
+      <translation>La referencita sonprogramo ne ekzistas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Malfermu&amp;en Ligon</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Konservi &amp;Legosignon &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>AVERTO: Aŭdludilo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ERARO: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
-      <translation type="unfinished">Save sound</translation>
+      <translation>Konservu sonon</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Konservi bildon</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Bildodosieroj (*.bmp *.jpg *.png *.tif);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Konservi &amp;bildon...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Frazo ne trovita</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 el %2 matĉoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Konservi s&amp;onon...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
-      <translation type="unfinished">Send &quot;%1&quot; to input line</translation>
+      <translation>Sendu &quot;%1&quot; al eniga linio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
-      <translation type="unfinished">&amp;Add &quot;%1&quot; to history</translation>
+      <translation>&amp;Aldonu &quot;%1&quot; al historio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Sendu Nunan Artikolon al Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Sendu elektitan tekston al Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Sondosieroj (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Malsukcesis ludi sondosieron: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Krei Anki-noton</translation>
     </message>
   </context>
   <context>
@@ -396,111 +391,111 @@
     <message>
       <location filename="../src/dict/belarusiantranslit.cc" line="417"/>
       <source>Belarusian transliteration from latin to cyrillic (classic orthography)</source>
-      <translation type="unfinished">Belarusian transliteration from latin to cyrillic (classic orthography)</translation>
+      <translation>Belarusian transliterumo de la latina ĝis cirila (klasika ortografio)</translation>
     </message>
     <message>
       <location filename="../src/dict/belarusiantranslit.cc" line="420"/>
       <source>Belarusian transliteration from latin to cyrillic (school orthography)</source>
-      <translation type="unfinished">Belarusian transliteration from latin to cyrillic (school orthography)</translation>
+      <translation>Belarusian transliterumo de la latina ĝis cirila (lerneja ortografio)</translation>
     </message>
     <message>
       <location filename="../src/dict/belarusiantranslit.cc" line="423"/>
       <source>Belarusian transliteration (smoothes out the difference
 between classic and school orthography in cyrillic)</source>
-      <translation type="unfinished">Belarusian transliteration (smoothes out the difference
-between classic and school orthography in cyrillic)</translation>
+      <translation>Belarusian transliterumo (glatigas la diferencon
+inter klasika kaj lerneja ortografio en cirila)</translation>
     </message>
   </context>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Ĉina Konvertiĝo</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Ebligu konvertiĝon inter simpligitaj kaj tradiciaj ĉinaj signoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Ĉina Konvertiĝo</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Ebligu konvertiĝon de simpligitaj signoj al tradiciaj (tajvana varianto) signoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC al TC (Tajvana variaĵo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Ebligu konvertiĝon de simpligitaj signoj al tradiciaj (Honkonga varianto) signoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC al TC (Honkonga variaĵo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Ebligu konvertiĝon de tradiciaj signoj al simpligitaj signoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC al SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Simpligita al tradicia ĉina (tajvana varianto) konvertiĝo</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Simpligita al tradicia ĉina (Honkonga varianto) konvertiĝo</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Tradicia al simpligita ĉina konvertiĝo</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>kutima transliterumo</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>Prokura aŭtentikigo bezonata</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>Vi devas provizi Uzantnomon kaj Pasvorton por aliri per prokurilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Uzantnomo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Pasvorto:</translation>
     </message>
@@ -508,24 +503,24 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formularo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Grupon bildsimbolo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Fulmoklavo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Dosierujo de ŝatataj:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -540,7 +535,7 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="96"/>
       <source>Choose a file to use as group icon</source>
-      <translation type="unfinished">Choose a file to use as group icon</translation>
+      <translation>Elektu dosieron por uzi kiel grupikono</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="98"/>
@@ -548,81 +543,81 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Bildoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Ĉiuj dosieroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Eraro</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
-      <translation type="unfinished">Can&apos;t read the specified image file.</translation>
+      <translation>Ne povas legi la specifitan bilddosieron.</translation>
     </message>
   </context>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Konfirmo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on language pairs?</translation>
+      <translation>Ĉu vi certas, ke vi volas generi aron da grupoj bazitaj sur lingvoparoj?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Ĉu vi certas, ke vi volas generi aron da grupoj bazitaj sur metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
-      <translation type="unfinished">Combine groups by source language to &quot;%1-&gt;&quot;</translation>
+      <translation>Kombinu grupojn laŭ fontlingvo al &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
-      <translation type="unfinished">Combine groups by target language to &quot;-&gt;%1&quot;</translation>
+      <translation>Kombinu grupojn laŭ cellingvo al &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Aŭtomata grupo laŭ dosierujo malsukcesis.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>La gepatra dosierujo de %1 ne povas esti atingita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Ĉu vi certas, ke vi volas generi aron da grupoj bazitaj sur enhavado de dosierujoj?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
-      <translation type="unfinished">Make two-side translate group &quot;%1-%2-%1&quot;</translation>
+      <translation>Faru duflankan tradukgrupon &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
-      <translation type="unfinished">Combine groups with &quot;%1&quot;</translation>
+      <translation>Kombinu grupojn kun &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Vortaroj: </translation>
     </message>
@@ -635,201 +630,211 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Serĉreĝimo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>Ĉi tiu elemento determinas kiel filtrila ĉeno estos interpretita</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>Se markita sur la simboloj kazo estos konsiderata kiam filtrado</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Atenti usklecon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>Eksportas kapvortojn al dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Eksporto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Helpo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>bone</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>Premu ĉi tiun butonon por apliki filtrilon al kapvortoj listo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Apliki</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>Se markite iujn ajn filtrilŝanĝojn, ni tuj aplikiĝos al kapvortoj listo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>Aŭtomate apliki</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtrilo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
+      <translation>Filtrila ĉeno (fiksa ĉeno, ĵokeroj aŭ regula esprimo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Teksto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Ĵokeroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegEsp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Ŝarĝante kapvortojn...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>Unika kapvortoj entute: %1, filtritaj: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>Konservu kapvortojn al dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstaj dosieroj (*.txt);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Ne povas malfermi eksportitan dosieron</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>Eksportu kapvortojn...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Rezigni</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Eksporta procezo estas interrompita</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Eksporto finiĝis</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Tuta artikoloj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduki el:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Tuta vortoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduki en:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Malfermi dosierujon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Redakti vortaron</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
-      <translation type="unfinished">Files comprising this dictionary:</translation>
+      <translation>Dosieroj kun ĉi tiu vortaro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Priskribo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>Montru ĉiujn unikajn vortarajn kapvortojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>Kapvortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
-      <translation type="unfinished">Edit the dictionary via command:
+      <translation>Redaktu la vortaron per komando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Indeksa dosiernomo:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Malfermu indeksan dosierujon</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 artikoloj</translation>
     </message>
@@ -849,142 +854,142 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>Serĉaj strategioj: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>Servilaj datumbazoj</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Ŝaltita</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adreso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Datumbazoj</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategioj</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Bildsimbolo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>Listo de komoj limigitaj de datumbazoj
+(malplena ĉeno aŭ &quot;*&quot; kongruas kun ĉiuj datumbazoj)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>Kom-limigita listo de serĉstrategioj
+(malplena ĉeno signifas &quot;prefikso&quot; strategio)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
-      <translation type="unfinished">Extended menu with all dictionaries...</translation>
+      <translation>Plilongigita menuo kun ĉiuj vortaroj...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
-      <translation type="unfinished">Edit this group</translation>
+      <translation>Redaktu ĉi tiun grupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
-      <translation type="unfinished">Dictionary info</translation>
+      <translation>Vortaraj informoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Vortaraj kapvortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
-      <translation type="unfinished">Open dictionary folder</translation>
+      <translation>Malfermu vortaran dosierujon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Redakti vortaron</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
-      <translation type="unfinished">&amp;Dictionary Bar</translation>
+      <translation>&amp;Vortaro Bar</translation>
     </message>
   </context>
   <context>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Vortaroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Vortaroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Akcepti</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Rezigni</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
-      <translation type="unfinished">Sources changed</translation>
+      <translation>Fontoj ŝanĝiĝis</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="44"/>
       <source>&amp;Sources</source>
-      <translation type="unfinished">&amp;Sources</translation>
+      <translation>&amp;Fontoj</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
-      <translation type="unfinished">Some sources were changed. Would you like to accept the changes?</translation>
+      <translation>Kelkaj fontoj estis ŝanĝitaj. Ĉu vi ŝatus akcepti la ŝanĝojn?</translation>
     </message>
   </context>
   <context>
@@ -992,12 +997,12 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Antaŭa Paĝo</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Sekva Paĝo</translation>
     </message>
   </context>
   <context>
@@ -1005,91 +1010,71 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/externalviewer.cc" line="51"/>
       <source>the viewer program name is empty</source>
-      <translation type="unfinished">the viewer program name is empty</translation>
+      <translation>la nomo de la programo de spektanto estas malplena</translation>
     </message>
   </context>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Plenteksta serĉo</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Plata teksto</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Ĵokeroj</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegEsp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>La demanda vorto ne povas esti malplena.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>subtenas xapian serĉsintakso, kiel KAJ AŬ +/- ktp</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Defaŭlte</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>Trovitaj artikoloj: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>Nun indeksante: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Nenio</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>Neniuj vortaroj por plenteksta serĉo</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Eraro en favorataj dosiero</translation>
     </message>
   </context>
   <context>
@@ -1097,27 +1082,27 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="31"/>
       <source>&amp;Delete Selected</source>
-      <translation type="unfinished">&amp;Delete Selected</translation>
+      <translation>&amp;Forigi Elektitajn</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="39"/>
       <source>Copy Selected</source>
-      <translation type="unfinished">Copy Selected</translation>
+      <translation>Kopiu Elektita</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Aldonu dosierujon</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Plej ŝatataj:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Ĉiuj elektitaj eroj estos forigitaj. Ĉu daŭrigi?</translation>
     </message>
   </context>
   <context>
@@ -1135,7 +1120,7 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/dict/forvo.cc" line="267"/>
       <source>by</source>
-      <translation type="unfinished">by</translation>
+      <translation>de</translation>
     </message>
     <message>
       <location filename="../src/dict/forvo.cc" line="271"/>
@@ -1153,9 +1138,9 @@ between classic and school orthography in cyrillic)</translation>
       <translation>el</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
-      <translation type="unfinished">Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</translation>
+      <translation>Iru al Redaktu|Vortaroj|Fontoj|Forvo kaj petu nian propran API-ŝlosilon por malaperi ĉi tiun eraron.</translation>
     </message>
   </context>
   <context>
@@ -1163,79 +1148,63 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Antaŭa</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Sekva</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Serĉi</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Atenti usklecon</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Reĝimo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>Trovitaj artikoloj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>Disponeblaj vortaroj en grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>Atendu indekson:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Helpo</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>Totalo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indeksita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>Nun indeksado: Neniu</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Rezigni</translation>
     </message>
@@ -1267,49 +1236,49 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Langeto 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
       <source>Are you sure you want to remove all the groups?</source>
-      <translation type="unfinished">Are you sure you want to remove all the groups?</translation>
+      <translation>Ĉu vi certas, ke vi volas forigi ĉiujn grupojn?</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="161"/>
       <source>Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</source>
-      <translation type="unfinished">Are you sure you want to remove the group &lt;b&gt;%1&lt;/b&gt;?</translation>
+      <translation>Ĉu vi certas, ke vi volas forigi la grupon &lt;b&gt;%1&lt;/b&gt;?</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="29"/>
       <source>Group tabs</source>
-      <translation type="unfinished">Group tabs</translation>
+      <translation>Grupo langetoj</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>Malfermu liston de grupoj</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1324,15 +1293,15 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/groups.cc" line="149"/>
       <source>Give a new name for the group:</source>
-      <translation type="unfinished">Give a new name for the group:</translation>
+      <translation>Donu novan nomon por la grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
-      <translation type="unfinished">Dictionaries available:</translation>
+      <translation>Disponeblaj vortaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Aldoni grupon</translation>
     </message>
@@ -1342,90 +1311,90 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Aldoni grupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
-      <translation type="unfinished">Create new dictionary group</translation>
+      <translation>Krei novan vortaran grupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Grupo laŭ Lingvoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Krei dosierujo-bazitajn grupojn.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Grupo per Dosierujoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Grupo per Metadatumoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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">Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</translation>
+      <translation>Trenu kaj faligi vortarojn al kaj de la grupoj, movu ilin enen de la grupoj, reordigu la grupojn per via muso.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
-      <translation type="unfinished">Rename current dictionary group</translation>
+      <translation>Alinomi nunan vortargrupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
-      <translation type="unfinished">Remove current dictionary group</translation>
+      <translation>Forigi nunan vortaran grupon</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="114"/>
       <source>Give a name for the new group:</source>
-      <translation type="unfinished">Give a name for the new group:</translation>
+      <translation>Donu nomon por la nova grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Forigi ĉiujn grupojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
-      <translation type="unfinished">Remove selected dictionaries from group (Del)</translation>
+      <translation>Forigi elektitajn vortarojn el grupo (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
-      <translation type="unfinished">Add selected dictionaries to group (Ins)</translation>
+      <translation>Aldonu elektitajn vortarojn al grupo (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Forigi grupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nomi grupon</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
-      <translation type="unfinished">Remove all dictionary groups</translation>
+      <translation>Forigu ĉiujn vortarajn grupojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
-      <translation type="unfinished">Create language-based groups</translation>
+      <translation>Kreu lingvajn grupojn</translation>
     </message>
   </context>
   <context>
@@ -1433,12 +1402,12 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/historypanewidget.cc" line="22"/>
       <source>&amp;Delete Selected</source>
-      <translation type="unfinished">&amp;Delete Selected</translation>
+      <translation>&amp;Forigi Elektitajn</translation>
     </message>
     <message>
       <location filename="../src/ui/historypanewidget.cc" line="30"/>
       <source>Copy Selected</source>
-      <translation type="unfinished">Copy Selected</translation>
+      <translation>Kopiu Elektita</translation>
     </message>
     <message>
       <location filename="../src/ui/historypanewidget.cc" line="46"/>
@@ -1446,25 +1415,25 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Historio:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
-      <translation type="unfinished">History size: %1 entries out of maximum %2</translation>
+      <translation>Historia grandeco: %1 enskriboj el maksimumo %2</translation>
     </message>
   </context>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
-      <translation type="unfinished">Spelling suggestions: </translation>
+      <translation>Literumaj sugestoj: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologio</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Ŝaltita</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksado: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nomo de vortaro</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
-      <translation type="unfinished">GoldenDict-ng - Initializing</translation>
+      <translation>GoldenDict-ng - Inicialigo</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation type="unfinished">Please wait while indexing dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Atendu...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indeksante...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Evea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
-      <translation type="unfinished">Ido</translation>
+      <translation>Mi faras</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laŭa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Tvia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Kria</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Palia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Taja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urduo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Ĉeĥa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Nederlanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
-      <translation type="unfinished">Ganda</translation>
+      <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Greka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Haŭsa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Kmera</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Konga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malaja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maoria</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Naura</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Odia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oroma</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sangoa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Ŝona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Taĝika</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamila</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Svazia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tongana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
-      <translation type="unfinished">Venda</translation>
+      <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Kimra</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Volofa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Kosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Itala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Romanĉa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzonka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
-      <translation type="unfinished">Kannada</translation>
+      <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
-      <translation type="unfinished">North Ndebele</translation>
+      <translation>Norda Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abĥaza</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgiza</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Burunda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Skotgaela</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Latva</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
-      <translation type="unfinished">Lingala</translation>
+      <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Malta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Araba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Eŭska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Ajmara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sunda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Mahla</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
-      <translation type="unfinished">Luba-Katanga</translation>
+      <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiĝia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Hungara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Franca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Germana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongola</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebrea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herera</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luksemburga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanura</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazaĥa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Korea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navaha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
+      <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Aniŝinabeka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Paŝtoa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Pola</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Okcitana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sinda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Conga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Cvana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ujgura</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbokroata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Joruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Ĝŭanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonezia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panĝaba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sota</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsika</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovena</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Okcidentfrisa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malagasa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galega</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerbajĝana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amhara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukraina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
-      <translation type="unfinished">Bambara</translation>
+      <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Gronlanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Baŝkira</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Belorusa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kaŝmira</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sarda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hirimotua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Keĉua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Java</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avesta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Ruanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikansa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
-      <translation type="unfinished">Bislama</translation>
+      <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armena</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingvao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Okcidentalo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Kataluna</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birma</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Rusa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norvega</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Ĉeĉena</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Ĉina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Ĉuvaŝa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
-      <translation type="unfinished">Sinhala</translation>
+      <translation>Sinhala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Hispana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Kornvala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagaloga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Oseta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Svahila</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sveda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibeta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vjetnama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Makedona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmena</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Guĝarata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktituta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Angla</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Kartvela</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Slavona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finna</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapuko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kuanjama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marŝala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Nord-samea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitia kreola</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Ĉamora</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Gvarania</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Suda Ndebela</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Njanĝa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litova</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Siĉuana jia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigraja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jida</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Tradicia ĉina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Simpligita ĉina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Alia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
-      <translation type="unfinished">Other Simplified Chinese dialects</translation>
+      <translation>Aliaj simpligitaj ĉinaj dialektoj</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="441"/>
+      <source>Other Traditional Chinese dialects</source>
+      <translation>Aliaj tradiciaj ĉinaj dialektoj</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="442"/>
+      <source>Other Eastern-European languages</source>
+      <translation>Aliaj orienteŭropaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="443"/>
-      <source>Other Traditional Chinese dialects</source>
-      <translation type="unfinished">Other Traditional Chinese dialects</translation>
+      <source>Other Western-European languages</source>
+      <translation>Aliaj okcidenteŭropaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="444"/>
-      <source>Other Eastern-European languages</source>
-      <translation type="unfinished">Other Eastern-European languages</translation>
+      <source>Other Russian languages</source>
+      <translation>Aliaj rusaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="445"/>
-      <source>Other Western-European languages</source>
-      <translation type="unfinished">Other Western-European languages</translation>
+      <source>Other Japanese languages</source>
+      <translation>Aliaj japanaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="446"/>
-      <source>Other Russian languages</source>
-      <translation type="unfinished">Other Russian languages</translation>
+      <source>Other Baltic languages</source>
+      <translation>Aliaj baltaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="447"/>
-      <source>Other Japanese languages</source>
-      <translation type="unfinished">Other Japanese languages</translation>
+      <source>Other Greek languages</source>
+      <translation>Aliaj grekaj lingvoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="448"/>
-      <source>Other Baltic languages</source>
-      <translation type="unfinished">Other Baltic languages</translation>
+      <source>Other Korean dialects</source>
+      <translation>Aliaj koreaj dialektoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="449"/>
-      <source>Other Greek languages</source>
-      <translation type="unfinished">Other Greek languages</translation>
+      <source>Other Turkish dialects</source>
+      <translation>Aliaj turkaj dialektoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="450"/>
-      <source>Other Korean dialects</source>
-      <translation type="unfinished">Other Korean dialects</translation>
+      <source>Other Thai dialects</source>
+      <translation>Aliaj tajlandaj dialektoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="451"/>
-      <source>Other Turkish dialects</source>
-      <translation type="unfinished">Other Turkish dialects</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="452"/>
-      <source>Other Thai dialects</source>
-      <translation type="unfinished">Other Thai dialects</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="453"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Loĵbano</translation>
     </message>
@@ -2517,947 +2490,947 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>franca</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>hispana</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Belarusian</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulgaro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>ĉeĥa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>germana</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>greka</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>finna</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>itala</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japanoj</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>korea</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>litova</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>makedona</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>nederlanda</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>pola</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugala</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Rusa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>la slovaka</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albana</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>la serba (cirilskribe)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Sveda</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turka</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukraina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Ĉina (simpligita)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Ĉina (tradicia)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vjetnama</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugala, Brazila</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Persa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Hispana, Argentino</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Germana, Svislando</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Hispana, Bolivio</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Taĝika</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>la keĉua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Araba, Saud-Arabio</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmena</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingvo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Loĵbano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>la angla</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
-      <translation type="unfinished">Error loading dictionaries</translation>
+      <translation>Eraro dum ŝarĝo de vortaroj</translation>
     </message>
   </context>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
-      <translation type="unfinished">Error in configuration file. Continue with default settings?</translation>
+      <translation>Eraro en agorda dosiero. Ĉu daŭrigi kun defaŭltaj agordoj?</translation>
     </message>
   </context>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Favo&amp;ritoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Ĉiuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Malantaŭen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 vortaroj, %2 artikoloj, %3 vortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Redakti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Helpo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Serĉi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Eliri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Eraro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
-      <translation type="unfinished">Quit from application</translation>
+      <translation>Forlasu de la aplikaĵo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
-      <translation type="unfinished">&amp;Close To Tray</translation>
+      <translation>&amp;Proksime Al Pleto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Ne eblas konservi artikolon: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zomi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Vortaroj...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Pri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forumo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Presi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Konservi Artikolon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Konservi artikolon kiel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
-      <translation type="unfinished">Minimizes the window to tray</translation>
+      <translation>Minimumigas la fenestron al pleto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Paĝo-ag&amp;ordoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Hejmpaĝo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
-      <translation type="unfinished">New Release Available</translation>
+      <translation>Nova Eldono Disponebla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation type="unfinished">Look up:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Malzomi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
-      <translation type="unfinished">Show &amp;Main Window</translation>
+      <translation>Montri &amp;Ĉeffenestron</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Pri GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Elŝuti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Paĝo-agordoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation type="unfinished">Look up in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normala grandeco</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
-      <translation type="unfinished">Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</translation>
+      <translation>Malsukcesis pravalorigi la mekanismon de monitorado de klavoj.&lt;br&gt;Certiĝu, ke via XServer havas RECORD-etendon ŝaltita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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">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>
+      <translation>Versio &lt;b&gt;%1&lt;/b&gt; de GoldenDict nun estas elŝutebla.&lt;br&gt;Klaku &lt;b&gt;Elŝutu&lt;/b&gt; por atingi la elŝutan paĝon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Ŝargo…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sentitola)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Agordoj...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Bonvenon!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
-      <translation type="unfinished">Pronounce Word (Alt+S)</translation>
+      <translation>Prononcu Vorton (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Konservi Artikolon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
-      <translation type="unfinished">Skip This Release</translation>
+      <translation>Preterpasi Ĉi tiun Eldonon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Antaŭen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Presi artikolon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
-      <translation type="unfinished">No printer is available. Please install one first.</translation>
+      <translation>Neniu presilo disponeblas. Bonvolu unue instali unu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Vido</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historio</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Vakigi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zomo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
-      <translation type="unfinished">Words Zoom In</translation>
+      <translation>Vortoj Zomi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
-      <translation type="unfinished">Words Zoom Out</translation>
+      <translation>Vortoj Zoom Out</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
-      <translation type="unfinished">Words Normal Size</translation>
+      <translation>Vortoj Normala Grandeco</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Fermi aktualan langeton</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Fermi ĉiujn langetojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Fermi ĉiujn langetojn krom aktuala</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
-      <translation type="unfinished">Opened tabs</translation>
+      <translation>Malfermitaj langetoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nova langeto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
-      <translation type="unfinished">&amp;Configuration Folder</translation>
+      <translation>&amp;Agorda Dosierujo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menubreto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
-      <translation type="unfinished">Found in Dictionaries:</translation>
+      <translation>Trovita en Vortaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Aldonu ĉiujn langetojn al Favoritoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>AVERTO: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
+      <translation>Ŝnuro por serĉi en vortaroj. La ĵokeroj &apos;*&apos;, &apos;?&apos; kaj aroj de simboloj &apos;[...]&apos; estas permesitaj.
+Por trovi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; simboloj uzas &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respektive</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
-      <translation type="unfinished">Open Tabs List</translation>
+      <translation>Malfermu Listo de Tabs</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Forigu la nunan langeton el Favoritoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
-      <translation type="unfinished">You have chosen to hide a menubar. Use %1 to show it back.</translation>
+      <translation>Vi elektis kaŝi menubreton. Uzu %1 por montri ĝin reen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Montri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Eksporti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Kaŝi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
-      <translation type="unfinished">Export history to file</translation>
+      <translation>Eksportu historion al dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstaj dosieroj (*.txt);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
-      <translation type="unfinished">History export complete</translation>
+      <translation>Historio eksportado finiĝis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
-      <translation type="unfinished">Export error: </translation>
+      <translation>Eraro de eksporto: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;importi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
-      <translation type="unfinished">Import history from file</translation>
+      <translation>Importi historion el dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
-      <translation type="unfinished">Import error: invalid data in file</translation>
+      <translation>Importa eraro: nevalidaj datumoj en dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
-      <translation type="unfinished">History import complete</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
-      <source>Import error: </source>
-      <translation type="unfinished">Import error: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
-      <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Historio importo finiĝis</translation>
     </message>
     <message>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
       <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <source>Import error: </source>
+      <translation>Importa eraro: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
+      <source>Export Favorites to file</source>
+      <translation>Eksportu Favoritojn al dosiero</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>XML-dosieroj (*.xml);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Plej ŝatataj eksportado</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Eksportu Favoritojn al dosiero kiel simpla listo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Importu Favoritojn el dosiero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML-dosieroj (*.xml);;Txt-dosieroj (*.txt);;Ĉiuj dosieroj (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Plej ŝatataj importado kompleta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Eraro de analizado de datumoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
-      <translation type="unfinished">Dictionary info</translation>
+      <translation>Vortaraj informoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Vortaraj kapvortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
-      <translation type="unfinished">Open dictionary folder</translation>
+      <translation>Malfermu vortaran dosierujon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Redakti vortaron</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Nun indeksante por plenteksta serĉo: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Ĉu forigi kapvorton &quot;%1&quot; el Favoritoj?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Serĉa panelo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
-      <translation type="unfinished">&amp;Results Navigation Pane</translation>
+      <translation>&amp;Rezulta Navigado-Panelo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Favora&amp;itoj Paneo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
-      <translation type="unfinished">Print Pre&amp;view</translation>
+      <translation>Presita antaŭvido</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Reskani dosierojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nova langeto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
-      <translation type="unfinished">&amp;Always on Top</translation>
+      <translation>&amp;Ĉiam supre</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
-      <translation type="unfinished">Always on Top</translation>
+      <translation>Ĉiam supre</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menubutono</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Serĉi en la paĝo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Plenteksta serĉo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>GoldenDict referenco</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Montru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Eksporto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Importi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Aldoni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Aldonu nunan langeton al Favoritoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Eksportu al listo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
-      <translation type="unfinished">Show Names in Dictionary &amp;Bar</translation>
+      <translation>Montri Nomojn en Vortaro &amp; Trinkejo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
-      <translation type="unfinished">Show Small Icons in &amp;Toolbars</translation>
+      <translation>Montru Malgrandajn Piktogramojn en &amp;Ilbretoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigado</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Ebligu Skanadon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
-      <translation type="unfinished">Article, Complete (*.html)</translation>
+      <translation>Artikolo, Kompleta (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
-      <translation type="unfinished">Article, HTML Only (*.html)</translation>
+      <translation>Artikolo, HTML Nur (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
-      <translation type="unfinished">Saving article...</translation>
+      <translation>Konservante artikolon...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Konservu artikolon kompleta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
-      <translation type="unfinished">The main window is set to be always on top.</translation>
+      <translation>La ĉefa fenestro estas agordita por esti ĉiam supre.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Historia panelo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
-      <translation type="unfinished">Accessibility API is not enabled</translation>
+      <translation>Alirebleco API ne estas ebligita</translation>
     </message>
   </context>
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
-      <translation type="unfinished">Dictionary file was tampered or corrupted</translation>
+      <translation>Vortardosiero estis mistraktita aŭ koruptita</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
-      <translation type="unfinished">Failed loading article from %1, reason: %2</translation>
+      <translation>Malsukcesis ŝargi artikolon de %1, kialo: %2</translation>
     </message>
   </context>
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML-analizeraro: %1 at %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adreso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Ŝaltita</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Bildsimbolo</translation>
     </message>
@@ -3498,101 +3471,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Ne eblis malfermi sonbufferon por legado.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formularo</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
-      <translation type="unfinished">Inactive (disabled) dictionaries:</translation>
+      <translation>Neaktivaj (malfunkciigitaj) vortaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nomo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Tuta artikoloj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduki el:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduki en:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Tuta vortoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
-      <translation type="unfinished">Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</translation>
+      <translation>Alĝustigu la ordon trenante kaj faligante erojn en ĝi. Faligi vortarojn al la neaktiva grupo por malebligi ilian uzon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
-      <translation type="unfinished">Dictionary order:</translation>
+      <translation>Ordo de vortaro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
-      <translation type="unfinished">Files comprising this dictionary:</translation>
+      <translation>Dosieroj kun ĉi tiu vortaro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
-      <translation type="unfinished">Dictionary information</translation>
+      <translation>Vortaraj informoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Priskribo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ordigi laŭ nomo</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordigi laŭ lingvoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Vortaraj kapvortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>Aktivaj vortaroj: %1, neaktivaj: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Vojo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rikure</translation>
     </message>
@@ -3600,918 +3573,957 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
-      <translation type="unfinished">Start to system tray</translation>
+      <translation>Komencu al sistema pleto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
-      <translation type="unfinished">Left Shift only</translation>
+      <translation>Maldekstra Shift nur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Venko/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
-      <translation type="unfinished">Enable system tray icon</translation>
+      <translation>Ebligu la sistempleto-ikonon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
-      <translation type="unfinished">Host:</translation>
+      <translation>Gastiganto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
-      <translation type="unfinished">Port:</translation>
+      <translation>Haveno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
-      <translation type="unfinished">User:</translation>
+      <translation>Uzanto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
-      <translation type="unfinished">&amp;Scan Popup</translation>
+      <translation>&amp;Skani Ŝprucfenestron</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, opening a new tab switches to it immediately.
-With this on however, new tabs will be opened without
-switching to them.</translation>
+      <translation>Normale, malfermi novan langeton tuj ŝanĝas al ĝi.
+Kun ĉi tio ŝaltita tamen, novaj langetoj estos malfermitaj sen
+ŝanĝi al ili.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
-      <translation type="unfinished">Use proxy server</translation>
+      <translation>Uzu prokuran servilon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
-      <translation type="unfinished">Use the following hotkey to translate a word from clipboard:</translation>
+      <translation>Uzu la sekvan klavon por traduki vorton el tondujo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
-      <translation type="unfinished">Windows key or Meta key</translation>
+      <translation>Vindoza klavo aŭ Meta ŝlosilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
-      <translation type="unfinished">Auto-pronounce words in main window</translation>
+      <translation>Aŭtomate prononcu vortojn en ĉefa fenestro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
-      <translation type="unfinished">Start with system</translation>
+      <translation>Komencu per sistemo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
-      <translation type="unfinished">Left Alt only</translation>
+      <translation>Maldekstra Alt nur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
-      <translation type="unfinished">Tabbed browsing</translation>
+      <translation>Retumado kun langeto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
-      <translation type="unfinished">Right Shift only</translation>
+      <translation>Nur Dekstra Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
-      <translation type="unfinished">With this on, an attempt to close main window would hide it instead of closing
-the application.</translation>
+      <translation>Kun ĉi tio aktiva, provo fermi ĉefan fenestron kaŝus ĝin anstataŭ
+la aplikaĵon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
-      <translation type="unfinished">&amp;Audio</translation>
+      <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
-      <translation type="unfinished">Enable if you wish to use a proxy server
-for all program&apos;s network requests.</translation>
+      <translation>Ebligu se vi volas uzi prokuran servilon
+por ĉiuj retaj petoj de la programo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
-      <translation type="unfinished">Interface language:</translation>
+      <translation>Interfaco-lingvo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
-      <translation type="unfinished">Left Ctrl only</translation>
+      <translation>Maldekstra Ctrl nur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
-      <translation type="unfinished">Open new tabs in background</translation>
+      <translation>Malfermu novajn langetojn en la fono</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
-      <translation type="unfinished">&amp;Network</translation>
+      <translation>&amp;Reto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
-      <translation type="unfinished">Right Ctrl only</translation>
+      <translation>Dekstra Ctrl nur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Dekstra Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Maldekstra Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">With this enabled, the popup would only show up if all chosen keys are
-in the pressed state when the word selection changes.</translation>
+      <translation>Kun ĉi tio ebligita, la ŝprucfenestro nur aperus se ĉiuj elektitaj klavoj estas
+en la premita stato kiam la vortelekto ŝanĝiĝas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
-      <translation type="unfinished">Auto-pronounce words in scan popup</translation>
+      <translation>Aŭtomate prononcu vortojn en skana ŝprucfenestro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
-      <translation type="unfinished">Open new tabs after the current one</translation>
+      <translation>Malfermu novajn langetojn post la nuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
-      <translation type="unfinished">Restart the program to apply the language change.</translation>
+      <translation>Rekomencu la programon por apliki la lingvoŝanĝon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt-klavo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
-      <translation type="unfinished">Check for new program releases periodically</translation>
+      <translation>Kontrolu novajn programeldonojn periode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">With this on, new tabs are opened just after the
-current, active one. Otherwise they are added to
-be the last ones.</translation>
+      <translation>Kun ĉi tio aktiva, novaj langetoj estas malfermitaj tuj post la
+nuna, aktiva. Alie ili aldoniĝas al
+esti la lastaj.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
-      <translation type="unfinished">Close to system tray</translation>
+      <translation>Proksime al sistema pleto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
-      <translation type="unfinished">System default</translation>
+      <translation>Sistemo defaŭlta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
-      <translation type="unfinished">When enabled, an icon appears in the system tray area which can be used
-to open main window and perform other tasks.</translation>
+      <translation>Kiam ĝi estas ebligita, ikono aperas en la sistempleta areo, kiu povas esti uzata
+por malfermi ĉefan fenestron kaj plenumi aliajn taskojn.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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.</translation>
+      <translation>Kiam ĉi tio estas ebligita, la programo periode
+kontrolas ĉu nova, ĝisdatigita versio de GoldenDict
+estas disponebla por elŝuto. Se estas tiel, la programo
+informas la uzanton pri ĝi kaj instigas malfermi
+elŝutan paĝon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Startigo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Pasvorto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Defaŭlto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfaco</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
-      <translation type="unfinished">Changing Language</translation>
+      <translation>Ŝanĝanta Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl-klavo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
-      <translation type="unfinished">Use the following hotkey to show or hide the main window:</translation>
+      <translation>Uzu la sekvan klavon por montri aŭ kaŝi la ĉefan fenestron:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Maldekstra Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
-      <translation type="unfinished">Right Alt only</translation>
+      <translation>Dekstra Alt nur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Agordoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Maldekstra Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Dekstra Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</translation>
+      <translation>La klavoj estas tutmondaj kaj funkcias de iu ajn programo kaj ene de ajna kunteksto kondiĉe ke GoldenDict funkcias fone.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Dekstra Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
-      <translation type="unfinished">Hotkeys</translation>
+      <translation>Hotkeys</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
-      <translation type="unfinished">Start with scan popup turned on</translation>
+      <translation>Komencu kun skanado ŝprucfenestron ŝaltita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
-      <translation type="unfinished">With this on, the application starts directly to system tray without showing
-its main window.</translation>
+      <translation>Kun ĉi tio enŝaltita, la aplikaĵo komenciĝas rekte al sistempleto sen montri
+sian ĉefan fenestron.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift-klavo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
-      <translation type="unfinished">Automatically starts GoldenDict after operation system bootup.</translation>
+      <translation>Aŭtomate lanĉas GoldenDict post ekfunkciigo de la operacia sistemo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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>
+      <translation>Elektas ĉu la skana ŝprucfenestra reĝimo estas ŝaltita defaŭlte aŭ ne. Se markite,
+la programo ĉiam komenciĝus kun la skana ŝprucfenestro aktiva.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Ne montru ŝprucfenestron kiam elekto aŭ tondujo en unu el la propraj fenestroj de GoldenDict ŝanĝiĝas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Ignoru la propran elekton kaj tondujoŝanĝojn de GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Ludu sondosierojn per enkonstruita sonsubteno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Uzu internan ludilon:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Elektu sonan malantaŭan finon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Enigu komandlinion de aŭdludilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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.</translation>
+      <translation>Ebligi ĉi tion igus GoldenDict bloki plej multajn reklamojn
+malpermesante enhavon (bildoj, kadroj) ne devenantaj de la retejo
+, kiun vi foliumas. Se iu retejo rompas pro tio, provu malŝalti ĉi tion.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
-      <translation type="unfinished">Disallow loading content from other sites (hides most advertisements)</translation>
+      <translation>Malpermesu ŝarĝi enhavon de aliaj retejoj (kaŝas plej multajn reklamojn)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Prononco</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
-      <translation type="unfinished">Playback</translation>
+      <translation>Reproduktado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
-      <translation type="unfinished">Use external program:</translation>
+      <translation>Uzu eksteran programon:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
-      <translation type="unfinished">Double-click translates the word clicked</translation>
+      <translation>Duobla klako tradukas la vorton klakita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
-      <translation type="unfinished">Use any external program to play audio files</translation>
+      <translation>Uzu ajnan eksteran programon por ludi sondosierojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
-With this on however, it will hide the main window.</translation>
+      <translation>Kutime, premante ESC-klavon movas fokuson al la traduklinio.
+Kun ĉi tio ŝaltita tamen, ĝi kaŝos la ĉefan fenestron.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
-      <translation type="unfinished">ESC key hides main window</translation>
+      <translation>ESC-klavo kaŝas la ĉefan fenestron</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
+      <translation>Elektu ĉi tiun opcion se vi ne volas vidi la ĉefan langeton kiam nur unu sola langeto estas malfermita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
-      <translation type="unfinished">Hide single tab</translation>
+      <translation>Kaŝi ununuran langeton</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
-      <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
+      <translation>Alĝustigu ĉi tiun valoron por eviti grandegajn kuntekstajn menuojn.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
-      <translation type="unfinished">Context menu dictionaries limit:</translation>
+      <translation>Kuntekstmenuaj vortaroj limigas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
-      <translation type="unfinished">Send translated word to main window instead of to show it in popup window</translation>
+      <translation>Sendu tradukitan vorton al ĉefa fenestro anstataŭ montri ĝin en ŝprucfenestro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
-      <translation type="unfinished">Send translated word to main window</translation>
+      <translation>Sendu tradukitan vorton al ĉefa fenestro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Montru flagan fenestron antaŭ ol montri ŝprucfenestron, alklaku la flagon por montri ŝprucfenestron. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Normale, alklaki ligilon, duoble alklaki vorton aŭ serĉi
+elekton en artikolo ŝarĝas la tradukon kaj preskaŭ tuj
+rulumas al la artikolo el la sama vortaro. Kun ĉi tiu opcio malŝaltita,
+tamen, la artikolo el la plej supra vortaro estas montrata.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Aŭtomate rulumu al cela artikolo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Artikola Montra stilo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Turnu la UI al mallumo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Malhela Reĝimo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Turnu la artikolon montrostilon al malhela.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Malhela Leganto-Reĝimo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU-ordo: Plej lastatempe uzata mendo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Spuri al tondujo ŝanĝojn kiam Skanado estas ebligita. Rimarku! Vi ĉiam devus ebligi ĉi tion krom se vi estas en Linukso.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Ŝanĝo de Tondujo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Ŝanĝo de Elekto de Trako</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Selektado de klavoj nur kiam ĉiuj elektitaj klavoj estas tenitaj premitaj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Montru skanan flagon kiam vorto estas elektita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Malfrua tempo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>Sistema prokurilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>Propra prokurilo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>Propraj agordoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Konekti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Ferdeko:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Modelo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Vorto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Vortfara kampo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Teksto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Difina kampo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Frazo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Frazkampo (povas esti malplena)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-      <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
-Enable this option to workaround the problem.</translation>
+      <translation>Iuj retejoj detektas GoldenDict per HTTP-titoloj kaj blokas la petojn.
+Ebligu ĉi tiun opcion por solvi la problemon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
-      <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
+      <translation>Ne identigu GoldenDict en HTTP-kapoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Maksimuma reta kaŝmemorgrandeco:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Maksimuma diskospaco okupita de la retkaŝmemoro de GoldenDict
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Se agordita al 0, la retdiska kaŝmemoro estos malŝaltita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Kiam ĉi tiu opcio estas ebligita, GoldenDict
+forigas sian retan kaŝmemoron el disko dum eliro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Malplenigi retan kaŝmemoron ĉe eliro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Plenteksta serĉo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>Permesu plentekstan serĉon por:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Ne serĉu en vortaroj enhavantaj pli ol</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>artikoloj (0 - senlima)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
-      <translation type="unfinished">Ad&amp;vanced</translation>
+      <translation>Al&amp;avantis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Dum sinsekvaj serĉoj, se unu vortaro estas kolapsita per manlibro, ĝi restos kolapsita en la sekva serĉo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Sesiokolapso</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Kiam vi uzas tondujo, forigu ĉion post novlinio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Dum nova serĉo, enfokusigu la ĉefan aŭ ŝprucfenestron eĉ se ĝi estas videbla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Plej ŝatataj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Intervalo de konservado de ŝatatoj. Se agordita al 0 Favoritoj estos konservitaj nur dum eliro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Ŝaltu ĉi tiun opcion por konfirmi ĉiun operacion de forigo de eroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Konfirmo por forigo de eroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Enŝaltu ĉi tiun opcion por ignori neracie longan enigtekston
+de mus-supera, elekto, tondujo aŭ komandlinio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Ignoru enigajn frazojn pli longajn ol</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Enigofrazoj pli longaj ol ĉi tiu grandeco estos ignoritaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Enŝaltu ĉi tiun opcion por ignori diakritajn signojn dum serĉado de artikoloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Ignoru diakritajn signojn dum serĉado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
-      <translation type="unfinished">Turn this option on to always expand optional parts of articles</translation>
+      <translation>Ŝaltu ĉi tiun opcion por ĉiam pligrandigi laŭvolajn partojn de artikoloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
-      <translation type="unfinished">Expand optional &amp;parts</translation>
+      <translation>Vastigu laŭvolajn &amp;partojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
-      <translation type="unfinished">Select this option to automatic collapse big articles</translation>
+      <translation>Elektu ĉi tiun opcion por aŭtomata kolapsigi grandajn artikolojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
-      <translation type="unfinished">Collapse articles more than</translation>
+      <translation>Kolapsi artikolojn pli ol</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
-      <translation type="unfinished">Articles longer than this size will be collapsed</translation>
+      <translation>Artikoloj pli longaj ol ĉi tiu grandeco estos kolapsitaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Ignoru interpunkcion dum serĉado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Enŝaltu ĉi tiun opcion por ebligi kromajn artikolojn serĉadon per sinonimaj listoj
+el Stardict, Babylon kaj GLS-vortaroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Ekstra serĉo per sinonimoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>simboloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
-      <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
+      <translation>Ctrl-Tab navigas klapetojn en MRU-ordo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babilono</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
-      <translation type="unfinished">History</translation>
+      <translation>Historio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
-      <translation type="unfinished">Turn this option on to store history of the translated words</translation>
+      <translation>Enŝaltu ĉi tiun opcion por konservi historion de la tradukitaj vortoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
-      <translation type="unfinished">Store &amp;history</translation>
+      <translation>Stoki &amp;historion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikoloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
-      <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
+      <translation>Enŝaltu ĉi tiun opcion se vi volas elekti vortojn per unu musklako</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
-      <translation type="unfinished">Select word by single click</translation>
+      <translation>Elektu vorton per unu klako</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
-      <translation type="unfinished">Add-on style:</translation>
+      <translation>Aldonaĵa stilo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
-      <translation type="unfinished">Specify the maximum number of entries to keep in history.</translation>
+      <translation>Indiku la maksimuman nombron da enskriboj konservitaj en la historio.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
-      <translation type="unfinished">Maximum history size:</translation>
+      <translation>Maksimuma historia grandeco:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
-      <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
+      <translation>Intervalo de konservado de historio. Se agordita al 0, la historio estos konservita nur dum eliro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
-      <translation type="unfinished">Save every</translation>
+      <translation>Konservu ĉiun</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
-      <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
-      <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
-      <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Klasika</translation>
     </message>
     <message>
       <location filename="../src/ui/preferences.cc" line="132"/>
+      <source>Modern</source>
+      <translation>Modernaj</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="135"/>
+      <source>Lingoes</source>
+      <translation>Lingvestoj</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="136"/>
+      <source>Lingoes-Blue</source>
+      <translation>Lingvoes-Blua</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Poziciaj informoj estas bezonataj por uzi la frazserĉadon kaj NEAR-funkciigiston de Xapian, sed la datumbazo grandeco estos multe pli granda. Validas nur por novaj alvenantaj vortaroj.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Ebligu indekson kun poziciaj informoj</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Norma Tiparo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospaca Tiparo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif Tiparo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif Tiparo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Aspekto</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Ĉi tiuj tiparoj estos aplikataj kiam la tiparoj specifitaj de vortaro ne estas trovitaj.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Rezervaj Tiparoj</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Aŭdio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Plata teksto</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
-      <translation type="unfinished">Prefix Match</translation>
+      <translation>Prefiksa Matĉo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Nekonata</translation>
     </message>
@@ -4519,45 +4531,45 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
-      <translation type="unfinished">No program name was given.</translation>
+      <translation>Neniu programnomo estis donita.</translation>
+    </message>
+    <message>
+      <location filename="../src/dict/programs.cc" line="195"/>
+      <source>The program has crashed.</source>
+      <translation>La programo kraŝis.</translation>
     </message>
     <message>
       <location filename="../src/dict/programs.cc" line="198"/>
-      <source>The program has crashed.</source>
-      <translation type="unfinished">The program has crashed.</translation>
-    </message>
-    <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
       <source>The program has returned exit code %1.</source>
-      <translation type="unfinished">The program has returned exit code %1.</translation>
+      <translation>La programo resendis elirkodon %1.</translation>
     </message>
   </context>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Ŝaltita</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Komandolinio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Bildsimbolo</translation>
     </message>
@@ -4565,122 +4577,137 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
-      <translation type="unfinished">Article loading error</translation>
+      <translation>Eraro de ŝarĝo de artikolo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
-      <translation type="unfinished">Article decoding error</translation>
+      <translation>Eraro pri malkodado de artikoloj</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Kopirajto: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Versio: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>%2: %1</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>Retpoŝto: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>%2: %1</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>%2: %1</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>Dato%2%1</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Vortara serĉprogramo.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Vorto aŭ frazo por pridemandi.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Konservu sencimigajn mesaĝojn al gd_log.txt en la agorda dosierujo.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Restarigi fenestrostaton.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Malebligu tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Ŝanĝu la grupon de ĉefa fenestro.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Ŝanĝu la grupon de ŝprucfenestroj.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Baskuligi skanadon ŝprucfenestron.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Presa versio kaj diagnozaj informoj.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
-      <translation type="unfinished">Dictionary search/filter (Ctrl+F)</translation>
+      <translation>Vortara serĉo/filtrilo (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
-      <translation type="unfinished">Clear Search</translation>
+      <translation>Klara Serĉo</translation>
     </message>
   </context>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ERARO: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
-      <translation type="unfinished">Resource saving error: </translation>
+      <translation>Eraro pri konservado de rimedoj: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
-      <translation type="unfinished">The referenced resource failed to download.</translation>
+      <translation>La referencita rimedo malsukcesis elŝuti.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>AVERTO: %1</translation>
     </message>
@@ -4690,12 +4717,12 @@ from Stardict, Babylon and GLS dictionaries</translation>
     <message>
       <location filename="../src/dict/romaji.cc" line="117"/>
       <source>Hepburn Romaji for Katakana</source>
-      <translation type="unfinished">Hepburn Romaji for Katakana</translation>
+      <translation>Hepburn Romaji por Katakana</translation>
     </message>
     <message>
       <location filename="../src/dict/romaji.cc" line="108"/>
       <source>Hepburn Romaji for Hiragana</source>
-      <translation type="unfinished">Hepburn Romaji for Hiragana</translation>
+      <translation>Hepburn Romaji por Hiragana</translation>
     </message>
   </context>
   <context>
@@ -4709,67 +4736,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialogo</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
-      <translation type="unfinished">Pronounce Word (Alt+S)</translation>
+      <translation>Prononcu Vorton (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Aldonu vorton al Favoritaj (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
-      <translation type="unfinished">Shows or hides the dictionary bar</translation>
+      <translation>Montras aŭ kaŝas la vortarstangon</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Ĉiam restu super ĉiuj aliaj fenestroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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">Use this to pin down the window so it would stay on screen,
-could be resized or managed in other ways.</translation>
+      <translation>Uzu ĉi tion por fiksi la fenestron por ke ĝi restu sur ekrano,
+povus esti regrandigita aŭ administrita alimaniere.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
-      <translation type="unfinished">Send word to main window (Alt+W)</translation>
+      <translation>Sendu vorton al ĉefa fenestro (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Malantaŭen</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Antaŭen</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>AVERTO: %1</translation>
     </message>
   </context>
   <context>
@@ -4777,53 +4809,53 @@ could be resized or managed in other ways.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Antaŭa</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Sekva</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Elstarigi &amp;ĉion</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Usklecodistinga</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Trovu:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Vojo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Bildsimbolo</translation>
     </message>
@@ -4831,372 +4863,362 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Dosieroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Rondaj kanaoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
-      <translation type="unfinished">Systems:</translation>
+      <translation>Sistemoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-      <translation type="unfinished">Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
+      <translation>Ĉu forigi retejon &lt;b&gt;%1&lt;/b&gt; el la listo?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Vikipedio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
-      <translation type="unfinished">Katakana Japanese syllabary</translation>
+      <translation>Katakana japana silabaro</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
-      <translation type="unfinished">Make dictionaries from bunches of audiofiles by adding paths here:</translation>
+      <translation>Faru vortarojn el amasoj da sondosieroj aldonante vojojn ĉi tie:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-      <translation type="unfinished">Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
+      <translation>Ĉu forigi dosierujon &lt;b&gt;%1&lt;/b&gt; el la listo?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
-      <translation type="unfinished">Japanese Romaji</translation>
+      <translation>Japana Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
 Not implemented yet in GoldenDict.</source>
-      <translation type="unfinished">Based on Nihon-shiki system, but modified for modern standard Japanese.
-Standardized as ISO 3602
+      <translation>Surbaze de Nihon-shiki-sistemo, sed modifita por moderna norma japano.
+Normigita kiel ISO 3602
 
-Not implemented yet in GoldenDict.</translation>
+Ankoraŭ ne efektivigita en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
-      <translation type="unfinished">Wikipedia (MediaWiki) sites:</translation>
+      <translation>Vikipedio (MediaWiki) retejoj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
-      <translation type="unfinished">Sound Dirs</translation>
+      <translation>Sound Dirs</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Ajnaj eksteraj programoj. Ŝnuro %GDWORD% estos anstataŭigita per la demandvorto. Ŝnuro %GDSEARCH% estos anstataŭigita per la teksto en la serĉbreto. Se ambaŭ parametroj ne estas provizitaj, la kapvorto estos enigita en norman enigaĵon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingvo Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provid by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, kunlabora lingva amaskomunikilaro de Vikimedia Francio. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Ebligu Lingvon Libren</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 lingvokodo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uzo de Forvo nuntempe postulas API-ŝlosilon, registriĝu ĉe la retejo por akiri vian propran ŝlosilon.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Akiru vian propran ŝlosilon &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ĉi tie&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
-      <translation type="unfinished">The most widely used method of transcription of Japanese,
-based on English phonology</translation>
+      <translation>La plej uzata metodo de transskribo de la japana,
+bazita sur angla fonologio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
-      <translation type="unfinished">Hiragana Japanese syllabary</translation>
+      <translation>Hiragana japana silabaro</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Propra transliterumo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Ĉi tio aplikita nur en serĉfrazo, kun ĉiu linio reprezentas transliterumon, punktokomo apartigita. Ekzemple, ae;æ,uzantoj povas enigi ae por reprezenti æ en la celvorto.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #tio estas ekzemplo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliterado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">The most regular system, having a one-to-one relation to the
-kana writing systems. Standardized as ISO 3602
+      <translation>La plej regula sistemo, havanta unu-al-unu rilaton al la
+kana skribsistemoj. Normigita kiel ISO 3602
 
-Not implemented yet in GoldenDict.</translation>
+Ankoraŭ ne efektivigita en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Rusa transliterado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Ŝanĝi...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Ekzemploj:  &amp;quot;epo&amp;quot; por la angla, &amp;quot;fra&amp;quot; por la franca &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Plena listo de disponeblaj lingvoj troveblas &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; ĉi tie &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Strekaj kanaoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
-      <translation type="unfinished">Path to a directory with Hunspell/Myspell dictionaries:</translation>
+      <translation>Vojo al dosierujo kun Hunspell/Myspell vortaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
-      <translation type="unfinished">Re&amp;scan now</translation>
+      <translation>Re&amp;skanu nun</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Germana transliterado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
-      <translation type="unfinished">Any websites. A string %GDWORD% will be replaced with the query word:</translation>
+      <translation>Ajna retejoj. Ŝnuro %GDWORD% estos anstataŭigita per la demandvorto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Aldoni...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Elekti dosierujon</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Forigi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
-      <translation type="unfinished">Websites</translation>
+      <translation>Retejoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
-      <translation type="unfinished">Paths to search for the dictionary files:</translation>
+      <translation>Vojetoj por serĉi la vortarajn dosierojn:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
-      <translation type="unfinished">Confirm removal</translation>
+      <translation>Konfirmu forigon</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
-      <translation type="unfinished">Syllabaries:</translation>
+      <translation>Silabaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
-      <translation type="unfinished">Available morphology dictionaries:</translation>
+      <translation>Disponeblaj morfologiaj vortaroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
-      <translation type="unfinished">Enables to use the Latin alphabet to write the Japanese language</translation>
+      <translation>Ebligas uzi la latinan alfabeton por skribi la japanan lingvon</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
+      <translation>Ĉiu morfologia vortaro aperas kiel
+aparta helpvortaro, kiu
+provizas radikvortojn por serĉoj kaj
+literumajn sugestojn por mistajpitaj vortoj.
+Aldonu taŭgajn vortarojn al la fundoj
+de la taŭgaj grupoj por uzi ilin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT-serviloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT-serviloj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
+      <translation>Vivaj elparoloj de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. La retejo permesas al homoj registri kaj dividi vortprononcojn. Vi povas aŭskulti ilin de GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
-      <translation type="unfinished">Enable pronunciations from Forvo</translation>
+      <translation>Ebligu prononcojn de Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API ŝlosilo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
-      <translation type="unfinished">Language codes (comma-separated):</translation>
+      <translation>Lingvaj kodoj (komoj disigitaj):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
-      <translation type="unfinished">List of language codes you would like to have. Example: &quot;en, ru&quot;.</translation>
+      <translation>Listo de lingvokodoj, kiujn vi ŝatus havi. Ekzemplo: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">Full list of language codes is available &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;here&lt;/a&gt;.</translation>
+      <translation>Plena listo de lingvokodoj haveblas &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;ĉi tie&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Greka transliterado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
-      <translation type="unfinished">(not available in portable version)</translation>
+      <translation>(ne havebla en portebla versio)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programoj</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-      <translation type="unfinished">Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
+      <translation>Ĉu forigi programon &lt;b&gt;%1&lt;/b&gt; el la listo?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Belorusa transliterado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
+      <translation>Alternative, uzu %GD1251% por CP1251, %GDISO1%...%GDISO16% por ISO 8859-1...ISO 8859-16 respektive,
+%GDBIG5% por Big-5, %GDBIG5HKSCS% por Big5-HKSCS, %GDGBK% por GBK kaj GB18030, %GDSHIFTJIS% por Shift-JIS .</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Parolsintezo</translation>
     </message>
@@ -5212,90 +5234,90 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
-      <translation type="unfinished">Selected voice engines:</translation>
+      <translation>Elektitaj voĉmotoroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Aldoni</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Forigi</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
-      <translation type="unfinished">Preview</translation>
+      <translation>Antaŭrigardo</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
-      <translation type="unfinished">Available voice engines:</translation>
+      <translation>Disponeblaj voĉmotoroj:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
-      <translation type="unfinished">Text to be previewed:</translation>
+      <translation>Teksto antaŭrigardenda:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
-      <translation type="unfinished">Type text to be previewed here.</translation>
+      <translation>Tajpu tekston por antaŭrigardi ĉi tie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
-      <translation type="unfinished">&amp;Preview</translation>
+      <translation>&amp;Antaŭrigardo</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="79"/>
       <source>No TTS voice available</source>
-      <translation type="unfinished">No TTS voice available</translation>
+      <translation>Neniu TTS-voĉo havebla</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="110"/>
       <source>Confirm removal</source>
-      <translation type="unfinished">Confirm removal</translation>
+      <translation>Konfirmu forigon</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="111"/>
       <source>Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</source>
-      <translation type="unfinished">Remove voice engine &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
+      <translation>Ĉu forigi voĉmotoron &lt;b&gt;%1&lt;/b&gt; el la listo?</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="80"/>
       <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">Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</translation>
+      <translation>Ne povas trovi disponeblan TTS-voĉon.&lt;br&gt;Bonvolu certigi, ke almenaŭ unu TTS-motoro jam estas instalita en via komputilo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Agordoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Laŭteco:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
-      <translation type="unfinished">Rate:</translation>
+      <translation>Prezo:</translation>
     </message>
   </context>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
-      <translation type="unfinished">Type a word or phrase to search dictionaries</translation>
+      <translation>Tajpu vorton aŭ frazon por serĉi vortarojn</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Fallisto</translation>
     </message>
@@ -5315,7 +5337,7 @@ of the appropriate groups to use them.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5326,33 +5348,33 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nomo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adreso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Ŝaltita</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Enigu artikolon kiel ligilon ene de &lt;iframe&gt; -etikedo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Kiel ligilo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Bildsimbolo</translation>
     </message>
@@ -5360,17 +5382,9 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
-      <translation type="unfinished">Failed to query some dictionaries.</translation>
-    </message>
-  </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>AVERTO: %1</translation>
+      <translation>Malsukcesis pridemandi kelkajn vortarojn.</translation>
     </message>
   </context>
 </TS>
diff --git a/locale/es_AR.ts b/locale/es_AR.ts
index b4459bcf..54ce9bf6 100644
--- a/locale/es_AR.ts
+++ b/locale/es_AR.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Acerca de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Diccionario Electrónico GoldenDict, versión </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencia de GNU GPLv3 o posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Copiar información de versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Copiar lista de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Créditos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Desconocido]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basado en Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
-      <translation type="unfinished">(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
+      <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basado en Qt %1 (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: no se puede crear una carta sin una palabra</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Búsqueda Anki: AnkiConnect no está habilitado.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: mensaje a anki fallido</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: post para éxito anki</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Inspeccionar</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Expandir artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Trabajar con la función de ventana emergente</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sin título)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>No se encontró ninguna traducción para &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;foro&lt;/a&gt; del programa es bienvenida.&lt;p&gt;Consulte el &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(imagen)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Expandir artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Resultados de </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Hacer una nueva nota de Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Error de consulta: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Palabras aproximadas: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palabras individuales:</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>No fue posible crear archivo temporal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>El recurso referenciado no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Buscar &quot;%1&quot; en %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Seleccionar artículo actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copiar como texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspeccionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Abrir vínculo en nueva &amp;pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir vínculo en Navegador &amp;Web externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Recurso</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Texto a Voz</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Imagen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation type="unfinished">Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation type="unfinished">Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definición de diccionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definición: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>El programa de audio referenciado no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation type="unfinished">Op&amp;en Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation type="unfinished">WARNING: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Guardar audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Guardar imagen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Archivos de imagen (*.bmp *.jpg *.png *.tif);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Guardar &amp;imagen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation type="unfinished">Phrase not found</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Guardar &amp;audio...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Enviar &quot;%1&quot; a búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Agregar &quot;%1&quot; a historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation type="unfinished">&amp;Send Current Article to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation type="unfinished">Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation type="unfinished">Failed to play sound file: %1</translation>
     </message>
@@ -413,62 +408,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation type="unfinished">Chinese Conversion</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation type="unfinished">Chinese Con&amp;version</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation type="unfinished">SC to TC (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC a TC (Variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>CT a CS</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
     </message>
@@ -476,7 +471,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -484,22 +479,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation type="unfinished">Proxy authentication required</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation type="unfinished">Username:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
@@ -507,22 +502,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ícono de grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tecla de acceso directo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation type="unfinished">Favorites folder:</translation>
     </message>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Imágenes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Todos los archivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>No es posible leer el archivo de imagen especificado.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmación</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>¿Está seguro que desea generar un conjunto de grupos basado en pares de idiomas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combinar grupos por idioma origen a &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combinar grupos por idioma destino a &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Crear un grupo para traducir &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combinar grupos con &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Diccionarios: </translation>
     </message>
@@ -634,133 +629,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation type="unfinished">Search mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation type="unfinished">This element determines how filter string will be interpreted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation type="unfinished">Match case</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation type="unfinished">Exports headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation type="unfinished">OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation type="unfinished">Press this button to apply filter to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation type="unfinished">Apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation type="unfinished">Auto apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation type="unfinished">Filter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation type="unfinished">RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation type="unfinished">Save headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Documentos de texto (*.txt);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation type="unfinished">Export headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation type="unfinished">Export finished</translation>
     </message>
@@ -768,67 +763,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Total de artículos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduce de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Total de palabras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduce a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Abrir carpeta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Archivos que componen este diccionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descripción:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation type="unfinished">Show all unique dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation type="unfinished">Headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Editar el diccionario vía comando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 entradas</translation>
     </message>
@@ -859,44 +864,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation type="unfinished">Databases</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation type="unfinished">Strategies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ícono</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation type="unfinished">Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation type="unfinished">Comma-delimited list of search strategies
@@ -906,37 +911,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menú extendido con todos los diccionarios...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Editar este grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Información del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Abrir carpeta del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Barra de &amp;diccionarios</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Aceptar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fuentes modificadas</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Algunas fuentes fueron modificadas. Desea aceptar las modificaciones?</translation>
     </message>
@@ -1010,75 +1015,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation type="unfinished">Plain text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation type="unfinished">Articles found: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation type="unfinished">Now indexing: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ninguno</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation type="unfinished">No dictionaries for full-text search</translation>
     </message>
@@ -1086,7 +1071,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation type="unfinished">Error in favorities file</translation>
     </message>
@@ -1116,7 +1101,7 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Todos los elementos seleccionados serán eliminados. ¿Continuar?</translation>
     </message>
   </context>
   <context>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Ingrese a Editar|Diccionarios|Fuentes|Forvo y solicite su propia clave de API para que este error desaparezca.</translation>
     </message>
@@ -1173,68 +1158,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation type="unfinished">Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation type="unfinished">Articles found:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation type="unfinished">Available dictionaries in group:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation type="unfinished">Wait for indexing:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation type="unfinished">Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation type="unfinished">Indexed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation type="unfinished">Now indexing: None</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation type="unfinished">&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation type="unfinished">&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation type="unfinished">Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation type="unfinished">Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Pestaña 2</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ingrese un nuevo nombre para el grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Diccionarios disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Agregar grupo</translation>
     </message>
@@ -1341,43 +1310,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Agregar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Crear un nuevo grupo de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Arrastre &amp; suelte los diccionarios dentro de un grupo para agregarlos y muévalos dentro del mismo para ordenarlos
 Reordene los grupos usando el mouse sobre las pestañas con los nombres de los mismos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renombrar el grupo de diccionarios seleccionado</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Eliminar el grupo de diccionarios seleccionado</translation>
     </message>
@@ -1387,43 +1356,43 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
       <translation>Ingrese un nombre para el nuevo grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Eliminar todos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Eliminar los diccionarios seleccionados del grupo (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Agregar los diccionarios seleccionados al grupo (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Eliminar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nombrar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Eliminar todos los grupos de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Crear grupos de diccionarios automáticamente, basados en el idioma de cada diccionario en particular</translation>
     </message>
@@ -1446,12 +1415,12 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
       <translation>Historial:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation type="unfinished">%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Tamaño del historial: %1 entradas de un máximo de %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugerencias ortográficas: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfología de %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nombre de diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Inicializando</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Por favor espere mientras los diccionarios son indexados</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Por favor espere...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation type="unfinished">Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laosiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation type="unfinished">Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation type="unfinished">Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Acano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation type="unfinished">Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation type="unfinished">Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation type="unfinished">Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation type="unfinished">Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdú</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulú</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation type="unfinished">Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation type="unfinished">Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation type="unfinished">Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latín</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maorí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation type="unfinished">Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation type="unfinished">Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation type="unfinished">Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation type="unfinished">Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation type="unfinished">Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tayiko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation type="unfinished">Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tártaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Suazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation type="unfinished">Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Iñupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation type="unfinished">Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation type="unfinished">Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation type="unfinished">Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retorrománica</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation type="unfinished">Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation type="unfinished">Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Sindebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abjasiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirguís</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation type="unfinished">Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico escocés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation type="unfinished">Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation type="unfinished">Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation type="unfinished">Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Árabe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Vasco (Eusquera)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Ávaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation type="unfinished">Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aimará</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sondanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation type="unfinished">Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation type="unfinished">Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiyiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation type="unfinished">Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation type="unfinished">Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>kazajio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation type="unfinished">Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation type="unfinished">Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation type="unfinished">Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation type="unfinished">Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation type="unfinished">Pashto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation type="unfinished">Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Eslovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation type="unfinished">Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation type="unfinished">Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setsuana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbocroata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation type="unfinished">Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Chuan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Esloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisio occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Gallego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amárico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sánscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucraniano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation type="unfinished">Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation type="unfinished">Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation type="unfinished">Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Quiñaruanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation type="unfinished">Afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation type="unfinished">Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation type="unfinished">Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Checheno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation type="unfinished">Chuvash</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Español (Castellano)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asamés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation type="unfinished">Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation type="unfinished">Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kuanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami septentrional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation type="unfinished">Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nynorsk noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Nrebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation type="unfinished">Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation type="unfinished">Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigriña</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation type="unfinished">Yiddish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chino tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chino simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Otro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Otros dialectos de chino simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Otros dialectos de chino tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Otras lenguas de Europa del Este</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Otras lenguas de Europa Occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Otras lenguas de Rusia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Otras lenguas de Japón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Otras lenguas bálticas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Otras lenguas griegas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Otros dialectos de Corea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Otros dialectos de Turquía</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Otros dialectos de Tailandia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation type="unfinished">Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
@@ -2517,207 +2490,207 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation type="unfinished">French</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation type="unfinished">Spanish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation type="unfinished">Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation type="unfinished">Czech</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation type="unfinished">German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation type="unfinished">Greek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation type="unfinished">Finnish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation type="unfinished">Dutch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation type="unfinished">Polish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation type="unfinished">Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation type="unfinished">Russian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation type="unfinished">Turkish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation type="unfinished">German, Switzerland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation type="unfinished">Spanish, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation type="unfinished">Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation type="unfinished">English</translation>
     </message>
@@ -2725,7 +2698,7 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Error al cargar diccionarios</translation>
     </message>
@@ -2733,7 +2706,7 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2741,702 +2714,702 @@ Reordene los grupos usando el mouse sobre las pestañas con los nombres de los m
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation type="unfinished">F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation type="unfinished">F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation type="unfinished">Favo&amp;rites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation type="unfinished">F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation type="unfinished">F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Todos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Atrás</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>A&amp;yuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Salir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Salir del programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Cerrar a bandeja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>No es posible guardar el artículo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Acercar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Acerca de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Foro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Imprimir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Guardar artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Guardar artículo como</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimiza la ventana a la bandeja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Configurar &amp;página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Sitio web</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nueva versión disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Buscar:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Alejar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Mostrar ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Acerca de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Descargar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Configurar página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Buscar en:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Tamaño normal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation type="unfinished">Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation type="unfinished">Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Cargando...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sin título)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Guardar artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Saltarse esta versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Adelante</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimir artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Impresora no disponible. Por favor instale una primero.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Ver</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Limpiar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation type="unfinished">&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Aumentar tamaño palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Reducir tamaño palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Tamaño normal de palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Cerrar pestaña actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Pestañas abiertas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nueva pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Carpeta de &amp;configuración</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barra de &amp;menú</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Resultados en diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation type="unfinished">Add all tabs to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Abrir lista de pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation type="unfinished">Remove current tab from Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Mostrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Ocultar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportar historial a archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Documentos de texto (*.txt);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Exportación de historial finalizada</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Error de exportación:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importar historial desde archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Error de importación: datos inválidos en el archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Importación de historial finalizada</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Error de importación: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation type="unfinished">Export Favorites to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation type="unfinished">Favorites export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation type="unfinished">Export Favorites to file as plain list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation type="unfinished">Import Favorites from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation type="unfinished">Favorites import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation type="unfinished">Data parsing error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Información del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Abrir carpeta del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation type="unfinished">Now indexing for full-text search: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Cuadro de &amp;búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Cuadro de navegación de &amp;resultados</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation type="unfinished">Favor&amp;ites Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Vista preliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Reescanear archivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nueva pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Siempre &amp;visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Siempre visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menú principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation type="unfinished">Search in page</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation type="unfinished">GoldenDict reference</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation type="unfinished">Show</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation type="unfinished">Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation type="unfinished">Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation type="unfinished">Add current tab to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation type="unfinished">Export to list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Mostrar n&amp;ombres en la barra de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Mostrar íconos &amp;pequeños en las barras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Barra de &amp;navegación</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artículo, Completo (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artículo, sólo HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Guardando artículo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Cuadro de &amp;historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>La función de accesibilidad no esta activada</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>El archivo del diccionario ha sido manipulado o corrompido</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Error al cargar artículo de %1, motivo: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Error de parsing XML: %1 en %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ícono</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Diccionarios inactivos (desactivados):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nombre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Total de artículos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduce de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduce a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Total de palabras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Orden de diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Archivos que componen este diccionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Información del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descripción:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ordenar por nombre</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordenar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ruta de directorio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Búsqueda recursiva</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation type="unfinished">Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Iniciar a bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Sólo Shift izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation type="unfinished">Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation type="unfinished">Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Activar ícono en bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Servidor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Puerto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation type="unfinished">Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usuario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Ventana emergente de lectura</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3670,137 +3641,137 @@ switching to them.</source>
 Sin embargo, si esta opción se activa las nuevas pestañas se abrirán sin que el programa cambie el foco a ellas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Utilizar servidor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tecla Windows o tecla Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Auto-pronunciar palabras en la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Auto-ejecutar el programa al iniciar el sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Sólo Alt izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navegación por pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Sólo Shift derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Con esta opción activada, al intentar cerrar la ventana principal del programa,
 éste se ocultará en vez de cerrarse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation type="unfinished">&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Idioma de la interfaz:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Sólo Ctrl izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Abrir nuevas pestañas en segundo plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Red</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Sólo Ctrl derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation type="unfinished">Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Auto-pronunciar palabras en la ventana emergente de lectura</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Abrir nuevas pestañas a continuación de la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Reinicie el programa para aplicar el cambio de idioma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Verificar periódicamente si hay nuevas versiones del programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,18 +3780,17 @@ a continuación de la pestaña activa actual. Caso contrario,
 se agregarán al final de la lista de pestañas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Cerrar a bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Por defecto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Con esta opción activada, un ícono aparecerá
@@ -3829,7 +3799,7 @@ para abrir la ventana principal del programa y
 ejecutar otras operaciones.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,87 +3811,87 @@ Si fuera así, el programa informa al usuario sobre la misma y abre una
 página web de descarga utilizando el navegador de internet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Inicio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Por defecto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Modificar idioma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tecla Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Sólo Alt derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl izquierdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Iniciar con la ventana emergente de lectura activada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Con esta opción activada, el programa aparece directamente
@@ -3929,54 +3899,54 @@ en la bandeja del sistema, sin mostrar la ventana principal.
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Iniciar automáticamente el GoldenDict al terminar de iniciarse el sistema.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation type="unfinished">Play audio files via built-in audio support</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation type="unfinished">Use internal player:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation type="unfinished">Choose audio back end</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation type="unfinished">Enter audio player command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,84 +3955,84 @@ al desactivar el contenido (imágenes, frames, etc.) que no sea originario del s
 que está accediendo. Si algunos sitios web dejan de funcionar, intente desactivar esta opción.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronunciación</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reproducción</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Utilizar un programa externo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Traducir la palabra con un doble click sobre la misma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalmente, al presionar la tecla ESC el programa hace foco en el cuadro de búsqueda.
 Sin embargo, si esta opción se activa se cerrará la ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>La tecla ESC oculta la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Seleccione esta opción para no mostrar la barra de pestañas cuando existe una única pestaña.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ocultar única pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Límite de diccionarios en menú contextual:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Enviar palabra traducida a la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4073,158 +4043,158 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation type="unfinished">Dark Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation type="unfinished">Show scan flag when word is selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation type="unfinished">System proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation type="unfinished">Custom proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation type="unfinished">Custom settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation type="unfinished">Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation type="unfinished">http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation type="unfinished">Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation type="unfinished">Word</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation type="unfinished">Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>No identificar GoldenDict en encabezados HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation type="unfinished">Maximum network cache size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4233,284 +4203,326 @@ If set to 0 the network disk cache will be disabled.</source>
 If set to 0 the network disk cache will be disabled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation type="unfinished"> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation type="unfinished">When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation type="unfinished">Clear network cache on exit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation type="unfinished">Allow full-text search for:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation type="unfinished">articles (0 - unlimited)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vanzado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Cuando se usa el portapapeles, clip todo después de la nueva línea</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>En una nueva búsqueda, enfoca la ventana principal o emergente incluso si está visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation type="unfinished">Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Active esta opción para confirmar cada operación en que se eliminen elementos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation type="unfinished">Confirmation for items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation type="unfinished">Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation type="unfinished">Ignore input phrases longer than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation type="unfinished">Ignore diacritics while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Expandir &amp;partes opcionales</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Plegar artículos con más de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Búsqueda adicional a través de sinónimos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>símbolos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab cambia a última pestaña vista</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation type="unfinished">Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Guardar &amp;historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artículos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Activar esta opción si desea seleccionar palabras por medio de un click simple</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Seleccionar palabra con un click simple</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Estilo complementario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Tamaño máximo del historial:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Guardar cada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation type="unfinished">Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation type="unfinished">Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation type="unfinished">Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation type="unfinished"> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation type="unfinished">Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Texto simple</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation type="unfinished">Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Coincidencia prefijo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Desconocido</translation>
     </message>
@@ -4518,17 +4530,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>No se ha ingresado el nombre del programa.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Ha ocurrido un error en el programa.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>El programa ha retornado un error %1.</translation>
     </message>
@@ -4536,27 +4548,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Línea de comando</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ícono</translation>
     </message>
@@ -4564,99 +4576,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Error al cargar artículo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Error al decodificar artículo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation type="unfinished">Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation type="unfinished">Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation type="unfinished">Author: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation type="unfinished">E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation type="unfinished">Title: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation type="unfinished">Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation type="unfinished">Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation type="unfinished">A dictionary lookup program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Búsqueda/filtro de diccionarios (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Limpiar búsqueda</translation>
     </message>
@@ -4664,22 +4691,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Error al guardar recurso: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>No fue posible descargar el recurso referenciado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ATENCIÓN: %1</translation>
     </message>
@@ -4708,37 +4735,37 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Diálogo</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Muestra u oculta la barra de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation type="unfinished">Always stay on top of all other windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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
@@ -4746,31 +4773,36 @@ quede en la pantalla, pueda ser redimensionada
 o pueda ser manipulada de otras formas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Enviar palabra a la ventana principal (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Atrás</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Adelante</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4813,17 +4845,17 @@ o pueda ser manipulada de otras formas.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ruta de directorio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ícono</translation>
     </message>
@@ -4831,60 +4863,60 @@ o pueda ser manipulada de otras formas.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Archivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation type="unfinished">Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabario japonés Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Cree diccionarios de un conjunto de archivos de audio al agregar rutas de directorios aquí:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonés romanizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Estandarizado como ISO 3602
 Todavía no está implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sitios de Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Pronunciación</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Cualquier programa externo. Una cadena %GDWORD% será reemplazada por la palabra consulta. Una cadena %GDSEARCH% será reemplazada por el texto en la barra de búsqueda. Si no se proporcionan ambos parámetros, la palabra cabecera será introducida en la entrada estándar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation type="unfinished">Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prounciones promocionadas por &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, una biblioteca colaborativa de medios de comunicación lingüísticos de Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabario japonés Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteración</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,22 +5015,22 @@ Not implemented yet in GoldenDict.</source>
 Todavía no está implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteración de ruso</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfología</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Modificar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5007,94 +5039,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation type="unfinished">Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ruta de directorio con diccionarios Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Ree&amp;scanear ahora</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteración de alemán</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Ingrese todos los sitios web que quiera. La ocurrencia %GDWORD% se reemplazará por el término de búsqueda especificado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Agregar...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Elija un directorio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Sitios web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Rutas de directorios donde buscar los archivos de los diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirmar eliminación</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silabarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Diccionarios morfológicos disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5108,94 +5130,94 @@ para palabras escritas de manera incorrecta.
 Agregue los diccionarios al final de los grupos pertinentes para utilizarlos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Romanización Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation type="unfinished">Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation type="unfinished">DICT servers</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation type="unfinished">DICT servers:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Activar la función para escuchar la pronunciación del sitio Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Clave API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Códigos de idiomas (separados por coma):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteración de griego</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Transliteración de bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Como alternativa, puede utilizar %GD1251% para codificación CP1251 y %GDISO1%...%GDISO16% para codificación ISO-8859-1...ISO 8859-16 
 respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK y GB18030, %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Texto a Voz</translation>
     </message>
@@ -5211,42 +5233,42 @@ respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% par
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Motores de voz seleccionados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Agregar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Muestra de voz</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Motores de voz disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Texto de muestra:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Escriba aquí el texto que desea escuchar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Escuchar muestra</translation>
     </message>
@@ -5271,17 +5293,17 @@ respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% par
       <translation>No se encuentra disponible ninguna opción de Texto a Voz. Por favor asegúrese de instalar al menos un motor de voz en su computadora.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volumen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Velocidad:</translation>
     </message>
@@ -5289,12 +5311,12 @@ respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% par
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Escriba la palabra o frase a buscar</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Desplegar resultados</translation>
     </message>
@@ -5325,33 +5347,33 @@ respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% par
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation type="unfinished">As link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ícono</translation>
     </message>
@@ -5359,17 +5381,9 @@ respectivamente, %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% par
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>No fue posible consultar algunos diccionarios.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ATENCIÓN: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/es_BO.ts b/locale/es_BO.ts
index 0fa986cf..a9ca394e 100644
--- a/locale/es_BO.ts
+++ b/locale/es_BO.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Acerca de</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, diccionario electrónico, versión </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencia GNU GPLv3 o después </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Copiar información de la versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Copiar lista de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Créditos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Desconocido]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation type="unfinished">Based on Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basado en Qt %1 (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: no se puede crear una carta sin una palabra</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Búsqueda Anki: AnkiConnect no está habilitado.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: mensaje a anki fallido</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: post para éxito anki</translation>
     </message>
   </context>
   <context>
@@ -79,111 +74,111 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Inspeccionar</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
-      <translation type="unfinished">Expand article</translation>
+      <translation>Desplegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
-      <translation type="unfinished">Collapse article</translation>
+      <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Utilizando la ventana emergente</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sin título)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>No se encontró ninguna traducción para &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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 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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;foro&lt;/a&gt; de GoldenDict. &lt;p&gt;Visite el &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
-      <translation type="unfinished">(picture)</translation>
+      <translation>(imagen)</translation>
     </message>
   </context>
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
-      <translation type="unfinished">Expand article</translation>
+      <translation>Desplegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>De </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
-      <translation type="unfinished">Collapse article</translation>
+      <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation type="unfinished">Make a new Anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Error de búsqueda: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Cerrar palabras:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palabras individuales:</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Fallo creando archivo temporal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>El recurso referido no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Buscar &quot;%1&quot; en %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation type="unfinished">Select Current Article</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation type="unfinished">Copy as text</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Inspeccionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Abrir enlace en una nueva &amp;pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir enlace en un &amp;navegador web externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
-      <translation type="unfinished">Resource</translation>
+      <translation>Recurso</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation type="unfinished">TTS Voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation type="unfinished">Picture</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation type="unfinished">Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation type="unfinished">Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation type="unfinished">Definition from dictionary &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation type="unfinished">Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation type="unfinished">Op&amp;en Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation type="unfinished">WARNING: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation type="unfinished">Save sound</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation type="unfinished">Save image</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation type="unfinished">Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation type="unfinished">Save &amp;image...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation type="unfinished">Phrase not found</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation type="unfinished">Save s&amp;ound...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation type="unfinished">Send &quot;%1&quot; to input line</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation type="unfinished">&amp;Add &quot;%1&quot; to history</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation type="unfinished">&amp;Send Current Article to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation type="unfinished">Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation type="unfinished">Failed to play sound file: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation type="unfinished">Chinese Conversion</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation type="unfinished">Chinese Con&amp;version</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation type="unfinished">SC to TC (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC a TC (Variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>CT a CS</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
     </message>
@@ -477,7 +472,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -485,22 +480,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation type="unfinished">Proxy authentication required</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation type="unfinished">Username:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Icono del grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tecla de acceso rápido:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation type="unfinished">Favorites folder:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Imágenes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Todos los archivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>No puede leer el archivo especificado de imagen</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmación</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>¿Estás seguro que quiere generar un conjunto de grupos basado en pares de lengua?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation type="unfinished">Combine groups by source language to &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation type="unfinished">Combine groups by target language to &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation type="unfinished">Make two-side translate group &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation type="unfinished">Combine groups with &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation type="unfinished">Dictionaries: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation type="unfinished">Search mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation type="unfinished">This element determines how filter string will be interpreted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation type="unfinished">Match case</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation type="unfinished">Exports headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation type="unfinished">OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation type="unfinished">Press this button to apply filter to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation type="unfinished">Apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation type="unfinished">Auto apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation type="unfinished">Filter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation type="unfinished">RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation type="unfinished">Save headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">Text files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation type="unfinished">Export headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation type="unfinished">Export finished</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Artículos en total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduce de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Palabras en total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduce a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation type="unfinished">Open folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Este diccionario consiste de los archivos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation type="unfinished">Description:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation type="unfinished">Show all unique dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation type="unfinished">Headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation type="unfinished">Edit the dictionary via command:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 entradas</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation type="unfinished">Databases</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation type="unfinished">Strategies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation type="unfinished">Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation type="unfinished">Comma-delimited list of search strategies
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation type="unfinished">Extended menu with all dictionaries...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Modificar este grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation type="unfinished">Dictionary info</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation type="unfinished">&amp;Dictionary Bar</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Aceptar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fuentes modificados</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Algunos fuentes fueron cambiados. ¿Quieres aceptar los cambios?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation type="unfinished">Plain text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation type="unfinished">Articles found: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation type="unfinished">Now indexing: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ningún</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation type="unfinished">No dictionaries for full-text search</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation type="unfinished">Error in favorities file</translation>
     </message>
@@ -1117,7 +1102,7 @@ between classic and school orthography in cyrillic)</translation>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Se eliminarán todos los elementos seleccionados. ¿Continuar?</translation>
     </message>
   </context>
   <context>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</translation>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Vaya a Editar|Diccionarios|Fuentes|Forvo y solicitar su propia clave de API para hacer desaparecer este error.</translation>
     </message>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation type="unfinished">Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation type="unfinished">Articles found:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation type="unfinished">Available dictionaries in group:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation type="unfinished">Wait for indexing:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation type="unfinished">Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation type="unfinished">Indexed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation type="unfinished">Now indexing: None</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation type="unfinished">&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation type="unfinished">&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>SUPR</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>INS</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Pestaña 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Asignar un nombre nuevo al grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Diccionarios disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Añadir grupo</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Añadir grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Crear un nuevo grupo de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Para añadir diccionarios a grupos, utilice el ratón para arrastrar y soltar los diccionarios a los grupos. Además cambie el orden de los grupos arrastrándolos con el ratón.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renombrar el grupo actual de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Eliminar el grupo actual de diccionarios</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Asignar un nombre al grupo nuevo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Eliminar todos los grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Quitar diccionarios seleccionados del grupo (SUPR)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Añadir diccionarios seleccionados al grupo (INS)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Eliminar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Renombrar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Eliminar todos los grupos de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Crear grupos basados en lengua</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation type="unfinished">History:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation type="unfinished">%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation type="unfinished">History size: %1 entries out of maximum %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugerencias ortográficas: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfología %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nombre del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Iniciando</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Por favor espere mientras construyendo el índice de los diccionarios</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Por favor espere...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation type="unfinished">Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation type="unfinished">Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laosiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation type="unfinished">Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation type="unfinished">Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Acano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation type="unfinished">Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation type="unfinished">Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation type="unfinished">Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation type="unfinished">Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation type="unfinished">Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation type="unfinished">Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation type="unfinished">Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation type="unfinished">Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Camboyano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latín</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation type="unfinished">Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation type="unfinished">Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation type="unfinished">Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation type="unfinished">Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation type="unfinished">Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tayiko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation type="unfinished">Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tártaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation type="unfinished">Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation type="unfinished">Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation type="unfinished">Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation type="unfinished">Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wólof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation type="unfinished">Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retorrománico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation type="unfinished">Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation type="unfinished">Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abjasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirguís</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation type="unfinished">Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico escocés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation type="unfinished">Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation type="unfinished">Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation type="unfinished">Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Vasco (Euskara)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Ávaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation type="unfinished">Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation type="unfinished">Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation type="unfinished">Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiyiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation type="unfinished">Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation type="unfinished">Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Cazaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation type="unfinished">Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation type="unfinished">Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation type="unfinished">Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation type="unfinished">Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pastún</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation type="unfinished">Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation type="unfinished">Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation type="unfinished">Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation type="unfinished">Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation type="unfinished">Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation type="unfinished">Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation type="unfinished">Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsì</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisón occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Gallego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amárico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucranio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation type="unfinished">Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation type="unfinished">Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation type="unfinished">Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avéstico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation type="unfinished">Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikáans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation type="unfinished">Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Noruego bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation type="unfinished">Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Chechén</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Español</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation type="unfinished">Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asamés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osseto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suajili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Guyaratí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation type="unfinished">Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation type="unfinished">Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation type="unfinished">Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Criollo haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation type="unfinished">Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Noruego Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele sureño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation type="unfinished">Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation type="unfinished">Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigriña</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yidis</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation type="unfinished">Traditional Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation type="unfinished">Simplified Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation type="unfinished">Other</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation type="unfinished">Other Simplified Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation type="unfinished">Other Traditional Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation type="unfinished">Other Eastern-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation type="unfinished">Other Western-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation type="unfinished">Other Russian languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation type="unfinished">Other Japanese languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation type="unfinished">Other Baltic languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation type="unfinished">Other Greek languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation type="unfinished">Other Korean dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation type="unfinished">Other Turkish dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation type="unfinished">Other Thai dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation type="unfinished">Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
@@ -2517,207 +2490,207 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation type="unfinished">French</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation type="unfinished">Spanish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation type="unfinished">Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation type="unfinished">Czech</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation type="unfinished">German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation type="unfinished">Greek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation type="unfinished">Finnish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation type="unfinished">Dutch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation type="unfinished">Polish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation type="unfinished">Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation type="unfinished">Russian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation type="unfinished">Turkish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation type="unfinished">German, Switzerland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation type="unfinished">Spanish, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation type="unfinished">Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation type="unfinished">English</translation>
     </message>
@@ -2725,7 +2698,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Error cargando los diccionarios</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation type="unfinished">Error in configuration file. Continue with default settings?</translation>
     </message>
@@ -2741,715 +2714,715 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation type="unfinished">F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation type="unfinished">F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation type="unfinished">Favo&amp;rites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation type="unfinished">F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation type="unfinished">F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Todo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Ayuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Salir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation type="unfinished">Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Salir de la aplicación</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Cerrar a la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>No puede guardar articulo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Agrandar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Acerca de</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Foro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Imprimir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Guardar Artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Guardar articulo como</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimiza el programa a la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Configuración de &amp;Pagina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Página de inicio</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Una nueva versión está disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Buscar en:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Achicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Mostrar Ventana &amp;Principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Acerca de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Descargar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Configuración de página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Buscar en:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Tamaño normal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation type="unfinished">Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation type="unfinished">Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Cargando...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sin titulo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar la Palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Guardar Artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Saltar esta versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Siguiente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimir articulo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Ver</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Despejar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation type="unfinished">&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Agrandar Palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Achicar Palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Tamaño Normal de Palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Cerrar la pestaña actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Pestañas abiertas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation type="unfinished">New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation type="unfinished">&amp;Configuration Folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation type="unfinished">&amp;Menubar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation type="unfinished">Found in Dictionaries:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation type="unfinished">Add all tabs to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation type="unfinished">Open Tabs List</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation type="unfinished">Remove current tab from Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation type="unfinished">You have chosen to hide a menubar. Use %1 to show it back.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation type="unfinished">&amp;Show</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation type="unfinished">&amp;Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation type="unfinished">&amp;Hide</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation type="unfinished">Export history to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">Text files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation type="unfinished">History export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation type="unfinished">Export error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation type="unfinished">&amp;Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation type="unfinished">Import history from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation type="unfinished">Import error: invalid data in file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation type="unfinished">History import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation type="unfinished">Import error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation type="unfinished">Export Favorites to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation type="unfinished">Favorites export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation type="unfinished">Export Favorites to file as plain list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation type="unfinished">Import Favorites from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation type="unfinished">Favorites import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation type="unfinished">Data parsing error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation type="unfinished">Dictionary info</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation type="unfinished">Now indexing for full-text search: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation type="unfinished">&amp;Search Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation type="unfinished">&amp;Results Navigation Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation type="unfinished">Favor&amp;ites Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation type="unfinished">Print Pre&amp;view</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation type="unfinished">&amp;Rescan Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation type="unfinished">&amp;New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation type="unfinished">&amp;Always on Top</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation type="unfinished">Always on Top</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation type="unfinished">Menu Button</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation type="unfinished">Search in page</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation type="unfinished">GoldenDict reference</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation type="unfinished">Show</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation type="unfinished">Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation type="unfinished">Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation type="unfinished">Add current tab to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation type="unfinished">Export to list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation type="unfinished">Show Names in Dictionary &amp;Bar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation type="unfinished">Show Small Icons in &amp;Toolbars</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation type="unfinished">&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation type="unfinished">Article, Complete (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation type="unfinished">Article, HTML Only (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation type="unfinished">Saving article...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation type="unfinished">The main window is set to be always on top.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation type="unfinished">&amp;History Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
-      <translation type="unfinished">Accessibility API is not enabled</translation>
+      <translation>La API de accesibilidad no está habilitada</translation>
     </message>
   </context>
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation type="unfinished">Dictionary file was tampered or corrupted</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation type="unfinished">Failed loading article from %1, reason: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Error leyendo XML: %1 en %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Diccionarios deshabilitados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nombre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Artículos en total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduce de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduce a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Palabras en total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Orden de diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Este diccionario consiste de los archivos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Información del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation type="unfinished">Description:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation type="unfinished">Sort by name</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation type="unfinished">Sort by languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ruta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursivo</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Inicia en la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Sola MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Windows o Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Habilitar el icono en la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation type="unfinished">Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Puerto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usuario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Escanear con ventana emergente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,137 +3642,137 @@ inmediatamente. Con esta opción pestañas nuevas serán
 abiertas sin trasladar a ellas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Utilizar servidor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tecla de Windows o Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Pronuncia palabras automáticamente en la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Inicia cuando el sistema arranca</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Sola ALT de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navegación por pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Sola MAYÚSCULA de derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Con esta opción un intento de cerrar la ventana principal la ocultaría sin cerrar la aplicación.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation type="unfinished">&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Lengua de la interfaz:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Solo CTRL de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Abre pestañas nuevas en el fondo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Red</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Solo CTRL de derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation type="unfinished">Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>MAYÚSCULA de derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Pronunciar palabras automáticamente a escanear con la ventana emergente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Abre pestañas nuevas después de la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Reinicie el programa para utilizar la lengua nueva del programa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3810,24 +3781,23 @@ de la lista. Con está opción pestañas nuevas son
 abiertas al lado de la pestaña actual.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Cerrar a la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Por defecto del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Cuando activado un icono aparece en la bandeja del sistema que puede ser utilizado para abrir la ventana principal y realizar otras tareas. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3840,224 +3810,224 @@ el programa le informa al usuario y le apunta a
 la página web para descargarla.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Inicio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Por defecto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Cambiando la lengua</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tecla CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>ALT de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Sola ALT de derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>CTRL de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>ALT de derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>CTRL de derecho</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Habilitar escaneo en una ventana emergente cuando inicia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Con esta opción, la aplicación inicia directamente en la bandeja del sistema sin mostrar su ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>GoldenDict-ng inicia automáticamente cuando el sistema arranca.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation type="unfinished">Play audio files via built-in audio support</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation type="unfinished">Use internal player:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation type="unfinished">Choose audio back end</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation type="unfinished">Enter audio player command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronunciación</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reproducción</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Usar el programa externo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Un doble clic traduce la palabra cliqueada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Usar cualquier programa para reproducir archivos de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation type="unfinished">ESC key hides main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation type="unfinished">Hide single tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation type="unfinished">Context menu dictionaries limit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation type="unfinished">Send translated word to main window instead of to show it in popup window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation type="unfinished">Send translated word to main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4068,159 +4038,159 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation type="unfinished">Dark Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation type="unfinished">Show scan flag when word is selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation type="unfinished">System proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation type="unfinished">Custom proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation type="unfinished">Custom settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation type="unfinished">Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation type="unfinished">http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation type="unfinished">Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation type="unfinished">Word</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation type="unfinished">Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation type="unfinished">Maximum network cache size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4229,284 +4199,326 @@ If set to 0 the network disk cache will be disabled.</source>
 If set to 0 the network disk cache will be disabled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation type="unfinished"> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation type="unfinished">When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation type="unfinished">Clear network cache on exit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation type="unfinished">Allow full-text search for:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation type="unfinished">articles (0 - unlimited)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation type="unfinished">Ad&amp;vanced</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Cuando se usa el portapapeles, clip todo después de la nueva línea</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>En una nueva búsqueda, enfoca la ventana principal o emergente incluso si está visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation type="unfinished">Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Active esta opción para confirmar cada operación en que se eliminen elementos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Confirmación para la eliminación de elementos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation type="unfinished">Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation type="unfinished">Ignore input phrases longer than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation type="unfinished">Ignore diacritics while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation type="unfinished">Turn this option on to always expand optional parts of articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation type="unfinished">Expand optional &amp;parts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation type="unfinished">Select this option to automatic collapse big articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation type="unfinished">Collapse articles more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation type="unfinished">Articles longer than this size will be collapsed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Búsqueda extra vía sinónimos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation type="unfinished">symbols</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation type="unfinished">Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation type="unfinished">History</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation type="unfinished">Turn this option on to store history of the translated words</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation type="unfinished">Store &amp;history</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation type="unfinished">Articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation type="unfinished">Select word by single click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation type="unfinished">Add-on style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation type="unfinished">Specify the maximum number of entries to keep in history.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation type="unfinished">Maximum history size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation type="unfinished">Save every</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation type="unfinished">minutes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation type="unfinished">Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation type="unfinished">Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation type="unfinished">Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation type="unfinished">Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation type="unfinished"> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation type="unfinished">Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation type="unfinished">Plain Text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation type="unfinished">Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation type="unfinished">Prefix Match</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
@@ -4514,145 +4526,160 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
-      <translation type="unfinished">No program name was given.</translation>
+      <translation>No se proporcionó el nombre del programa.</translation>
+    </message>
+    <message>
+      <location filename="../src/dict/programs.cc" line="195"/>
+      <source>The program has crashed.</source>
+      <translation>El programa ha fallado.</translation>
     </message>
     <message>
       <location filename="../src/dict/programs.cc" line="198"/>
-      <source>The program has crashed.</source>
-      <translation type="unfinished">The program has crashed.</translation>
-    </message>
-    <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
       <source>The program has returned exit code %1.</source>
-      <translation type="unfinished">The program has returned exit code %1.</translation>
+      <translation>El programa ha devuelto el código de error %1.</translation>
     </message>
   </context>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
-      <translation type="unfinished">Type</translation>
+      <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
-      <translation type="unfinished">Command Line</translation>
+      <translation>Línea de comandos</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
-      <translation type="unfinished">Icon</translation>
+      <translation>Icono</translation>
     </message>
   </context>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation type="unfinished">Article loading error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation type="unfinished">Article decoding error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation type="unfinished">Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation type="unfinished">Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation type="unfinished">Author: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation type="unfinished">E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation type="unfinished">Title: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation type="unfinished">Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation type="unfinished">Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation type="unfinished">A dictionary lookup program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation type="unfinished">Dictionary search/filter (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation type="unfinished">Clear Search</translation>
     </message>
@@ -4660,22 +4687,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation type="unfinished">Resource saving error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>El recurso ha fallado de descargar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ADVERTENCIA: %1</translation>
     </message>
@@ -4704,67 +4731,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Diálogo</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar la palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Muestra u oculta la barra de diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation type="unfinished">Always stay on top of all other windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation type="unfinished">Send word to main window (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Siguiente</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4807,17 +4839,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ruta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -4825,60 +4857,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>File</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation type="unfinished">Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabario de Japonés Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Crear diccionarios de grupos de archivos de audio, encontrados en rutas aquí:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonés romanizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4889,84 +4921,84 @@ Estandarizado como ISO 3602
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sitios de Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Directorios de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Cualquier programa externo. Una cadena %GDWORD% será reemplazada por la palabra consulta. Una cadena %GDSEARCH% será reemplazada por el texto en la barra de búsqueda. Si no se proporcionan ambos parámetros, la palabra cabecera será introducida en la entrada estándar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation type="unfinished">Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prounciones promocionadas por &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, una biblioteca colaborativa de medios de comunicación lingüísticos de Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabario de Japonés Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteración</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4977,22 +5009,22 @@ Su estándar es ISO-3602.
 Todavia no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteración rusa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfología</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Cambiar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5001,94 +5033,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation type="unfinished">Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ruta de un directorio con diccionarios Hunspell o Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Reescanear ahora</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteración alemana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Cualquier sitio web. Una cadena %GDWORD% será reemplazada por la palabra buscada:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Añadir...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Escoger un directorio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Sitios web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Rutas para buscar archivos de diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirma la eliminación</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silabario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Diccionarios morfológicos disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5103,94 +5125,94 @@ mal escritas. Agregar diccionarios a los
 fondos de grupos apropriados para utilizarlos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation type="unfinished">Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation type="unfinished">Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation type="unfinished">DICT servers</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation type="unfinished">DICT servers:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Habilitar la pronuncia da Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Clave API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Códigos de lengua (separados por comas):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteración griega</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
-      <translation type="unfinished">Programs</translation>
+      <translation>Programas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation type="unfinished">Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation type="unfinished">Belarusian transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation type="unfinished">Text to Speech</translation>
     </message>
@@ -5206,42 +5228,42 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation type="unfinished">Selected voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation type="unfinished">&amp;Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation type="unfinished">Preview</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation type="unfinished">Available voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation type="unfinished">Text to be previewed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation type="unfinished">Type text to be previewed here.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation type="unfinished">&amp;Preview</translation>
     </message>
@@ -5263,20 +5285,20 @@ fondos de grupos apropriados para utilizarlos.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="80"/>
       <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">Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</translation>
+      <translation>No se puede encontrar la voz TTS disponible.&lt;br&gt;Asegúrese de que al menos un motor TTS ya esté instalado en su computadora.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation type="unfinished">Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation type="unfinished">Rate:</translation>
     </message>
@@ -5284,12 +5306,12 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation type="unfinished">Type a word or phrase to search dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation type="unfinished">Drop-down</translation>
     </message>
@@ -5320,33 +5342,33 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation type="unfinished">As link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -5354,17 +5376,9 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Fallo buscando en algunos diccionarios.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ADVERTENCIA: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/es_ES.ts b/locale/es_ES.ts
index e73d7fd5..b4c2ad23 100644
--- a/locale/es_ES.ts
+++ b/locale/es_ES.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Acerca de</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, programa para consulta de diccionarios, versión </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencia GNU GPLv3 o posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copiar información de versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copiar lista de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Créditos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Desconocido]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basado en Qt %1 (%2, %3 bits)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basado en Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: puede&apos;t crear una tarjeta sin una palabra</translation>
+      <translation>anki: no se puede crear una carta sin una palabra</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Desplegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Utilización de la ventana emergente</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sin título)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>No se encontró ninguna traducción para &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; en el grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(imagen)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Desplegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>De</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Plegar artículo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Hacer una nueva nota de Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Error de consulta: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Palabras parecidas: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expresiones compuestas: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palabras sueltas: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>No se ha podido crear un fichero temporal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Buscar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>El recurso indicado no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Buscar &quot;%1&quot; en &quot;%2&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Seleccionar artículo actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copiar como texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspeccionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Abrir Enlace en Nueva &amp;Pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir Enlace en Navegador Web &amp;Externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Recurso</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Voz de síntesis (TTS)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Foto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Vídeo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Vídeo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definición de diccionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definición: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>El reproductor de audio indicado no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Op&amp;en Enlace</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Guardar &amp;marcador &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ADVERTENCIA: Reproductor de audio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Guardar sonido</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Guardar imagen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Guardar &amp;imagen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Frase no encontrada</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 de %2 partidas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Guardar s&amp;onido...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <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="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Aña&amp;dir &quot;%1&quot; al historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Enviar artículo actual a Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Enviar texto seleccionado a Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Archivos de sonido (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos los archivos (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Archivos de sonido (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Hubo un fallo al reproducir el archivo de sonido: %1</translation>
     </message>
@@ -414,62 +409,62 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversión china</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Habilita la conversión entre caracteres chinos simplificados y tradicionales</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Conversión china</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Habilitar la conversión de caracteres simplificados a caracteres tradicionales (variantes de Taiwán)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC a TC (variante de Taiwán)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Habilita la conversión de caracteres simplificados a caracteres tradicionales (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC a TC (Variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Habilitar conversión desde los caracteres tradicionales a los simplificados</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>CT a CS</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Simplificado a la conversión tradicional china (variante Taiwán)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Fácil para la conversión de Chino tradicional (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Tradicional a la conversión simplificada de China</translation>
     </message>
@@ -477,7 +472,7 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation>Transliteración del ruso</translation>
     </message>
@@ -485,22 +480,22 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Autenticación proxy requerida</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Necesitas proporcionar un nombre de usuario y una contraseña para acceder a través de proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Usuario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
@@ -508,22 +503,22 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Icono de grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Atajo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Carpeta de favoritos:</translation>
     </message>
@@ -548,17 +543,17 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>Imágenes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Todos los ficheros</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>No se puede leer el fichero de imagen especificado.</translation>
     </message>
@@ -566,63 +561,63 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmación</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>¿Está seguro que quiere generar un conjunto de grupos basado en pares de idiomas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation>¿Está seguro que desea generar un conjunto de grupos basados en metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combinar grupos por lengua de origen a &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combinar grupos por lengua destino a &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>La agrupación automática por carpeta falló.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>No se puede acceder al directorio principal de %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>¿Está seguro de que desea generar un conjunto de grupos basados en carpetas contenedoras?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Crear grupo de traducción bidireccional &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combinar grupos con &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Diccionarios:</translation>
     </message>
@@ -635,133 +630,133 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Modo de búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Este elemento determina cómo se interpreta la cadena de filtro</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Si se marca en el caso de los símbolos se tendrá en cuenta al filtrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Coincidir mayúsculas y minúsculas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Exportar lemas a un archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Ayuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Vale</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Pulse este botón para aplicar el filtro a la lista de palabras de cabecera</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Aplicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Si está marcado, cualquier cambio de filtro se aplicará inmediatamente a la lista de palabras de cabecera</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Auto aplicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filtrar cadena (cadena fija, comodines o expresión regular)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Comodines</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Cargando encabezados...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Total de palabras de cabecera: %1, filtrado: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Guardar headwords en el archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Ficheros de texto (*.txt);;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>No se puede abrir el archivo exportado</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportar lemas...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>El proceso de exportación está interrumpido</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exportación finalizada</translation>
     </message>
@@ -769,67 +764,77 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Número de artículos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Idioma origen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Número de palabras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Idioma destino:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Abrir carpeta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Ficheros que componen este diccionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descripción:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Mostrar todos los lemas únicos del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Lemas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Editar el diccionario mediante comando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nombre de archivo de índice:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Abrir carpeta de índice</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 entradas</translation>
     </message>
@@ -860,44 +865,44 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Bases de datos</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Estrategias</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Icono</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Lista separada por comas de bases de datos
 (cadena vacía o &quot;*&quot; coincide con todas las bases de datos)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Lista delimitada por comas de estrategias de búsqueda
@@ -907,37 +912,37 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menú ampliado con todos los diccionarios...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Editar este grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Información del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Lemas del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Abrir carpeta del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Barra de &amp;Diccionarios</translation>
     </message>
@@ -946,27 +951,27 @@ entre ortografía clásica y escolar en cirílico)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Aceptar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fuentes modificadas</translation>
     </message>
@@ -977,12 +982,12 @@ entre ortografía clásica y escolar en cirílico)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1011,75 +1016,55 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Búsqueda de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Palabras completas</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Texto sencillo</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Comodines</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>La palabra consultada no puede estar vacía.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>soporta sintaxis de búsqueda xapian, como AND O +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Distancia máxima entre palabras (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Por defecto</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Máximo artículos por diccionario (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Artículos encontrados: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Ahora indexando: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ninguno</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>La línea de búsqueda debe contener al menos una palabra que contenga </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> o más símbolos</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>No hay diccionarios para la búsqueda de texto completo</translation>
     </message>
@@ -1087,7 +1072,7 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Error en el archivo de Favoritos</translation>
     </message>
@@ -1153,7 +1138,7 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Vaya a Editar|Diccionarios|Fuentes|Forvo y solicite su propia clave de la API para que este error desaparezca.</translation>
     </message>
@@ -1174,68 +1159,52 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Buscar</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Coincidir mayúsculas y minúsculas</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorar orden de palabras</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorar diacríticos</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Artículos encontrados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Diccionarios disponibles en el grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Esperar para indexar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Ayuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Ahora indexando: Ninguno</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
@@ -1267,27 +1236,27 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Supr</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Pestaña 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>Introduzca un nuevo nombre para el grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Diccionarios disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Añad&amp;ir grupo</translation>
     </message>
@@ -1342,42 +1311,42 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>Añadir grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Crear un nuevo grupo de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Agrupar por Idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Cree grupos basados en carpetas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Agrupar por carpetas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Agrupar por metadatos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Arrastre y suelte con el ratón para pasar diccionarios de un grupo a otro, para moverlos dentro de un grupo o para ordenar los grupos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renombrar el grupo de diccionarios actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Eliminar el grupo de diccionarios actual</translation>
     </message>
@@ -1387,43 +1356,43 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>Introduzca un nombre para el nuevo grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Eliminar todos los grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Eliminar los diccionarios seleccionados del grupo (Supr)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Añadir los diccionarios seleccionados al grupo (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Eliminar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nombrar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Eliminar todos los grupos de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Crear grupos de diccionarios según los idiomas</translation>
     </message>
@@ -1446,12 +1415,12 @@ entre ortografía clásica y escolar en cirílico)</translation>
       <translation>Historial:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Tamaño del historial: %1 entradas de un máximo de %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugerencias ortográficas: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfología del %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexación: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nombre del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Inicializando</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Espere mientras se indexa el diccionario, por favor</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Espere por favor...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexación...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laosiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Acano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdú</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulú</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindú</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latín</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maorí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tayiko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tártaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Suazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Iñupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retorrománica</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Sindebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abjasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirguís</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico escocés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Maratí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Árabe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Vasco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Ávaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aimará</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiyiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>kazajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pashto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Eslovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setsuana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbocroata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Chuan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Esloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisio occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Gallego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amárico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sánscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucraniano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Quiñaruanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Checheno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvash</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Español</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asamés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kuanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami septentrional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nynorsk noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Nrebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigriña</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yídica</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chino tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chino simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Otro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Otros dialectos del chino simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Otros dialectos del Chino Tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Otras lenguas del Este de Europa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Otras lenguas del Oeste de Europa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Otras lenguas rusas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Otras lenguas japonesas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Otras lenguas bálticas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Otras lenguas griegas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Otros dialectos coreanos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Otros dialectos turcos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Otros dialectos tailandeses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Bereber</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Francés</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Español</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Bielorruso</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Búlgaro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Checo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Alemán</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Griego</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Finlandés</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italiano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japonés</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Coreano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Lituano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Macedonio</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Holandés</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polaco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugués</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Ruso</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Eslovaco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albanés</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Serbio (Cirílico)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Sueco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ucraniano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Chino simplificado</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chino tradicional</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugués de Brasil</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Farsí</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Español, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindú</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>German, Switzerland</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Español, Bolivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tayiko</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aimará</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Árabe, Arabia Saudita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turcomano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Inglés</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Error al cargar diccionarios</translation>
     </message>
@@ -2733,7 +2706,7 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2741,702 +2714,702 @@ entre ortografía clásica y escolar en cirílico)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Favo&amp;ritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Todo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Atrás</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 diccionarios, %2 artículos, %3 palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Fichero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Ayuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Buscar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Salir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Salir del programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Сerrar en la Bandeja del Sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>No se puede guardar el artículo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Acercar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Diccionarios...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Acerca de</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Foro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Imprimir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Guardar artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Guardar Artículo Como</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimiza la ventana en la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Config&amp;uración de Página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Sitio web</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nueva Versión Disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Buscar:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Alejar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Mostrar Ventana Principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Acerca de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Descargar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Configuración de Página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Buscar en:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Tamaño normal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl + F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl + F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Cargando...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sin título)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferencias...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Guardar artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Saltarse esta versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Adelante</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimir Artículo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Ver</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Borrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Ampliación</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Aumentar tamaño de palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Reducir tamaño de palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Tamaño normal de palabras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Cerrrar la pestaña actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Cerrar todas las pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Cerrar todas las pestañas excepto la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Pestañas abiertas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nueva Pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Carpeta de configuración</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barra de &amp;menús</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Encontrado en los diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Añadir todas las pestañas a Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ADVERTENCIA: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Cadena para buscar en diccionarios. Los comodines &apos;*&apos;, &apos;?&apos; y conjuntos de símbolos &apos;[...]&apos; están permitidos.
 Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbolos usar &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectivamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Abrir lista de pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Eliminar la pestaña actual de Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Mo&amp;strar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Ocultar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportar historial a fichero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Ficheros de texto (*.txt);;Todos los ficheros (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Exportación del historial completa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Error de exportación:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl + H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importar Historial desde un archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Error de importación: datos incorrectos en el archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Importación del historial completa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Import error:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportar Favoritos a un archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Archivos XML (*.xml);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Exportación de Favoritos completada</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportar Favoritos a un archivo como lista en texto sencillo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importar Favoritos desde un archivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Archivos XML (*.xml);;Archivos Txt (*.txt);;Todos los archivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Importación de Favoritos completada</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Error al analizar los datos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Información de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Lemas del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Abrir directorio de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Editar diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexando ahora la búsqueda de texto completo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>¿Eliminar el encabezado &quot;%1&quot; de Favoritos?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Panel de &amp;búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Panel de &amp;resultados de navegación</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Panel de Favor&amp;itos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Vista Pre&amp;via</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Ree&amp;scanear ahora</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nueva Pestaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Siempre en primer plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Siempre en primer plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl + O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Botón de Menú</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Buscar en página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Búsqueda de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Mayús+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Referencia de GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Mostrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Añadir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Añadir la pestaña actual a Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportar a lista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Mostrar N&amp;ombres en Barra de Diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Mostrar &amp;Iconos Pequeños en Barras de Herramientas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navegación</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Habilitar escaneo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artículo, Completo (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artículo, sólo HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Guardando articulo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Guardar artículo completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Panel de &amp;historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>La API de accesibilidad no está activada</translation>
     </message>
@@ -3444,12 +3417,12 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Archivo de diccionario alterado o corrupto</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Fallo al cargar artículo de %1, motivo: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Error de sintaxis XML: %1 en %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Icono</translation>
     </message>
@@ -3498,88 +3471,88 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>No se pudo&apos;abrir el buffer de audio para leer.</translation>
+      <translation>No se pudo abrir el búfer de audio para leer.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Diccionarios no activos (deshabilitados):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nombre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Número de artículos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Idioma origen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Idioma destino:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Número de palabras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Orden de los diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Ficheros que componen este diccionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Información de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descripción:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ordenar por nombre</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordenar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Lemas del diccionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Diccionarios activos: %1, inactivo: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ruta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursiva</translation>
     </message>
@@ -3600,69 +3573,67 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Iniciar en bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Sólo Shift izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Activar icono de bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Servidor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Puerto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Mayúsculas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usuario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Ventana emergente de búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3670,138 +3641,138 @@ switching to them.</source>
 Con esta opción activada, en cambio, las nuevas pestañas se abrirán sin que se pase a ellas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Utilizar un servidor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tecla Windows o tecla Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Pronunciar palabras automáticamente en la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Ejecutar automáticamente al arrancar el sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Sólo Alt izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navegación con pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Sólo Mayúsculas derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Si se habilita esta opción, al intentar cerrar la ventana principal ésta se oculta
 en lugar de cerrrarse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Idioma de la interfaz de usuario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Sólo Ctrl izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Abrir nuevas pestañas en segundo plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Red</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Sólo Ctrl derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Mayúsculas derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Abrir nuevas pestañas después de la actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <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>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Comprobar periódicamente la existencia de nuevas versiones del programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 justo después de la actual. Si no, se situarán las últimas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Cerrar en la bandeja del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Idioma por defecto del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Al activar esta opción, aparece un icono en el área de la bandeja del sistema que se puede usar
 para abrir la ventana actual y realizar otras tareas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,141 +3809,141 @@ Si es así, el programa informará acerca de ello y permitirá abrir una página
 para su descarga.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Inicio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Contraseña:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Por defecto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Cambiando Idioma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tecla Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Sólo Alt derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl Izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl derecha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Teclas de acceso rápido</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Empezar con la ventana emergente de búsqueda activada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Al activar esta opción, el programa aparecerá directamente
 en la bandeja del sistema, sin mostrar la ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla mayúsculas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Inicia automáticamente GoldenDict al arrancar el sistema operativo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>No mostrar ventana emergente cuando la selección o portapapeles en una de las ventanas de GoldenDict&apos;s cambie</translation>
+      <translation>No mostrar ventana emergente cuando cambia la selección o el portapapeles en una de las ventanas propias de GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Ignorar GoldenDict&apos;s propia selección y cambios del portapapeles</translation>
+      <translation>Ignorar la selección propia de GoldenDict y los cambios en el portapapeles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Reproducir archivos de audio mediante el soporte de audio integrado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Usar reproductor interno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Elegir reverso de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Introducir línea de comandos del reproductor de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3982,84 +3952,84 @@ al desactivar el contenido (imágenes, marcos, etc.) que no procedan del sitio w
 que está accediendo. Si algunos sitios web dejan de funcionar, intente desactivar esta opción.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronunciación</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reproducción</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Utilizar un programa externo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Al hacer doble clic sobre una palabra ésta se traduce</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalmente, al pulsar la tecla ESC se pasa a la línea de traducción.
 Pero con esta opción seleccionada, se esconderá la ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>La tecla ESC oculta la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Seleccione esta opción si no quiere que se muestre la barra de pestañas cuando sólo hay abierta una pestaña.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ocultar una pesaña</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Límite de diccionarios para el menú contextual:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Enviar palabra traducida a la ventana principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Mostrar una ventana de bandera antes de mostrar ventana emergente, haga clic en la bandera para mostrar ventana emergente. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4070,445 +4040,487 @@ se desplaza al artículo desde el mismo diccionario. Con esta opción,
 sin embargo, el artículo del diccionario superior se muestra.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Desplazar automáticamente para el artículo objetivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Fuente del diccionario: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>establecer la familia de fuentes de respaldo para diccionario</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Estilo de visualización del artículo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Convierte la IU en la oscuridad.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Modo Oscuro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Gira el estilo de visualización del artículo a oscuro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Modo Lector Oscuro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Orden MRU: Pedido más reciente usado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>El portapapeles de seguimiento cambia cuando el escaneo está activado. ¡Atención! Siempre debería activarlo a menos que esté en Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Cambiar el portapapeles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Cambio de selección de pista</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Sólo la selección de toques cuando todas las teclas seleccionadas se mantienen presionadas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Mostrar una notificación de búsqueda cuando una palabra está seleccionada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Tiempo de retardo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personalizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Ajustes personalizados</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Conectar Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Masco:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modelo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Palabra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Campo vocabulario...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Campo de definición...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Frase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Campo de oración (puede estar vacío)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Tamaño máximo de caché de red:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Espacio máximo de disco ocupado por GoldenDict&apos;s caché de red en
+      <translation>Espacio máximo en disco ocupado por la caché de red de GoldenDict en
 %1
-Si se establece en 0 se desactivará la caché de disco de red.</translation>
+Si se establece en 0, la memoria caché del disco de red se desactivará.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Cuando esta opción está activada, GoldenDict
 borra su caché de red del disco durante la salida.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Borrar caché de red al salir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Búsqueda de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Permitir la búsqueda de texto completo para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation>Don&apos;t búsqueda en diccionarios que contienen más de</translation>
+      <translation>No busque en diccionarios que contengan más de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artículos (0 - ilimitado)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vanzado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Durante las búsquedas sucesivas, si un diccionario está colapsado por el manual, permanecerá colapsado en la siguiente búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Colapsar sesión</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Cuando se usa el portapapeles, clip todo después de la nueva línea</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>En una nueva búsqueda, enfoca la ventana principal o emergente incluso si&apos;s visible</translation>
+      <translation>En una nueva búsqueda, enfoca la ventana principal o emergente incluso si está visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Intervalo de ahorro de favoritos. Si se establece en 0 Favoritos sólo se guardará durante la salida.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Active esta opción para confirmar cada operación en que se eliminen elementos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Confirmación para la eliminación de elementos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Active esta opción para ignorar texto de entrada inrazonablemente largo
 del ratón sobre el ratón, la selección, el portapapeles o la línea de comandos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorar frases de entrada más largas que</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Las frases de entrada más largas que este tamaño serán ignoradas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Active esta opción para ignorar los diacríticos al buscar artículos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorar los diacríticos al buscar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Desplegar &amp;partes opcionales</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Mostrar plegados los artículos con más de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Los artículos con una longitud mayor que ésta se mostrarán plegados</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignorar puntuación durante la búsqueda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Active esta opción para activar la búsqueda de artículos adicionales mediante listas de sinónimos
 de diccionarios Stardict, Babylon y GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Búsqueda extra vía sinónimos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>símbolos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab cambia a las pestañas usadas más recientemente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Active esta opción para almacenar el historial de palabras traducidas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Almacenar &amp;historial</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artículos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Active esta opción para seleccionar palabras con una sola pulsación del ratón</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Seleccionar palabra con un solo clic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Estilo suplementario add-on):</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Tamaño máximo del historial:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Guardar cada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Clásico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Azul</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> Mb</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Se requiere información posicional para usar la búsqueda de frases de Xapian y el operador NEAR, pero el tamaño de la base de datos será mucho mayor. Se aplica solo a los nuevos diccionarios entrantes.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Habilitar índice con información posicional</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Fuente estándar</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Fuente monoespaciada</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Fuente serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Fuente sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Apariencia</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Estas fuentes se aplicarán cuando no se encuentren las fuentes especificadas por un diccionario.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fuentes alternativas</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Texto sencillo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Coincidencia con prefijo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Desconocido</translation>
     </message>
@@ -4516,17 +4528,17 @@ de diccionarios Stardict, Babylon y GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>No se proporcionó el nombre del programa.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>El programa ha fallado.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>El programa ha devuelto el código de error %1.</translation>
     </message>
@@ -4534,27 +4546,27 @@ de diccionarios Stardict, Babylon y GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Línea de comandos</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Icono</translation>
     </message>
@@ -4562,99 +4574,114 @@ de diccionarios Stardict, Babylon y GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Error al cargar el artículo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Error al decodificar artículo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Copia: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versión: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Correo electrónico: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Título: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Sitio web: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Fecha: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Un programa de búsqueda de diccionarios.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Palabra o frase a consultar.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Guardar mensajes de depuración en gd_log.txt en la carpeta de configuración.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Restablecer el estado de la ventana.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Deshabilitar tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Cambiar el grupo de la ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Cambiar el grupo de ventanas emergentes.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Cambiar ventana emergente de escaneo.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Versión impresa e información de diagnóstico.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Búsqueda/filtro en diccionario (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Eliminar Búsqueda</translation>
     </message>
@@ -4662,22 +4689,22 @@ de diccionarios Stardict, Babylon y GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Error al guardar recurso:</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>No se ha podido descargar recurso referenciado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ADVERTENCIA: %1</translation>
     </message>
@@ -4706,68 +4733,73 @@ de diccionarios Stardict, Babylon y GLS</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt + S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Diálogo</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar palabra (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Añadir palabra a favoritos (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Muestra u oculta la barra de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Mantener siempre por encima de otras ventanas</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Enviar palabra a la ventana principal (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Atrás</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Adelante</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ADVERTENCIA: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4779,7 +4811,7 @@ se pueda redimensionar o se pueda manipular de otras maneras.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Mayús+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4789,7 +4821,7 @@ se pueda redimensionar o se pueda manipular de otras maneras.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Control+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4810,17 +4842,17 @@ se pueda redimensionar o se pueda manipular de otras maneras.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ruta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Icono</translation>
     </message>
@@ -4828,60 +4860,60 @@ se pueda redimensionar o se pueda manipular de otras maneras.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Ficheros</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabario japonés Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Añada rutas aquí para crear diccionarios a partir de un conjunto de ficheros de sonido:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romaji Japonés</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4892,84 +4924,84 @@ Estandarizado como ISO 3602
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sitios de Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Directorios de Sonido</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Cualquier programa externo. Una cadena %GDWORD% será reemplazada por la palabra consulta. Una cadena %GDSEARCH% será reemplazada por el texto en la barra de búsqueda. Si no se proporcionan ambos parámetros, la palabra cabecera será introducida en la entrada estándar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prounciones promocionadas por &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, una biblioteca colaborativa de medios de comunicación lingüísticos de Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Habilitar Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Código de idioma ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;El uso de Forvo actualmente requiere una clave API, regístrese en el sitio para obtener su propia clave.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Obtén tu propia clave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;aquí&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabario japonés Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Transliteración personalizada</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Esto solo se aplica en la frase de búsqueda, con cada línea representando una transliteración, separada por punto y coma. Por ejemplo, ae;æ,los usuarios pueden ingresar ae para representar æ en la palabra objetivo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #este es un ejemplo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteración</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ sistema de escritura kana. Estandarizado como ISO 3602
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteración del ruso</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfología</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>Ca&amp;mbiar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Ejemplos:  &amp;quot;eng&amp;quot; para inglés, &amp;quot;fra&amp;quot; para francés &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Puede encontrar la lista completa de idiomas disponibles &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; aquí &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ruta a un directorio con diccionarios de Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Ree&amp;scanear ahora</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteración del alemán</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Cualquier sitio web. Se reemplazará la cadena %GDWORD% con la palabra buscada:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>Añad&amp;ir...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Elija un directorio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Sitios Web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Rutas para buscar los ficheros de diccionarios:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirmar la eliminación</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silabarios:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Diccionarios de morfología disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5106,94 +5128,94 @@ Añada diccionarios apropiados al final
 de los grupos apropiados para utilizarlos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Servidores DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Servidores DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Activar pronunciaciones desde Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>clave de la API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Códigos de idioma (separados por comas):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteración del griego</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(no disponible en la versión portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Transliteración del bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>También puede usar %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1...ISO 8859-16,
 %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK y GB18030, y %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Síntesis de voz</translation>
     </message>
@@ -5209,42 +5231,42 @@ de los grupos apropiados para utilizarlos.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Motores de voz seleccionados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Añadir</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Eliminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Previsualización</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Motores de voz disponibles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Texto a previsualizar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Introduzca aquí el texto que previsualizar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Previsualización</translation>
     </message>
@@ -5269,17 +5291,17 @@ de los grupos apropiados para utilizarlos.</translation>
       <translation>No se ha encontrado ninguna voz de síntesis (TTS).&lt;br&gt;Por favor, verifique que hay al menos un motor de síntesis de voz (TTS) instalado en su ordenador.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferencias</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volumen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Velocidad:</translation>
     </message>
@@ -5287,12 +5309,12 @@ de los grupos apropiados para utilizarlos.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Introduzca una palabra o un texto para buscar en los diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Mostrar coincidencias</translation>
     </message>
@@ -5323,33 +5345,33 @@ de los grupos apropiados para utilizarlos.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nombre</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Dirección</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Activado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Insertar artículo como enlace dentro de la etiqueta &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Como enlace</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Icono</translation>
     </message>
@@ -5357,17 +5379,9 @@ de los grupos apropiados para utilizarlos.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>No se ha podido consultar algunos diccionarios.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>AVISO: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/fa_IR.ts b/locale/fa_IR.ts
index 20646c9e..f9157e4b 100644
--- a/locale/fa_IR.ts
+++ b/locale/fa_IR.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>درباره</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>برنامه جست‌وجوگر واژه‌نامه گلدن‌دیکت، نسخه </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>تحت مجوز گنو GPLv3 یا بالاتر</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>کپی اطلاعات نسخه</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>فهرست لغت نامه ها را کپی کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>دست اندرکاران:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[ناشناخته]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>برپایه‌ی کیوتی %1 (%2، %3 بیت)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© ۲۰۰۸-۲۰۱۳ کنستانتین ایساکوف (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>بر اساس Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: نمی توان بدون کلمه کارت ایجاد کرد</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>جستجوی Anki: AnkiConnect فعال نیست.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: ارسال به anki ناموفق بود</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: ارسال به موفقیت anki</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>بازرسی کنید</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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>
+      <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>گستراندن بند</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>جمع‌کردن بند</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>کار با پنجره واشو</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(بی‌عنوان)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>خوش آمدید!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>هیچ ترجمه ای برای &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; در گروه &lt;b&gt;%2&lt;/b&gt;یافت نشد.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;انجمن برنامه&lt;/a&gt;.&lt;p dir=&quot;RTL&quot;&gt; برای به‌روزرسانی‌ها &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;وب‌سایت برنامه&lt;/a&gt; را بررسی کنید.&lt;p dir=&quot;RTL&quot;&gt;© ۲۰۰۸-۲۰۱۳ کنستانتین ایساکوف. تحت لیسانس GPLv3 یا بالاتر.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(عکس)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>گستراندن بند</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>از </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>جمع‌کردن بند</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>یک یادداشت جدید Anki ایجاد کنید</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>خطای جست‌وجو: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>واژه‌های نزدیک: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>عبارت‌های ترکیبی: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>واژه‌های جداگانه: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>ساخت پرونده موقت شکست خورد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;یافتن &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>یافتن &quot;%1&quot; در &amp;زبانه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>منبع ارجاع شده وجود ندارد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>باز کردن خودکار پرونده منبع شکست خورد، تلاش کنید به‌صورت دستی بازکنید: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>یافتن &quot;%1&quot; در %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>برگزیدن بند جاری</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>رونوشت مانند متن</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>بازرسی کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>یافتن &quot;%1&quot; در %2 در &amp;زبانه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>باز کردن پیوند در &amp;زیانه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>باز کردن پیوند در &amp;مرورگر بیرونی</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>منبع</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>شنیداری</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>گفتار TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>عکس</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>ویدیو</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>ویدیوی: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>تعریف از واژه‌نامه &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>تعریف: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>برنامه شنیداری ارجاع شده وجود ندارد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>لینک باز</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>ذخیره &amp;نشانک &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>هشدار: پخش کننده صوتی: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>خطای: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>ذخیره کردن آوا</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>ذخیره کردن تصویر</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>پرونده‌های تصویر (*.bmp *.jpg *.png *.tif);;همه پرونده‌ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>ذخیره &amp;تصویر...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>عبارت پیدا نشد</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 از %2 مسابقه</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>ذخیره آ&amp;وا...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>فرستادن &quot;%1&quot; به خط ورودی</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;افزودن &quot;%1&quot; به پیشینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;ارسال مقاله فعلی به Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;ارسال متن انتخابی به Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>فایل های صوتی (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;همه فایل ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>فایل صوتی پخش نشد: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;ایجاد یادداشت Anki</translation>
     </message>
   </context>
   <context>
@@ -414,93 +409,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>تبدیل چینی</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>تبدیل بین نویسه های چینی ساده و سنتی را فعال کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>تبدیل چینی</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>تبدیل از نویسه های ساده شده به نویسه های سنتی (نوع تایوان) را فعال کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC به TC (نوع تایوان)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>تبدیل نویسه های ساده شده به نویسه های سنتی (نوع هنگ کنگ) را فعال کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC به TC (نوع هنگ کنگ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>تبدیل از نویسه های سنتی به نویسه های ساده شده را فعال کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC به SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>تبدیل به چینی سنتی (نوع تایوان) ساده شده است</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>تبدیل ساده شده به چینی سنتی (نوع هنگ کنگ)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>تبدیل سنتی به چینی ساده شده</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>نویسه‌گردانی سفارشی</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>احراز هویت پروکسی مورد نیاز است</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>برای دسترسی از طریق پروکسی باید یک نام کاربری و یک رمز عبور وارد کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>نام کاربری:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>گذرواژه:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>فرم</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>نشانه گروه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>میان‌بر:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>پوشهٔ پسندیده‌ها:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>تصویرها</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>همه پرونده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>خطا</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>پرونده تصویری مشخص شده را نمی‌تواند بخواند.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>تایید</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>آیا شما از درخواست ایجاد یک مجموعه از گروه‌ها برپایه جفت‌های زبان اطمینان دارید؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>آیا مطمئن هستید که می خواهید مجموعه ای از گروه ها را بر اساس metadata.toml ایجاد کنید؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>گروه‌ها را با زبان منبع ترکیب کنید به &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>گروه‌ها را با زبان هدف ترکیب کنید به &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>گروه‌بندی خودکار براساس پوشه انجام نشد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>دایرکتوری والد %1 قابل دسترسی نیست.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>آیا مطمئن هستید که می خواهید مجموعه ای از گروه ها را بر اساس پوشه های حاوی آن ایجاد کنید؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>گروه ترجمه دوطرفه بسازید &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>گروه‌ها را ترکیب کنید با &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>واژه‌نامه‌ها:</translation>
     </message>
@@ -635,200 +630,210 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>شیوه جست‌وجو</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>این رکن تعیین می‌کند که رشته پالایه چگونه تفسیر شود</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>اگر به‌کار افتاده باشد برای نمادها در هنگام پالایش پذیرفته می‌شود</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>همتا بودن مورد</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>صادر کردن سرواژه‌ها به پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>صادر کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>کمک</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>خوب</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>برای اعمال پالایه لیست سرواژه‌ها این کلید را فشار دهید</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>اعمال کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>اگر به‌کار افتاده باشد هر تغییر پالایه بی‌درنگ بر روی لیست سرواژه‌ها اعمال می‌گردد</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>اعمال خودکار</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>پالایه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>رشته پالایه (رشته ثابت، نویسه‌های عام یا عبارت منظم)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>متن</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>نویسه‌های عام</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>در حال بارگیری کلمات اصلی...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>جمع سرواژه‌های یکتا:  %1، پالایش شده: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>ذخیره سرواژه‌ها در پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>پرونده‌های متنی (*.txt);;همه پرونده‌ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>نمی توان فایل صادر شده را باز کرد</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>صادر کردن سرواژه‌ها...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>لغو</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>فرآیند صادرات قطع شده است</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>صادرات به پایان رسید</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>مجموع بندها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>ترجمه از:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>مجموع واژه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>ترجمه به:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>بازکردن پوشه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>ویرایش واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>پرونده‌های دربرگیرنده این واژه‌نامه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>شرح:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>همه سرواژه‌های واژه‌نامه یکتا را نشان بده</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>سرواژه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>ویرایش واژه‌نامه با دستور: %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>نام فایل فهرست:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>پوشه فهرست را باز کنید</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 ورودی</translation>
     </message>
@@ -838,105 +843,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>آدرس اینترنتی: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>پایگاه های داده: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>استراتژی های جستجو: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>پایگاه های داده سرور</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>به‌کار افتاده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>آدرس</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>پایگاه های داده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>استراتژی ها</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>نشانه</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>فهرست پایگاه‌های داده با کاما
+(رشته خالی یا &quot;*&quot; با همه پایگاه‌های داده مطابقت دارد)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>فهرست راهبردهای جستجو با کاما محدود شده
+(رشته خالی به معنای استراتژی &quot;پیشوند&quot;)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>منوی گسترش یافته با همه واژه‌نامه‌ها...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>ویرایش این گروه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>اطلاعات واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>سرواژه‌های واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>بازکردن پوشه واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>ویرایش واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>نوار &amp;واژه‌نامه</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;واژه‌نامه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>واژه‌نامه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>پذیرش</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>لغو</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>منابع تغییر کردند</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;گروه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>برخی منابع تغییر کرده‌اند. شما می‌خواهید تغییرات را بپذیرید؟</translation>
     </message>
@@ -991,12 +996,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>صفحه قبلی</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>صفحه بعد</translation>
     </message>
   </context>
   <context>
@@ -1010,83 +1015,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>جستجوی متن کامل</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>متن ساده</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>نویسه‌های عام</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>کلمه پرس و جو نمی تواند خالی باشد.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>از نحو جستجوی xapian مانند AND OR +/- و غیره پشتیبانی کنید</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>پیش فرض</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>مقالات یافت شده: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>اکنون در حال نمایه سازی: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
-      <translation type="unfinished">None</translation>
+      <translation>هیچ یک</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>دیکشنری برای جستجوی تمام متن وجود ندارد</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>خطا در پروندهٔ پسندیده‌ها</translation>
     </message>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>از</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>به ویرایش|واژه‌نامه‌ها|منابع|فوروُ بروید و کلید API مربوط به ما را بپذیرید تا این خطا ناپدید شود.</translation>
     </message>
@@ -1162,79 +1147,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;قبلی</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;بعد</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>جست‌وجو</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>همتا بودن مورد</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>حالت:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>مقالات یافت شده:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>لغت نامه های موجود در گروه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>منتظر نمایه سازی باشید:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>کمک</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>جمع:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>نمایه شده:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>در حال نمایه سازی: هیچ کدام</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>لغو</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>حذف</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>درج</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>زبانه ۲</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>یک نام تازه برای گروه بدهید:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>واژه‌نامه‌های در دست‌رس:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;افزودن گروه</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>افزودن گروه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>ساخت گروه واژه‌نامه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>گروه بندی بر اساس زبان</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>ایجاد گروه های مبتنی بر پوشه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>گروه بندی بر اساس پوشه ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>گروه بر اساس فراداده</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>تغییرنام گروه واژه‌نامه جاری</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>حذف گروه واژه‌نامه جاری</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>یک نام برای گروه تازه بدهید:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>حذف همه گروه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>حذف واژه‌نامه‌های برگزیده شده از گروه (حذف)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>افزودن واژه‌نامه‌های برگزیده شده به گروه (درج)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;حذف گروه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>گروه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;تغییرنام گروه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>حذف همه گروه‌های واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>ساخت گروه‌های زبان-پایه</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>پیشینه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>اندازه پیشینه: %1 ورودی فراتر از بیشینه %2</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>پیش‌نهادهای درست‌نویسی:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 ریخت‌شناسی</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>به‌کار افتاده</translation>
     </message>
@@ -1484,1031 +1453,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>نمایه سازی: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>نام واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>گلدن‌دیکت - برپاسازی</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>لطفا تا فهرست‌سازی واژه‌نامه صبر کنید</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>لطفا منتظر بمانید...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>نمایه سازی...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>ایوی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>ایدو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>لائوسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>توی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>عفری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>آکانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>کری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>ایگبویی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>کومی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>مانکسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>پالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>تایلندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>اردو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>زولو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>چکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>هلندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>گاندا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>فولاهی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>یونانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>هوساوی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>هندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>ایرلندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>خمیری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>کنگو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>لاتینی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>مالایا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>مائوری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>نائورو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>اوریا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>اورومی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>سانگو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>شونا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>تاجیک</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>تامیلی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>تاتاری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>سواتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>تونگا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>اینوپیاک</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>ویندا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>ازبکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>ولزی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>ولوف</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>زوسا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>ایتالیایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>ریتو-رومنس</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>زونخایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>کانادایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>ندیبیلی شمال</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>آبخازی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>قرقیزی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>کیروندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>اسکاتلندی بومی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>آلبانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>لاتویانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>مالایایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>کردی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>بلغاری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>لینگالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>مالتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>مهاراتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>عربی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>باسکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>آواری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>بیهاری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>آیماری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>بریتونی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>سوندانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>دانمارکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>دایوهایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>لوبا کاتانگا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>فیجی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>مجارستانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>فرانسوی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>آلمانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>مغولستانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>عبری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>هریرو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>لوگزامبورگی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>کانیوری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>قزاقی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>کیکویو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>کره‌ای</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>ناواهو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>اندونگا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>نپالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>اجیبوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>پشتو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>لهستانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>ساموی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>اکیتانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>سندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>اسلواکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>سومالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>تیلگو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>تسونگا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>تسوانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>اویغوری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>صربستانی- کرواتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>یوروبی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>ژوانکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>رومانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>اندونزیایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>پنجابی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>سوتو جنوب</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>کورسیکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>اسپرانتور</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>فارسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>اسلونی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>فریزلندی غربی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>اراگونی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>تاهیتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>مالاگاسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>گالیشی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>آذری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>آمهاری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>سانسکریتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>ژاپنی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>اوکراینی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>بامباری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>گرینلندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>باشکیری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>بلاروسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>کشمیری</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>ساردینی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>هیری موتو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>کچوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>بنگالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>جاوایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>اوستایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>کینیارواندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>آفریقایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>بیسلامی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>ارمنی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>بوکمال نروژی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>کرواتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>بوسنی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>اینترلینگوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>اینترلینگو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>کاتالانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>صربستانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>برمه‌ای</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>روسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>لیمبورگی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>نروژی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>چچنی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>چینی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>چوواشی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>سنهالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>اسپانیایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>کرنیش</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>تاگالوگی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>اسامی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>قفقازی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>استونیایی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>سواحیلی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>سوئدی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>تبتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>ویتنامی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>مقدونی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>پرتغالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>ترکی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>ترکمن</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>گوجراتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>آیسلندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>اینوکتیتوتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>انگلیسی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>گرجستانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>کلیسا اسلاوی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>فارویی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>فنلاندی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>ولاپوک</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>والونی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>کاوانیامی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>مارشالی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>سامی شمال</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>هایتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>چامورو</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>نینورسک نروژی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>گورانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>ندیبیلی جنوب</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>چیچوا</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>لیتوانی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>سیچوانی یی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>تگرینی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>یدیشی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>چینی سنتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>چینی ساده</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>سایر</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>چینی سایر گویش‌های ساده</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>چینی سایر گویش‌های سنتی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>سایر زبان‌های اروپای شرقی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>سایر زبان‌های اروپای غربی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>روسی سایر زبان‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>ژاپنی سایر زبان‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>بالتیک سایر زبان‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>یونانی سایر زبان‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>کره‌ای سایر گویش‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>ترکی سایر گویش‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>تایلندی سایر گویش‌ها</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>آمازیغی</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>لوجبانی</translation>
     </message>
@@ -2516,215 +2489,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>فرانسوی</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>اسپانیایی</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>بلاروسی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>بلغاری</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>کشور چک</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>آلمانی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>یونانی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>فنلاندی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>ایتالیایی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>ژاپنی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>کره ای</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>لیتوانیایی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>مقدونی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>هلندی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>لهستانی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>پرتغالی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>روسی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>اسلواکی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>آلبانیایی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>صربی (سیریلیک)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>سوئدی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>ترکی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>اوکراینی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>زبان چینی ساده شده</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>سنتی چینی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>ویتنامی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>پرتغالی، برزیلی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>فارسی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>اسپانیایی، آرژانتین</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>هندی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>اسپرانتو</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>آلمان، سوئیس</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>اسپانیایی، بولیوی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>تاجیک</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>کچوا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>آیمارا</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>عربی، عربستان سعودی</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>ترکمن</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>بین زبان</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>لوژبان</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>انگلیسی</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>خطا در بارگیری واژه‌نامه‌ها</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>خطا در پرونده پیکربندی. با تنظیمات پیش‌فرض ادامه می‌دهید؟</translation>
     </message>
@@ -2740,702 +2713,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>آداب و رسوم مورد علاقه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>همه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>پس</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 واژه‌نامه، %2 بند، %3 واژه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;ویرایش</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;راهنما</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>جست‌وجو</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;ترک کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>خطا</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>ترک کردن برنامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>بستن به &amp;سینی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>نمی‌تواند بند: %1 را ذخیره کند</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>بزرگ‌نمایی به درون</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;واژه‌نامه‌ها...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;درباره</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;انجمن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;چاپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;ذخیره بند</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>ذخیره بند به‌عنوان</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>کمینه کردن پنجره به سینی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;برپایی برگه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;برگه آغازین</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>نسخه تازه موجود است</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>یافتن:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>بزرگ‌نمایی به بیرون</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;نمایش پنجرهٔ اصلی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>درباره گلدن‌دیکت</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>بارگیری</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>برپایی برگه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>یافتن در:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>اندازه عادی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>بارگیری...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(بی‌عنوان)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;ترجیحات...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>خوش آمدید!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>بیان واژه (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>ذخیره بند</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>پرش از این نسخه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>پیش</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>چاپ بند</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>چاپ‌گری موجود نیست. لطفاً نخست یکی نصب کنید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;نما</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>پی&amp;شینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;پاک کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;بزرگ‌نمایی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>بزرگ‌نمایی به درون واژه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>بزرگ‌نمایی به بیرون واژه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>اندازه عادی واژه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>بستن زبانه جاری</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>بستن همه زبانه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>بستن همه زبانه‌ها مگر زبانه جاری</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>زبانه‌های باز شده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>زبانه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;پوشه پیکربندی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>نوار &amp;منو</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>در این واژه‌نامه‌ها یافت شد:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>افزودن تمام زبانه‌ها به پسندیده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>هشدار: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>باز کردن لیست زبانه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>حذف زبانهٔ کنونی از پسندیده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>شما پنهان کردن نوار منو را برگزیده‌اید. %1 را به‌کار ببرید تا دوباره نمایش داده شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;نمایش</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;صادر کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>پنهان&amp;سازی</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>صادر کردن پیشینه به پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>پرونده‌های متنی (*.txt);;همه پرونده‌ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>صادر کردن پیشینه کامل شد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>خطا در صادر کردن:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;وارد کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>وارد کردن پیشینه از پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>خطا در وارد کردن: داده نامعتبر در پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>وارد کردن پیشینه کامل شد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>خطا در وارد کردن:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>برون‌ریزی پسندیده‌ها به پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>فایل های XML (*.xml)؛؛ همه فایل ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>برون‌ریزی پسندیده‌ها کامل شد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>برون‌ریزی پسندیده‌ها به پرونده به عنوان متن ساده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>درون‌ریزی پسندیده‌ها از پرونده</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>فایل های XML (*.xml)؛؛ فایل های Txt (*.txt)؛؛ همه فایل ها (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>درون‌ریزی پسندیده‌ها کامل شد</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>خطای تجزیه داده ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>اطلاعات واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>سرواژه‌های واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>باز کردن پوشه واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>ویرایش واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>اکنون در حال نمایه سازی برای جستجوی متن کامل: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>عنوان &quot;%1&quot; از موارد دلخواه حذف شود؟</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>قاب &amp;جست‌وجو</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>قاب &amp;ناوبری نتایج</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>صفحه موارد دلخواه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;پیش‌نمایش چاپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>پویش &amp;دوباره پرونده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;زبانه تازه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;همیشه در بالا</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>همیشه در بالا</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>کلید منو</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>جستجو در صفحه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>جستجوی متن کامل</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>مرجع GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>نمایش دهید</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>صادر کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>وارد كردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>اضافه کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>افزودن زبانهٔ کنونی به پسندیده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>صادرات به لیست</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>نمایش نا&amp;م‌ها در نوار واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>نمایش نشانه‌های &amp;کوچک در نوار ابزار</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>نا&amp;وبری</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>به کار انداختن پویش</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>بند، کامل (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>بند HTML تنها (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>درحال ذخیره بند...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>ذخیره مقاله کامل</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>پنجره اصلی تنظیم می‌شود تا همیشه در بالا باشد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>قاب &amp;پیشینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API دست‌رسی به‌کار نیفتاده است</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>پرونده واژه‌نامه دست‌کاری یا خراب شده است</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>بارگیری بند از %1 شکست خورد، دلیل: %2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>خطای تجزیه XML: %1 در %2،%3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>آدرس</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>به‌کار افتاده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>نشانه</translation>
     </message>
@@ -3497,101 +3470,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>بافر صدا برای خواندن باز نشد.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>فرم</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>واژه‌نامه‌های غیرفعال (از کار افتاده):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>نام:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>جمع بندها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>ترجمه از:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>ترجمه به:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>جمع واژه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>ترتیب واژه‌نامه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>پرونده‌های دربرگیرنده این واژه‌نامه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>اطلاعات واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>شرح:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>مرتب کردن با نام</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>مرتب کردن با زبان</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>سرواژه‌های واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>دیکشنری های فعال: %1, غیر فعال: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>مسیر</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>بازگشتی</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>دگرساز</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>آغاز برنامه در سینی سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>تنها تبدیل چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>مهار</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>ویندوز/متا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>به‌کار انداختن نشانه سینی سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>میزبان:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>درگاه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>تبدیل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>نوع:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>کاربر:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>پویش &amp;واشو</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,138 +3640,138 @@ switching to them.</source>
 با فعال بودن این، زیانه‌ی تازه باز می‌شود ولی به آن نمی‌روید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>به‌کار بردن کارگزار پروکسی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>برای ترجمه یک واژه از حافظه میان‌برهای زیر را به‌کار ببر:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>کلید ویندوز یا کلید متا</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>بیان خودکار واژه‌ها در پنجره اصلی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>آغاز هم‌راه با سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>تنها دگرساز چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>مرور زبانه‌ای</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>تنها تبدیل چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;شنیداری</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>اگر می‌خواهید کارگزار پروکسی را برای همه درخواست‌های
 شبکه برنامه به‌کار ببرید این را به‌کار اندازید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>زبان رابط کاربری:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>تنها مهار چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>باز کردن زبانه‌های تازه در پس‌زمینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>ش&amp;بکه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>تنها مهار راست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>لینگوُ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>تبدیل راست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>تبدیل چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>بیان خودکار واژه‌ها در پویش واشو</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>باز کردن زبانه تازه پس از زبانه جاری</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>برای به‌کار برده شدن تغییر زبان برنامه را دوباره راه‌اندازی کنید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>کلید دگرساز</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>بررسی دوره‌ای برای نسخه‌های تازه برنامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 به‌عنوان آخرین زیانه افزوده می‌شوند.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>بستن به سینی سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>پیش‌فرض سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>هنگامی‌که به‌کار افتاده، یک نشانه در سینی سیستم نمایش داده می‌شود
 که می‌تواند برای باز کردن پنجره اصلی و انجام دیگر کارها به‌کار برده شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,141 +3809,141 @@ download page.</source>
 و پیام می‌دهد تا یک برگه بارگیری باز کند.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>آغازگر</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>گذرواژه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>پیش‌فرض</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;رابط</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>تغییر دادن زبان</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>کلید مهار</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>برای نمایش یا پنهان کردن پنجره اصلی میان‌برهای زیر را به‌کار ببر:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>دگرساز چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>تنها دگرساز راست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>ترجیحات</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>مهار چپ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>دگرساز راست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>مهار راست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>کلیدهای میان‌برها</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>آغاز با روشن بودن پویش واشو</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>با به‌کار انداختن این، برنامه هنگام آغاز بدون
 نمایش پنجره اصلی به سینی سیستم می‌رود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>کلید تبدیل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>پس از بالا آمدن سیستم‌عامل گلدن‌دیکت به‌طور خودکار اجرا شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>هنگام تغییر انتخاب یا کلیپ بورد در یکی از پنجره های خود GoldenDict، پنجره بازشو نشان داده نشود</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>انتخاب و تغییرات کلیپ‌بورد خود GoldenDict را نادیده بگیرید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>پخش فایل های صوتی از طریق پشتیبانی صوتی داخلی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>از پخش کننده داخلی استفاده کنید:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>پایان صوتی را انتخاب کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>وارد خط فرمان پخش کننده صوتی شوید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3982,533 +3952,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 اگر برخی پایگاه‌ها به خاطر این خراب شدند، این را از کار بیندازید. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>بارگیری محتوا از دیگر پایگاه‌ها را می‌بندد (بیش‌تر آگهی‌ها را پنهان می‌کند)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>بیان کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>بازپخش</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>به‌کار بردن برنامه بیرونی:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>دوبار کلیک واژه کلیک شده را ترجمه کند</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>به‌کار بردن هر برنامه بیرونی برای پخش پرونده‌های شنیداری</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>کلید ESC پنجره اصلی را پنهان کند</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>پنهان کردن تک زبانه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>برای دوری از فهرست زمینه خیلی بزرگ این مقدار را تنظیم کنید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>شمار واژه‌نامه‌های فهرست زمینه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>واژه ترجمه شده را به‌جای نمایش در پنجره واشو به پنجره اصلی بفرست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>واژه ترجمه شده را به پنجره اصلی بفرست</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>نمایش یک پنجره پرچم قبل از نمایش پنجره بازشو، روی پرچم کلیک کنید تا پنجره بازشو نشان داده شود. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>به طور معمول، با کلیک بر روی یک پیوند، دوبار کلیک کردن روی یک کلمه یا جستجوی
+انتخاب در یک مقاله، ترجمه بارگیری می شود و تقریباً بلافاصله
+به مقاله از همان فرهنگ لغت می رود. اما با خاموش بودن این گزینه
+، مقاله از بالاترین فرهنگ لغت نشان داده می شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>به طور خودکار به مقاله هدف بروید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>سبک نمایش مقاله:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>رابط کاربری را تاریک کنید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>حالت تاریک</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>سبک نمایش مقاله را به تیره تبدیل کنید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>حالت خواننده تاریک</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>سفارش MRU: سفارش اخیر استفاده شده.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>وقتی اسکن فعال است، بریده‌دان ردیابی تغییر می‌کند. اطلاع! همیشه باید این را فعال کنید مگر اینکه در لینوکس باشید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>ردیابی تغییر کلیپ بورد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>تغییر انتخاب آهنگ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>فقط زمانی که همه کلیدهای انتخاب شده فشار داده شده باشند، انتخاب تکه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>هنگام انتخاب کلمه، پرچم اسکن را نشان دهید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>زمان تاخیر</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>پروکسی سیستم</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>پروکسی سفارشی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>تنظیمات سفارشی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>عرشه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>مدل:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>کلمه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>رشته واژگان ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>متن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>فیلد تعریف ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>جمله</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>قسمت جمله (می تواند خالی باشد)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>گلدن‌دیکت را در سرآیند HTTP نمایان نکن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>حداکثر اندازه کش شبکه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>حداکثر فضای دیسک اشغال شده توسط حافظه پنهان شبکه GoldenDict در
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+اگر روی 0 تنظیم شود، کش دیسک شبکه غیرفعال می شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>هنگامی که این گزینه فعال است، GoldenDict
+حافظه پنهان شبکه خود را در هنگام خروج از دیسک پاک می کند.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>کش شبکه را در هنگام خروج پاک کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>جستجوی متن کامل</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>اجازه جستجوی متن کامل برای:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>در فرهنگ لغت های حاوی بیش از</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>مقالات (0 - نامحدود)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;پیش‌رفته</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>در طول جستجوهای متوالی، اگر یک فرهنگ لغت به صورت دستی جمع شود، در جستجوی بعدی جمع می شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>فروپاشی جلسه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>هنگام استفاده از کلیپ بورد، همه چیز را بعد از خط جدید پاک کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>در جستجوی جدید، پنجره اصلی یا بازشو را فوکوس کنید، حتی اگر قابل مشاهده باشد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>پسندیده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>فاصله ذخیره موارد دلخواه. اگر روی 0 تنظیم شود، موارد دلخواه فقط در حین خروج ذخیره می شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>برای تأیید هر عملیات حذف موارد، این گزینه را روشن کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>تایید برای حذف موارد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>این گزینه را روشن کنید تا متن ورودی طولانی و غیرمنطقی
+را از روی ماوس، انتخاب، کلیپ بورد یا خط فرمان نادیده بگیرید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>عبارات ورودی طولانی تر از آن را نادیده بگیرید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>عبارات ورودی طولانی تر از این اندازه نادیده گرفته می شود</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>این گزینه را روشن کنید تا در حین جستجوی مقاله‌ها، نشانه‌ها نادیده گرفته شوند</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>در حین جست و جو از نشانه ها چشم پوشی کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>برای گستراندن همیشگی بخش‌های اختیاری بندها این گزینه را روشن کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>&amp;بخش‌های اختیاری را بگستران</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>برای جمع کردن خودکار بندهای بزرگ این گزینه را برگزینید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>بندهای بیش از این را جمع کن</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>بندهای کشیده‌تر از این اندازه جمع می‌شوند</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>هنگام جستجو، علائم نگارشی را نادیده بگیرید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>این گزینه را روشن کنید تا جستجوی مقالات اضافی از طریق فهرست‌های مترادف
+از دیکشنری‌های Stardict، Babylon و GLS فعال شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>جستجوی اضافی از طریق مترادف ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>نماد</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>با مهار+Tab بین زبانه‌ها به ترتیب MRU جابه‌جا شوید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>بابیلون</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>پیشینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>برای نگه‌داری پیشینه واژه‌های ترجمه شده این گزینه را روشن کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>نگه‌داری &amp;پیشینه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>بندها</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>اگر می‌خواهید واژه‌ها را با تک کلیک موش برگزینید این گزینه را به‌کار اندازید</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>برگزیدن واژه با تک کلیک</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>سبک افزونه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>بیشینه شمار ورودی برای نگه‌داری در پیشینه را تعیین می‌کند.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>بیشینه اندازه پیشینه:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>وقفه ذخیره پیشینه. اگر ۰ قرار داده شود پیشینه تنها هنگام ترک برنامه ذخیره خواهد شد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>ذخیره کن هر</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>دقیقه</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>کلاسیک</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>نوین</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>لینگوز</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>لینگوز-آبی</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>برای استفاده از جستجوی عبارت Xapian و عملگر NEAR به اطلاعات موقعیتی نیاز است، اما اندازه پایگاه داده بسیار بزرگتر خواهد بود. فقط برای فرهنگ لغت‌های ورودی جدید اعمال می‌شود.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>فهرست را با اطلاعات موقعیتی فعال کنید</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>فونت استاندارد</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>فونت Monospace</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>قلم سریف</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>قلم Sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>ظاهر</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>این فونت ها زمانی اعمال می شوند که فونت های مشخص شده توسط یک فرهنگ لغت پیدا نشوند.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>فونت های بازگشتی</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>شنیداری</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>متن ساده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>همتا بودن پیش‌وند</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>ناشناخته</translation>
     </message>
@@ -4516,17 +4528,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>نام برنامه‌ای داده نشده است.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>برنامه خراب شده است.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>برنامه این کد خروج را برگردانده است %1.</translation>
     </message>
@@ -4534,27 +4546,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>به‌کار افتاده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>نوع</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>خط فرمان</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>نشانه</translation>
     </message>
@@ -4562,99 +4574,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>خطا در بارگیری بند</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>خطا در رمزگشایی بند</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>حق چاپ: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>نسخه: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>نویسنده: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>ایمیل: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>عنوان: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>وب سایت: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>تاریخ: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>یک برنامه جستجوی فرهنگ لغت.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>کلمه یا جمله به پرس و جو.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>پیام های اشکال زدایی را در gd_log.txt در پوشه پیکربندی ذخیره کنید.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>بازنشانی وضعیت پنجره</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>tts را غیرفعال کنید.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>گروه پنجره اصلی را تغییر دهید.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>گروه پاپ آپ را تغییر دهید.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>جابجایی پنجره اسکن</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>نسخه چاپی و اطلاعات تشخیص</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>جست‌وجو/پالایه واژه‌نامه (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>پاک کردن جست‌وجو</translation>
     </message>
@@ -4662,22 +4689,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>خطای: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>خطا در ذخیره منبع: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>بارگیری منبع ارجاع شده شکست خورد.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>هشدار: %1</translation>
     </message>
@@ -4706,67 +4733,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>دیالوگ</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>بیان واژه (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>افزودن واژه به پسندیده‌ها (مهار+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>نمایش یا پنهان کردن نوار واژه‌نامه</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>همیشه بالای تمام پنجره های دیگر بمانید</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>فرستادن واژه به پنجره اصلی (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>پس</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>پیش</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>هشدار: %1</translation>
     </message>
   </context>
   <context>
@@ -4774,53 +4806,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;قبلی</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;بعد</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>برجسته کردن &amp;همه</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;حساس به حروف کوچک و بزرگ</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>پیدا کردن:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>مسیر</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>نشانه</translation>
     </message>
@@ -4828,60 +4860,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>پرونده‌ها</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>هیراگانا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>سامانه‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>نیهون-شیکی</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>ویکی‌پدیا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>هجابندی کاتاکانای ژاپنی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>ساخت واژه‌نامه‌ها از دسته‌های پرونده‌های شنیداری با افزودن مسیرها در این‌جا:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>روماجی ژاپنی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4892,84 +4924,84 @@ Not implemented yet in GoldenDict.</source>
 هنوز در گلدن‌دیکت پیاده‌سازی نشده است.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>پایگاه‌های ویکی‌پدیا (ویکی‌مدیا):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>شاخه‌های آوا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>هر برنامه خارجی رشته %GDWORD% با کلمه پرس و جو جایگزین می شود. رشته %GDSEARCH% با متن در نوار جستجو جایگزین می شود. اگر هر دو پارامتر ارائه نشده باشند، عنوان اصلی به ورودی استاندارد وارد می شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;تلفظ های ارائه شده توسط &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;، یک کتابخانه رسانه زبانی مشترک ویکی مدیا فرانسه. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Lingua Libre را فعال کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>کد زبان ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;استفاده از Forvo در حال حاضر به یک کلید API نیاز دارد، برای دریافت کلید خود در سایت ثبت نام کنید.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;کلید خود را دریافت کنید &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;اینجا&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>پر کاربردترین روش آوانویسی ژاپنی،
 بر پایه واج‌شناسی انگلیسی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>هجابندی هیراگانای ژاپنی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>نویسه‌گردانی سفارشی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>این فقط در عبارت جستجو اعمال می شود، با هر خط نشان دهنده نویسه نویسی، نقطه ویرگول از هم جدا شده است. به عنوان مثال، ae;æ، کاربران می توانند ae را برای نشان دادن æ در کلمه هدف وارد کنند.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #این یک مثال است</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>نویسه‌گردانی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ Not implemented yet in GoldenDict.</source>
 هنوز در گلدن‌دیکت پیاده‌سازی نشده است.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>نویسه‌گردانی روسی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>ریخت‌شناسی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;تغییر دادن...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>مثال‌ها:  &amp;quot;eng&amp;quot; برای انگلیسی، &amp;quot;fra&amp;quot; برای فرانسوی &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+فهرست کامل زبان‌های موجود را می‌توانید پیدا کنید &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; اینجا &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>کاتاکانا</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>مسیر شاخه با واژه‌نامه‌های Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>اکنون &amp;پویش دوباره کن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>نویسه‌گردانی آلمانی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>هر پایگاه وبی. یک رشته %GDWORD% با واژه درخواستی جای‌گزین می‌شود:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;افزودن...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>یک شاخه برگزینید</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;حذف کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>پایگاه‌های وب</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>مسیرهای جست‌وجوی پرونده‌های واژه‌نامه:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>تایید حذف کردن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>هجابندی‌ها:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>واژه‌نامه‌های ریخت‌شناسی موجود:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>برای به‌کار بردن الفبای لاتین برای نوشتن زبان ژاپنی به‌کار اندازید</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5106,94 +5128,94 @@ of the appropriate groups to use them.</source>
 مناسب برای به‌کار بردن آن‌ها می‌افزاید.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>هپ‌برن</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>کنری-شیکی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>فوروُ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>سرورهای DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>سرورهای DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>به‌کار انداختن بیان کردن با فوروُ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>کلید API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>کدهای زبان (جدا شده با کاما):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>نویسه‌گردانی یونانی</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(در نسخه قابل حمل در دست‌رس نیست)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>برنامه‌ها</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>نویسه‌گردانی بلاروسی</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>متن به گفتار</translation>
     </message>
@@ -5209,42 +5231,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>موتورهای گفتار برگزیده:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;افزودن</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;حذف</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>پیش‌نمایش</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>موتورهای گفتار موجود:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>متن پیش‌نمایش:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>متن را تایپ کنید تا این‌جا پیش‌نمایش شود.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;پیش‌نمایش</translation>
     </message>
@@ -5269,17 +5291,17 @@ of the appropriate groups to use them.</source>
       <translation>نمی‌تواند گفتار TTS در دست‌رسی بیابد. &lt;br&gt; مطمئن شوید که دست‌کم یک موتور TTS روی رایانه شما نصب شده است.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>ترجیحات</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>حجم:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>نرخ:</translation>
     </message>
@@ -5287,12 +5309,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>یک واژه یا عبارت برای جست‌وجو در واژه‌نامه‌ها تایپ کنید</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>پایین رفتن</translation>
     </message>
@@ -5323,33 +5345,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>نام</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>آدرس</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>به‌کار افتاده</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>مقاله را به عنوان پیوند داخل تگ &lt;iframe&gt; درج کنید</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>به عنوان پیوند</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>نشانه</translation>
     </message>
@@ -5357,17 +5379,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>پرس و جوی برخی واژه‌نامه‌ها شکست خورد.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>هشدار: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/fi_FI.ts b/locale/fi_FI.ts
index bb1cf984..c89dd3a6 100644
--- a/locale/fi_FI.ts
+++ b/locale/fi_FI.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Tietoja</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-sanakirjaohjelma, versio </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Lisensoitu GNU GPLv3:n mukaan tai myöhemmin</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Kopioi version tiedot</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Kopioi sanakirjaluettelo</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Avustajat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Tuntematon]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Perustuu Qt:n %1 versioon (%2, %3-bittinen)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Perustuu Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Sitten vain pysäyttää kohdistimen sanan yli haluat etsiä toisessa sovelluksessa, ja ikkuna pop up joka kuvaisi sitä sinulle.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;Ponnahdusikkunan kanssa työskentely&lt;/h3&gt;Voit etsiä sanoja muista aktiivisista sovelluksista, sinun täytyy ensin aktivoida &lt;i&gt;&quot;Skannaa ponnahdusikkuna toiminto&quot;&lt;/i&gt; &lt;b&gt;Asetukset&lt;/b&gt;, ja sitten ota se käyttöön milloin tahansa joko käynnistämällä &apos;ponnahdusikkuna&apos; kuvake edellä, tai klikkaamalla tarjotin kuvaketta alhaalla oikealla hiiren painikkeella ja valitsemalla niin valikossa&apos;on silvottu. </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Laajenna artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Piilota artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Käännöstä &lt;b&gt;%1&lt;/b&gt; ei löytynyt ryhmässä &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Työskentely ponnahdusikkunan kanssa</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(nimetön)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Tervetuloa!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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>Valitse sitten mitä tahansa sanaa, jonka haluat katsoa toiseen sovellukseen hiirelläsi (kaksoisnapsauta sitä tai pyyhkäise sitä hiirellä painamalla painiketta), ja ikkuna pop up joka kuvaisi sanaa sinulle.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Käännöstä ei löytynyt ryhmässä &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Ryhmästä &lt;b&gt;%2&lt;/b&gt;ei löytynyt käännöstä sanalle &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;Tervetuloa &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Aloittaaksesi työskentelyn ohjelman kanssa, ensimmäinen vierailu &lt;b&gt;Muokkaus: Sanakirjoja&lt;/b&gt; lisätäksesi joitakin hakemistopolkuja, joista voit etsiä sanakirjatiedostoja, määrittää erilaisia Wikipedian sivustoja tai muita lähteitä, säädä sanakirjajärjestystä tai luo sanakirjaryhmiä.&lt;p&gt;Ja sitten&apos;ovat valmiita etsimään sanojasi! Voit tehdä sen tässä ikkunassa käyttämällä vasemmalla olevaa paneelia, tai voit &lt;a href=&quot;Working with popup&quot;&gt;etsiä sanoja muista aktiivisista sovelluksista&lt;/a&gt;. &lt;p&gt;Voit muokata ohjelmaa, tutustu käytettävissä oleviin asetuksiin osoitteessa &lt;b&gt;Muokkausasetukset&lt;/b&gt;. Kaikissa asetuksissa on työkaluvihjeitä, muista lukea ne, jos olet epävarma mistä tahansa.&lt;p&gt;Jos tarvitset lisäapua, sinulla on kysyttävää, ehdotuksia tai vain miettiä, mitä muut ajattelevat, olet tervetullut ohjelmaan&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;foorumi&lt;/a&gt;.&lt;p&gt;Tarkista ohjelma&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;sivusto&lt;/a&gt; päivitykset. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Lisenssi GPLv3 tai uudempi.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(kuva)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Laajenna artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Sanakirjasta </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Piilota artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Tee uusi Anki-muistio</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Kyselyvirhe: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Läheiset sanat: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Yhdyslauseet: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Yksittäiset sanat: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Väliaikaistiedoston luonti epäonnistui.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Hae &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Etsi &quot;%1&quot; &amp;uudessa välilehdessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Viittattu resurssi ei ole&apos;t olemassa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Resurssitiedoston automaattinen avaaminen epäonnistui, yritä avata manuaalisesti: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Hae &quot;%1&quot; %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Valitse nykyinen artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopioi tekstinä</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Tarkista</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Hae &quot;%1&quot; %2 &amp;uudessa välilehdessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Avaa linkki uuteen &amp;välilehteen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Avaa linkki ulkoisessa &amp;selaimessa</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Resurssi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Ääni</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS-ääni</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Kuva</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Määritelmä sanakirjasta &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Määritelmä: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Viittattu ääniohjelma ei ole&apos;t olemassa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Avaa Linkki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Tallenna kirjanmerkki &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>VAROITUS: äänisoitin: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>VIRHE: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Tallenna ääni</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Tallenna kuva</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Kuvatiedostot (*.bmp *.jpg *.png *.tif);;Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Tallenna &amp;kuva...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Ilmausta ei löydy</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 / %2 ottelua</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Tallenna ää&amp;ni...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Lähetä &quot;%1&quot; syöttääksesi riviä</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Lisää &quot;%1&quot; historiaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Lähetä nykyinen artikkeli Ankille</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Lähetä valittu teksti Ankiin</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Äänitiedostot (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);Kaikki tiedostot (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Äänitiedostot (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Äänitiedoston toistaminen epäonnistui: %1</translation>
     </message>
@@ -414,62 +409,62 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Kiinalainen Muuntaminen</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Ota käyttöön muuntaminen yksinkertaistettujen ja perinteisten kiinalaisten merkkien välillä</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Kiinan&amp;muunnos</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Ota käyttöön muuntaminen yksinkertaistetuista merkeistä perinteisiin (Taiwan variantti) merkkeihin</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC – TC (Taiwanin versio)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Ota käyttöön muuntaminen yksinkertaistetuista merkeistä perinteisiin (Hong Kong -variantti) merkkeihin</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC – TC (Hong Kong -variantti)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Ota käyttöön muuntaminen perinteisistä merkeistä yksinkertaistettuihin merkkeihin</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC – SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Yksinkertaistettu perinteiseen kiinalaiseen (Taiwan variantti) muuntamiseen</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Yksinkertaistettu perinteiseen kiinalaiseen (Hong Kong -versioon) muuntamiseen</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Perinteinen yksinkertaistettu Kiinan muuntaminen</translation>
     </message>
@@ -477,30 +472,30 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>mukautettu translitterointi</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Välityspalvelimen todennus vaaditaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Sinun täytyy antaa käyttäjätunnus ja salasana, jotta voit käyttää välityspalvelinta</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Käyttäjänimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Salasana:</translation>
     </message>
@@ -508,22 +503,22 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Lomake</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ryhmän kuvake:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Pikanäppäin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Suosikkien kansio:</translation>
     </message>
@@ -548,17 +543,17 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>Kuvat</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Virhe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Voi&apos;t lukea määritellyn kuvatiedoston.</translation>
     </message>
@@ -566,63 +561,63 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Vahvistus</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Oletko varma, että haluat luoda joukon ryhmiä, jotka perustuvat kielipareihin?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Haluatko varmasti luoda joukon ryhmiä metadata.toml-tiedoston perusteella?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Yhdistä ryhmät lähdekielen mukaan &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Yhdistä ryhmät kohdekielen mukaan &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automaattinen ryhmittely kansion mukaan epäonnistui.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Päähakemistoon %1 ei saada yhteyttä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Haluatko varmasti luoda joukon ryhmiä sisältävien kansioiden perusteella?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Tee kaksipuolinen kääntää ryhmä &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Yhdistä ryhmät &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Sanakirjaa: </translation>
     </message>
@@ -635,133 +630,133 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Hakutila</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Tämä elementti määrittää, miten suodatinmerkkijono tulkitaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Jos valittu, symbolien kirjain otetaan huomioon suodattamisen yhteydessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Huomioi kirjainkoko</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Vie otsikkosanat tiedostoon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Vienti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Ohje</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Ok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Paina tätä painiketta ottaaksesi käyttöön suodattimen otsikkoluettelosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Käytä</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Jos valittuna, suodatinmuutokset otetaan välittömästi käyttöön otsikkoluettelossa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Automaattinen soveltaminen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Suodatin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Suodatinmerkkijono (kiinteä merkkijono, jokerimerkit tai säännöllinen lauseke)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Teksti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Jokerimerkit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Ladataan otsikoita...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Ainutlaatuiset otsikot yhteensä: %1, filtered: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Tallenna otsikkosanat tiedostoon</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstitiedostot (*.txt);;Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Vietyä tiedostoa ei voi avata</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Vie otsikot...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Peruuta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Vienti prosessi on keskeytynyt</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Vienti valmis</translation>
     </message>
@@ -769,67 +764,77 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Yhteensä artikkeleita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Käännökset lähteestä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Yhteensä sanoja:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Käännös:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Avaa kansio</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Muokkaa sanakirjaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Tämän sanakirjan sisältämät tiedostot:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Kuvaus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Näytä kaikki ainutlaatuiset sanakirjan otsikot</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Otsikot</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Muokkaa sanakirjaa komennon kautta:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Hakemistotiedoston nimi:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Avaa hakemistokansio</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 artikkelia</translation>
     </message>
@@ -860,44 +865,44 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Käytössä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Osoite</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Tietokannat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategiat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikoni</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Pilkulla erotettu tietokantojen luettelo
 (tyhjä merkkijono tai &quot;*&quot; vastaa kaikkia tietokantoja)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Pilkuin rajattu luettelo hakustrategioista
@@ -907,37 +912,37 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Laajennettu valikko kaikilla sanakirjoilla...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Muokkaa tätä ryhmää</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Sanakirjan tiedot</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Sanakirjan otsikot</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Avaa sanakirjakansio</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Muokkaa sanakirjaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Sanakirjapalkki</translation>
     </message>
@@ -946,27 +951,27 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Sanakirjat</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Sanakirjat</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Hyväksy</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Peruuta</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Lähteet vaihdettu</translation>
     </message>
@@ -977,12 +982,12 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Ryhmät</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Joitakin lähteitä on muutettu. Haluatko hyväksyä muutokset?</translation>
     </message>
@@ -1011,75 +1016,55 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Täystekstihaku</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Kokonaiset sanat</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Pelkkä teksti</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Jokerimerkit</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Kyselysana ei voi olla tyhjä.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>tukea xapian hakusyntaksia, kuten JA TAI +/- jne.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Maksimi etäisyys sanojen välillä (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Oletus</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Artikkeleiden enimmäismäärä sanakirjassa (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Löydetyt artiklat: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Nyt indeksointi: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Tyhjä</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Hakurivin tulee sisältää vähintään yksi sana joka sisältää </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> tai enemmän symboleja</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Ei sanakirjoja koko tekstin hakuun</translation>
     </message>
@@ -1087,7 +1072,7 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Virhe suosikkitiedostossa</translation>
     </message>
@@ -1153,7 +1138,7 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>alkaen</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Siirry Muokkaus: Sanakirjat. Lähteet Forvo ja hakea oman API avain jotta tämä virhe katoaa.</translation>
     </message>
@@ -1174,68 +1159,52 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Etsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Huomioi kirjainkoko</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Tila:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ohita sanojen järjestys</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ohita diakritiikka</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Löydetyt artiklat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Saatavilla olevat sanakirjat ryhmässä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Odota indeksointia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Ohje</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Yhteensä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indeksoitu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Nyt indeksointi: Ei mitään</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Peruuta</translation>
     </message>
@@ -1267,27 +1236,27 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>Anna ryhmälle uusi nimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Saatavilla olevat sanakirjat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Lisää ryhmä</translation>
     </message>
@@ -1342,42 +1311,42 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>Lisää ryhmä</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Luo uusi sanakirja ryhmä</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Ryhmittele kielten mukaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Luo kansiopohjaisia ryhmiä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Ryhmittele kansioiden mukaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Ryhmittele metatietojen mukaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Vedä ja pudota sanakirjoja ryhmiin, siirrä ne ryhmien sisälle, järjestä ryhmät uudelleen hiirellä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Nimeä nykyinen sanakirja uudestaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Poista nykyinen sanakirja ryhmä</translation>
     </message>
@@ -1387,43 +1356,43 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>Anna uuden ryhmän nimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Poista kaikki ryhmät</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Poista valitut sanakirjat ryhmästä (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Lisää valitut sanakirjat ryhmään (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Poista ryhmä</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Ryhmät:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Ni&amp;meä ryhmä uudelleen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Poista kaikki sanakirjaryhmät</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Luo kielipohjaisia ryhmiä</translation>
     </message>
@@ -1446,12 +1415,12 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
       <translation>Historia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Historian koko: %1 kirjausta maksimistaan %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Oikeinkirjoituksen ehdotukset: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologia</translation>
     </message>
@@ -1472,12 +1441,12 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Käytössä</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksointi: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Sanakirjan nimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Alustetaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Odota kun indeksoit sanakirjaa</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Odota...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indeksoidaan...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>afari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>akani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>manski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>paali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>thai</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>tšekki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>hollanti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>fulani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>kreikka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>iiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>khmeri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>latina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>malaiji</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>orija</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Šona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>tadžikki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>tamili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>tataari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>swazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>inupiatu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>uzbekki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>kymri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>wolofi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>italia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>retoromaani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>pohjois-ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>abhaasi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>kirgiisi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>gaeli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>albania</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>latvia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>kurdi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>bulgaria</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>malta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>baski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>avaari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>bihar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>aimara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>bretoni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>sunda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>tanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>katanganluba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>fidži</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>unkari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>ranska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>saksa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>mongoli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>heprea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>luxemburgi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>kazaki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>kikuju</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>korea</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>odžibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>paštu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>puola</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>samoa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>oksitaani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>slovakki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>uiguuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>serbokroaati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>joruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>zhuangi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>romania</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>indonesia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>pandžabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>eteläsotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>korsika</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>persia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>sloveeni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>länsifriisi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>aragonia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>tahiti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>malagassi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>galicia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>azeri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>amhara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>japani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>ukraina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>grönlanti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>baškiiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>valkovenäjä</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>kašmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>sardi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>hiri-motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>ketšua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>bengali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>jaava</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>avesta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>ruanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>afrikaansi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>armenia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>kirjanorja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>kroatia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>bosnia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>katalaani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>serbia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>burma</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>venäjä</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>limburgi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>norja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>tšetšeeni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>kiina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>tšuvassi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>sinhali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>espanja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>korni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>assami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>osseeti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>eesti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>ruotsi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>tiibeti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>vietnami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>makedonia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>portugali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>turki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>turkmeeni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>gudžarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>islanti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>englanti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>georgia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>kirkkoslaavi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>fääri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>suomi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>valloni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>marshalli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>pohjoissaame</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>haiti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>tšamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>uusnorja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>etelä-ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>njandža</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>liettua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>sichuanin-yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>tigrinja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>jiddiš</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>perinteiset merkit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>yksinkertaistetut merkit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>muu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Muut yksinkertaistetut Kiinan murteet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Muut perinteiset Kiinan murteet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Muut itäeurooppalaiset kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Muut Länsi-Euroopan kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Muut venäjän kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Muut japanin kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Muut Baltian kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Muut kreikkalaiset kielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Muut Korean murteet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Muut Turkin murteet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Muut thaimaalaiset murteet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>berberikielet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Ranskan kieli</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Espanja</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>valkovenäläinen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulgarialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Tšekki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Saksan kieli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>kreikkalainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Suomalainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>italialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>japanilainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Korealainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>liettualainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>makedonialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Hollannin kieli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Kiillottaa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugalin kieli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Venäjän kieli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slovakian</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albanialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>serbia (kyrillinen)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Ruotsin kieli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turkkilainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ukrainalainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Yksinkertaistettu kiina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Kiinalainen perinteinen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnam</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugali, brasilialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persialainen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>espanja, Argentiina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Saksa, Sveitsi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>espanja, Bolivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadžiki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>ketsua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>arabia, Saudi-Arabia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmenistan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Englanti</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Virhe ladattaessa sanakirjoja</translation>
     </message>
@@ -2733,7 +2706,7 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Virhe asetustiedostossa. Jatketaanko oletusasetuksilla?</translation>
     </message>
@@ -2741,702 +2714,702 @@ klassisen ja kouluortografian välillä kyrillisessä)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Suosikit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Kaikki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Taaksepäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 sanakirjaa, %2 artikkelia, %3 sanaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Muokkaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Tiedosto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Ohje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>&amp;Etsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>Lopeta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Virhe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Lopeta sovellus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Sulje Kaukalon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Voi&apos;t tallentaa artikkeli: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Lähennä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>Sanakirjat...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>Tietoja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>Foorumi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Tulosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Tallenna artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Tallenna artikkeli nimellä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimoi ikkunan ilmoitusalueelle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Sivun asetukset</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>Kotisivu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Uusi Versio Saatavilla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Hae:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Loitonna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Näytä Pääikkuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Tietoja GoldenDictista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Lataa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Sivun asetukset</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Etsi ryhmästä:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normaalikoko</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation>Pikanäppäinten seurantamekanismin alustus epäonnistui.&lt;br&gt;Varmista, että XServer on ottanut RECORD-laajennuksen käyttöön.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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>GoldenDictin &lt;b&gt;%1&lt;/b&gt; versio on nyt ladattavissa.&lt;br&gt;Napsauta &lt;b&gt;Lataa&lt;/b&gt; päästäksesi lataussivulle.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Ladataan…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(nimetön)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>Asetukset...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Tervetuloa!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Prounce Word (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Tallenna artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Ohita Tämä Versio</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Eteenpäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Tulosta artikkeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Tulostinta ei ole saatavilla. Asenna se ensin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Näytä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Tyhjennä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Zoomaus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Sanojen Lähennys</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Sanat Lähennä Loitonna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Sanojen Normaali Koko</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Sulje nykyinen välilehti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Sulje kaikki välilehdet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Sulje kaikki välilehdet paitsi nykyisen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Avatut välilehdet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Uusi välilehti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Asetuskansio</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Valikkopalkki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Löytyi sanakirjoista:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Lisää kaikki välilehdet suosikkeihin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>VAROITUS: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Merkkijono hakemaan sanakirjoja. Villikortit &apos;*&apos;, &apos;?&apos; ja symbolisarjat &apos;[...]&apos; ovat sallittuja.
 Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnusta käytetään &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Avaa Välilehdet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Poista nykyinen välilehti suosikeista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Olet valinnut valikkopalkin piilottamisen. Käytä %1 näyttääksesi sen takaisin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Näytä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>Vie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>Piilota</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Vie historia tiedostoon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstitiedostot (*.txt);;Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Historian vienti valmis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Vientivirhe: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>Tuo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Tuo historia tiedostosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Tuontivirhe: virheellinen data tiedostossa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Historian tuonti valmis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Tuontivirhe: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Vie suosikit tiedostoon</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML-tiedostot (*.xml);;Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Suosikkien vienti valmis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Vie suosikit tiedostoon pelkkänä listana</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Tuo suosikit tiedostosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-tiedostot (*.xml);;Txt tiedostot (*.txt);;Kaikki tiedostot (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Suosikkien tuonti valmis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Datan jäsennysvirhe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Sanakirjan tiedot</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Sanakirjan otsikot</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Avaa sanakirjakansio</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Muokkaa sanakirjaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Nyt indeksoidaan koko tekstin hakuun: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Poista otsikkosana &quot;%1&quot; suosikeista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Hakupaneeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Tulokset Navigointipaneeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Suosikit-paneeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Tulostuksen esikatselu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Skannaa tiedostot uudelleen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>Uusi välilehti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Aina päällimmäisenä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Aina päällimmäisenä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Valikkopainike</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Etsi sivulta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Täystekstihaku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Vaihto+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDictin viite</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Näytä</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Vie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Tuo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Lisää</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Lisää nykyinen välilehti suosikkeihin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Vie listana</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Näytä nimet sanakirjassa &amp;palkki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Näytä pienet kuvakkeet työkalupalkeissa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Navigointi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Ota Skannaus Käyttöön</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikkeli, Täydellinen (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Vain Artikkeli, Html (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Tallennetaan artikkelia...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Artikkelin tallennus valmis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Tärkein ikkuna on asetettu aina päälle.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Historiapaneeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Esteettömyyden API ei ole käytössä</translation>
     </message>
@@ -3444,12 +3417,12 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Sanakirjatiedosto on kajottu tai vioittunut</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Artikkelin lataaminen kohteesta %1epäonnistui, syy: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML-jäsennysvirhe: %1 %2:lla,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Osoite</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Käytössä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikoni</translation>
     </message>
@@ -3504,82 +3477,82 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Lomake</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Passiiviset (pois käytöstä) sanakirjat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Yhteensä artikkeleita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Käännökset lähteestä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Käännös:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Yhteensä sanoja:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation>Säädä tilausta vetämällä ja pudottamalla kohteita siihen. Pudota sanakirjoja passiiviseen ryhmään poistaaksesi käytöstä niiden käytön.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Sanakirjan järjestys:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Tämän sanakirjan sisältämät tiedostot:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Sanakirjan tiedot</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Kuvaus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Järjestä nimen mukaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Järjestä kielen mukaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Sanakirjan otsikot</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Sanakirjat aktiivisia: %1, ei aktiivisia: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Polku</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursiivinen</translation>
     </message>
@@ -3600,69 +3573,67 @@ Löytääksesi &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; tunnus
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Aloita ilmoitusalueelle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Vain vasen siirto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Ota käyttöön ilmoitusalueen kuvake</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Isäntä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Portti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Vaihto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tyyppi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Käyttäjä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Kartoita Ponnahdusikkuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ Tällä avataan kuitenkin uusia välilehtiä ilman
 vaihtamista niihin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Käytä välityspalvelinta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Käytä seuraavaa pikanäppäintä kääntääksesi sanan leikepöydältä:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows-näppäin tai Meta-näppäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Ääntää sanat automaattisesti pääikkunassa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Aloita järjestelmällä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Vain vasen Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Välilehden selaus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Vain oikea siirto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Tämän avulla pääikkunan sulkeminen piilottaisi sen sen sijaan, että suljettaisiin
 sovellus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Ääni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Ota käyttöön, jos haluat käyttää välityspalvelinta
 kaikille ohjelmille&apos;s verkkopyyntöille.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Käyttöliittymän kieli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Vain vasen Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Avaa uudet välilehdet taustalla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Verkko</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Vain oikea Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Oikea Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Vasen Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Tämän ollessa käytössä, ponnahdusikkuna näkyisi vain, jos kaikki valitut avaimet ovat
 painettuna tilassa, kun sana valinta muuttuu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Ääntää automaattisesti sanoja skannauksessa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Avaa uudet välilehdet nykyisen välilehtien jälkeen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Ohjelma pitää käynnistää uudelleen jotta kieli voidaan vaihtaa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt-näppäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Tarkista uusien ohjelmien julkaisut ajoittain</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ virtauksen jälkeen, aktiivinen välilehti. Muuten ne lisätään
 ovat viimeisiä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Sulje ilmoitusalue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Järjestelmän oletus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Kun käytössä, kuvake näkyy ilmoitusalueen alueella, jota voidaan käyttää
 avaamaan pääikkuna ja suorittamaan muita tehtäviä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,141 +3812,141 @@ ilmoittaa siitä käyttäjälle ja pyytää avaamaan
 lataussivun.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Käynnistys</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Salasana:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Oletus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Käyttöliittymä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Vaihdetaan Kieltä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl-näppäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Käytä seuraavaa pikanäppäintä näyttääksesi tai piilottaaksesi pääikkunan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Vasen Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Vain oikea Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Asetukset</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Vasen Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Oikea Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
       <translation>Pikanäppäimet ovat globaaleja ja toimivat mistä tahansa ohjelmasta ja missä tahansa kontekstissa niin kauan kuin GoldenDict on käynnissä taustalla.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Oikea Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Pikanäppäimet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Aloita skannaus ponnahdusikkuna otettu käyttöön</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Tämän avulla sovellus alkaa suoraan ilmoitusalueelle näyttämättä
 sen pääikkunaa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift-näppäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Käynnistä GoldenDict automaattisesti käyttöjärjestelmän käynnistyksen jälkeen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Valitsee onko skannaus ponnahdusikkuna oletusarvoisesti päällä vai ei. Jos valittuna,
 ohjelma alkaisi aina skannauksen ponnahdusikkunan ollessa aktiivinen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Älä näytä ponnahdusikkunoita kun valinta tai leikepöytä yhdessä GoldenDict&apos;s omat ikkunat muuttuvat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ohita GoldenDict&apos;s oma valinta ja leikepöydän muutokset</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Toista äänitiedostoja sisäänrakennetun äänituen kautta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Käytä sisäistä pelaajaa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Valitse audio back end</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Syötä soittimen komentorivi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,84 +3955,84 @@ kieltämällä sisällön (kuvien, kehyksien) käytön, jotka eivät ole peräis
 joita selailet. Jos jokin sivusto rikkoo tämän vuoksi, kokeile poistaa tämä käytöstä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Estä sisällön lataaminen muilta sivustoilta (piilottaa useimmat mainokset)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Ääntäminen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Toisto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Käytä ulkoista ohjelmaa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Kaksoisnapsauta kääntää sanan napsautettuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Käytä mitä tahansa ulkoista ohjelmaa äänitiedostojen toistamiseen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Tavallisesti painamalla TSK:n näppäintä siirtyy painopiste käännösriviin.
 Tämän avulla se kuitenkin piilottaa pääikkunan.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC-näppäin piilottaa pääikkunan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Valitse tämä vaihtoehto, jos et halua&apos;t nähdä päävälilehden palkin, kun vain yksi välilehti on avattu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Piilota yksi välilehti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Säädä tätä arvoa välttääksesi valtavat kontekstivalikot.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Kontekstivalikon sanakirjojen raja:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Lähetä käännetty sana pääikkunaan sen sijaan, että se näytetään ponnahdusikkunassa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Lähetä käännetty sana pääikkunaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Näytä lippuikkuna ennen kuin näytetään ponnahdusikkuna, napsauta lippua näyttääksesi ponnahdusikkunan. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4073,159 +4043,159 @@ vierittää artikkeliin samasta sanakirjasta. Tällä valinnalla pois päältä,
 kuitenkin ylimmän sanakirjan artikkeli näytetään.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Vieritä automaattisesti kohdistetulle artikkelille</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Sanakirjasin: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>aseta varmennuskirjasinperhe sanakirjaan</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Artikkelin esitystyyli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Käännä käyttöliittymä pimeäksi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Tumma Tila</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Käännä artikkelin näytön tyyli pimeäksi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Tumma Lukija -tila</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU-tilaus: Viimeksi käytetty tilaus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Seuraa leikepöytää muuttuu, kun skannaus on käytössä. Huomio! Sinun pitäisi aina ottaa tämä käyttöön, ellet ole Linuxissa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Kappaleen leikepöydän vaihto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Kappaleen valinnan muutos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Valitse vain kun kaikki valitut näppäimet pidetään painettuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Näytä skannaus kun sana on valittu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Viiveaika</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Järjestelmän välityspalvelin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Oma välityspalvelin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Mukautetut asetukset</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Yhdistä Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Pakka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Malli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Sana</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Sanaston kenttä...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Teksti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Määritelmän kenttä...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Lause</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Lausekkeen kenttä (voi olla tyhjä)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation>Jotkut sivustot havaitsevat GoldenDictin HTTP-otsikoiden kautta ja estävät pyynnöt.
 Ota tämä asetus käyttöön korjataksesi ongelman.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Älä tunnista GoldenDictia HTTP-otsikoissa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Verkon välimuistin enimmäiskoko:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4234,284 +4204,326 @@ If set to 0 the network disk cache will be disabled.</source>
 Jos arvo on 0, verkkovälimuisti ei ole käytössä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Kun tämä asetus on käytössä, GoldenDict
 tyhjentää verkon välimuistin levyltä poistumisen aikana.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Tyhjennä verkkovälimuisti poistuttaessa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Täystekstihaku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Salli koko tekstin haku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Don&apos;t haku sanakirjoissa, jotka sisältävät enemmän kuin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artikkelit (0 - rajoittamaton)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Ad&amp;vanced</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Aikana peräkkäisiä hakuja, jos yksi sanakirja on romahtanut manuaalisesti, se pysyy romahti seuraavassa haussa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Istunto romahtaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Kun käytät leikepöydällä, nauhat kaiken jälkeen uudemman</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>Tarkenna uudessa haussa pää- tai ponnahdusikkuna, vaikka se olisi&apos;s näkyvissä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Suosikit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Suosikkien tallennusväli. Jos arvo on 0 Suosikkia, tallennetaan vain ulostulon aikana.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Ota tämä asetus käyttöön vahvistaaksesi jokaisen toimintojen poistamisen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Vahvistus kohteiden poistolle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Ota tämä asetus käyttöön ohittaaksesi kohtuuttoman pitkän tekstin
 hiiren yli, valinnan, leikepöydältä tai komentoriviltä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Jätä huomiotta pidemmät syöttölauseet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Tämän kokoisia pidempiä ilmaisuja ei oteta huomioon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Ota tämä asetus käyttöön, jos haluat ohittaa diakritiikan artikkeleita etsittäessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ohita diakritiikka etsittäessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Laita tämä asetus päälle laajentaaksesi aina artikkeleiden valinnaisia osia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Laajenna valinnaiset &amp;osat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Valitse tämä vaihtoehto suurien artikkeleiden automaattiseen tiivistämiseen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Tiivistä artikkelit enemmän kuin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Tämän kokoisia pidempiä artikkeleita romahtaa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ohita välimerkit etsittäessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Laita tämä asetus päälle ottaaksesi käyttöön ylimääräiset artikkelit haun synonyymilistojen kautta
 alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Ylimääräinen haku synonyymien kautta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>symbolit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-välilehti navigoi välilehdet MRU-järjestyksessä</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Ota tämä asetus käyttöön tallentaaksesi käännettyjen sanojen historian</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Kaupan &amp;historia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikkelit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Ota tämä asetus käyttöön, jos haluat valita sanat yhdellä hiiren napsautuksella</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Valitse sana yhdellä napsautuksella</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Lisäosan tyyli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Määritä historiassa säilytettävien merkintöjen enimmäismäärä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Historian enimmäiskoko:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Historian tallennus aika. Jos asetettu 0 historiaan, tallennetaan vain poistumisen aikana.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Tallenna joka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minuuttia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klassinen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingot</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingo-sininen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> Mt</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapianin lausehaun ja NEAR-operaattorin käyttämiseen tarvitaan sijaintitietoja, mutta tietokannan koko tulee olemaan paljon suurempi. Koskee vain uusia saapuvia sanakirjoja.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Ota indeksi käyttöön sijaintitiedoilla</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Vakiofontti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace fontti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif-fontti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif-fontti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Ulkomuoto</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Näitä fontteja käytetään, kun sanakirjan määrittämiä fontteja ei löydy.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Varafontit</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Ääni</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Pelkkä teksti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Etuliitteen Vastaavuus</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Tuntematon</translation>
     </message>
@@ -4519,17 +4531,17 @@ alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Ohjelman nimeä ei annettu.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Ohjelma kaatui.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Ohjelma on palauttanut lähdekoodin %1.</translation>
     </message>
@@ -4537,27 +4549,27 @@ alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Käytössä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tyyppi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Komentoliittymä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikoni</translation>
     </message>
@@ -4565,99 +4577,114 @@ alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Artikkelin latausvirhe</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Artikkelin koodauksen purkuvirhe</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Tekijänoikeus: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versio: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Tekijä: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Sähköposti: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Otsikko: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Verkkosivu: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Päivämäärä: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Sanakirjan hakuohjelma.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Kyselyyn käytettävä sana tai lause.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Tallenna debug viestit gd_log.txt config kansioon.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Palauta ikkunan tila.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Poista tts käytöstä.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Muuta pääikkunan ryhmää.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Muuta ponnahdusikkunan ryhmää.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Vaihda skannauksen ponnahdusikkuna.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Tulostusversio ja diagnoositiedot.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Sanakirjan haku/suodatin (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Tyhjennä Haku</translation>
     </message>
@@ -4665,22 +4692,22 @@ alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>VIRHE: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Resurssien tallennusvirhe: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Viitattua resurssia ei voitu ladata.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>VAROITUS: %1</translation>
     </message>
@@ -4709,68 +4736,73 @@ alkaen alkaen alkupisteestä, Babylonista ja GLS-sanakirjoista</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialogi</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Prounce Word (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Lisää sana suosikeihin (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Näyttää tai piilottaa sanakirjan</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Pysy aina kaikkien muiden ikkunoiden päällä</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
       <translation>Tämän avulla voit kiinnittää ikkunan alaspäin, jotta se pysyisi ruudulla,
 voidaan muuttaa tai hallita muulla tavoin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Lähetä sana pääikkunaan (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Taaksepäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Eteenpäin</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>VAROITUS: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4782,7 +4814,7 @@ voidaan muuttaa tai hallita muulla tavoin.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4792,7 +4824,7 @@ voidaan muuttaa tai hallita muulla tavoin.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4813,17 +4845,17 @@ voidaan muuttaa tai hallita muulla tavoin.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Polku</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikoni</translation>
     </message>
@@ -4831,60 +4863,60 @@ voidaan muuttaa tai hallita muulla tavoin.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Tiedostot</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Järjestelmät:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Poistetaanko sivusto &lt;b&gt;%1&lt;/b&gt; luettelosta?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Katakana japanilainen oppimäärä</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Tee sanakirjoja nippujen audiofiles lisäämällä polkuja tähän:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Poistetaanko kansio &lt;b&gt;%1&lt;/b&gt; listalta?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japanilainen Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Standardoitu ISO 3602
 Ei vielä käytössä GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) sivustot:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Ääni Dirs</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Kaikki ulkoiset ohjelmat. Merkkijono %GDWORD% korvataan kyselyn sanalla. A string %GDSEARCH% will be replaced with the text in the search bar. (Automatic Copy) Jos kumpaakin parametria ei ole annettu, otsikkosana syötetään standardiin syötettäväksi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, Wikimedia Francen kielikirjasto. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Ota Lingua Libre Käyttöön</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639–3 -kielikoodi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forvon käyttö vaatii tällä hetkellä API-avaimen, rekisteröityä sivustolle saadaksesi oman avaimen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Hanki oma avain &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;täältä&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Yleisimmin käytetty menetelmä transkriptio japani,
 perustuu Englanti fonologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Hiraganan japanilainen tavu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Muokattu translitterointi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Tätä sovelletaan vain hakulausekkeessa, ja jokainen rivi edustaa translitterointia puolipisteellä erotettuna. Esimerkiksi ae;æ, käyttäjät voivat syöttää ae edustamaan æ:tä kohdesanassa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #tämä on esimerkki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Translitteraatio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ kanan kirjoitusjärjestelmiin. Standardoitu ISO 3602
 Ei vielä toteutettu GoldenDictissä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>venäjän translitteraatio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Muuta...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Esimerkkejä:  &amp;quot;eng&amp;quot; englanniksi, &amp;quot;fra&amp;quot; ranskaksi &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Täydellinen luettelo saatavilla olevista kielistä löytyy &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; täältä &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Polku hakemistoon, jossa on Hunspell/Myspell sanakirjat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Uudelleen&amp;skannaa nyt</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>saksan translitteraatio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Kaikki sivustot. Merkkijono %GDWORD% korvataan kyselyn sanalla:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Lisää...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Valitse hakemisto</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Poista</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Verkkosivut</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Hakupolut, jotka hakevat sanakirjatiedostoja:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Vahvista poistaminen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Tillabaarit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Käytettävissä olevat morfologian sanakirjat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Mahdollistaa latinan aakkosten käyttämisen Japanin kielen kirjoittamiseen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ Lisätään sopivia sanakirjoja asianomaisten ryhmien pohjalle
 niiden käyttämiseksi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT-palvelimet</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT-palvelimet:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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 ääntämiset &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Sivuston avulla ihmiset voivat tallentaa ja jakaa sanaäänityksiä. Voit kuunnella niitä GoldenDictistä.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Ota ääntäminen käyttöön Forvosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API avain:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Kielikoodit (pilkulla erotettu):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Luettelo kielikoodeista, joita haluat käyttää. Esimerkki: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Koko kielikoodien luettelo on saatavilla &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;täällä&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>kreikan translitteraatio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(ei saatavilla kannettavassa versiossa)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Ohjelmat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Poistetaanko ohjelma &lt;b&gt;%1&lt;/b&gt; listalta?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>valkovenäjän translitteraatio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Vaihtoehtoisesti, käytä %GD1251% CP1251, %GDISO1%...%GDISO16% ISO 8859-1... SO 8859-16 vastaavasti,
 %GDBIG5% Big-5, %GDBIG5HKSCS% Big5-HKSCS:lle, %GDGBK% GBK:lle ja GB18030, %GDSHIFTJIS% Shift-JIS:lle.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Tekstistä puheeksi</translation>
     </message>
@@ -5212,42 +5234,42 @@ niiden käyttämiseksi.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Valitut äänimoottorit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Lisää</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Poista</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Esikatselu</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Saatavilla olevat äänimoottorit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Esikatseltava teksti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Kirjoita esikatseltava teksti tähän.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Esikatselu</translation>
     </message>
@@ -5272,17 +5294,17 @@ niiden käyttämiseksi.</translation>
       <translation>Saatavilla olevaa TTS-ääntä ei löydy.&lt;br&gt;Varmista, että tietokoneelle on jo asennettu ainakin yksi TTS-moottori.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Asetukset</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Äänenvoimakkuus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Hinta:</translation>
     </message>
@@ -5290,12 +5312,12 @@ niiden käyttämiseksi.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Kirjoita sana tai lause hakeaksesi sanakirjoja</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Pudotusalas</translation>
     </message>
@@ -5326,33 +5348,33 @@ niiden käyttämiseksi.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nimi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Osoite</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Käytössä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Lisää artikkeli linkkinä &lt;iframe&gt; -tagin sisälle</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Linkinä</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikoni</translation>
     </message>
@@ -5360,17 +5382,9 @@ niiden käyttämiseksi.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Joidenkin sanakirjojen kysely epäonnistui.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>VAROITUS: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/fr_FR.ts b/locale/fr_FR.ts
index e7972a24..dc0e6fba 100644
--- a/locale/fr_FR.ts
+++ b/locale/fr_FR.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>À propos</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Logiciel de recherche de dictionnaires GoldenDict, version </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Sous licence GPLv3 ou ultérieure</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copier les informations de version</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copier la liste des dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Crédits :</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Inconnu]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basé sur Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basé sur Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,57 +80,57 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Agrandir l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Diminuer l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Utilisation avec pop-up</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sans titre)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Bienvenue !</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Aucune traduction pour &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; n'a été trouvée dans le groupe &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;.
@@ -145,7 +140,7 @@
 &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Sous licence GPLv3 ou ultérieure.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(image)</translation>
     </message>
@@ -153,42 +148,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Agrandir l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>De </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Diminuer l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Prendre une nouvelle note Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Erreur dans la requête : %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Mots se rapprochant : </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expressions composées :</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Mots seuls :</translation>
     </message>
@@ -196,197 +191,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Échec de création d&apos;un fichier temporaire.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>Re&amp;chercher &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <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="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Rechercher &quot;%1&quot; dans %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Sélectionner l&apos;article courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copier le texte</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspecter</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Ouvrir un lien dans un nouvel on&amp;glet</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Ouvrir un lien dans un navigateur &amp;externe</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ressource</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Synthèse vocale TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Image</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Vidéo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Vidéo : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Définition à partir du dictionnaire &quot;%1&quot; : %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Définition : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <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="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Ouvrir le lien</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Enregistrer le &amp;signet &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ATTENTION : Lecteur audio : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ERREUR : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Enregistrer le fichier audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Enregistrer l&apos;image</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Fichiers image (*.bmp *.jpg *.png *.tif);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Enregistrer l&apos;&amp;image...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Phrase introuvable</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 sur %2 correspondances</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Enregistrer le fichier audi&amp;o...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Envoyer &quot;%1&quot; dans la zone de saisie</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Ajouter &quot;%1&quot; à l&apos;historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Envoyer l'article actuel à Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Envoyer le texte sélectionné à Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Fichiers son (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tous les fichiers (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Fichiers son (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Impossible de lire le fichier sonore: %1</translation>
     </message>
@@ -418,62 +413,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversion Chinoise</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Activer la conversion entre les caractères chinois simplifiés et traditionnels</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Con&amp;version chinoise</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Activer la conversion de caractères simplifiés en caractères traditionnels (variante taïwanaise)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC à TC (variante de Taïwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Activer la conversion de caractères simplifiés en caractères traditionnels (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC à TC (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Activer la conversion des caractères traditionnels en caractères simplifiés</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC à SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Conversion simplifiée en chinois traditionnel (variante taïwanaise)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Conversion simplifiée en chinois traditionnel (Hong Kong variant)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Conversion chinoise traditionnelle à simplifiée</translation>
     </message>
@@ -481,30 +476,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>translittération personnalisée</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Authentification requise pour le proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <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="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Utilisateur :</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Mot de passe :</translation>
     </message>
@@ -512,22 +507,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Icône de groupe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Raccourci :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Dossier des Favoris :</translation>
     </message>
@@ -552,17 +547,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Images</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Tous les fichiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Erreur</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Impossible de lire le fichier d&apos;image spécifié.</translation>
     </message>
@@ -570,63 +565,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Valider</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Êtes-vous sûr de vouloir générer un ensemble de groupes basés sur des paires de langues ?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Voulez-vous vraiment générer un ensemble de groupes basés sur metadata.toml ?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combiner les groupes selon la langue source pour &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combiner les groupes selon la langue cible pour &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Échec du regroupement automatique par dossier.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Le répertoire parent de %1 ne peut pas être atteint.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Voulez-vous vraiment générer un ensemble de groupes en fonction des dossiers contenant ?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Faire des groupes de traduction dans les deux sens &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combiner les groupes avec &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Dictionnaires :</translation>
     </message>
@@ -639,133 +634,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Mode de recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Respecter la casse</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Enregistre les vedettes dans un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exporter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Aide</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Appliquer</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Applique le filtre à la liste de vedettes</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Appliquer</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Appliquer automatiquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtre :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Texte</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Opérateurs de cardinalité</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Expression régulière</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Chargement des mots-clés...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Total de vedettes uniques : %1, %2 filtrées</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Enregistrer les vedettes dans un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Fichiers texte (*.txt);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Impossible d'ouvrir le fichier exporté</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exporter les vedettes ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Annuler</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Le processus d'exportation est interrompu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exportation terminée</translation>
     </message>
@@ -773,67 +768,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Articles :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduit de :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Mots :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduit vers :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Ouvrir le dossier</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Éditer le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Fichiers incluant ce dictionnaire :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Description :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Montrer toutes les vedettes uniques du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Vedettes</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Éditer le dictionnaire avec la commande :
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nom du fichier d'index :</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Ouvrir le dossier d'index</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 entrées</translation>
     </message>
@@ -864,44 +869,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Activé</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Bases de données</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Stratégies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Icône</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <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="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <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
@@ -911,37 +916,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menu étendu avec tous les dictionnaires...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Éditer ce groupe</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Vedettes du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Ouvrir le dossier des dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Éditer le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Barre de &amp;dictionnaire</translation>
     </message>
@@ -950,27 +955,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Accepter</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Annuler</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Sources modifiées</translation>
     </message>
@@ -981,12 +986,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Groupes</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1015,75 +1020,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Recherche en texte intégral</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Mots entiers</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Texte intégral</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Opérateurs de cardinalité</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Expression régulière</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Le mot de requête ne peut pas être vide.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>supporter la syntaxe de recherche xapienne, comme ET OU +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Distance max entre les mots (%1-%2) :</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Défaut</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Articles max par dictionnaire (%1-%2) :</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Articles trouvés :</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>En cours d&apos;indexation : </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Aucun</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>La ligne de recherche doit contenir au moins un mot de </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> symboles ou plus</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Pas de dictionnaires pour la recherche en texte intégral</translation>
     </message>
@@ -1091,7 +1076,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Erreur dans le fichier des favoris</translation>
     </message>
@@ -1157,7 +1142,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Allez dans Édition|Dictionnaires|Sources|Forvo puis faites une requête pour obtenir votre clé API afin de faire disparâitre ce message d&apos;erreur.</translation>
     </message>
@@ -1178,68 +1163,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Respecter la casse</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Mode :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorer l'ordre des mots</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorer les diacritiques</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Articles trouvés :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dictionnaires disponibles dans le groupe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Indexation en cours :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Aide</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Total :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexés :</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>En cours d&apos;indexation : Aucun</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Annuler</translation>
     </message>
@@ -1271,27 +1240,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Suppr</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Onglet 2</translation>
     </message>
@@ -1331,12 +1300,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Renommer le groupe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dictionnaires disponibles :</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Ajouter groupe</translation>
     </message>
@@ -1346,42 +1315,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ajouter groupe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Créer un nouveau groupe de dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Regrouper par langues</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Créez des groupes basés sur des dossiers.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Regrouper par dossiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Regrouper par métadonnées</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renommer le groupe de dictionnaires courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Retirer le groupe de dictionnaires courant</translation>
     </message>
@@ -1391,43 +1360,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Nommer le nouveau groupe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Retirer tous les groupes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Retirer les dictionnaires sélectionnés du groupe (Suppr)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Ajouter les dictionnaires sélectionnés au groupe (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Retirer le groupe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Groupes :</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nommerle groupe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Retirer tous les groupes de dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Créer des groupes selon la langue</translation>
     </message>
@@ -1450,12 +1419,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Historique :</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Taille de l&apos;historique : %1 entrées sur un maximum de %2</translation>
     </message>
@@ -1463,12 +1432,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Orthographes suggérées :</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morphologie</translation>
     </message>
@@ -1476,12 +1445,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Activé</translation>
     </message>
@@ -1489,1031 +1458,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexage: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nom du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Initialisation</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Veuillez patienter pendant l&apos;indexation du dictionnaire</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Veuillez patienter...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexage...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi (Akan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Mannois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pāli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thaï</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Ourdou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zoulou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tchèque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Néerlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Peul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Haoussa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latins</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Māori (Nouvelle-Zélande)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadjik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamoul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonguien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Ouzbek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Gallois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Romanche</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndébélé (nord)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abkhaze</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirghize</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélique écossais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malaisien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgare</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Basque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Breton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Soundanais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fidjien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Hongrois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Français</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Allemand</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hébreu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Héréro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxembourgeois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazakh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coréen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Népalais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pachto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhî</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Télougou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ouïghour</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croate</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Roumain</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonésien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjābī</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sotho du Sud</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Perse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovénien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frison occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azéri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanscrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bachkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Biélorusse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sarde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bichelamar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Arménien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norvégien (bokmål)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croate</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosniaque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birman</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limbourgeois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norvégien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tchétchène</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tchouvache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Espagnol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossète</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Suédois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibétain</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macédonien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turc</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmène</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Anglais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Géorgien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Liturgique slave</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Féroïen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finnois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Wallon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami (Nord)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haïtien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norvégien (nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndébélé (sud)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituanien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Nuosu (Yi)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrigna</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yiddish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinois traditionel</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinois simplifié</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Autre</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Autres dialectes chinois simplifiés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Autres dialectes chinois traditionels</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Autres langues d&apos;Europe de l&apos;Est</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Autres langues d&apos;Europe de l&apos;Ouest</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Autres langues russes</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Autres langues japonaises</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Autres langues baltiques</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Autres langues grecques</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Autres dialectes coréens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Autres dialectes turcs</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Autres ldialectes thaï</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight (Berbère)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2521,215 +2494,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Français</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Espagnol</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>biélorusse</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulgare</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>tchèque</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Allemand</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>grec</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>finlandais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>italien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japonais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>coréen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>lituanien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Macédonien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Néerlandais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>polonais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>russe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>slovaque</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albanais</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Serbe (cyrillique)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>suédois</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turc</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ukrainien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Chinois simplifié</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chinois (Traditionnel</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnamien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugais, brésilien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Espagnol, Argentine</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>espéranto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Allemand, Suisse</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Espagnol, Bolivie</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadjik</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabe, Arabie Saoudite</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turkmène</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Anglais</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Erreur lors du chargement des dictionnaires</translation>
     </message>
@@ -2737,7 +2710,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2745,702 +2718,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Privilèges</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>f4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Tout</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Précédent</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dictionnaires, %2 articles, %3 mots</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>Éditio&amp;n</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Aide</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Quitter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Erreur</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Quitter à partir de l&apos;application</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Fermer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Impossible d&apos;enregistrer l&apos;article : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dictionnaires...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;À propos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Im&amp;primer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Sauver l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Enregister l&apos;article sous</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Réduit la fenêtre dans la barre des tâches</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Paramètres d&apos;&amp;impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Accueil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nouvelle version disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Chercher :</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Dézoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Afficher la fenêtre &amp;principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>À propos de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Téléchargement</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Paramètres d&apos;impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Chercher dans :</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Taille normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Chargement...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sans titre)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Préférences...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Bienvenue !</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Prononcer le mot (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Sauver l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Ignorer la version</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Suivant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimer l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Vue</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>E&amp;ffacer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Dézoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Taille normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Fermer l&apos;onglet courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Fermer tous les onglets</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Fermer tous les onglets sauf l&apos;onglet courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Onglets ouverts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nouvel onglet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Dossier de &amp;configuration</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barre du &amp;menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Trouvé dans les dictionnaires :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Ajouter tous les onglets aux Favoris</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ATTENTION : %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Liste des onglets ouverts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Supprimer l'onglet actuel des Favoris</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Affi&amp;cher</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exporter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Masquer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exporter l&apos;historique dans un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Fichiers texte (*.txt);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export de l&apos;historique terminé</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Erreur d&apos;export :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importer l&apos;historique à partir d&apos;un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Erreur d&apos;import : données invalides dans le fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import d&apos;historique terminé</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Erreur d&apos;import :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exporter les Favoris vers un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Fichiers XML (*.xml);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Exportation des Favoris terminée</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exporter les Favoris vers un fichier en tant que liste simple</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importer les Favoris depuis un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Fichiers XML (*.xml);;Fichiers Txt (*.txt);Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Importation des Favoris terminée</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Erreur d'analyse des données</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Vedettes du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Ouvrir le dossier des dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Éditer le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexation en cours pour la recherche plein texte : </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Supprimer le mot-vedette &quot;%1&quot; des favoris ?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Re&amp;chercher</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Résultats de la recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Panneau des &amp;Favoris</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Aperçu avant impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Rescanner les fichiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nouvel onglet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Toujours au-&amp;dessus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Toujours au-dessus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Bouton du menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Rechercher dans la page</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Recherche en texte intégral</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Maj+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Référence de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Afficher</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exporter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Ajouter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Ajouter l'onglet actuel aux Favoris</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exporter vers la liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Afficher les noms dans la &amp;barre de dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <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="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Activer le scan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Article, Complet (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Article, HTML uniquement (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Sauvegarde de l&apos;article...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Enregistrer l'article terminé</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>L&apos;API d&apos;accessibilité n&apos;est pas activée</translation>
     </message>
@@ -3448,12 +3421,12 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Le fichier de dictionnaire a été modifié ou corrompu</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Échec du chargement de l&apos;article à partir de %1, cause : %2</translation>
     </message>
@@ -3461,7 +3434,7 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Erreur de lecture XML  : %1 à la position %2,%3</translation>
     </message>
@@ -3477,22 +3450,22 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Activé</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Icône</translation>
     </message>
@@ -3508,82 +3481,82 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Dictionnaires inactifs :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nom :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Articles :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduit de :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduit vers :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Mots :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Ordre des dictionnaires :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Fichiers incluant ce dictionnaire :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Description :</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Trier par nom</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Trier par langue</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Vedettes du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Dictionnaires actifs : %1, inactifs : %2</translation>
     </message>
@@ -3591,12 +3564,12 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Chemin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Récursif</translation>
     </message>
@@ -3604,69 +3577,67 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Démarrer dans la barre des tâches</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Maj gauche uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Activer l&apos;icône système</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Hôte :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Port :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Maj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Type :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Utilisateur :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Fenêtre de &amp;scan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3675,136 +3646,136 @@ Si cette option est activée, les nouveaux onglets seront ouverts
 sans basculer vers ceux-ci.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Utiliser un proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Touche Windows ou Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Prononciation automatique dans la fenêtre principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Lancer au démarrage du système</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Alt gauche uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navigation par onglets</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Maj droite uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Cacher la fenêtre principale au lieu de fermer l&apos;application.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Langue de l&apos;interface :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Ctrl gauche uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Nouveaux onglets en arrière-plan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Réseau</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Ctrl droite uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Maj droite</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Maj gauche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Prononciation automatique dans la fenêtre de scan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Nouveaux onglets après l&apos;onglet courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Redémarrez le programme pour appliquer le changement de langue.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Touche Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Vérifier régulièrement les mises à jour</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3813,25 +3784,24 @@ ouverts à côté de l&apos;onglet courant. Sinon, ils seront ajoutés
 en fin de liste.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Réduire dans la barre des tâches</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Défaut (système)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Lorsque cette option est active, une icône apparaît dans la barre des tâches, pouvant être utilisée
 pour ouvrir la fenâtre principale et accomplir d&apos;autres tâches.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3843,141 +3813,141 @@ en sera informé, et invité à se rendre sur la page de
 téléchargement.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Démarrage</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Mot de passe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Défaut</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interface</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Changement de langue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Touche Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt gauche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Alt droite uniquement</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Préférences</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl gauche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt droite</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl droite</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Raccourcis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Démarrer avec la fenêtre de scan activée</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>L&apos;application démarre directement dans la barre des tâches, sans que
 la fenêtre principale n&apos;apparaisse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Touche Maj</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Démarrer automatiquement GoldenDict avec l&apos;ordinateur.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Ne pas afficher la popup lorsque la sélection ou le presse-papiers dans une des fenêtres de GoldenDict&apos;s change de fenêtre</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignorer GoldenDict&apos;s propres changements de sélection et de presse-papiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Jouer des fichiers audio via le support audio intégré</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Utiliser le lecteur interne:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Choisir la fin de l'audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Entrer la ligne de commande du lecteur audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3986,84 +3956,84 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 que du contenu est manquant, essayez de désactiver cette option.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Prononciation</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Lecture</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Utiliser un programme externe :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Double-clic traduit le mot cliqué</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalement, presser Echap donne le focus à la ligne de traduction.
 Avec cette otion activée, Echap cachera la fenêtre principale.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Echap cache la fenêtre principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Sélectionnez cette option si vous ne voulez pas voir la barre principale lorsqu&apos;un seul onglet est ouvert.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Cacher l&apos;onglet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limite de dictionnaires dans les menus contextuels :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Envoyer la traduction du mot vers la fenêtre principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Afficher une fenêtre d'indicateur avant d'afficher la fenêtre popup, cliquez sur le drapeau pour afficher la fenêtre popup. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4074,159 +4044,159 @@ fait défiler vers l'article à partir du même dictionnaire. Avec cette option
 cependant, l'article du dictionnaire le plus haut est affiché.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Défilement automatique vers l'article cible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Police du dictionnaire : </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>définir la famille de police de secours pour le dictionnaire</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Style d'affichage de l'article :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Tourne l'interface utilisateur vers l'obscurité.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Mode Sombre</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Tournez le style d'affichage de l'article en obscurité.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Mode lecture sombre</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Ordre MRU : la commande la plus récente.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Suivre les changements dans le presse-papiers lorsque le balayage est activé. Attention ! Vous devriez toujours l'activer à moins que vous ne soyez sous Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Suivre le changement du presse-papier</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Changement de sélection du parcours</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>N'appuyer sur la sélection que lorsque toutes les touches sélectionnées sont maintenues enfoncées :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Afficher l'indicateur de scan lorsque le mot est sélectionné</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Temporisation</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy du système</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personnalisé</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Paramètres personnalisés</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Connexion Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Deck :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modèle :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Mot</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Champ de vocabulaire...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Texte du texte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Champ de définition...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Phrase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Champ de phrase (peut être vide)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Taille maximale du cache réseau:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4235,284 +4205,326 @@ If set to 0 the network disk cache will be disabled.</source>
 Si défini à 0, le cache du disque réseau sera désactivé.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> Mio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Lorsque cette option est activée, GoldenDict
 efface le cache réseau du disque pendant la sortie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Vider le cache réseau à la sortie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Recherche en texte intégral</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Autoriser la recherche en texte intégral pour :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Ne pas rechercher dans les dictionnaires contenant plus de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>article(s) (0 - pas de limite)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vancé</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Lors des recherches successives, si un dictionnaire est réduit par un manuel, il restera réduit dans la recherche suivante</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Réduire la session</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Lorsque vous utilisez le presse-papiers, supprimer tout après le retour à la ligne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>Lors d'une nouvelle recherche, focalisez la fenêtre principale ou popup même si elle&apos;s est visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoris</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Intervalle de sauvegarde des Favoris. Si défini à 0, les Favoris ne seront sauvegardés qu'à la sortie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Activer cette option pour confirmer chaque opération de suppression des articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Confirmation de suppression des éléments</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Activer cette option pour ignorer la longueur déraisonnablement longue du texte
 depuis la souris, la sélection, le presse-papiers ou la ligne de commande</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorer les phrases de saisie de plus de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Les phrases plus longues que cette taille seront ignorées</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Activer cette option pour ignorer les diacritiques lors de la recherche d'articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorer les diacritiques lors de la recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Afficher les &amp;parties optionnelles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Réduire les articles de plus de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignorer la ponctuation lors de la recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Activez cette option pour activer la recherche d'articles supplémentaires via les listes de synonymes
 des dictionnaires Stardict, Babylon et GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Recherche supplémentaire par synonymes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>symboles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab parcourt les onglets dans l&apos;ordre des éléments les plus récents</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylone</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Conserver l&apos;&amp;historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Sélection des mots avec un clic unique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Sélection par clic unique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Style d&apos;add-on :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Taille maximale de l&apos;historique :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Sauver toutes les</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Classique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Bleu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MO</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Les informations de position sont nécessaires pour utiliser la recherche de phrases et l'opérateur NEAR de Xapian, mais la taille de la base de données sera beaucoup plus grande. S'applique uniquement aux nouveaux dictionnaires entrants.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Activer l'index avec les informations de position</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Police standard</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Police Monospace</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Police Serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Police sans empattement</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Apparence</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Ces polices seront appliquées lorsque les polices spécifiées par un dictionnaire ne seront pas trouvées.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Polices de secours</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Texte</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Préfixe</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Inconnu</translation>
     </message>
@@ -4520,17 +4532,17 @@ des dictionnaires Stardict, Babylon et GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Aucun nom d&apos;application n&apos;a été renseigné.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>L&apos;application a planté.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>L&apos;application a renvoyé le code de sortie %1.</translation>
     </message>
@@ -4538,27 +4550,27 @@ des dictionnaires Stardict, Babylon et GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Activé</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Type de texte</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Ligne de commande</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Icône</translation>
     </message>
@@ -4566,99 +4578,114 @@ des dictionnaires Stardict, Babylon et GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Erreur de chargement de l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Erreur de décodage de l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Copyright : %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Version : %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Auteur: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Courriel : %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titre : %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Site Web: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Un programme de recherche de dictionnaire.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Mot ou phrase à requêter.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Enregistrer les messages de débogage dans gd_log.txt dans le dossier de configuration.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Réinitialiser l'état de la fenêtre.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Désactiver tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Changer le groupe de la fenêtre principale.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Changer le groupe de popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Activer/désactiver la popup d'analyse.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Version imprimée et informations de diagnostic.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Rechercher dans les dictionnaires/filtrer (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Effacer la recherche</translation>
     </message>
@@ -4666,23 +4693,23 @@ des dictionnaires Stardict, Babylon et GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ERREUR : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>
 Erreur lors de l&apos;enregistrement de la ressource :</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <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>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ATTENTION : %1</translation>
     </message>
@@ -4711,67 +4738,72 @@ Erreur lors de l&apos;enregistrement de la ressource :</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Message</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Prononcer le mot (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Ajouter un mot aux favoris (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Affiche ou masque la barre de dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Toujours rester au-dessus de toutes les autres fenêtres</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Précédent</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Suivant</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ATTENTION : %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4783,7 +4815,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Maj+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4793,7 +4825,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4814,17 +4846,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Chemin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Icône</translation>
     </message>
@@ -4832,60 +4864,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Fichiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systèmes :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipédia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Syllabaire japonais (Katakana)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Créer des dictionnaires à partir de fichiers audio en ajoutant les chemins ici :</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonais (Rōmaji)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4896,84 +4928,84 @@ Standardisé comme ISO 3602
 Pas encore implémenté dans GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sites Wikipedia (MediaWiki) :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Dossiers audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>N'importe quel programme externe. Une chaîne %GDWORD% sera remplacée par le mot de requête. Une chaîne %GDSEARCH% sera remplacée par le texte dans la barre de recherche. Si les deux paramètres ne sont pas fournis, le mot-vedette sera alimenté en entrée standard.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations fournies par &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, une bibliothèque multimédia linguistique collaborative de Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Activer Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Code de langue ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L'utilisation de Forvo nécessite actuellement une clé API, inscrivez-vous sur le site pour obtenir votre propre clé.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Obtenez votre propre clé &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ici&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Syllabaire japonais (Hiragana)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Translittération personnalisée</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Cela ne s'applique qu'à la phrase de recherche, chaque ligne représentant une translittération, séparée par un point-virgule. Par exemple, ae;æ, les utilisateurs peuvent saisir ae pour représenter æ dans le mot cible.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #ceci est un exemple</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Tanslitération</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4984,118 +5016,108 @@ Standardisé comme ISO 3602
 Pas encore implémenté dans GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Translitération russe</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morphologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Changer...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Exemples :  &amp;quot;eng&amp;quot; pour l'anglais, &amp;quot;fra&amp;quot; pour le français &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+La liste complète des langues disponibles peut être trouvée &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; ici &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Chemin vers un répertoire contenant des dictionnaires Hunspell/Myspell :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Scanner à nouveau</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Translitération allemande</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>N&apos;importe quel site. Une chaîne %GDWORD% sera remplacée par le mot recherché :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Ajouter...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Sélectionner un répertoire</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Retirer</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Sites web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Chemins à parcourir pour trouver des fichiers de dictionnaires :</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirmer la suppression</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Syllabaires :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dictionnaires de morphologie disponibles :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5108,94 +5130,94 @@ et les suggestions orthographiques pour les mots mal orthographiés.
 Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les utiliser.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Serveurs DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Serveurs DICT :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Activer les prononciations à partir de Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Clé API :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Codes des langues (séparés par des virgules) :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Translitération grecque</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(non disponible dans la version portable)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programmes</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Translitération biélorusse</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Utilisez %GD1251% pour CP1251, %GDISO1%...%GDISO16% pour ISO 8859-1...ISO 8859-16 respectivement,
 %GDBIG5% pour Big-5, %GDBIG5HKSCS% pour Big5-HKSCS, %GDGBK% pour GBK et GB18030, %GDSHIFTJIS% pour Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Synthèse vocale TTS</translation>
     </message>
@@ -5211,42 +5233,42 @@ Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Moteurs de synthèse vocale sélectionnés :</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Ajouter</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Supprimer</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Aperçu</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Moteurs disponibles :</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Texte de l&apos;aperçu :</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Saisissez le texte à synthétiser ici.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>A&amp;perçu</translation>
     </message>
@@ -5271,17 +5293,17 @@ Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les
       <translation>Synthèse vocale non disponible.&lt;br&gt;Vérifiez qu&apos;au moins un logiciel de synthèse vocale est installé sur votre ordinateur.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Préférences</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volume :</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Vitesse :</translation>
     </message>
@@ -5289,12 +5311,12 @@ Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Saisissez un mot ou une phrase pour chercher dans les dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Descendre</translation>
     </message>
@@ -5325,33 +5347,33 @@ Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nom</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Activé</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Insérer un article comme lien dans la balise &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>En tant que lien</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Icône</translation>
     </message>
@@ -5359,17 +5381,9 @@ Ajoutez les dictionnaires appropriés à la fin des groupes concernés pour les
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Échec d&apos;interrogation de certains dictionnaires.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ATTENTION : %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/hi_IN.ts b/locale/hi_IN.ts
index 21510c63..17b630e0 100644
--- a/locale/hi_IN.ts
+++ b/locale/hi_IN.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>के सम्बन्ध में</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>गोल्डेनडिक्ट शब्दकोश अवलोकन प्रोग्राम, संस्करण</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>GNU GPLv3 या उत्तरवर्ती अनुज्ञापत्र के अन्तर्गत </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>संस्करण जानकारी कॉपी करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>शब्दकोश सूची कॉपी करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>आभार :</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[अज्ञात]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Qt %1 (%2, %3 bit) आधारित</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© २००८-२०१३ कोंस्टेंटिन इसाकोव (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Qt %1 (%2, %3) पर आधारित</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>अंकी: क्या बिना किसी शब्द के कार्ड&apos;बनाया जा सकता</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki खोज: AnkiConnect सक्षम नहीं है.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>अंकी: अंकी को पोस्ट करना विफल रहा</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>अंकी: अंकी की सफलता के लिए पोस्ट करें</translation>
     </message>
   </context>
   <context>
@@ -79,63 +74,63 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>निरीक्षण</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>लेख का विस्तार करें</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>लेख को संक्षिप्त करें</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Utilisation avec pop-up</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(शीर्षकहीन)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>स्वागत है!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; का कोई अनुवाद नहीं मिला।</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;.
@@ -145,7 +140,7 @@
 &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Sous licence GPLv3 ou ultérieure.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(छवि)</translation>
     </message>
@@ -153,42 +148,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>लेख का विस्तार करें</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>से </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>लेख को संक्षिप्त करें</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>एक नया अंकी नोट बनाएं</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>पृच्छा त्रुटि: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>निकट शब्द: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>यौगिक भाव:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>व्यक्तिगत शब्द:</translation>
     </message>
@@ -196,204 +191,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>अस्थायी फ़ाइल बनाने में विफल।</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot; को देखें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>&quot;%1&quot; को देंखें &amp;नया टैब</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>संदर्भित संसाधन विद्यमान नहीं है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>स्वतः-संसाधन फ़ाइल खोलने में विफल, मैन्युअल रूप से खोलने का प्रयास करें: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>%2 में &quot;%1&quot; देखें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>वर्तमान लेख का चयन करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>पाठ के रूप में प्रतिलिपि बनाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>निरीक्षण</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>नये टैब में &quot;%1&quot; को %2 में देखें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>कडी को नये &amp;टैब में खोलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>&amp;बाह्य गवेषक में कडी खोलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>संसाधन</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>श्रव्य</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>टी.टीए.एस. ध्वनि</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>छवि</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>वीडियो</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>वीडियो: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>शब्दकोश &quot;%1&quot; से परिभाषा: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>परिभाषा : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>संदर्भित श्रव्य प्रोग्राम विद्यमान नहीं है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>खुला लिंक</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>सहेजें और बुकमार्क करें &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>चेतावनी: श्रव्य वादक: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>त्रुटि : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>ध्वनि सुरक्षित करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>छवि सहेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>छवि फ़ाइलें (*.bmp *.jpg *.png *.tif);;सभी फाइलें (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>&amp;छवि सहेजें...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>वाक्यांश नहीं मिला</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%2 मैचों में से %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>ध्वनि सुरक्षित करें...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>&quot;%1&quot; को निवेश पंक्ति में भेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>तथा &quot;%1&quot; को इतिहास में जोड़ें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>अंकी को वर्तमान लेख भेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;चयनित पाठ को अंकी को भेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>ध्वनि फ़ाइलें (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;सभी फ़ाइलें (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>श्रव्य फ़ाइल चलाने में विफल: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;अंकी नोट बनाएं</translation>
     </message>
   </context>
   <context>
@@ -418,62 +413,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>चीनी रूपांतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>सरलीकृत और पारंपरिक चीनी अक्षरों के बीच रूपांतरण सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>चीनी कान्टोनी संस्करण</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>सरलीकृत वर्णों से पारंपरिक (ताइवान संस्करण) वर्णों में रूपांतरण सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>सरलीकृत चीनी से पारम्परिक चीनी(ताइवान संस्करण)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>सरलीकृत वर्णों से पारंपरिक (हांगकांग संस्करण) वर्णों में रूपांतरण सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>सरलीकृत चीनी से पारम्परिक चीनी(हांगकांग संस्करण) रूपान्तरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>पारंपरिक वर्णों से सरलीकृत वर्णों में रूपांतरण सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>पारम्परिक चीनी से सरलीकृत चीनी</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>सरलीकृत से पारंपरिक चीनी (ताइवान संस्करण) रूपांतरण</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>सरलीकृत से पारंपरिक चीनी (हांगकांग संस्करण) रूपांतरण</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>पारंपरिक से सरलीकृत चीनी में रूपांतरण</translation>
     </message>
@@ -481,30 +476,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>कस्टम लिप्यंतरण</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>परोक्षी प्रमाणीकरण आवश्यक है</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>आपको परोक्षी के द्वारा अभिगम करने के लिए उपयोगकर्ता नाम तथा पारण शब्द को भरना होगा</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>उपयोगकर्ता नाम :</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>पारण शब्द:</translation>
     </message>
@@ -512,22 +507,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>प्रपत्र</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>समूह चित्रक:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>अल्प मार्ग:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>पसंदीदा फ़ोल्डर:</translation>
     </message>
@@ -552,17 +547,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>छवियाँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>सभी फ़ाइलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>त्रुटि</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>निर्दिष्ट छवि फ़ाइल नहीं पढ़ सकते हैं।</translation>
     </message>
@@ -570,63 +565,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>पुष्टीकरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>क्या आप सुनिश्चित हैं कि आप भाषा युग्मों के आधार पर समूहों का एक समूह बनाना चाहते हैं?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>क्या आप वाकई मेटाडेटा.टीओएमएल पर आधारित समूहों का एक सेट तैयार करना चाहते हैं?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>स्रोत भाषा द्वारा समूहों को &quot;%1-&gt;&quot; में मिलाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>लक्ष्य भाषा द्वारा समूहों को &quot;-&gt;%1&quot; में मिलाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>फ़ोल्डर के अनुसार स्वतः समूह बनाना विफल रहा.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>%1 की मूल निर्देशिका तक नहीं पहुंचा जा सकता।</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>क्या आप वाकई फ़ोल्डरों के आधार पर समूहों का एक सेट तैयार करना चाहते हैं?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>दो तरफा अनुवाद समूह बनाएं &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>&quot;%1&quot;के साथ समूहों को मिलाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>शब्दकोश:</translation>
     </message>
@@ -639,201 +634,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>खोज पद्धति</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>यह तत्व निर्धारित करता है कि छँटाई स्ट्रिंग की व्याख्या कैसे की जाएगी</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>यदि चिह्नित है तो छँटाई के समय चिह्न प्रकारों का भी ध्यान रखा जाएगा</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>अक्षरप्रकार मिलाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>मुख्यशब्दों को फ़ाइल में सहेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>निर्यात करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>सहायता</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>ठीक</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>मुख्यशब्द-सूची में छाँट लागू करने के लिए इस बटन को दबाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>लागू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>यदि चिह्नित है तो कोई भी छाँट-परिवर्तन तुरन्त मुख्यशब्द-सूची में लागू होगा</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>स्वतः लागू</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>छाँटें :</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>स्ट्रिंग छाँटें(निश्चित स्ट्रिंग, अक्षरचिह्नम् या नियमवचन)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>पाठ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>अक्षरचिह्नम्</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>नियमवचन</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>शीर्षक लोड हो रहा है...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>कुल अद्वितीय मुख्यशब्द: %1, छाँटे हुएः  %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>मुख्यशब्दों को फ़ाइल में सहेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>पाठ फ़ाइलें (*.txt);;सभी फ़ाइलें (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>निर्यातित फ़ाइल नहीं खोली जा सकती</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>मुख्यशब्दों को निर्यात करें...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>रद्द करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>निर्यात प्रक्रिया बाधित है</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>निर्यात समाप्त</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>कुल लेख:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>जिस भाषा से अनुवाद करता है:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>कुल शब्द:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>जिस भाषा में अनुवाद करता हैः</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>फोल्डर खोेलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>शब्दकोश संपादित करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>इस शब्दकोश में सम्मिलित फाइलें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>विवरण:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>सभी अद्वितीय शब्दकोश शीर्षशब्दों को दिखाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>शीर्षशब्द</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>शब्दकोश को समादेश के माध्यम से संपादित करें:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>अनुक्रमणिका फ़ाइल नाम:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>इंडेक्स फ़ोल्डर खोलें</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 प्रविष्टियाँ</translation>
     </message>
@@ -864,44 +869,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>सक्रिय</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>पता</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>डेटाबेस</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>रणनीतियाँ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>चित्रक</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>डेटाबेस की अल्पविराम-सीमांकित सूची
 (खाली स्ट्रिंग या &apos;*&apos; सभी डेटाबेस से मेल खाता है)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>खोज रणनीतियों की अल्पविराम-सीमांकित सूची
@@ -911,37 +916,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>सभी शब्दकोशों के साथ विस्तारित प्रसूची...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>इस समूह को संपादित करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>शब्दकोश जानकारी</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>शब्दकोश मुखशब्द</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>शब्दकोश फ़ोल्डर खोलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>शब्दकोश संपादित करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>तथा शब्दकोश रेखिका</translation>
     </message>
@@ -950,27 +955,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>तथा शब्दकोश</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>शब्दकोश</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>स्वीकार करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>रद्द करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>स्रोत बदल गए</translation>
     </message>
@@ -981,12 +986,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>तथा समूह</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>कुछ स्रोत बदल दिए गए। क्या आप परिवर्तनों को स्वीकार करना चाहेंगे?</translation>
     </message>
@@ -996,12 +1001,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>पिछला पृष्ठ</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>अगला पृष्ठ</translation>
     </message>
   </context>
   <context>
@@ -1015,75 +1020,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>पूरा पाठ खोजें</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>संपूर्ण शब्द</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>सादा पाठ</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>अक्षरचिह्न</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>नियमित व्यंजक</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>पूछताछ करने वाला शब्द खाली नहीं हो सकता.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>xapian खोज सिंटैक्स का समर्थन करें, जैसे AND OR +/- आदि</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>शब्दों के बीच अधिकतम दूरी (%1-%2) :</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>गलती करना</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>प्रति शब्दकोश अधिकतम लेख (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>लेख मिले: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>अब अनुक्रमण हो रहा है:</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>कोई नही</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>खोज पंक्ति में कम से कम एक शब्द होना चाहिए</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>या अधिक प्रतीक चिह्न</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>पूर्ण-पाठ खोज के लिए कोई शब्दकोश नहीं</translation>
     </message>
@@ -1091,7 +1076,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>पसंदीदा फ़ाइल में त्रुटि</translation>
     </message>
@@ -1157,7 +1142,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>से</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>इस त्रुटि को मिटाने के लिए, सम्पादित करें|शब्दकोश|स्रोत|फोर्वो| पर जाएं और  हमारे स्वयं के API के लिए आवेदन करें</translation>
     </message>
@@ -1167,79 +1152,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;पहले का</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;अगला</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>खोज</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>अक्षर प्रकार का मिलान </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>पद्धति:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>शब्दों के क्रम को अनदेखा करें</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>स्वरों का विशिष्ट चिह्नों की उपेक्षा करें</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>लेख मिले:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>समूह में उपलब्ध शब्दकोश:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>अनुक्रमण के लिए प्रतीक्षा:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>सहायता</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>कुल:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>अनुक्रमित:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>अब अनुक्रमण: कोई नहीं</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>रद्द करें</translation>
     </message>
@@ -1271,27 +1240,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>हटाना</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>सम्मिलित करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>टैब २</translation>
     </message>
@@ -1331,12 +1300,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>समूह के लिए एक नया नाम दें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>उपलब्ध शब्दकोश:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>तथा समूह जोड़ें</translation>
     </message>
@@ -1346,42 +1315,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>समूह जोड़ें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>नया शब्दकोश समूह बनाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>भाषाओं द्वारा समूह</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>फ़ोल्डर-आधारित समूह बनाएं.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>फ़ोल्डरों द्वारा समूह</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>मेटाडेटा द्वारा समूह</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>अपने माउस का उपयोग करके समूहों से शब्दकोशों को खींचें और छोड़ें, उन्हें समूहों के अंदर ले जाएं,समूहों को फिर से व्यवस्थित करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>वर्तमान शब्दकोश समूह का नाम बदलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>वर्तमान शब्दकोश समूह निकालें</translation>
     </message>
@@ -1391,43 +1360,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>नए समूह के लिए एक नाम दें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>सभी समूह निकालें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>समूह से चयनित शब्दकोशों क निकालें (हटाएं)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>चयनित शब्दकोशों को समूह में जोड़ें (सम्मिलित करें)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>तथा समूह निकालें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>समूह:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>समूह का नाम बदलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>सभी शब्दकोश समूह निकालें</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>भाषा-आधारित समूह बनाएँ</translation>
     </message>
@@ -1450,12 +1419,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>इतिहास:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>इतिहासाकार: %1 प्रविष्टियाँ अधिकतम %2 प्रविष्टियों में से</translation>
     </message>
@@ -1463,12 +1432,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>वर्तनी सुझाव:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 आकारिकी</translation>
     </message>
@@ -1476,12 +1445,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>सक्रिय</translation>
     </message>
@@ -1489,1247 +1458,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>अनुक्रमण: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>शब्दकोश नाम</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>गोल्डेनडिक्ट - प्रारम्भ कर रहा है</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>कृपया शब्दकोश को अनुक्रमित करते समय तक प्रतीक्षा करें</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>कृपया प्रतीक्षा करें...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>अनुक्रमणिका...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
-      <translation type="unfinished">Ewe</translation>
+      <translation>एवै</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
-      <translation type="unfinished">Ido</translation>
+      <translation>मैं करता हूं</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
-      <translation type="unfinished">Lao</translation>
+      <translation>लाओ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi (Akan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
-      <translation type="unfinished">Afar</translation>
+      <translation>दूर</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
-      <translation type="unfinished">Akan</translation>
+      <translation>अकान</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>क्री</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
-      <translation type="unfinished">Igbo</translation>
+      <translation>ईग्बो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
-      <translation type="unfinished">Komi</translation>
+      <translation>कोमी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Mannois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>पाली</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thaï</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Ourdou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zoulou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tchèque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Néerlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Peul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Haoussa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <translation>हिंदी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>लैटिन</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Māori (Nouvelle-Zélande)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>उड़िया</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
-      <translation type="unfinished">Oromo</translation>
+      <translation>ओरोमो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
-      <translation type="unfinished">Sango</translation>
+      <translation>सांगो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
-      <translation type="unfinished">Shona</translation>
+      <translation>सोणा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadjik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamoul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
-      <translation type="unfinished">Tatar</translation>
+      <translation>टाटर</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
-      <translation type="unfinished">Swati</translation>
+      <translation>स्वाति</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonguien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
-      <translation type="unfinished">Venda</translation>
+      <translation>वेन्दा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Ouzbek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Gallois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
-      <translation type="unfinished">Wolof</translation>
+      <translation>वोलोफ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
-      <translation type="unfinished">Xhosa</translation>
+      <translation>षोसा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>इतालवी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Romanche</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
-      <translation type="unfinished">Dzongkha</translation>
+      <translation>जोंगखा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>कन्नड़</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndébélé (nord)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abkhaze</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirghize</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
-      <translation type="unfinished">Kirundi</translation>
+      <translation>किरुंदी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélique écossais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>मलयालम</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgare</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
-      <translation type="unfinished">Lingala</translation>
+      <translation>लिंगाला</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>मराठी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>अरबी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
-      <translation type="unfinished">Basque</translation>
+      <translation>बस्क</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>बिहारी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <translation>आइमारा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
-      <translation type="unfinished">Breton</translation>
+      <translation>ब्रेटन</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Soundanais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
-      <translation type="unfinished">Divehi</translation>
+      <translation>दिवेही</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
-      <translation type="unfinished">Luba-Katanga</translation>
+      <translation>लूबा-कटांगा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fidjien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Hongrois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>फ्रेंच</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Allemand</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>हेब्रु</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Héréro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxembourgeois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
-      <translation type="unfinished">Kanuri</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="198"/>
-      <source>Kazakh</source>
-      <translation type="unfinished">Kazakh</translation>
+      <translation>कनूरी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="196"/>
-      <source>Kikuyu</source>
-      <translation type="unfinished">Kikuyu</translation>
+      <source>Kazakh</source>
+      <translation>कजाख</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="194"/>
+      <source>Kikuyu</source>
+      <translation>किकुयू</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coréen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
-      <translation type="unfinished">Navajo</translation>
+      <translation>नावाजो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
+      <translation>डोन्गा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>नेपाली</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>पश्तो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
-      <translation type="unfinished">Samoan</translation>
+      <translation>सामोन</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
-      <translation type="unfinished">Occitan</translation>
+      <translation>ओसीटान</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhî</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Télougou</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
-      <translation type="unfinished">Tsonga</translation>
+      <translation>त्सोंगा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
-      <translation type="unfinished">Tswana</translation>
+      <translation>ट्स्वाना</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ouïghour</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croate</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
-      <translation type="unfinished">Yoruba</translation>
+      <translation>योरूबा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
-      <translation type="unfinished">Zhuang</translation>
+      <translation>ज़ुआंग</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Roumain</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonésien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>पंजाबी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sotho du Sud</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <translation>एस्पेरांतो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Perse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovénien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frison occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azéri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>संस्कृत</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
-      <translation type="unfinished">Bambara</translation>
+      <translation>बंबारा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bachkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Biélorusse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sarde</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
-      <translation type="unfinished">Hiri Motu</translation>
+      <translation>हिरी मोटू</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <translation>केचुआ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>बंगला</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
-      <translation type="unfinished">Kinyarwanda</translation>
+      <translation>किन्यारवाण्डा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
-      <translation type="unfinished">Afrikaans</translation>
+      <translation>अफ्रीकी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bichelamar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Arménien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norvégien (bokmål)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croate</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosniaque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
-      <translation type="unfinished">Interlingua</translation>
+      <translation>ईन्टरलिंगुआ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
+      <translation>इंटरलिंगुई</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
-      <translation type="unfinished">Catalan</translation>
+      <translation>कातालान</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birman</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>रूसी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limbourgeois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norvégien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tchétchène</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tchouvache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Espagnol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
-      <translation type="unfinished">Tagalog</translation>
+      <translation>तागालोग</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossète</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
-      <translation type="unfinished">Swahili</translation>
+      <translation>swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Suédois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>तिब्बती</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macédonien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>पुर्तगाली</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turc</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmène</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>गुजराती</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
-      <translation type="unfinished">Inuktitut</translation>
+      <translation>इनूकीटूत्</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Anglais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Géorgien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Liturgique slave</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Féroïen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finnois</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Wallon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
-      <translation type="unfinished">Kwanyama</translation>
+      <translation>क्वान्यामा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami (Nord)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haïtien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
-      <translation type="unfinished">Chamorro</translation>
+      <translation>चमोर्रो</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norvégien (nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
-      <translation type="unfinished">Guarani</translation>
+      <translation>गुआरानी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndébélé (sud)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
-      <translation type="unfinished">Chichewa</translation>
+      <translation>चिचेवा</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituanien</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Nuosu (Yi)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrigna</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
-      <translation type="unfinished">Yiddish</translation>
+      <translation>यहूदी</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinois traditionel</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinois simplifié</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Autre</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Autres dialectes chinois simplifiés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Autres dialectes chinois traditionels</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Autres langues d&apos;Europe de l&apos;Est</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Autres langues d&apos;Europe de l&apos;Ouest</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Autres langues russes</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Autres langues japonaises</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Autres langues baltiques</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Autres langues grecques</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Autres dialectes coréens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Autres dialectes turcs</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Autres ldialectes thaï</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight (Berbère)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>लोज्बान</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>फ़्रेंच</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>स्पैनिश</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>बेलारूसी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>बलगेरियाई</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>चेक</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>जर्मन</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>यूनानी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>फिनिश</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>इतालवी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>जापानी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>कोरियाई</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>लिथुआनियाई</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>मेसीडोनियन</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>डच</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>पोलिश</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>पुर्तगाली</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>रूसी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>स्लोवाक</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>अल्बानियन</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>सर्बियाई (सिरिलिक)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>स्वीडिश</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>तुर्की</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>यूक्रेनी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>सरलीकृत चीनी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>चीनी पारंपरिक</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>वियतनामी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>पुर्तगाली, ब्राज़ीलियाई</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>फ़ारसी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>स्पैनिश, अर्जेंटीना</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>हिंदी</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>एस्पेरांतो</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>जर्मन, स्विट्जरलैंड</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>स्पैनिश, बोलीविया</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>ताजिक</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>केचुआ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>आइमारा</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>अरबी, सऊदी अरब</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>तुक्रमेन</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>इंटरलिंगुई</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>लोज्बान</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>अंग्रेज़ी</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Erreur lors du chargement des dictionnaires</translation>
     </message>
@@ -2737,7 +2710,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2745,702 +2718,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>एफ1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>पसंदीदा&amp;संस्कार</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>f4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Tout</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Précédent</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dictionnaires, %2 articles, %3 mots</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>Éditio&amp;n</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Aide</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Quitter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Erreur</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Quitter à partir de l&apos;application</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Fermer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Impossible d&apos;enregistrer l&apos;article : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dictionnaires...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;À propos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
-      <translation type="unfinished">&amp;Forum</translation>
+      <translation>&amp;मंच</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Im&amp;primer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Sauver l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Enregister l&apos;article sous</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Réduit la fenêtre dans la barre des tâches</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Paramètres d&apos;&amp;impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Accueil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nouvelle version disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Chercher :</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Dézoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Afficher la fenêtre &amp;principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>À propos de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Téléchargement</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Paramètres d&apos;impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Chercher dans :</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Taille normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Chargement...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sans titre)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Préférences...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Bienvenue !</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Prononcer le mot (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Sauver l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Ignorer la version</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Suivant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimer l&apos;article</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Vue</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>E&amp;ffacer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
-      <translation type="unfinished">&amp;Zoom</translation>
+      <translation>&amp;ज़ूम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Dézoomer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Taille normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Fermer l&apos;onglet courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Fermer tous les onglets</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Fermer tous les onglets sauf l&apos;onglet courant</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Onglets ouverts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nouvel onglet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Dossier de &amp;configuration</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barre du &amp;menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Trouvé dans les dictionnaires :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>सभी टैब को पसंदीदा में जोड़ें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>चेतावनी: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Liste des onglets ouverts</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>पसंदीदा से वर्तमान टैब हटाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Affi&amp;cher</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exporter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Masquer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exporter l&apos;historique dans un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Fichiers texte (*.txt);;Tous les fichiers (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export de l&apos;historique terminé</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Erreur d&apos;export :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importer l&apos;historique à partir d&apos;un fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Erreur d&apos;import : données invalides dans le fichier</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import d&apos;historique terminé</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Erreur d&apos;import :</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>फ़ाइल में पसंदीदा निर्यात करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>XML फ़ाइलें (*.xml);;सभी फ़ाइलें (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>पसंदीदा निर्यात पूर्ण</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>पसंदीदा को सादी सूची के रूप में फ़ाइल करने के लिए निर्यात करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>फ़ाइल से पसंदीदा आयात करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML फ़ाइलें (*.xml);;Txt फ़ाइलें (*.txt);;सभी फ़ाइलें (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>पसंदीदा आयात पूर्ण</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>डेटा पार्सिंग त्रुटि</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informations sur le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Vedettes du dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Ouvrir le dossier des dictionnaires</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Éditer le dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>अब पूर्ण-पाठ खोज के लिए अनुक्रमण: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>पसंदीदा से हेडवर्ड &quot;%1&quot; हटाएं?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Re&amp;chercher</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Résultats de la recherche</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>पसंदीदा फलक</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Aperçu avant impression</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Rescanner les fichiers</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nouvel onglet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Toujours au-&amp;dessus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Toujours au-dessus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Bouton du menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Rechercher dans la page</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Recherche en texte intégral</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Référence de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>दिखाना</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exporter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>आयात</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>जोड़ना</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>वर्तमान टैब को पसंदीदा में जोड़ें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>सूची में निर्यात करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Afficher les noms dans la &amp;barre de dictionnaire</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <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="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
-      <translation type="unfinished">&amp;Navigation</translation>
+      <translation>&amp;मार्गदर्शन</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>स्कैनिंग सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Article, Complet (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Article, HTML uniquement (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Sauvegarde de l&apos;article...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>आलेख पूर्ण सहेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Historique</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>L&apos;API d&apos;accessibilité n&apos;est pas activée</translation>
     </message>
@@ -3448,12 +3421,12 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Le fichier de dictionnaire a été modifié ou corrompu</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>%1 से लेख लोडिंग विफल रहा, कारण: %2</translation>
     </message>
@@ -3461,7 +3434,7 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>एक्स.एम.एल पदव्याख्या त्रुटि: %2,%3 पर %1</translation>
     </message>
@@ -3477,22 +3450,22 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>पता</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>सक्रिय</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>चित्रक</translation>
     </message>
@@ -3508,82 +3481,82 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>प्रपत्र</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>निष्क्रिय (अक्षम) शब्दकोश:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>नाम:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>कुल लेख:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>इससे अनुवाद करता है:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>इसमें अनुवाद करता है:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>कुल शब्द:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>शब्दकोश क्रम:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>इस शब्दकोश में सम्मिलित फाइलें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>शब्दकोश सूचना</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>विवरण:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>नाम के आधार पर छाँटें</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>भाषाओं के आधार पर छाँटें</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>शब्दकोश मुखशब्द</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>शब्दकोश सक्रिय: %1, निष्क्रिय: %2</translation>
     </message>
@@ -3591,12 +3564,12 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>पथ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>पुनरावर्ती</translation>
     </message>
@@ -3604,228 +3577,225 @@ Pour rechercher les symboles &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>सिस्टम ट्रे पर प्रारंभ करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>केवल वाम शिफ्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>कन्ट्रोल</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>खिडकी/मेटा</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>सिस्टम ट्रे चित्रक सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>होस्ट:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>संपर्क स्थल(पोर्ट):</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>शिफ्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>प्रकार:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>उपयोगकर्ता:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;स्कैन पॉपअप</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>परोक्षीवितरक का उपयोग करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>अंशफलक से किसी शब्द का अनुवाद करने के लिए निम्न त्वरयितृकील का उपयोग करें::</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>खिड़की-कुंजी या मेटा-कुंजी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>मुख्य खिडकी में शब्दों का स्वतः उच्चारण करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>तंत्र से शुरू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>केवल वाम Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
-      <translation type="unfinished">Tabbed browsing</translation>
+      <translation>टैब्ड ब्राउज़िंग</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>केवल दक्षिण शिफ्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;श्रव्य</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>यदि आप सभी प्रोग्राम के संजाल अनुरोधों के लिए परोक्षीवितरक का उपयोग करना चाहते हैं तो सक्षम करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>अंतरफलक भाषा:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>केवल वाम कन्ट्रोल</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>पृष्ठभूमि में नए टैब खोलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;संजाल</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>केवल दक्षिण कन्ट्रोल</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>लिंग्वो</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>दक्षिण शिफ्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>वाम शिफ्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>स्कैन पॉपअप में शब्दों का स्वतः उच्चारण करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>वर्तमान के बाद नए टैब खोलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>भाषा परिवर्तन लागू करने के लिए प्रोग्राम को पुनरारंभ करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt कुंजी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>समय-समय पर नए प्रोग्राम रिलीज़ के लिए जाँच करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>सिस्टम ट्रे के समीप</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>तंन्त्र औत्सर्गिक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>सक्षम होने पर, सिस्टम ट्रे क्षेत्र में एक चित्रक दिखाई देता है जिसका उपयोग मुख्य विंडो खोलने में तथा अन्य कार्य करने के लिए किया जा सकता है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3834,103 +3804,103 @@ download page.</source>
       <translation>जब यह सक्षम हो जाता है, तो समय-समय पर प्रोग्राम जाँच करता है कि यदि गोल्डेनडिक्ट का एक नया, अद्यतन संस्करण डाउनलोड के लिए उपलब्ध है।अगर ऐसा है, तो प्रोग्राम उपयोगकर्ता को इसके बारे में सूचित करता है और एक डाउनलोड पृष्ठ खोलने का संकेत देता है ।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>चालू होना</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>पारण शब्द:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>औत्सर्गिक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;अंतराफलक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>भाषा परिवर्तन</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>कन्ट्रोल कुंजी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>मुख्य खिड़की दिखाने या छिपाने के लिए निम्न त्वरितृकील का उपयोग करें::</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>वाम Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>केवल दक्षिण Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>प्राथमिकताएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>वाम कन्ट्रोल </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>दक्षिण Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>दक्षिण कन्ट्रोल</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>त्वरितृकील</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>स्कैन पॉपअप चालू के साथ शुरू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>इसके चालू होने पर, अनुप्रयोग मुख्य विंडो को दिखाए बिना सीधे सिस्टम ट्रे पर शुरू होता है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>शिफ्ट कुंजी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>सिस्टम बूटअप प्रक्रिया के बाद स्वचालित रूप से गोल्डनडिक्ट शुरू होता है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>यह चुनता है कि स्कैन पॉपअप पद्धति औत्सर्गिक रूप से चालू है या नहीं। अगर जाँचा हुआ हो,
@@ -3938,569 +3908,611 @@ the program would always start with the scan popup active.</source>
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>जब गोल्डेंडिक्ट में उसकी खिड़कियों में से चयन या क्लिपबोर्ड बदले तब पॉपअप न दिखाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>गोल्डेंडिक्ट के अपने चयन और क्लिपबोर्ड परिवर्तनों को अनदेखा करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>अंतर्निहित श्रव्य समर्थन के माध्यम से श्रव्य फ़ाइलें चलाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>आन्तरिक वादक प्रयोग करे</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>श्रव्य पश्च भाग चुने</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>श्रव्य वादक समादेश पंक्ति प्रविष्ट करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>अन्य साइटों से लोडिंग सामग्री को अस्वीकार करें (अधिकांश विज्ञापनों को छुपाता है)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>उच्चारण</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>प्लेबैक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>बाह्य प्रोग्रामों का उपयोग करें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>डबल-क्लिक, क्लिक किये गए शब्द को अनुवादित करता है</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>श्रव्य फ़ाइलों को चलाने के लिए किसी भी बाहरी प्रोग्राम का उपयोग करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ई.एस.सी. कुंजी मुख्य विंडो को छुपाती है</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>एकल टैब छिपाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>विशाल संदर्भ मेनू से बचने के लिए इस मान को समायोजित करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>संदर्भ मेनू में शब्दकोशों की सीमा:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>पॉपअप विंडो में दिखाने की जगह, अनुवादित शब्द को मुख्य विंडो पर भेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>मुख्य खिड़की में अनुवादित शब्द भेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>पॉपअप विंडो दिखाने से पहले फ्लैग विंडो दिखाएं, पॉपअप विंडो दिखाने के लिए फ्लैग पर क्लिक करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>आम तौर पर, किसी लिंक पर क्लिक करने, किसी शब्द पर डबल-क्लिक करने या किसी लेख में
+चयन देखने से अनुवाद लोड हो जाता है और लगभग तुरंत ही उसी शब्दकोश से लेख पर
+स्क्रॉल हो जाता है। हालाँकि, इस विकल्प के बंद होने पर,
+, शीर्षतम शब्दकोश का लेख दिखाया जाता है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>लक्ष्य आलेख तक स्वचालित रूप से स्क्रॉल करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>आलेख प्रदर्शन शैली:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>यूआई को अंधेरे में बदलें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>डार्क मोड</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>आलेख प्रदर्शन शैली को गहरे रंग में बदलें.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>डार्क रीडर मोड</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>एमआरयू ऑर्डर: सबसे हाल ही में इस्तेमाल किया गया ऑर्डर।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>स्कैनिंग सक्षम होने पर ट्रैक क्लिपबोर्ड बदल जाता है। सूचना! जब तक आप लिनक्स पर न हों, आपको इसे हमेशा सक्षम करना चाहिए।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>ट्रैक क्लिपबोर्ड परिवर्तन</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>ट्रैक चयन परिवर्तन</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>केवल तभी चयन करें जब सभी चयनित कुंजियाँ दबाई जाएं:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>जब शब्द का चयन किया जाता है तो स्कैन ध्वज दिखाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>विलंब समय</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>तंन्त्र परोक्षी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>अनुकूलित परोक्षी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>अनुकूलित सेटिंग्स</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>अंकी कनेक्ट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>एचटीटीपी://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>जहाज़ की छत:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>नमूना:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>शब्द</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>शब्दावली क्षेत्र...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>मूलपाठ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>परिभाषा फ़ील्ड...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>वाक्य</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>वाक्य फ़ील्ड (खाली हो सकता है)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation>कुछ साइटें एच.टी.टी.पी. शीर्षक के माध्यम से गोल्डेनडिक्ट का पता लगाती हैं और अनुरोधों को रोकती हैं।
 समस्या को हल करने के लिए इस विकल्प को सक्षम करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>एच.टी.टी.पी शीर्षक में गोलेडेनडिक्ट की पहचान न करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>अधिकतम नेटवर्क कैश आकार:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+में गोल्डनडिक्ट&apos;एस नेटवर्क कैश द्वारा कब्जा किया गया अधिकतम डिस्क स्थान यदि 0 पर सेट किया गया है तो नेटवर्क डिस्क कैश अक्षम हो जाएगा।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> एमआईबी</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>जब यह विकल्प सक्षम होता है, तो गोल्डनडिक्ट
+बाहर निकलने के दौरान डिस्क से अपना नेटवर्क कैश साफ़ कर देता है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>बाहर निकलने पर नेटवर्क कैश साफ़ करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>पूर्ण-पाठ खोज</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>पूर्ण-पाठ खोज की अनुमति दें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>इससे अधिक वाले शब्दकोशों में खोज न करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>लेख (0 - असीमित)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>उन्नत</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>क्रमिक खोजों के दौरान, यदि एक शब्दकोश को मैनुअल द्वारा संक्षिप्त किया जाता है, तो यह अगली खोज में संक्षिप्त हो जाएगा</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>सत्र पतन</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>क्लिपबोर्ड का उपयोग करते समय, न्यूलाइन के बाद सब कुछ हटा दें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>नई खोज पर, मुख्य या पॉपअप विंडो पर ध्यान केंद्रित करें, भले ही वह&apos;दिखाई दे</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>पसंदीदा</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>पसंदीदा रक्षण अंतराल। यदि 0 पर सेट किया जाता है तो पसंदीदा केवल निकास के समय रक्षण किया जाएगा।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>मद हटाने के प्रत्येक प्रक्रिया की पुष्टि करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>मद मिटाने की पुष्टि</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>माउस-ओवर, चयन, क्लिपबोर्ड या कमांड लाइन से अनुचित रूप से लंबे इनपुट टेक्स्ट
+को अनदेखा करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>से अधिक लंबे इनपुट वाक्यांशों पर ध्यान न दें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>इस आकार से अधिक लंबे इनपुट वाक्यांशों को अनदेखा कर दिया जाएगा</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>लेखों को खोजते समय विशिष्ट स्वर चिह्नों की उपेक्षा करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>खोज करते समय विशिष्ट स्वर चिह्नों की उपेक्षा करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>लेख के वैकल्पिक भागों का हमेशा विस्तार करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>वैकल्पिक &amp;भागों का विस्तार करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>बड़े लेखों को स्वचालित रूप से संक्षिप्त करने के लिए इस विकल्प का चयन करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>से अधिक लेखों को संक्षिप्त करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>इस आकार से अधिक लंबे लेख संक्षिप्त हो जाएंगे</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>खोजते समय विराम चिह्नों पर ध्यान न दें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>स्टारडिक्ट, बेबीलोन और जी.एल.एस शब्दकोशों से पर्याय सूची के माध्यम से अतिरिक्त लेख खोज को सक्षम करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>पर्याय/समानार्थी के माध्यम से अतिरिक्त खोज</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>प्रतीक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab सबसे हाल ही में प्रयुक्त(एमआरयू) क्रम में टैब नौचालन करता है</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>बेबीलोन</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>इतिहास</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>अनुवादित शब्दों के इतिहास को संग्रहीत करने के लिए इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;इतिहास संग्रहीत करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>लेख</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>यदि आप एकल माउस क्लिक द्वारा शब्दों का चयन करना चाहते हैं तो इस विकल्प को चालू करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>एकल क्लिक द्वारा शब्द का चयन करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on शैली:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>इतिहास में रखने के लिए प्रविष्टियों की अधिकतम संख्या निर्दिष्ट करें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>अधिकतम इतिहास का आकार:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>इतिहास रक्षण अंतराल। यदि 0 पर सेट किया जाता है तो इतिहास केवल निकास के दौरान ही सहेजा जाएगा।</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>प्रत्येक सहेजें</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>मिनट</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>क्लासिक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>आधुनिक</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>लिंगोज</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>लिंगोज-नीला</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> एमबी</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapian की वाक्यांश खोज और NEAR ऑपरेटर का उपयोग करने के लिए स्थिति संबंधी जानकारी की आवश्यकता होती है, लेकिन डेटाबेस का आकार बहुत बड़ा होगा। केवल नए आने वाले शब्दकोशों पर लागू होता है।</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>स्थिति संबंधी जानकारी के साथ सूचकांक सक्षम करें</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>मानक फ़ॉन्ट</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>मोनोस्पेस फ़ॉन्ट</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>सेरिफ़ फ़ॉन्ट</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>सैन्स-सेरिफ़ फ़ॉन्ट</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>उपस्थिति</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>ये फ़ॉन्ट तब लागू किए जाएंगे जब शब्दकोश द्वारा निर्दिष्ट फ़ॉन्ट नहीं मिलेंगे।</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>फ़ॉलबैक फ़ॉन्ट्स</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>श्रव्य</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>सादा पाठ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>एच.टी.एम.एल</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>उपसर्ग मिलान</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>अज्ञात</translation>
     </message>
@@ -4508,17 +4520,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>कोई प्रोग्राम नाम नहीं दिया गया था।</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>प्रोग्राम दुर्घटित हो गया है।</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>प्रोग्राम ने निर्गम कूट %1 लौटाया है ।</translation>
     </message>
@@ -4526,27 +4538,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>सक्रिय</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>प्रकार</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>समादेश रेखा</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>चित्रक</translation>
     </message>
@@ -4554,122 +4566,137 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>लेख लोड करने मे त्रुटि</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>लेख विकूटन त्रुटि</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>सर्वाधिकार</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>संस्करण: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>लेखक: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>ई-पत्र: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>शीर्षक: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>वेबसाइट: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>तिथि: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>एक शब्दकोश खोज कार्यक्रम.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>प्रश्न करने के लिए शब्द या वाक्य.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>डिबग संदेशों को कॉन्फ़िगरेशन फ़ोल्डर में gd_log.txt में सहेजें।</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>विंडो स्थिति रीसेट करें.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>टीटीएस अक्षम करें.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>मुख्य विंडो का समूह बदलें.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>पॉपअप का समूह बदलें.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>स्कैन पॉपअप टॉगल करें.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>प्रिंट संस्करण और निदान जानकारी।</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>शब्दकोश खोज/छाँट (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
-      <translation type="unfinished">Clear Search</translation>
+      <translation>स्पष्ट खोज</translation>
     </message>
   </context>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>त्रुटि : %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>संसाधन बचत त्रुटि: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>संदर्भित संसाधन डाउनलोड करने में विफल रहा।</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>चेतावनी : %1</translation>
     </message>
@@ -4698,67 +4725,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>ऑल्ट+एस</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>संवाद</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>शब्द का उच्चारण करें(Alt + S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>पसंदीदा में शब्द जोड़ें (कन्ट्रोल+ई)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>शब्दकोश रेखिका को दिखाता या छिपाता है</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>हमेशा अन्य सभी खिड़कियों के शीर्ष पर रहें</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>मुख्य खिडकी में शब्द भेजें (Alt + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>पीछे</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>आगे</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>चेतावनी: %1</translation>
     </message>
   </context>
   <context>
@@ -4766,53 +4798,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;पहले का</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;अगला</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>&amp;सभी को हाइलाइट करें</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;अक्षर संवेदनशील</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>पाना:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>पथ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>चित्रक</translation>
     </message>
@@ -4820,60 +4852,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>फ़ाइलें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>हीरागाना</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>तन्त्र:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>निहोन-शिकी</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>विकीपीडिया</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>काताकाना शब्दांशविषयक जापानी वर्णमाला</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>यहां कई श्रव्य फ़ाइलों के पथों को जोड़कर शब्दकोश बनाएं:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>जापानी रोमाजी</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4884,83 +4916,83 @@ Not implemented yet in GoldenDict.</source>
 गोल्डनडिक्ट में अभी तक लागू नहीं किया गया है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>विकिपीडिया (मीडियाविकि) साइटें:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>ध्वनि निर्देशिकाएँ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>कोई बाहरी प्रोग्राम. एक स्ट्रिंग %GDWORD% को क्वेरी शब्द से बदल दिया जाएगा। खोज बार में एक स्ट्रिंग %GDSEARCH% टेक्स्ट से बदल दिया जाएगा। यदि दोनों पैरामीटर प्रदान नहीं किए गए हैं, तो हेडवर्ड को मानक इनपुट में फीड किया जाएगा।</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>लिंगुआ लिब्रे</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;उच्चारण &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;लिंगुआ लिबरे&lt;/span&gt;&lt;/a&gt;द्वारा प्रमाणित, विकिमीडिया फ़्रांस की एक सहयोगी भाषाई मीडिया लाइब्रेरी। &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>लिंगुआ लिब्रे सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>आईएसओ 639-3 भाषा कोड</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;फ़ोर्वो के उपयोग के लिए वर्तमान में एक एपीआई कुंजी की आवश्यकता होती है, अपनी स्वयं की कुंजी प्राप्त करने के लिए साइट पर पंजीकरण करें।&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;अपनी स्वयं की कुंजी प्राप्त करें &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;यहां&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>आङ्ग्ल स्वरविज्ञान पर आधारित, जापानी प्रतिलेखन में सबसे व्यापक रूप से प्रयोग किये जाने वाली पद्धति</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>हीरागाना शब्दांशविषयक जापानी वर्णमाला</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>कस्टम लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>यह केवल खोज वाक्यांश में लागू होता है, प्रत्येक पंक्ति एक लिप्यंतरण का प्रतिनिधित्व करती है, अर्धविराम अलग किया जाता है। उदाहरण के लिए, ae;æ, उपयोगकर्ता लक्ष्य शब्द में æ का प्रतिनिधित्व करने के लिए ae इनपुट कर सकते हैं।</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #यह एक उदाहरण है</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4971,118 +5003,108 @@ Not implemented yet in GoldenDict.</source>
 गोल्डनडिक्ट में अभी तक लागू नहीं किया गया है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>रूसी लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>आकारिकी</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;बदलें...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>उदाहरण: अंग्रेजी के लिए  &amp;quot;अंग्रेजी&amp;quot; , फ्रेंच के लिए &amp;quot;एफआरए&amp;quot; &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+उपलब्ध भाषाओं की पूरी सूची &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; यहां पाई जा सकती है &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>काताकाना</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Hunspell/Myspell शब्दकोशों के लिए निर्देशिका पथ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;अब स्कैन करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>जर्मन लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>कोई भी वेबसाइट।एक स्ट्रिंग %GDWORD% को पूँछताछ शब्द से बदल दिया जाएगा:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;जोड़ें...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>एक निर्देशिका चुनें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;हटाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>वेबसाइटें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>शब्दकोश फ़ाइलों की खोज करने के लिए पथ:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>हटाने की पुष्टि करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>शब्दांशविषयक वर्णमाला:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>उपलब्ध आकारिकी शब्दकोश:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>जापानी भाषा लिखने के लिए लैटिन वर्णमाला का उपयोग करने में सक्षम बनाता है</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5092,93 +5114,93 @@ of the appropriate groups to use them.</source>
       <translation>प्रत्येक आकारिकी शब्दकोश एक अलग सहायक शब्दकोश के रूप में प्रकट होता है जो गलत लिखे शब्दों के लिए स्टेम शब्द और वर्तनी सुझाव प्रदान करता है ।उनका उपयोग करने के लिए उपयुक्त समूहों के नीचे उपयुक्त शब्दकोश जोड़ें ।</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>हेपबर्न</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>कुनरेई-शिकी</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>फोर्वों</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>डिक्टवितरक</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Serveurs DICT :</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>फोर्वो से उच्चारण सक्षम करें</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>ए.पी.आई. कुंजी:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>भाषा कूटसङ्केत (अल्पविराम से पृथक):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>भाषा कूटसंकेतों की सूची जिन्हें आप रखना चाहते हैं। उदाहरण: &quot;en, ru, hi&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>ग्रीक लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(सुवाह्य संस्करण में उपलब्ध नहीं)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>प्रोग्राम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>बेलारूसी लिप्यंतरण</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>वैकल्पिक रूप से, 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>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>वाक् संश्लेषण के लिए पाठ</translation>
     </message>
@@ -5194,42 +5216,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>चयनित ध्वनि इंजन:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;जोड़ें</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;हटाएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>पूर्वावलोकन</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>उपलब्ध ध्वनि इंजन:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>पूर्वावलोकन के लिए पाठ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>यहां पूर्वावलोकित किए जाने के लिए पाठ लिखें।</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;पूर्वावलोकन</translation>
     </message>
@@ -5254,17 +5276,17 @@ of the appropriate groups to use them.</source>
       <translation>उपलब्ध टीटीएस इंजन नही पा सका।&lt;br&gt;कृपया सुनिश्चित करें कि आपके कंप्यूटर पर पहले से ही कम से कम एक टीटीएस इंजन स्थापित है।</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>प्राथमिकताएं</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>परिमाण(मात्रा):</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>मूल्यांकन करें:</translation>
     </message>
@@ -5272,12 +5294,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>शब्दकोशों में खोजने के लिए एक शब्द या वाक्यांश लिखें</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>निपात</translation>
     </message>
@@ -5308,33 +5330,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>नाम</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>पता</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>सक्रिय</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>लेख को लिंक के रूप में &lt;iframe&gt; टैग के अंदर डालें</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>कड़ी के रूप में</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>चित्रक</translation>
     </message>
@@ -5342,17 +5364,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>कुछ शब्दकोशों से पूछताछ करने में विफल।</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>चेतावनी: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/ie_001.ts b/locale/ie_001.ts
index df790f7e..b2918dea 100644
--- a/locale/ie_001.ts
+++ b/locale/ie_001.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Pri li application</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Programma de sercha in dictionariums GoldenDict, v. </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation type="unfinished">Licensed under GNU GPLv3 or later</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copiar li version pri li version</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copiar li liste de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation type="unfinished">Credits:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Ínconosset]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Usa Qt %1 (%2, %3-bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;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. </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Expander li articul</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Contraer li articul</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Null traduction por &lt;b&gt;%1&lt;/b&gt; esset trovat in li gruppe &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation type="unfinished">Working with popup</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sin titul)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Benvenit!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Null traduction esset trovat in li gruppe &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;Benevenit a &lt;b&gt;GoldenDict&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;To start working with the program, first visit &lt;b&gt;Redacter|Dictionariums&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 o crear gruppes de dictionariums.&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;Redacter|Preferenties&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, vu es benevenit in li &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt; del programma.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(pictura)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Expander li articul</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Ex </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Contraer li articul</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation type="unfinished">Make a new Anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Errore de demanda: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Proxim paroles: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Composit expressiones: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Individual paroles: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation type="unfinished">Failed to create temporary file.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>S&amp;erchar «%1»</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Serchar «%1» in &amp;nov carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation type="unfinished">The referenced resource doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation type="unfinished">Failed to auto-open resource file, try opening manually: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Serchar «%1» in %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Select li actual articul</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copiar quam textu</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspecter</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Serchar «%1» in %2, in &amp;nov carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Aperter li ligament in nov car&amp;te</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Aperter li ligament in li &amp;extern navigator</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ressurse</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation type="unfinished">TTS Voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Pictura</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Li definition del dictionarium «%1»: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Ap&amp;erter li ligament</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Marcar li págine «%1»...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>AVISE: Reproductor de audio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ERRORE: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Gardar li son</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Gardar li image</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Files de images (*.bmp *.jpg *.png *.tif);;Omni files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Gardar li &amp;image...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Frase ne trovat</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Gardar li s&amp;on...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation type="unfinished">Send &quot;%1&quot; to input line</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Adjunter «%1» al diarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Inviar li actual articul a anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Files de son (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Omni files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Files de son (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Omni files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Ne successat reproducter un file de son: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversion del chinese</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Con&amp;version del chinese</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC a TC (variante Taiwanesi)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC a TC (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC a SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
     </message>
@@ -477,7 +472,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -485,22 +480,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation type="unfinished">Proxy authentication required</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Nómine de usator:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Contrasigne:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation type="unfinished">Form</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Icone de gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Rapid-taste:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Fólder del preferet:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</translation>
       <translation type="unfinished">Images</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Omni files</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Errore</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Ne successat leer li providet file de image.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation type="unfinished">Confirmation</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on language pairs?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation type="unfinished">Combine groups by source language to &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation type="unfinished">Combine groups by target language to &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation type="unfinished">Make two-side translate group &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combinar gruppes per «%1»</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Dictionariums: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Mode de sercha</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation type="unfinished">This element determines how filter string will be interpreted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Att. MAJ/min</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation type="unfinished">Exports headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Auxilie</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation type="unfinished">OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation type="unfinished">Press this button to apply filter to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Applicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Applicar automaticmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Textu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Jocon-simboles</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Exp. reg.</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unic paroles: total: %1, filtrat: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation type="unfinished">Save headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Files textual (*.txt);;Omni files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation type="unfinished">Export headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Anullar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exportation sta completat</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Total articules:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traducte de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Total paroles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traducte a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Aperter li fólder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Redacter dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Files includet in ti-ci dictionarium:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descrition:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Monstar omni unic titules de articulos</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Paroles</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Redacter li dictionarium med comande:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>Articules: %1</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Activ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Bases de data</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Icone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation type="unfinished">Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation type="unfinished">Comma-delimited list of search strategies
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation type="unfinished">Extended menu with all dictionaries...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Redacter ti-ci gruppe</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Info pri li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Paroles in li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Aperter li fólder del dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Redacter li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Panel de &amp;dictionariums</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Acceptar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Anullar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation type="unfinished">Sources changed</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Gruppes</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation type="unfinished">Some sources were changed. Would you like to accept the changes?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Sercha plentextual</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Integri paroles</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Simplic textu</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Jocon-simboles</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Exp. reg.</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max distantie inter paroles (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max articules por dictionarium (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Articules trovat: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indexante: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Null</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Li sercha deve haver adminim ún parol que contene </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> o plu simboles</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Null dictionariums disponibil por sercha plentextual</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Un errore in li file del preferet</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</translation>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation type="unfinished">Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</translation>
     </message>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Sercha</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Att. MAJ/min</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorar li órdine de paroles</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorar signes diacritic</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Articules trovat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Disponibil dictionariums in li gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Atende indexation:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Auxilie</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation type="unfinished">Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Indexante: null</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Anullar</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Insert</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation type="unfinished">Tab 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Nov nómine del gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Disponibil dictionariums:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Adjunter</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Adjunter un gruppe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Crear un nov gruppe de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Usa li mus por tirar dictionariums al e del gruppes, reordinar les o li gruppes self.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renominar li actual gruppe de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Remover li actual gruppe de dictionariums</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Nómine del gruppe:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Remover omni</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation type="unfinished">Remove selected dictionaries from group (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation type="unfinished">Add selected dictionaries to group (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Gruppes:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nominar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Remover omni gruppes de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Crear gruppes secun li lingues</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Diarium:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Elementes in li diarium: %1, %2 max</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Suggestiones: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfologie de %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Activ</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nómine de dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Inicialisation</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Ples atender: li dictionarium essent indexat</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Ples atender...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation type="unfinished">Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation type="unfinished">Lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation type="unfinished">Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation type="unfinished">Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation type="unfinished">Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation type="unfinished">Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation type="unfinished">Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation type="unfinished">Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation type="unfinished">Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation type="unfinished">Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation type="unfinished">Thai</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation type="unfinished">Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation type="unfinished">Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tscec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Nederlandesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation type="unfinished">Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation type="unfinished">Fulah</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation type="unfinished">Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation type="unfinished">Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation type="unfinished">Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation type="unfinished">Latin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation type="unfinished">Malay</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation type="unfinished">Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation type="unfinished">Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation type="unfinished">Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation type="unfinished">Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation type="unfinished">Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation type="unfinished">Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation type="unfinished">Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation type="unfinished">Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation type="unfinished">Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation type="unfinished">Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation type="unfinished">Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation type="unfinished">Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation type="unfinished">Uzbek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation type="unfinished">Welsh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation type="unfinished">Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation type="unfinished">Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation type="unfinished">Raeto-Romance</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation type="unfinished">Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation type="unfinished">Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation type="unfinished">North Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation type="unfinished">Abkhazian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation type="unfinished">Kirghiz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation type="unfinished">Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation type="unfinished">Scottish Gaelic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation type="unfinished">Latvian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation type="unfinished">Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation type="unfinished">Kurdish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation type="unfinished">Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation type="unfinished">Maltese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation type="unfinished">Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation type="unfinished">Basque</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation type="unfinished">Avaric</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation type="unfinished">Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation type="unfinished">Breton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation type="unfinished">Sundanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation type="unfinished">Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation type="unfinished">Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation type="unfinished">Fijian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation type="unfinished">Hungarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation type="unfinished">Mongolian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation type="unfinished">Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation type="unfinished">Luxembourgish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation type="unfinished">Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation type="unfinished">Kazakh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation type="unfinished">Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation type="unfinished">Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation type="unfinished">Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation type="unfinished">Nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation type="unfinished">Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation type="unfinished">Pashto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation type="unfinished">Samoan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation type="unfinished">Occitan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation type="unfinished">Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovac</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation type="unfinished">Somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation type="unfinished">Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation type="unfinished">Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation type="unfinished">Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation type="unfinished">Uighur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation type="unfinished">Serbo-Croatian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation type="unfinished">Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation type="unfinished">Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation type="unfinished">Indonesian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation type="unfinished">Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation type="unfinished">Southern Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation type="unfinished">Corsican</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation type="unfinished">Slovenian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>West-Frisian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation type="unfinished">Aragonese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation type="unfinished">Tahitian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation type="unfinished">Malagasy</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galician</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation type="unfinished">Azerbaijani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation type="unfinished">Amharic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation type="unfinished">Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation type="unfinished">Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation type="unfinished">Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation type="unfinished">Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation type="unfinished">Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation type="unfinished">Sardinian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation type="unfinished">Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation type="unfinished">Bengali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation type="unfinished">Javanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation type="unfinished">Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation type="unfinished">Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation type="unfinished">Afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation type="unfinished">Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation type="unfinished">Armenian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation type="unfinished">Norwegian Bokmal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation type="unfinished">Croatian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation type="unfinished">Bosnian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation type="unfinished">Serbian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation type="unfinished">Burmese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation type="unfinished">Limburgish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation type="unfinished">Norwegian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation type="unfinished">Chechen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation type="unfinished">Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation type="unfinished">Chuvash</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation type="unfinished">Sinhala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Hispan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation type="unfinished">Cornish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation type="unfinished">Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation type="unfinished">Assamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation type="unfinished">Ossetian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation type="unfinished">Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Svedesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation type="unfinished">Tibetan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portuguesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turcian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation type="unfinished">Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation type="unfinished">Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Anglesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation type="unfinished">Georgian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation type="unfinished">Church Slavic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation type="unfinished">Faroese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finn</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation type="unfinished">Walloon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation type="unfinished">Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation type="unfinished">Marshallese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation type="unfinished">Northern Sami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation type="unfinished">Haitian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation type="unfinished">Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation type="unfinished">Norwegian Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation type="unfinished">Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation type="unfinished">South Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation type="unfinished">Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation type="unfinished">Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation type="unfinished">Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation type="unfinished">Yiddish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation type="unfinished">Traditional Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation type="unfinished">Simplified Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Altri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation type="unfinished">Other Simplified Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation type="unfinished">Other Traditional Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation type="unfinished">Other Eastern-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation type="unfinished">Other Western-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation type="unfinished">Other Russian languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation type="unfinished">Other Japanese languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Altri baltic lingues</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation type="unfinished">Other Greek languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation type="unfinished">Other Korean dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation type="unfinished">Other Turkish dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation type="unfinished">Other Thai dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation type="unfinished">Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,207 +2490,207 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>Francese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>Hispan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>Tchec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>Grec</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>Finn</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>Hollandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>Polonese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>Russ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>Turcian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>German, Svissia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>Hispan, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>Anglese</translation>
     </message>
@@ -2725,7 +2698,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Un errore evenit cargante dictionariums</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Un errore in li file de configuration. Continuar con parametres predefinit?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>P&amp;referet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Omni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Retro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dictionariums, %2 articules, %3 paroles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>R&amp;edacter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;File</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>Au&amp;xilie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Sercha</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>S&amp;urtir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Errore</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Surtir li application</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation type="unfinished">&amp;Close To Tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Ne successat gardar li article: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Augmentar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dictionariums...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Pri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Printar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Gardar li articul</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Gardar li articul quam</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation type="unfinished">Minimizes the window to tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation type="unfinished">Page Set&amp;up</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Hem-págine</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation type="unfinished">New Release Available</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Serchar:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Diminuer</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Monstrar li &amp;fenestre principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Pri GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Descargar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Formate de págine</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Serchar in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Dimension predefinit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation type="unfinished">Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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; de GoldenDict es disponibil por descarga.&lt;br&gt;Fa un clic sur &lt;b&gt;Descargar&lt;/b&gt; por ear al págine de descarga.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Carga...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sin nómine)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferenties...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Benvenit!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar li parol (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Gardar li articul</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation type="unfinished">Skip This Release</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Avan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Printar li articul</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation type="unfinished">No printer is available. Please install one first.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Vise</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>D&amp;iarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Vacuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Sca&amp;le</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Agrandar li paroles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Diminuer li paroles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation type="unfinished">Words Normal Size</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Cluder li actual carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Cluder omni cartes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Cluder omni cartes except li actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Apertet cartes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nov carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Fólder del &amp;configuration</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Panel de &amp;menú</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Trovat in dictionariums:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Adjunter omni cartes al preferet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Aperter li liste de cartes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Remover li actual carte ex li preferet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation type="unfinished">You have chosen to hide a menubar. Use %1 to show it back.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Mon&amp;strar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>C&amp;elar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation type="unfinished">Export history to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Files textual (*.txt);;Omni files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation type="unfinished">History export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Errore de exportation: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation type="unfinished">Import history from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation type="unfinished">Import error: invalid data in file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation type="unfinished">History import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Errore de importation: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportar li preferet in un file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Files XML (*.xml);;Omni files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation type="unfinished">Favorites export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation type="unfinished">Export Favorites to file as plain list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importar li preferet ex un file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation type="unfinished">Favorites import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation type="unfinished">Data parsing error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Info pri li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Paroles in li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Aperter li fólder del dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Redacter li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexante por sercha plentextual: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Remover li parol «%1» ex li Preferet?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Panel de &amp;sercha</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Panel de &amp;resultates</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Panel del pre&amp;feret</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation type="unfinished">Print Pre&amp;view</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Ree&amp;xaminar files</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nov carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>S&amp;empre in avan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Sempre in avan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Buton del menú</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Sercha in li págine</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Sercha plentextual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Manuale de GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Monstrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Adjunter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Adjunter li actual carte al preferet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportar a un liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Monstrar nómines in li &amp;panel de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Micri icones in li &amp;instrumentarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Articul, complet (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Articul, solmen HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Gardante li articul...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation type="unfinished">The main window is set to be always on top.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Panel de &amp;diarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API de accessibilitá ne es activat</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation type="unfinished">Dictionary file was tampered or corrupted</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Ne successat cargar un artucul de %1, cause: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Errore de analise de XML: %1 ye %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Activat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Icone</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation type="unfinished">Form</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Ínactiv dictionariums:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nómine:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Total articules:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traducte de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traducte a:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Total paroles:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation type="unfinished">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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Órdine de dictionariums:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Files includet in ti-ci dictionarium:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Information pri li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descrition:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ordinar secun nómine</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordinar secun lingues</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Paroles in li dictionarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Dictionariums: activ: %1, ínactiv: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Rute</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursiv</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation type="unfinished">Start to system tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Solmen li levul Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation type="unfinished">Enable system tray icon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation type="unfinished">Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Portu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tip:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usator:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Monitor</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ With this on however, new tabs will be opened without
 switching to them.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Usar un servitor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Usar ti rapid-taste por traducter un parol in li Paperiere:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation type="unfinished">Windows key or Meta key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Auto-pronunciar paroles in li principal fenestre</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Lansar al inicie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Solmel li levul Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navigation in cartes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Solmen li dextri Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation type="unfinished">With this on, an attempt to close main window would hide it instead of closing
 the application.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation type="unfinished">Enable if you wish to use a proxy server
 for all program&apos;s network requests.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Lingue de interfacie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Solmen li levul Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Aperter nov cartes in li funde</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>R&amp;ete</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Solmen li dextri Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Dextri Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Levul Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation type="unfinished">Auto-pronounce words in scan popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Aperter nov cartes pos li actual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Relansa li programma por cambiar li lingue.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Taste Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation type="unfinished">Check for new program releases periodically</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ current, active one. Otherwise they are added to
 be the last ones.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation type="unfinished">Close to system tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Predefinit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation type="unfinished">When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,141 +3812,141 @@ informs the user about it and prompts to open a
 download page.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Inicie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Contrasigne:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Predefinit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfacie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Cambiar li lingue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Taste Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Usar ti rapid-taste por monstar o celar li fenestre principal:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Levul Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Solmel li dextri Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferenties</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Levul Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Dextri Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
       <translation>Li rapid-tastes es global e functiona in chascun programma durante que GoldenDict opera in li funde.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Dextri Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Rapid-tastes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Activar li monitor al inicie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation type="unfinished">With this on, the application starts directly to system tray without showing
 its main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation type="unfinished">Automatically starts GoldenDict after operation system bootup.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignorar li cambias del selection e li Paperiere fat per GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation type="unfinished">Play audio files via built-in audio support</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Internal reproductor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Selecte li infrastructura de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Provide li comande del reproduction</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,84 +3955,84 @@ by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Ne cargar contenete de altri sites (cela pluparte de reclams)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation type="unfinished">Pronunciation</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reproduction</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Extern programma:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Un duplic clic traducte li parol</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Usar alquel extern programma por reproducter audiofiles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Celar li fenestre principal per taste Esc</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Celar li singul carte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Max dictionariums in li menú:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation type="unfinished">Send translated word to main window instead of to show it in popup window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Inviar li traductet parol al fenestre principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4073,159 +4043,159 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Fonde de dictionarium: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Mode obscur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Monstrar li ballon del monitor quande un parol es selectet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy del sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation type="unfinished">Custom proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Parametres personal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Conexer a Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modelle:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Parol</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Textu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Frase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation type="unfinished">Maximum network cache size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4234,284 +4204,326 @@ If set to 0 the network disk cache will be disabled.</source>
 If set to 0 the network disk cache will be disabled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> Mio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation type="unfinished">When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation type="unfinished">Clear network cache on exit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Sercha plentextual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Usar sercha plentextual por:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Ne serchar dictionariums con plu quam</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>articules (0 - ínlimitat)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vansat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation type="unfinished">When using clipboard,strip everything after newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Preferet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Confirmar li deletion de elementes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation type="unfinished">Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation type="unfinished">Ignore input phrases longer than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorar signes diacritic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation type="unfinished">Turn this option on to always expand optional parts of articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Expander li facultativ &amp;partes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Selecte ti-ci option por contracter grand articules automaticmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Contraer articules plu long quam</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation type="unfinished">Articles longer than this size will be collapsed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Serchar per sinonims</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>simboles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation type="unfinished">Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Diarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation type="unfinished">Turn this option on to store history of the translated words</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Mantener diarium</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Articules</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Selecter paroles per un singul clic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation type="unfinished">Add-on style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation type="unfinished">Specify the maximum number of entries to keep in history.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Max grandore:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Gardar chascun</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation type="unfinished">Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation type="unfinished">Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> Mo</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation type="unfinished">Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation type="unfinished">Plain Text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Correspondentie de un prefix</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Ínconosset</translation>
     </message>
@@ -4519,17 +4531,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nómine de programma es mancant.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Li programma ha terminat abnormalmen.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Li programma ha retrodat li code %1.</translation>
     </message>
@@ -4537,27 +4549,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Activat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tip</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Linea de comandes</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Icone</translation>
     </message>
@@ -4565,99 +4577,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Errore evenit cargante un articul</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Errore evenit decodificante un articul</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Jure editorial: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-post: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titul: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation type="unfinished">Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Un programma de sercha in un dictionarium.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Sercha/filtre de dictionariums (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Vacuar li sercha</translation>
     </message>
@@ -4665,22 +4692,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ERRORE: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation type="unfinished">Resource saving error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation type="unfinished">The referenced resource failed to download.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>AVISE: %1</translation>
     </message>
@@ -4709,68 +4736,73 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation type="unfinished">Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar li parol (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Adjunter li parol al preferet (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Monstrar o celar li panel de dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Sempre in avan del altri fenestres</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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">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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Inviar li parol al fenestre principal (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Retro</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Avan</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4813,17 +4845,17 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Rute</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Icone</translation>
     </message>
@@ -4831,60 +4863,60 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation type="unfinished">Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover li site &lt;b&gt;%1&lt;/b&gt; ex li liste?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation type="unfinished">Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Sillabarium japanesi «katakana»</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation type="unfinished">Make dictionaries from bunches of audiofiles by adding paths here:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover li fólder &lt;b&gt;%1&lt;/b&gt; ex li list?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romaji japanesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Standardized as ISO 3602
 Not implemented yet in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sites de Wikipedia o MediaWiki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Fólderes de sones</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation type="unfinished">The most widely used method of transcription of Japanese,
 based on English phonology</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Sillabarium japanesi «hiragana»</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation type="unfinished">Transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,22 +5015,22 @@ kana writing systems. Standardized as ISO 3602
 Not implemented yet in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Russ transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Modificar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5007,94 +5039,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Fólder con dictionariums Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Ree&amp;xaminar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation type="unfinished">German transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Alquel websites. Un catene %GDWORD% va esser remplazzat per li demandat parole:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Adjunter...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Selecte un fólder</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation type="unfinished">Websites</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Rutes de sercha por files de dictionariums:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation type="unfinished">Confirm removal</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Sillabariums:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Disponibil dictionariums de morfologie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation type="unfinished">Enables to use the Latin alphabet to write the Japanese language</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ Add appropriate dictionaries to the bottoms
 of the appropriate groups to use them.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Servitores DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Servitores DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Activar pronunciationes de Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Clave de API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Codes de lingues:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Liste de codes de lingues, p.ex. «en, ie».</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Li &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;complet liste&lt;/a&gt; de codes es disponibil.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Grec transliteration</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation type="unfinished">(not available in portable version)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programmas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover li programa &lt;b&gt;%1&lt;/b&gt; ex li liste?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation type="unfinished">Belarusian transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Usa %GD1251% por codification CP1251, %GDISO1%...%GDISO16% por ISO 8859-1...ISO 8859-16,
 %GDBIG5% por Big-5, %GDBIG5HKSCS% por Big5-HKSCS, %GDGBK% por GBK and GB18030, %GDSHIFTJIS% por Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Diction</translation>
     </message>
@@ -5212,42 +5234,42 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation type="unfinished">Selected voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Adjunter</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Previder</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation type="unfinished">Available voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation type="unfinished">Text to be previewed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation type="unfinished">Type text to be previewed here.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Previder</translation>
     </message>
@@ -5272,17 +5294,17 @@ of the appropriate groups to use them.</translation>
       <translation type="unfinished">Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferenties</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volúmine:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Rapidore:</translation>
     </message>
@@ -5290,12 +5312,12 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Tippa un parol o frase por serchar dictionariums</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation type="unfinished">Drop-down</translation>
     </message>
@@ -5326,33 +5348,33 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nómine</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresse</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Activat</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Quam un ligament</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Icone</translation>
     </message>
@@ -5360,17 +5382,9 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation type="unfinished">Failed to query some dictionaries.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>AVISE: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/it_IT.ts b/locale/it_IT.ts
index ed80e017..9be5df24 100644
--- a/locale/it_IT.ts
+++ b/locale/it_IT.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Info</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, dizionario elettronico, versione </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licenza GNU GPLv3 o successiva</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copia informazioni sulla versione</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copia l'elenco dei dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Riconoscimenti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Sconosciuto]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Basato su Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2018 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Basato su Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Espandi traduzione</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Compatta traduzione</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Scansione e traduzione delle parole puntate</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(senza titolo)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Benvenuto!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Nessuna traduzione per &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; è stata trovata nel gruppo &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt; del programma è benvenuto. &lt;p&gt;Controlla nel &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(immagine)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Espandi traduzione</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Da </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Compatta traduzione</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Crea una nuova nota di Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Errore d&apos;interrogazione: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Chiudi parole: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Espressioni composte:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Parole individuali:</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>La creazione del file temporaneo è fallita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Cerca «%1»</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>La risorsa di riferimento non esiste.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Cerca &quot;%1&quot; in %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Seleziona traduzione corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copia come testo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Ispeziona</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Apri collegamento in una nuova &amp;scheda</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Apri collegamento in un programma di &amp;navigazione web esterno</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Risorsa</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Voce sintetizzata (TTS)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Immagine</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definizione dal dizionario &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definizione: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Il programma audio di riferimento non esiste.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Apri Collegamento</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Salva &amp;segnalibro &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ATTENZIONE: Lettore audio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>Errore: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Salva suono</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Salva immagine</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Salva &amp;immagine...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Frase non trovata</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 di %2 corrispondenze</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Salva s&amp;uono...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Invia &quot;%1&quot; alla linea di comando</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Aggiungi &quot;%1&quot; alla cronologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Invia l'articolo corrente ad Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Invia il testo selezionato ad Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>File sonori (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tutti i file (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>File sonori (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tutti i file (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Impossibile riprodurre il file audio: %1</translation>
     </message>
@@ -414,62 +409,62 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversione cinese</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Attiva la conversione dei caratteri tra cinese semplificato e tradizionale</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>conversione caratteri del cinese</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Attiva la conversione dei caratteri dal cinese semplificato a quello tradizionale (variante locale Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>cinese semplificato a tradizionale (variante locale Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Attiva la conversione dei caratteri dal cinese semplificato a quello tradizionale (variante locale Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>cinese semplificato a tradizionale (variante locale Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Attiva la conversione dei caratteri dal cinese tradizionale a quello semplificato</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>cinese tradizionale a semplificato</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Conversione cinese semplificato a tradizionale (variante locale Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Conversione cinese semplificato a tradizionale (variante locale Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Conversione cinese tradizionale a semplificato</translation>
     </message>
@@ -477,30 +472,30 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>traslitterazione personalizzata</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Autenticazione proxy richiesta</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>E&apos; necessario fornire un nome utente e password per accedere via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Nome utente:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Password,</translation>
     </message>
@@ -508,22 +503,22 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Modulo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Icona del gruppo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tasto scorciatoia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Cartella preferiti:</translation>
     </message>
@@ -548,17 +543,17 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>Immagini</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Tutti i file</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Errore</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Impossibile leggere il file d&apos;immagine specificato</translation>
     </message>
@@ -566,63 +561,63 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Conferma</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Sei sicuro di volere generare una serie di gruppi basati sulle coppie di lingue?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Sei sicuro di voler generare un set di gruppi basato su metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combina i gruppi in base alla lingua sorgente in &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combina i gruppi in base alla lingua di destinazione in &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Raggruppamento automatico per cartella non riuscito.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Impossibile raggiungere la directory padre di %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Sei sicuro di voler generare un set di gruppi basato su cartelle contenenti?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Crea gruppo di traduzione bidirezionale &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combina i gruppi con &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Dizionari: </translation>
     </message>
@@ -635,133 +630,133 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Modalità di ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Questo elemento determina come la stringa del filtro debba essere interpretata</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Spuntanto questa casella si istruisce che la ricerca debba essere sensibile alle MAIUSCOLE/minuscole</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>MAIUSCOLE/minuscole</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Esporta lemmi in un file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Esporta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Guida</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Premi questo pulsante per applicare il filtro all&apos;elenco dei lemmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Applica</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Spuntanto questa casella ogni filtro modificato verrà immediatamente applicato all&apos;elenco dei lemmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>applica automaticamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Stringa del filtro (stringa fissa, con caratteri jolly o espressione regolare)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Testo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Caratteri jolly</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Espressione regolare</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Caricamento dei lemmi...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Lemmi unici totali: %1, filtrati: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Salva lemmi in un file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>File di testo (*.txt);;Tutti i file (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Impossibile aprire il file esportato</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Esporta lemmi...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Annulla</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Il processo di esportazione è interrotto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Esportazione terminata</translation>
     </message>
@@ -769,67 +764,77 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Totale voci:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduzione da:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Parole totali:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduzione in:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Apri cartella</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Modifica dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>File relativi a questo dizionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descrizione:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Mostra tutti i lemmi univoci del dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Lemmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Modificia il dizionario via comando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nome file indice:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Apri cartella indice</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 voci</translation>
     </message>
@@ -860,44 +865,44 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Abilitato</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Indirizzo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Banche dati</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategie</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Icona</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Virgola-delimitatore dell&apos;elenco delle banche dati
 (stringa vuota o &quot;*&quot; corrisponde a tutte le banche dati)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Virgola-delimitatore dell&apos;elenco di ricerca delle strategie
@@ -907,37 +912,37 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Estendi menu con tutti i dizionari...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Modifica questo gruppo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Info sul dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Lemmi del dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Apri cartella dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Modifica dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Barra dei &amp;dizionari</translation>
     </message>
@@ -946,27 +951,27 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Accetto</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Annulla</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Risorse modificate</translation>
     </message>
@@ -977,12 +982,12 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Gruppi</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Alcune risorse sono state modificate. Accettare le modifiche?</translation>
     </message>
@@ -1011,75 +1016,55 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Ricerca a testo intero</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Parole intere</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Testo semplice</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Caratteri jolly</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Espressione regolare</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>La parola interrogante non può essere vuota.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>supporta la sintassi di ricerca xapiana, come AND OR +/- ecc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max distanza tra le parole (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Predefinito</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max voci per dizionario (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Voci trovate: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indicizzazione corrente: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Nessuno</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>La riga di ricerca deve contenere almeno una parola contenente </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>o più caratteri</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Nessun dizionario per la ricerca a testo intero</translation>
     </message>
@@ -1087,7 +1072,7 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Errore ne file dei preferiti</translation>
     </message>
@@ -1153,7 +1138,7 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>da</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Clicca il menu Modifica|Dizionari|Risorse|Forvo e applica la propria chiave API per fare scomparire questo errore.</translation>
     </message>
@@ -1174,68 +1159,52 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Cerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>MAIUSCOLE/minuscole</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modalità:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignora ordine parole</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignora caratteri diacritici</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Voci trovate:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dizionari disponibili nel gruppo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Attesa per l&apos;indicizzazione:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Guida</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Totale:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indicizzato:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Indicizzazione corrente: nessuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Annulla</translation>
     </message>
@@ -1267,27 +1236,27 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>CANC</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>INS</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>Assegna un nuovo nome al gruppo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dizionari disponibili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Aggiungi gruppo</translation>
     </message>
@@ -1342,42 +1311,42 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>Aggiungi gruppo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Crea un nuovo gruppo di dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Raggruppa per lingue</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Crea gruppi basati su cartelle.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Raggruppa per cartelle</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Raggruppa per metadati</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Trascina i dizionari da o nei gruppi, spostali al loro interno, riordinali usando il mouse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Rinomina il gruppo di dizionari corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Rimuovi il gruppo di dizionari corrente</translation>
     </message>
@@ -1387,43 +1356,43 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>Assegna un nome al nuovo gruppo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Rimuovi ogni gruppo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Rimuovi i dizionari selezionati dal gruppo (Canc)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Aggiungi al gruppo i dizionari selezionati (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Rimuovi gruppo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Gruppi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Rinomina gruppo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Rimuovi ogni gruppo di dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Crea gruppi basati sulla lingua</translation>
     </message>
@@ -1446,12 +1415,12 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
       <translation>Cronologia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Dimensioni cronologia: %1 voci per un massimo di %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Suggerimenti ortografici: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfologia %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Abilitato</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indicizzazione: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nome dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Inizializzazione</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Attendere l&apos;indicizzazione dei dizionari</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Attendere...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indicizzazione...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Mannese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thailandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Ceco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Danese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Greco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Monokutuba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tagico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tataro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Gallese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Reto-Romancio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele del nord</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abcaso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Chirghiso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Scozzese gaelico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Lettone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Curdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Basco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Maldiviano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Ungherese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Tedesco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Ebraico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Lussemburghese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Cazaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Mantieni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pashtu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polacco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovacco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigura</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsì</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisone occidentale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgascio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galizio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amarico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Giapponese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucraino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorusso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Africani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norvegese Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosniaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburghese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norvegese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Ceceno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Cinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Ciuvascio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singalese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spagnolo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osseto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Swedese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portoghese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Slavonico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faroese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Vallone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami del nord</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Creolo haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norvegese Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele del sud</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yiddish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Cinese tradizionale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Cinese semplificato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Altro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Altro dialetto cinese semplificato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Altro dialetto cinese tradizionale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Altra lingua dell&apos;est europeo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Altra lingua dell&apos;ovest europeo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Altra lingua russa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Altra lingua giapponese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Altra lingua baltica</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Altra lingua greca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Altro dialetto coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Altro dialetto turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Altro dialetto thailandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>francese</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>spagnolo</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>bielorusso</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulgaro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>ceco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Tedesco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>greco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>finlandese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italiano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>giapponese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>coreano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>lituano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>macedone</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Olandese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polacco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>portoghese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>russo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>slovacco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albanese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>serbo (cirillico)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>svedese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ucraino</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Cinese semplificato</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Cinese tradizionale</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnamita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portoghese, brasiliano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persiano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>spagnolo, argentino</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Tedesco, Svizzera</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>spagnolo, Bolivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tagico</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabo, Arabia Saudita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turkmeno</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Inglese</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Errore di caricamento dei dizionari</translation>
     </message>
@@ -2733,7 +2706,7 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Errore nel file di configurazione. Continuare con le impostazioni preimpostate?</translation>
     </message>
@@ -2741,703 +2714,703 @@ tra l&apos;ortografia classica e scolastica in cirillico)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Preferiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Tutto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Traduzione precedente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dizionari, %2 voci, %3 parole</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>M&amp;odifica</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;File</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>G&amp;uida</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Esci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Errore</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Esce dal programma</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Iconizza nella barra di notifica</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Impossibile salvare la traduzione: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Ingrandisci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dizionari...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Info</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Stampa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Salva traduzione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Salva traduzione come</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Iconizza il programma nella barra di notifica</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Imposta &amp;pagina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Visita il sito web</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>E&apos; disponibile una nuova versione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Cerca:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Riduci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Mostra finestra &amp;principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Info...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Scarica</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Imposta pagina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Cerca in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Ripristina zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Caricamento...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(senza titolo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Impostazioni...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Benvenuto!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Ascolta la pronuncia (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Salva la traduzione corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Tralascia questa versione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Traduzione successiva</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Stampa traduzione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Non è disponibile alcuna stampante. Per proseguire installarne una.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Visualizza</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Cronologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Elimina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Ingrandisci parole da cercare</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Riduci parole da cercare</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Ripristina zoom delle parole da cercare</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Chiudi scheda corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Chiudi ogni scheda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Chiudi ogni scheda eccetto la corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Schede aperte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nuova scheda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Cartella di configurazione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barra dei &amp;menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Trovato nei dizionari:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Aggiungi ogni scheda ai preferiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ATTENZIONE: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Stringa da cercare nei dizionari. Sono consentiti caratteri jolly &apos;*&apos;, &apos;?&apos; e una serie di caratteri &apos;[...]&apos;.
 Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; usare la rispettiva sintassi &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Apri l&apos;elenco delle schede</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Rimuovi la scheda corrente dai Preferiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Mostra</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Esporta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Nascondi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Esporta cronologia come file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>File di testo (*.txt);;Tutti i file (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Esportazione cronologia completata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Errore di esportazione: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importa cronologia da file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Errore d&apos;importazione: i dati nel file sono invalidi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Importazione della cronologia completata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Errore d&apos;importazione: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Esporta preferiti in  un file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>File XML (*.xml);;Tutti i file (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Esportazione dei preferiti completata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Esporta preferiti in un file come un  semplice elenco</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importa preferiti da file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>File XML (*.xml);;File Txt (*.txt);;Tutti i file (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Importazione dei preferiti completata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Errore di analisi dati</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Info sul dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Lemmi del dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Apri cartella dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Modifica dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indicizzazione corrente per la ricerca a testo intero: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Rimuovere il  lemma  &quot;%1&quot; dai Preferiti?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Pannello di &amp;ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Pannello dei risultati di &amp;ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Pannello dei preferiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Anteprima di stampa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Rianalizza file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nuova scheda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Mostra sempre in primo piano</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Mostra sempre in primo piano</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Pulsante menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Cerca nella pagina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Ricerca a testo intero</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Maiusc+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Guida di GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Mostra</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Esporta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Aggiungi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Aggiungi ai preferiti la pagina contenuta nella scheda corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Esporta come elenco</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Mostra i n&amp;omi dei dizionari nella barra</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Mostra icone &amp;piccole nelle barre</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Barra degli &amp;strumenti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Abilita Scansione</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Traduzione come pagina completa (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Traduzione come pagina solo HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Salvataggio traduzioni...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Salva articolo completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Pannello della &amp;cronologica</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>L&apos;accessibilità alle API non è abilitita</translation>
     </message>
@@ -3445,12 +3418,12 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Il file del dizionario risulta alterato o corrotto</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Impossibile caricare la traduzione da %1, per il motivo seguente: %2</translation>
     </message>
@@ -3458,7 +3431,7 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Errore di analisi XML: %1 al %2,%3</translation>
     </message>
@@ -3474,22 +3447,22 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Indirizzo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Abilitato</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Icona</translation>
     </message>
@@ -3505,82 +3478,82 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Modulo</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Dizionari inattivi (disabilitati):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Totale voci:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduzione da:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduzione in:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Parole totali:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Ordine dei dizionari:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>File relativi a questo dizionario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informazioni sul dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descrizione:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ordina per nome</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordina per lingua</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Lemmi del dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Dizionari attivi: %1, inattivi: %2</translation>
     </message>
@@ -3588,12 +3561,12 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Percorso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Ricorsivo</translation>
     </message>
@@ -3601,69 +3574,67 @@ Per utilizzare nelle ricerche i caratteri &apos;*&apos;, &apos;?&apos;, &apos;[&
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>iconizza nella barra di notifica all&apos;avvio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Solo tasto MAIUSCOLE sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Windows o Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Abilita come applicazione di notifica</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Porta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>MAIUSCOLE</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Utente:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Puntamento</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,106 +3642,106 @@ switching to them.</source>
 Spuntando questa casella, le nuove schede vengono aperte senza che si passi ad esse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Utilizza server proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tasto di Windows o Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>pronuncia automaticamente le parole dalla finestra principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>esegui all&apos;avvio di Windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Solo tasto Alt sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Esplorazione delle schede</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Solo tasto MAIUSCOLE destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Spuntando questa casella, il tentativo di chiudere la finestra principale 
 ne causerà soltanto l&apos;iconizzazione nella barra di notifica.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Pronuncia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Lingua interfaccia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Solo tasto Ctrl sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>apri le schede sullo sfondo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Rete</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Solo tasto Ctrl destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>MAIUSCOLE destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>MAIUSCOLE sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 
@@ -3778,32 +3749,32 @@ delle parole puntate quando i tasti scelti vengono effettivamente premuti.
 Le parole tradotte verranno mostrate in una finestra di dialogo a comparsa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>pronuncia automaticamente le parole puntate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>apri le nuove schede accanto a quella corrente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>La modifica della lingua avrà effetto al riavvio del programma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tasto Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>controlla periodicamente la presenza di aggiornamenti e novità</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 a quella corrente altrimenti vengono accodate all&apos;ultima.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>iconizza nella barra di notifica alla chiusura</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Preimpostata nel sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Spuntando questa casella, appare un&apos;icona sulla barra di notifica per aprire 
 la finestra principale ed effettuare altre operazioni.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3840,104 +3810,104 @@ se sono disponibili aggiornamenti, nuove versioni di GoldenDict
 e si collega al sito del programma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Avvio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Password,</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Preimpostato</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfaccia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Modifica della lingua</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tasto Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Solo tasto Alt destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Impostazioni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl sinistro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl destro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Tasti scorciatoia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Spuntando questa casella, il programma si avvia iconizzato nella barra di notifica
 senza aprire la finestra principale.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tasto MAIUSCOLE</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Esegue automaticamente il programma all&apos;avvio di Windows.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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.
@@ -3945,37 +3915,37 @@ Le parole tradotte verranno mostrate in una finestra di dialogo a comparsa.
 Al contrario se si deseleziona questa casella, scansione e traduzione vengono disabilitate.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Non mostrare alcuna finestra a comparsa se la selezione del testo all&apos;interno della finestra di dialogo di GoldenDict o negli Appunti di Windows sono cambiate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>ignora se la selezione del testo all&apos;interno di GoldenDict o degli Appunti di Windows vengono modificate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Riproduce i file audio mediante il supporto audio incorporato</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Utilizza lettore interno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Scegli l&apos;applicazione per la riproduzione dell&apos;audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Inserire la riga di comando per il lettore audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3984,83 +3954,83 @@ disabilitando i contenuti (immagini, frame) non originati dai siti visitati.
 Se alcuni siti dovessero bloccarsi, provare a disabilitare questa casella.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronuncia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Riproduzione</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Usa un programma esterno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>il doppio clic del mouse, traduce la parola cliccata</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalmente, premendo il tasto Esc si sposta il controllo d&apos;immissione da tastiera nella casella di traduzione. Spuntando questa casella la finestra principale viene nascosta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>il tasto Esc nasconde la finestra principale</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Spuntando questa casella, quando c&apos;è aperta una sola scheda la barra delle schede principale viene automaticamente nascosta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>nascondi scheda singola</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limite sul numero di dizionari per il menu contestuale:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>mostra le traduzioni nella finestra principale del programma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Mostra un pulsante a comparsa prima di mostrare la finestra con la traduzione, cliccando il pulsante viene quindi mostrata la traduzione.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4071,159 +4041,159 @@ scorre all'articolo dallo stesso dizionario. Con questa opzione disattivata,
 tuttavia, viene mostrato l'articolo dal dizionario più alto.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Scorri automaticamente all'articolo di destinazione</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Carattere Dizionario: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>imposta la famiglia dei caratteri di ripiego per il dizionario</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Articolo Stile di visualizzazione:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Gira l'interfaccia utente al buio.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Modalità Scura</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Trasforma lo stile di visualizzazione degli articoli al buio.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Modalità Lettore Scuro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Ordine MRU: Ordine usato più di recente.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Traccia le modifiche degli appunti quando la scansione è abilitata. Attenzione! Dovresti sempre abilitarla a meno che tu non sia su Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Traccia modifica appunti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Modifica selezione traccia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Tack selezione solo quando tutti i tasti selezionati vengono mantenuti premuti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>mostra un pulsante a comparsa per accedere ai risultati non appena avviene la scansione della parola da tradurre</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Ritardo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy di sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personalizzato</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Impostazioni personalizzate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Mazzo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modello:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Parola</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Campo di vocabolario...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Testo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Campo di definizione...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Frase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Campo frase (può essere vuoto)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>non consentire che GoldenDict venga identificato nelle intestazioni HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Dimensione massima cache di rete:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4232,284 +4202,326 @@ If set to 0 the network disk cache will be disabled.</source>
 Se impostato a 0 la cache su disco di rete sarà disabilitata.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Quando questa opzione è abilitata, GoldenDict
 cancella la cache di rete dal disco durante l'uscita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Cancella la cache di rete all'uscita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Ricerca a testo intero</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Abilita ricerca a testo intero per:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Non eseguire la ricerca nei dizionari contenenti più di</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>voci (0 - illimitate)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Avanzate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Durante le ricerche successive, se un dizionario è collassato dal manuale, rimarrà collassato nella ricerca successiva</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Collasso sessione</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Quando si utilizzano gli appunti,striscia tutto dopo newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>In una nuova ricerca, mettere a fuoco la finestra principale o popup anche se&apos;s visibile</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Preferiti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Intervallo di salvataggio dei preferiti. Impostando il valore 0 i preferiti verranno salvatati soltanto alla chiusura del programma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Spuntando questa casella, verrà domandata conferma per ogni tentativo di rimozione di un elemento</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>richiedi conferma prima di eliminare un elemento</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Attiva questa opzione per ignorare il testo di input non ragionevolmente lungo
 dal mouse-over, dalla selezione, dagli appunti o dalla riga di comando</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignora le frasi di input più lunghe di</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Le frasi di input più lunghe di questa dimensione verranno ignorate</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Spuntare questa casella per ignorare i caratteri diacritici durante la ricerca dei lemmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>ignora i caratteri diacritici durante la ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>espandi i &amp;contesti opzionali delle voci tradotte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>compatta le traduzioni più estese di </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignora punteggiatura durante la ricerca</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Spuntando questa casella, verrà abilitata la ricerca di articoli extra da un elenco di sinonimi
 dai dizionari di Stardict, Babylon e GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>ricerca extra via sinonimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>caratteri</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl+Tab naviga in ordine cronologico tra le schede aperte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babilonia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Cronologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>memorizza la &amp;cronologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Traduzioni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Spuntando questa casella, è possibile selezionare una parola con un singolo clic del mouse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>seleziona le parole con un singolo clic del mouse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Stile dei moduli aggiuntivi (add-on):</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Dimensione massima della cronologia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Intervallo di salvataggio della cronologia. Impostando il valore 0 la cronologia verrà salvata soltanto alla chiusura del programma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Salva ogni </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minuti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Classico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Linghi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Le informazioni sulla posizione sono necessarie per utilizzare la ricerca di frasi di Xapian e l'operatore NEAR, ma la dimensione del database sarà molto maggiore. Si applica solo ai nuovi dizionari in arrivo.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Abilita l'indice con le informazioni sulla posizione</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Tipo di carattere standard</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Carattere monospazio</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Carattere Serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Carattere sans serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Aspetto</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Questi caratteri verranno applicati quando non vengono trovati i caratteri specificati da un dizionario.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Font di riserva</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Testo semplice</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Compita prefisso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Sconosciuto</translation>
     </message>
@@ -4517,17 +4529,17 @@ dai dizionari di Stardict, Babylon e GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Non è stato assegnato alcun nome al programma.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Il programma si è bloccato.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Il programma ha restituito il codice di uscita %1.</translation>
     </message>
@@ -4535,27 +4547,27 @@ dai dizionari di Stardict, Babylon e GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Abilitato</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Linea di comando</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Icona</translation>
     </message>
@@ -4563,99 +4575,114 @@ dai dizionari di Stardict, Babylon e GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Errore di caricamento della traduzione</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Errore di decodifica del file di traduzione</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Diritti d&apos;autore: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versione: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autore: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titolo: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Sito Web: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Un programma di ricerca del dizionario.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Parola o frase da interrogare.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Salva i messaggi di debug su gd_log.txt nella cartella di configurazione.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Ripristina lo stato della finestra.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Disabilita tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Cambia il gruppo della finestra principale.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Cambia il gruppo di popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Attiva/disattiva popup di scansione.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Stampa la versione e le informazioni sulla diagnosi.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Cerca/Filtra nel dizionario (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Elimina cronologia</translation>
     </message>
@@ -4663,22 +4690,22 @@ dai dizionari di Stardict, Babylon e GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>Errore: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Errore di salvataggio risorsa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Lo scaricamento della risorsa di riferimento è fallita.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ATTENZIONE: %1</translation>
     </message>
@@ -4707,68 +4734,73 @@ dai dizionari di Stardict, Babylon e GLS</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dizionario</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Ascolta la pronuncia (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Aggiungi parola ai preferiti (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Mostra o nasconde la barra dei dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Mostra sempre in primo piano rispetto alle altre finestre</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Traduzione precedente</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Traduzione successiva</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ATTENZIONE: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4780,7 +4812,7 @@ in modo che possa essere ridimensionata o gestita liberamente.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Maiusc+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4790,7 +4822,7 @@ in modo che possa essere ridimensionata o gestita liberamente.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4811,17 +4843,17 @@ in modo che possa essere ridimensionata o gestita liberamente.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Percorso</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Icona</translation>
     </message>
@@ -4829,60 +4861,60 @@ in modo che possa essere ridimensionata o gestita liberamente.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>File</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Sillabario giapponese Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Per creare dei dizionari con le tue raccolte di file audio aggiungi qui il relativo percorso:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>giapponese romanizzato (convertito in caratteri latini)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4893,84 +4925,84 @@ Standard ISO 3602
 Non ancora implementato.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Siti Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Pronuncia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Qualsiasi programma esterno. Una stringa %GDWORD% verrà sostituita con la parola query. Una stringa %GDSEARCH% verrà sostituita con il testo nella barra di ricerca. Se entrambi i parametri non sono forniti, la parola d'intestazione sarà alimentata in input standard.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations fornite da &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, una biblioteca di media linguistici collaborativi di Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Abilita Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Codice lingua ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;L'utilizzo di Forvo attualmente richiede una chiave API, registrati sul sito per ottenere la tua chiave.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ottieni la tua chiave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;qui&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Sillabario giapponese Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Traslitterazione personalizzata</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Questo si applica solo nella frase di ricerca, con ogni riga che rappresenta una traslitterazione, separata da punto e virgola. Ad esempio, ae;æ, gli utenti possono inserire ae per rappresentare æ nella parola di destinazione.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #questo è un esempio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Traslitterazione</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4981,118 +5013,108 @@ la romanizzazione del giapponese kana. Standard ISO 3602
 Non ancora implementato.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>russo traslitterato</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Modifica...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Esempi:  &amp;quot;eng&amp;quot; per l'inglese, &amp;quot;fra&amp;quot; per il francese &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+L'elenco completo delle lingue disponibili può essere trovato &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; qui &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Percorso della cartella con i dizionari morfologici Hunspell e/o Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Rianalizza</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>tedesco traslitterato</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Inserire un qualsiasi sito. La stringa %GDWORD% aggiunta all&apos;indirizzo rappresenta la parola cercata:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Aggiungi...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Scegli una cartella</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Elimina</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Siti web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Percorsi dei file dei dizionari:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Conferma eliminazione</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Sillabari:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dizionari morfologici disponibili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Attiva la romanizzazione del giapponese</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5107,94 +5129,94 @@ Per poterli utilizzare inserire tali dizionari
 in fondo al gruppo linguistico appropriato.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>romanizzazione hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Server DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Server DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Abilita la pronuncia da Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Chiave API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Codici della lingua (separarli con una virgola e uno spazio):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>greco traslitterato</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(funzione non disponibile nella versione portatile)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programmi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>traslitterazione bielorusso</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>In alternativa usare %GD1251% per CP1251, %GDISO1%...%GDISO16% per ISO 8859-1...ISO 8859-16 rispettivamente,
 %GDBIG5% per Big-5, %GDBIG5HKSCS% per Big5-HKSCS, %GDGBK% per GBK e GB18030, %GDSHIFTJIS% per Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Testo a sintesi vocale (Text to Speech)</translation>
     </message>
@@ -5210,42 +5232,42 @@ in fondo al gruppo linguistico appropriato.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Motori di sintesi vocali selezionati:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Aggiungi</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Elimina</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Anteprima</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Motori di sintesi disponibili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Testo di anteprima da pronunciare:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Digita qui del testo d&apos;esempio da pronunciare per provare la voce di sintesi TTS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Anteprima</translation>
     </message>
@@ -5270,17 +5292,17 @@ in fondo al gruppo linguistico appropriato.</translation>
       <translation>Impossibile rilevare una voce di sintesi TTS disponibile.&lt;br&gt;Assicurarsi che sul proprio computer sia stato già installato almeno un motore di sintesi TTS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Impostazioni</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volume</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Velocità:</translation>
     </message>
@@ -5288,12 +5310,12 @@ in fondo al gruppo linguistico appropriato.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Digita una parola o una frase da cercare nei dizionari</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Elenco a discesa</translation>
     </message>
@@ -5324,33 +5346,33 @@ in fondo al gruppo linguistico appropriato.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Indirizzo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Abilitato</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Inserisci voce come un collegamento all&apos;interno di un tag &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Come un collegamento</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Icona</translation>
     </message>
@@ -5358,17 +5380,9 @@ in fondo al gruppo linguistico appropriato.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Impossibile consultare alcuni dizionari.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ATTENZIONE: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/ja_JP.ts b/locale/ja_JP.ts
index 059c8bdf..d558d557 100644
--- a/locale/ja_JP.ts
+++ b/locale/ja_JP.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>バージョン情報</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng 辞書検索プログラム version </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>GNU GPLv3 以降の下でライセンスされています</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>バージョン情報をコピー</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>辞書一覧をコピー</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>クレジット:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[不明]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Qt %1 (%2, %3 bit) に基づいています</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Qt %1 (%2, %3) に基づく</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>記事を展開</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>記事を折りたたむ</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>ポップアップ作業</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(無題)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>ようこそ!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; の翻訳が見つかりませんでした。</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;Working with popup&quot;&gt;他のアクティブなアプリケーションから単語を検索します&lt;/a&gt;。&lt;p&gt;プログラムをカスタマイズするには、&lt;b&gt;[編集|環境設定]&lt;/b&gt; で利用可能なオプションをチェックしてください。そこにある設定にはすべてツールチップがあります、何か疑問に思った場合はそれらを読むようにしてください。&lt;p&gt;さらなるヘルプを必要とする場合、質問、提案やその他気になることがある場合は、プログラムの&lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;フォーラム&lt;/a&gt;で歓迎されます。&lt;p&gt;更新はプログラムの&lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;Web サイト&lt;/a&gt;をチェックしてください。&lt;p&gt;(c) 2008-2013 Konstantin Isakov. GPLv3 以降の下でライセンスされています。</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(画像)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>記事を展開</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>から: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>記事を折りたたむ</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>新しいAnkiノートを作成</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>クエリ エラー: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>類似語: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>複合表現: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>単語ごと: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>一時ファイルの作成に失敗しました。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot; を検索(&amp;L)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>新しいタブで &quot;%1&quot; を検索(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>参照されたりソースが存在しません。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>リソース ファイルの自動オープンに失敗しました、手動で開いています: %1。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>%2 から &quot;%1&quot; を検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>記事を選択</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>テキストとしてコピー</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>検査する</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>新しいタブでリンクを開く(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>外部ブラウザーでリンクを開く(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>資源</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>音楽</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS音声</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>画像</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>動画です。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>動画: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>辞書からの定義 &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>定義: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>参照されたりソースが存在しません。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>リンクを開く(&amp;O)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>ブックマークを保存 &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>警告: 音声プレーヤー: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>エラー: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>サウンドを保存</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>画像を保存</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>画像ファイル (*.bmp *.jpg *.png *.tif);すべてのファイル (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>画像を保存(&amp;I)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>フレーズが見つかりません</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 / %2 一致</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>保存(&amp;O)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>&quot;%1&quot; を入力ラインに送る</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&quot;%1&quot; を履歴に追加</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>現在の記事をAnkiに送信(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>選択したテキストをAnkiに送信(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>サウンドファイル (*.wav *.ogg *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);すべてのファイル (*..*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>サウンドファイル (*.wav *.opus *.ogg *.ogg *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);すべてのファイル (*..*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>サウンド ファイルの再生に失敗しました: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>中国語変換</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>簡体字と繁体字の変換を有効にする</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>中国語バージョン(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>簡略化された文字から従来の文字への変換を有効にする (台湾のバリアント文字)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC から TC (台湾のバリアント)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>簡略化された文字から従来の文字への変換を有効にする (香港のバリアント文字)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC から TC (香港変種)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>従来の文字から簡略化された文字への変換を有効にする</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC to SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>簡体字から繁体字中国語への変換 (台湾のバリアント)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>簡体字中国語(香港バリアント)変換</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>繁体字から簡体字への変換</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>カスタム音訳</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>プロキシ認証が必要です</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>プロキシ経由でアクセスするにはユーザー名とパスワードを入力する必要があります</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>ユーザー名:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>パスワード:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>フォーム</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>グループ アイコン:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>ショートカット:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>お気に入りフォルダ:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>イメージ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>すべてのファイル</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>エラー</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>指定されたイメージ ファイルを読み取ることができません。</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>確認</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>言語の組み合わせに基づいたグループのセットを生成しますか?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>metadata.tomlに基づいてグループのセットを生成してもよろしいですか？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>翻訳元の言語でグループを &quot;%1-&gt;&quot; に結合します</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>翻訳先の言語で &quot;-&gt;%1&quot; にグループを結合します</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>フォルダーごとの自動グループ化に失敗しました。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>%1 の親ディレクトリに到達できません。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>含まれているフォルダに基づいて一連のグループを生成してもよろしいですか？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>二面翻訳グループ &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>&quot;%1&quot; とグループを結合</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>辞書: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>検索モード</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>この要素はフィルター文字列の解釈方法を決定します</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>フィルタリング時にシンボルケースが考慮されます</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>大文字と小文字を区別する</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>ヘッドワードをファイルにエクスポートする</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>エクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>ヘルプ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>このボタンを押して、ヘッダ単語リストにフィルタを適用します</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>適用</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>フィルタをチェックすると、すぐにヘッドワードリストに適用されます</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>自動適用</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>フィルタ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>フィルター文字列 (固定文字列、ワイルドカードまたは正規表現)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>テキスト</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>ワイルドカード</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>見出し語を読み込んでいます...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>ユニークなヘッドワードの合計: %1, フィルタリング: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>ヘッドワードをファイルに保存</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>テキスト ファイル (*.txt);;すべてのファイル (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>エクスポートしたファイルを開くことができません</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>ヘッドワードをエクスポート...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>キャンセル</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>エクスポートプロセスが中断されました</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>エクスポート完了</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>辞書の合計:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>翻訳元:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>単語の合計:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>翻訳先:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>フォルダを開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>辞書を編集</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>この辞書を含むファイル:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>説明:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>すべての一意の辞書の見出しを表示</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>コマンドで辞書を編集します:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>インデックスファイル名:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>インデックスフォルダーを開く</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 個のエントリ</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>アドレス</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>データベース</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>ストラテジー</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>アイコン</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>カンマ区切りのデータベースリスト
 (空文字列または &quot;*&quot; はすべてのデータベースに一致します)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>カンマ区切りの検索戦略リスト
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>すべての辞書を含む拡張メニュー...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>このグループを編集</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>辞書情報</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>辞書のheadwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>辞書フォルダを開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>辞書を編集</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>辞書バー(&amp;D)</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>辞書(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>辞書</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>承認</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>キャンセル</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>ソースが変更されました</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>グループ(&amp;G)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>いくつかのソースが変更されました。変更を承認しますか?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>全文検索</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>単語全体</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>プレーンテキスト</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>ワイルドカード</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>クエリの単語を空にすることはできません。</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>AND OR +/- などのxapian検索構文をサポートしています</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>単語間の最大距離 (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>デフォルト</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>辞書あたりの最大記事数 (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>発見された記事: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>インデックス作成中: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>なし</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>検索行には、少なくとも 1 つの単語を含む必要があります </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> 記号を追加してください</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>全文検索用の辞書がありません</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>お気に入りファイルにエラーがあります</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>from</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>大文字と小文字を区別する</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>モード:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>単語の順序を無視</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>発音を無視</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>発見された記事:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>グループ内の使用可能な辞書:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>インデックス待ち:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>ヘルプ</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>合計:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>インデックス:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>インデックス作成: なし</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>キャンセル</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>タブ 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>グループの新しい名前:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>利用可能な辞書:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>グループの追加(&amp;A)</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>グループの追加</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>新しい辞書グループを作成します</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>言語ごとにグループ化</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>フォルダーベースのグループを作成します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>フォルダーごとにグループ化</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>メタデータによるグループ化</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>マウスを使ってグループ間で辞書をドラッグ アンド ドロップ、グループ内で移動、グループの順序を変更します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>現在の辞書グループの名前を変更します</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>現在の辞書グループを削除します</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>新しいグループの名前:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>すべてのグループを削除</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>選択された辞書をグループから削除します (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>選択された辞書をグループに追加します (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>グループの削除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>グループ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>グループ名の変更(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>すべての辞書グループを削除します</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>言語ごとのグループを作成します</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>履歴:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>履歴サイズ: %1 件のエントリが最大 %2 件中</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>もしかして: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 形態</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>インデックス作成: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>辞書名</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - 初期化中</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>辞書の索引を構築している間お待ちください</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>お待ちください...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>インデックス作成中...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>エウェ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>イド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>ラオ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>トウィ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>アファール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>アカン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>クリー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>イボ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>コミ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>マン島語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>パリ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>タイ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>ウルドゥー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>ズールー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>チェコ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>オランダ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>ガンダ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>ラフニ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>ギリシャ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>ハウサ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>ヒンディー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>アイルランド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>クメール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>コンゴ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>ラテン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>マレー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>マオリ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>ナウル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>オリヤー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>オロモ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>サンゴ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>ショナ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>タジク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>タミル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>タタール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>スワジ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>トンガ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>イヌピアク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>ベンダ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>ウズベク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>ウェールズ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>ウォロフ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>ホサ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>イタリア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>レトロマン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>ゾンカ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>カンナダ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>北ンデベレ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>アブハズ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>キルギス語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>キルンディ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>スコットランドゲール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>アルバニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>ラトビア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>マラヤーラム語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>クルド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>ブルガリア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>リンガラ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>マルタ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>マラーティー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>アラビア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>バスク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>アバル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>ビハール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>アイマラ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>ブリュターニュ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>スーダン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>デンマーク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>ディベヒ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>ルバカタンガ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>フィジー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>ハンガリー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>フランス語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>ドイツ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>モンゴル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>ヘブライ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>ヘレロ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>ルクセンブルク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>カヌリ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>カザフ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>キクユ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>韓国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>ナバホ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>ンドンガ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>ネパール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>オジブワ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>パシュトー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>ポーランド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>サモア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>オック語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>シンド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>スロバキア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>ソマリ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>テルグ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>ツォンガ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>ツワナ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>ウイグル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>セルボ・クロアチア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>ヨルバ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>チワン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>ルーマニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>インドネシア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>パンジャブ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>北ソト語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>コルシカ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>エスペラント語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>ペルシャ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>スロベニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>西フリジア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>アラゴン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>タヒチ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>マラガシ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>ガリシア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>アゼルバイジャン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>アムハラ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>サンスクリット語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>日本語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>ウクライナ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>バンバラ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>カラーリット語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>バシキール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>ベラルーシ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>カシミール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>サルデーニャ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>ヒリモツ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>ケチュア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>ベンガル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>ジャワ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>アベスター語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>キニヤルワンダ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>アフリカーンス語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>ビスラマ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>アルメニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>ノルウェー語ブークモール</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>クロアチア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>ボスニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>インターリングア</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>インターリング</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>カタロニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>セルビア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>ビルマ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>ロシア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>リンブルフ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>ノルウェー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>チェチェン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>中国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>チュバシュ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>シンハラ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>スペイン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>コーンウォール語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>タガログ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>アッサム語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>オセット語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>エストニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>スワヒリ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>スウェーデン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>チベット語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>ベトナム語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>マケドニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>ポルトガル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>トルコ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>トルクメン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>グジャラート語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>アイスランド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>イヌクティトゥト語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>英語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>グルジア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>教会スラブ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>フェロー語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>フィンランド語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>ヴォラピュク語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>ワロン語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>クワニャマ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>マーシャル語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>北部サーミ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>ハイチ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>チャモロ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>ノルウェー語ニーノシュク</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>グアラニ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>南ンデベレ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>チェワ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>リトアニア語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>四川イ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>ティグリニア語 </translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>イディッシュ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>繁体字中国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>簡体字中国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>その他</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>その他の簡体字中国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>その他の繁体字中国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>その他の東ヨーロッパ諸語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>その他の西洋諸語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>ロシア語以外の言語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>その他の日本語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>その他のバルト諸語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>その他のギリシャ語言語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>その他の韓国語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>その他のトルコ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>その他のタイ語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>フランス語</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>スペイン語</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>ベラルーシ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>ブルガリア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>チェコ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>ドイツ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>ギリシャ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>フィンランド語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>イタリア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>日本語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>韓国語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>リトアニア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>マケドニア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>オランダ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>ポーランド語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>ポルトガル語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>ロシア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>スロバキア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>アルバニア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>セルビア語 (キリル)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>スウェーデン語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>トルコ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ウクライナ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>中国語 (簡体字)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>中国語 (繁体字)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>ベトナム語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>ポルトガル語（ブラジル）</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>ペルシャ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>スペイン語 (アルゼンチン)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>ヒンディー語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>エスペラント語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>ドイツ語 (スイス)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>スペイン語 (ボリビア)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>タジク語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>ケチュア語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>アイマラ語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>アラビア語 (サウジアラビア)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>トルクメン語</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>インターリング</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>英語</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>辞書の読み込みエラー</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>設定ファイルでエラーが発生しました。既定の設定で続行しますか？</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Favo(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>(F3)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>(F4)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>すべて</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>戻る</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 個の辞書、%2 個の記事、 %3 個の単語</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>編集(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>ファイル(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>ヘルプ(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>終了(&amp;Q)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>エラー</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>アプリケーションを終了します</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>トレイへ閉じる(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>記事を保存できません: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>拡大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>辞書(&amp;D)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>バージョン情報(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>フォーラム(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>印刷(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>記事の保存(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>名前を付けて記事を保存</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>トレイへウィンドウを最小化します</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>ページ設定(&amp;U)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>ホーム ページ(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>新しいリリースが利用可能です</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>検索:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>縮小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>メイン ウィンドウの表示(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>GoldenDict-ng のバージョン情報</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>ダウンロード</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>ページ設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>検索する場所:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>通常のサイズ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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-ng のバージョン &lt;b&gt;%1&lt;/b&gt; のダウンロードが利用可能です。&lt;br&gt;ダウンロード ページへ移動するには&lt;b&gt;ダウンロード&lt;/b&gt;をクリックします。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>読み込んでいます...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(無題)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>環境設定(&amp;P)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>ようこそ!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>単語の発音 (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>記事の保存</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>このリリースをスキップ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>進む</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>記事の印刷</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>利用可能なプリンターがありません。まずインストールしてください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>表示(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>履歴(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>クリア(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>ズーム&amp;Z)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>単語の拡大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>単語の縮小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>通常の単語のサイズ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>現在のタブを閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>すべてのタブを閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>現在以外のすべてのタブを閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>開いているタブ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>設定フォルダ(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>メニューバー(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>辞書で見つかりました:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>すべてのタブをお気に入りに追加</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
-      <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">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</translation>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>警告: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
+      <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="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>タブ一覧を開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>お気に入りから現在のタブを削除</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>メニューバーを非表示にしました。 %1 を使用して表示します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>表示(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>エクスポート(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>非表示 (&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>履歴をファイルにエクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>テキスト ファイル (*.txt);;すべてのファイル (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>履歴エクスポート完了</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>エクスポートエラー: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>インポート(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>ファイルから履歴をインポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>インポートエラー：ファイル内の無効なデータ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>履歴のインポート完了</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>インポートエラー: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>お気に入りをファイルにエクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML ファイル (*.xml);;すべてのファイル (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>お気に入りのエクスポートが完了</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>お気に入りをプレーンリストとしてファイルにエクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>ファイルからお気に入りをインポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML ファイル (*.xml);;Txtファイル (*.txt);すべてのファイル (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>お気に入りのインポート完了</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>データ解析エラー</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>辞書情報</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>辞書のheadwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>辞書フォルダを開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>辞書を編集</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>全文検索のインデックス作成: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>ヘッドワード &quot;%1&quot; をお気に入りから削除しますか？</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>検索ペイン(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>結果ナビゲーションペイン(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>お気に入りペイン(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>プレビュー印刷(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>ファイルを再スキャン(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>新しいタブ(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>常に一番上(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>常に一番上に表示</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>メニューボタン</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>ページ内で検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>全文検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict リファレンス</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>表示</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>エクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>インポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>追加</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>現在のタブをお気に入りに追加</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>リストにエクスポート</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>辞書バーに名前を表示(&amp;B)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>ツールバーに小さなアイコンを表示(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>ナビゲーション(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>スキャンを有効化</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>記事, Complete (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>記事、HTML のみ (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>記事を保存しています...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>記事の保存が完了しました</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>メインウィンドウは常に上に設定されています。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>履歴ペイン(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>アクセシビリティAPIが有効になっていません</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>辞書ファイルが改ざんまたは破損しています</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>%1から記事の読み込みに失敗しました。理由: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML 分析エラー: %1 at %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>アドレス</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>アイコン</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>フォーム</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>非アクティブ (無効) な辞書:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>名前:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>辞書の合計:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>翻訳元:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>翻訳先:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>単語の合計:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>辞書の順序:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>この辞書を含むファイル:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>辞書の情報</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>説明:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>名前でソート</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>言語でソート</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>辞書のheadwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>辞書はアクティブ: %1, 非アクティブ: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>パス</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>再帰</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>システム トレイに入れて起動する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>左 Shift のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>(Ctrl)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>システム トレイ アイコンを有効にする</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>ホスト:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>ポート:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>種類:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>ユーザー:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>スキャン ポップアップ(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ switching to them.</source>
 開きます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>プロキシ サーバーを使用する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>クリップボードからの単語を翻訳するのに次のホットキーを使用します:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows キーまたは Meta キー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>メイン ウィンドウで単語を自動的に発音する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>システムと起動する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>左 Alt のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>タブ ブラウズ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>右 Shift のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>オーディオ(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>すべてのプログラムのネットワーク要求にプロキシ
 サーバーを使用したい場合は有効にします。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>インターフェイス言語:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>左 Ctrl のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>背景で新しいタブを開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>ネットワーク(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>右 Ctrl のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>右 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>左 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>スキャン ポップアップで単語を自動的に発音する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>現在の後に新しいタブを開く</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>言語の変更を適用するにはプログラムを再起動します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt キー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>定期的に新しいプログラム リリースをチェックする</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 そうでなければ最後に追加されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>システム トレイへ閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>システム既定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>有効だと、メイン ウィンドウを開いたりするのに使われる
 アイコンがシステム トレイ領域に表示されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,141 +3811,141 @@ download page.</source>
 ダウンロード ページを開くか確認します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>スタートアップ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>パスワード:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>既定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>インターフェイス(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>言語の変更</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl キー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>メイン ウィンドウを表示または非表示にするのに次のホットキーを使用します:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>左 Al</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>右 Alt のみ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>環境設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>左 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>右 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>右 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>ホットキー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>スキャン ポップアップをオンにして起動する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>これがオンだと、アプリケーションはメイン ウィンドウを表示することなく
 直接システム トレイに入って起動します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift キー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>オペレーション システムのブートアップの後に GoldenDict が自動的に起動します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>GoldenDict&apos;の 1 つの選択またはクリップボードでは、ポップアップを表示しない</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>GoldenDict&apos;s 自身の選択とクリップボードの変更を無視する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>内蔵のオーディオサポートを介してオーディオファイルを再生する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>内部プレイヤーを使用:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>オーディオバックエンドを選択</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>オーディオプレーヤーのコマンドラインを入力してください</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3984,247 +3954,247 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 ブロックします。特定のサイトが破損する場合は、これを無効にしてみてください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>他のサイトからのコンテンツの読み込みを無効にする (ほとんどの広告を非表示にします)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>発音</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>再生</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>外部プログラムを使用する:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>ダブルクリックでクリックされた単語を翻訳する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>オーディオ ファイルの再生に外部プログラムを使用します</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC キーでメインウィンドウを隠す</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
+      <translation>タブを 1 つだけ開いているときにメイン タブ バーを表示したく&apos;場合は、このオプションを選択します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>単一タブを隠す</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>大きなコンテキストメニューを避けるために、この値を調整します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>コンテキストメニュー辞書の制限:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>翻訳された単語をポップアップウィンドウに表示する代わりにメインウィンドウに送信する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>翻訳された単語をメインウィンドウに送信</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>ポップアップウィンドウを表示する前にフラグウィンドウを表示し、ポップアップウィンドウを表示するにはフラグをクリックします。 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>通常、リンクをクリックするか、単語を
+クリックするか、記事内の選択項目を検索すると、翻訳が読み込まれ、ほぼ
+に同じ辞書から記事までスクロールします。ただし、このオプションをオフ
+にすると、最上位の辞書の記事が表示されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>自動的にターゲット記事までスクロールする</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>辞書フォント: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>フォントファミリを辞書に設定</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>記事表示のスタイル:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>UIを暗くします。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>ダークモード</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>記事の表示スタイルを暗くします。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>ダークリーダーモード</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU注文: 最後に使用された注文。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>スキャンが有効な場合、クリップボードの変更を追跡します。注意！Linuxでない限り、常に有効にする必要があります。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>クリップボードの変更を追跡する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>選択内容の変更を追跡</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>選択したすべてのキーが押された場合のみタック選択:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>単語が選択されたときにスキャンフラグを表示する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>遅延時間</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ミリ秒</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>システムプロキシ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>カスタム プロキシ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>カスタム設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>デッキ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>モデル:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>単語</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>語彙フィールド...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>テキスト</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>定義フィールド...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>センテンスフィールド（空にすることができます）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>HTTPヘッダーでGoldenDictを識別しない</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>ネットワークキャッシュの最大サイズ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4233,284 +4203,326 @@ If set to 0 the network disk cache will be disabled.</source>
 に設定されている場合、ネットワークのディスクキャッシュは無効になります。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>このオプションを有効にすると、GoldenDict
 は終了時にネットワークキャッシュをディスクから消去します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>終了時にネットワークキャッシュをクリア</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>全文検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>全文検索を許可:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Don&apos;t search in dictions including more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>記事 (0 - 無制限)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>詳細(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>連続した検索では、辞書が手動で折りたたまれている場合、次の検索では折りたたまれたままになります</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>セッションを閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>クリップボードを使用する場合は、改行後にすべてを取り除きます</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>新しい検索では、たとえそれが表示されていてもメインまたはポップアップウィンドウにフォーカスします&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>お気に入り</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>お気に入り保存間隔。0に設定すると、終了時にのみ保存されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>項目削除のすべての操作を確認するには、このオプションをオンにしてください</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>項目削除の確認</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>マウスオーバー、クリップボード、またはコマンドラインから不当に長い入力テキスト
 を無視するには、このオプションをオンにします。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>より長い入力フレーズを無視する</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>このサイズより長い入力フレーズは無視されます</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>記事検索中に発音を無視するには、このオプションをオンにしてください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>検索中に発音を無視</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>常に記事のオプション部分を展開するには、このオプションをオンにしてください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>オプションパーツを展開(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>大きな記事を自動的に折りたたむには、このオプションを選択してください</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>より多くの記事を閉じる</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>このサイズより長い記事は折りたたまれます</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>検索中に句読点を無視</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Stardict、Babylon、GLS辞書から同義語リスト
 で追加記事検索を有効にするには、このオプションをオンにしてください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>同義語による追加検索</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>シンボル</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab でMRUの順序でタブを移動</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>沿革</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>翻訳された単語の履歴を保存するには、このオプションをオンにしてください</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>履歴を保存(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>記事</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>単語をクリックして単語を選択する場合は、このオプションをオンにします</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>ワンクリックで単語を選択</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>アドオンのスタイル:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>履歴に保存するエントリの最大数を指定します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>履歴の最大サイズ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>履歴の保存間隔。0に設定すると、終了時にのみ履歴が保存されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>保存間隔</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>分</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>クラシック</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>モダンな</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>ランゴー・ブルー</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapian のフレーズ検索や NEAR 演算子を使用するには位置情報が必要ですが、データベースのサイズが非常に大きくなります。 新しい辞書にのみ適用されます。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>位置情報付きインデックスを有効にする</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>標準フォント</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>等幅フォント</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>セリフフォント</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>サンセリフフォント</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>外観</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>これらのフォントは、辞書で指定されたフォントが見つからない場合に適用されます。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>フォールバックフォント</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>オーディオ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>プレーンテキスト</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>プレフィックス一致</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>不明</translation>
     </message>
@@ -4518,17 +4530,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>プログラム名が指定されていません。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>プログラムがクラッシュしました。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>プログラムは終了コード %1 を返しました。</translation>
     </message>
@@ -4536,27 +4548,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>タイプ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Command Line</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>アイコン</translation>
     </message>
@@ -4564,99 +4576,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>記事の読み込みエラー</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>記事のデコードエラー</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>著作権: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>バージョン: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>作成者: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>メール: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>タイトル: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>ウェブサイト: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>日付: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>辞書検索プログラム。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>クエリする単語または文。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>configフォルダのgd_log.txtにデバッグメッセージを保存します。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>ウィンドウの状態をリセットします。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>tts を無効にします。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>メイン ウィンドウのグループを変更します。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>ポップアップのグループを変更します</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>スキャンポップアップの切り替え。</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>バージョンと診断情報を印刷します。</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>辞書検索/フィルタ (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>検索をクリア</translation>
     </message>
@@ -4664,22 +4691,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>エラー: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>リソース保存エラー: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>参照されたリソースのダウンロードに失敗しました。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>警告: %1</translation>
     </message>
@@ -4708,68 +4735,73 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>ダイアログ</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>単語の発音 (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>単語をお気に入りに追加 (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>辞書バーの表示または非表示を切り替えます</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>常に他のすべてのウィンドウの上にとどまります</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>単語をメインウィンドウに送信 (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>戻る</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>進む</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>警告: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4781,7 +4813,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4791,7 +4823,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4812,17 +4844,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>パス</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>アイコン</translation>
     </message>
@@ -4830,60 +4862,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>ファイル</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>ひらがな</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>システム:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>日本式</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>カタカナ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>ここにパスを追加してオーディオ ファイルのディレクトリを作成します:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>日本語ローマ字</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4894,83 +4926,83 @@ ISO 3602 として標準化されています
 GoldenDict にはまだ実装されていません。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) サイト:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>サウンド ディレクトリ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>外部プログラム。文字列 %GDWORD% はクエリ単語に置き換えられます。文字列 %GDSEARCH% は検索バー内のテキストに置き換えられます。両方のパラメータが指定されていない場合、見出し語は標準入力に入力されます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt; &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;フランスのウィキメディアメディアライブラリであるリンガ・リブレ&lt;/span&gt;&lt;/a&gt;によって証明された主張。 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>リンガ・リブレを有効にする</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 言語コード</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forvo を使用するには現在、API キーが必要です。サイトに登録して、独自のキーを取得してください。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;あなた自身のキー &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;ここ&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>英語の音韻に基づいた、最も広く使われている日本語の音写法です</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>ひらがな</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>カスタム音訳</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>これは検索フレーズにのみ適用され、各行はセミコロンで区切られた音訳を表します。たとえば、ae;æ,ユーザーは、ターゲット単語の æ を表すために ae を入力できます。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #これは一例です</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>音訳</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4981,118 +5013,108 @@ ISO 3602 として標準化されています
 GoldenDict にはまだ実装されていません。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>ロシア語音訳</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>形態</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>変更(&amp;C)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>例: 英語の場合は  &amp;quot;eng&amp;quot; 、フランス語の場合は &amp;quot;fra&amp;quot; &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+利用可能な言語の完全なリストはここにあります &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>カタカナ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Hunspell/Myspell 辞書のあるディレクトリへのパス:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>今すぐ再スキャン(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>ドイツ語音訳</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>どんな Web サイトでも。文字列 %GDWORD% がクエリの単語に置換されます:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>追加(&amp;A)...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>ディレクトリを選択します</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>削除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Web サイト</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>辞書ファイルを検索するパス:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>削除の確認</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>仮名:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>利用可能な形態辞書:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>日本語の記述のラテン文字の使用を有効にします</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5102,94 +5124,94 @@ of the appropriate groups to use them.</source>
       <translation>それぞれの形態辞書は検索の語幹と誤入力された単語のスペルの提案を提供する個別の補助辞書として表示されます。適切な辞書を使用するには適切なグループの末尾へそれらを追加します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>ヘボン式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>訓令式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICTサーバー</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICTサーバー:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvo からの発音を有効にする</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API キー:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>言語コード (コンマ区切り):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>ギリシャ語音訳</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(ポータブル バージョンでは利用できません)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>プログラム</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>ベラルーシ語</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</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>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>テキスト読み上げ</translation>
     </message>
@@ -5205,42 +5227,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>選択した音声エンジン:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>追加(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>削除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>プレビュー</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>利用可能な音声エンジン:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>プレビューするテキスト:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>プレビューするテキストを入力します。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>プレビュー(&amp;P)</translation>
     </message>
@@ -5265,17 +5287,17 @@ of the appropriate groups to use them.</source>
       <translation>利用可能なTTS音声が見つかりません。&lt;br&gt;コンピュータに少なくとも1つのTTSエンジンがインストールされていることを確認してください。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>環境設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>ボリューム:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>レート:</translation>
     </message>
@@ -5283,12 +5305,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>辞書を検索する単語またはフレーズを入力します</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>ドロップダウン</translation>
     </message>
@@ -5319,33 +5341,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>名前</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>アドレス</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>有効</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>&lt;iframe&gt; タグ内のリンクとして記事を挿入</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>リンクとして</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>アイコン</translation>
     </message>
@@ -5353,17 +5375,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>いくつかの辞書のクエリに失敗しました。</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>警告: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/jbo_EN.ts b/locale/jbo_EN.ts
index 5a03279b..a247ffe1 100644
--- a/locale/jbo_EN.ts
+++ b/locale/jbo_EN.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>datni</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>.i la .goldendikt. cu vlacku sisku samtci </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>.i la&apos;o zoi. GNU GPLv3 .zoi ja ro bavla&apos;i cu javni</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation type="unfinished">Copy version info</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation type="unfinished">Copy dictionaries list</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>zanfu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>to na djuno toi</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>.i jicmu fa lo %1 moi be la&apos;i .kutis. (%2, bitmu li %3)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>lanli</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;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. </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>viska pa notci</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>mipri pa notci</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>.i pu facki lo du&apos;u no cmima be la&apos;o zoi. &lt;b&gt;%2&lt;/b&gt; .zoi cu xe fanva la&apos;o zoi. &lt;b&gt;%1&lt;/b&gt; .zoi</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation type="unfinished">Working with popup</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>to no da cmene toi</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>rinsa</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>.i pu facki lo du&apos;u no cmima be la&apos;o zoi. &lt;b&gt;%2&lt;/b&gt; .zoi cu xe fanva</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;.i fi&apos;i do do pilno &lt;b&gt;la .goldendikt.&lt;/b&gt;&lt;/h3&gt;&lt;p&gt;.i sarcu pa nu do kakne lo ka pilno lo samtci kei kei fa pa se tadji be pa nu do cuxna &lt;b&gt;la vlacku&lt;/b&gt; pe &lt;b&gt;la binxo&lt;/b&gt; be&apos;o poi nu do jmina pa judri be pa vlacku datnyveimei be&apos;o ja pa samtcise&apos;u be fi la .midiiauikis. be&apos;o ja pa drata lo&apos;i vreji ja cu basygau fo lo ka se porsi fi lo&apos;i vlacku ja cu cupra pa vlacku selcmi&lt;p&gt;.i ba da do co&apos;a kakne lo ka sisku fi lo&apos;i valsi .i pa nu sisku cu se tadji pa nu do pilno lo cankyuidje poi zunle dei kei je pa nu &lt;a href=&quot;Working with popup&quot;&gt;do sisku tu&apos;a pa valsi pe pa samtci poi drata&lt;/a&gt;&lt;p&gt;.i pa nu do cuxna &lt;b&gt;la te tcimi&apos;e&lt;/b&gt; pe &lt;b&gt;la binxo&lt;/b&gt; cu tadji pa nu tcimi&apos;e .i ro da poi kakne lo ka binxo cu ckini pa djunoi poi ga ja nai do bilga lo ka tcidu ke&apos;a gi cfipu do&lt;p&gt;.i ga na ja do nitcu lo ka se sidju kei ja cu djica lo ka cusku pa preti ja cu stidi da kei ja cu kucli pa se jinvi be pa prenu poi na du do gi ko vitke &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;lo snustu&lt;/a&gt; be fi lo samtci&lt;p&gt;.i nuzba ro cnino &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;lo kibystu&lt;/a&gt; pe lo samtci&lt;p&gt;(c) 2008-2013 Konstantin Isakov .i la&apos;o zoi. GPL3 .zoi ja ro bavla&apos;i be ri cu javni</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>to pixra toi</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>viska pa notci</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>vreji </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>mipri pa notci</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation type="unfinished">Make a new Anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>.i nabmi fi pa nu sisku kei fa la&apos;o zoi. %1 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation type="unfinished">Close words: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation type="unfinished">Compound expressions: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation type="unfinished">Individual words: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation type="unfinished">Failed to create temporary file.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>sisku tu&apos;a zoi zoi. %1 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>cupra pa sepli poi vanbi pa nu sisku tu&apos;a zoi zoi. %1 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation type="unfinished">The referenced resource doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation type="unfinished">Failed to auto-open resource file, try opening manually: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation type="unfinished">Look up &quot;%1&quot; in %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>cuxna pa notci poi ca se viska</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>fukra&apos;e pa lerpoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>lanli</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>cupra pa sepli poi vanbi pa nu sisku tu&apos;a zoi zoi. %1 .zoi da pe la&apos;o zoi. %2 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>cupra pa sepli poi vanbi pa nu viska lo se judri</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation type="unfinished">Open Link in &amp;External Browser</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation type="unfinished">Resource</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>snavi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation type="unfinished">TTS Voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>pixra</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>vidvi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation type="unfinished">Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation type="unfinished">Definition from dictionary &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation type="unfinished">Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation type="unfinished">Op&amp;en Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation type="unfinished">WARNING: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>.i nabmi fa la&apos;o zoi. %1 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>co&apos;a vreji fi pa se snavi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>co&apos;a vreji fi pa pixra</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation type="unfinished">Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>co&apos;a vreji fi pa pixra</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation type="unfinished">Phrase not found</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>co&apos;a vreji fi pa se snavi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation type="unfinished">Send &quot;%1&quot; to input line</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation type="unfinished">&amp;Add &quot;%1&quot; to history</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation type="unfinished">&amp;Send Current Article to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation type="unfinished">Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation type="unfinished">Failed to play sound file: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation type="unfinished">Chinese Conversion</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation type="unfinished">Chinese Con&amp;version</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation type="unfinished">SC to TC (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation type="unfinished">TC to SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
     </message>
@@ -477,7 +472,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -485,22 +480,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation type="unfinished">Proxy authentication required</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>plicme</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>se mipri jaspu</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation type="unfinished">Form</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>pixra je cu sinxa pa selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation type="unfinished">Shortcut:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation type="unfinished">Favorites folder:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</translation>
       <translation>datnyvei fi pa pixra</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>datnyvei fi da</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>nabmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation type="unfinished">Can&apos;t read the specified image file.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>birti</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on language pairs?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation type="unfinished">Combine groups by source language to &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation type="unfinished">Combine groups by target language to &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation type="unfinished">Make two-side translate group &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation type="unfinished">Combine groups with &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>vlacku</translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>tadji lo nu sisku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation type="unfinished">This element determines how filter string will be interpreted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation type="unfinished">Match case</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation type="unfinished">Exports headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>co&apos;a vreji</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>sidju</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>mipri</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation type="unfinished">Press this button to apply filter to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation type="unfinished">Apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation type="unfinished">Auto apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>julne</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation type="unfinished">RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation type="unfinished">Save headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>datnyvei fi pa lerpoi (*.txt);;datnyvei fi da (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation type="unfinished">Export headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>sisti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation type="unfinished">Export finished</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>se zilkancu lo&apos;i notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>ve fanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>se zilkancu lo&apos;i valsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>te fanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation type="unfinished">Open folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>pa vlacku cu binxo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>datnyvei fi pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>ve skicu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation type="unfinished">Show all unique dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation type="unfinished">Headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation type="unfinished">Edit the dictionary via command:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation type="unfinished">%1 entries</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>katci</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation type="unfinished">Databases</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation type="unfinished">Strategies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>pixra</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation type="unfinished">Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation type="unfinished">Comma-delimited list of search strategies
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation type="unfinished">Extended menu with all dictionaries...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>pa selcmi cu binxo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>datni pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>pa vlacku cu binxo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>vlacku kajna</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation type="unfinished">Accept</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>sisti</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation type="unfinished">Sources changed</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation type="unfinished">Some sources were changed. Would you like to accept the changes?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>sisku fi ro lerpoi</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation type="unfinished">Plain text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>lo&apos;i notci poi jai se facki cu zilkancu li </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation type="unfinished">Now indexing: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>no da</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation type="unfinished">No dictionaries for full-text search</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation type="unfinished">Error in favorities file</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</translation>
       <translation type="unfinished">from</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation type="unfinished">Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</translation>
     </message>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>sisku</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation type="unfinished">Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>notci je cu jai se facki</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation type="unfinished">Available dictionaries in group:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation type="unfinished">Wait for indexing:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>sidju</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation type="unfinished">Indexed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation type="unfinished">Now indexing: None</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>sisti</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation type="unfinished">&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation type="unfinished">&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Insert</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>re moi lo&apos;i vanbi poi sepli</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>.i ko samci&apos;a pa basti be fi lo ka cmene lo selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>cupra pa selcmi</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</translation>
       <translation>cupra pa selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>cupra pa vlacku selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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">Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>basti fi lo ka cmene lo vlacku selcmi poi ca se cuxna</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>vimcu pa vlacku selcmi poi ca se cuxna</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</translation>
       <translation>.i ko samci&apos;a pa ba cmene be lo selcmi poi cnino</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>vimcu ro selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>ro vlacku poi ca se cuxna co&apos;u cmima (Delete)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>ro vlacku poi ca se cuxna co&apos;a cmima (Insert)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>vimcu pa selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>basti fi lo ka cmene lo selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>vimcu ro vlacku selcmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation type="unfinished">Create language-based groups</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation type="unfinished">%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation type="unfinished">History size: %1 entries out of maximum %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>se stidi vlalerpoi </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation type="unfinished">%1 Morphology</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>katci</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>cmene pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation type="unfinished">GoldenDict-ng - Initializing</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation type="unfinished">Please wait while indexing dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>.i ca&apos;o gunka</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>bangeve&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>bangidu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>banlu&apos;a&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>bantuve&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>banga&apos;aru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>bangaku&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>bancuru&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>bangibu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>banku&apos;omu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>baurguluvu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>banpulu&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>bantuxe&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>bangurudu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>banzu&apos;ulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>bancu&apos;esu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>baurnuludu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>banlu&apos;ugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>banfu&apos;ulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>bangelulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>banxe&apos;a&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>banxe&apos;inu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>baurgulu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>bankuxemu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>banku&apos;onu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>banlu&apos;atu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>banmusu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>banmuru&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>baurnu&apos;a&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>bangoru&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>bangorumu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>bansu&apos;agu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>bansunu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>bantuguku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>bantu&apos;amu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>bantu&apos;atu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>bansusuve</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>bantu&apos;onu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>bangipuku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>banvu&apos;enu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>banguzubu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>bancujemu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>banve&apos;olu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>banxuxe&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>bangitu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>.raitoroman.</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>banduzu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>banku&apos;anu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>baurnudu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>bangabuku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>banku&apos;iru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>banru&apos;unu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>baurgulu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>bansuke&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>banlu&apos;avu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>banmu&apos;alu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>banku&apos;uru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>banbu&apos;ulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>banlu&apos;inu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>banmulutu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>banmu&apos;aru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>bangaru&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>bange&apos;usu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>bangavu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>banbu&apos;ixe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>bangajemu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>banburu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>bansu&apos;unu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>bandu&apos;anu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>bandu&apos;ivu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>banlu&apos;ubu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>banfu&apos;iju</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>banxe&apos;unu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>banfuru&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>bandu&apos;e&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>banmu&apos;onu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>banxe&apos;ebu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>banxe&apos;eru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>banlutuzu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>banku&apos;a&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>banku&apos;azu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>banku&apos;iku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>banku&apos;oru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>baurnu&apos;avu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>baurnudu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>baurnu&apos;epu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>bangoju&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>banpu&apos;usu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>banpu&apos;olu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>bansumu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>bangocu&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>bansunudu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>bansuluku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>bansu&apos;omu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>bantu&apos;elu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>bantusu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>bantusunu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>bango&apos;u&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>banxebusu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>banje&apos;oru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>banzuxe&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>banru&apos;onu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>banginudu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>banpu&apos;anu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>bansu&apos;otu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>bancu&apos;osu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>bangepu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>banfu&apos;asu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>bansuluvu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>banfuruje</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>bangarugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>bantu&apos;axe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>banmulugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>baurgulugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>bangazu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>bangamuxe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>bansu&apos;anu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>banjupunu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>bangukuru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>banbu&apos;amu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>banku&apos;alu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>banbu&apos;aku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>banbu&apos;elu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>banku&apos;asu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>bansurudu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>banxemu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>banke&apos;u&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>banbu&apos;enu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>banju&apos;avu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>bangavu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>banku&apos;inu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>bangafuru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>banbu&apos;isu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>banxeje&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>baurnu&apos;obu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>banxeruvu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>banbu&apos;osu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>banginu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>bangilu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>bancu&apos;atu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>bansurupu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>banmuje&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>banru&apos;usu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>banlu&apos;imu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>baurnu&apos;oru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>bancuxe&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>banzuxe&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>bancuxevu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>bansu&apos;inu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>bansupu&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>bancu&apos;oru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>bantugulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>bangasumu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>bangosusu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>bangesutu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>bansuvecu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>bansuve&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>banbu&apos;odu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>banvu&apos;i&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>banmukudu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>banpu&apos;oru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>bantu&apos;uru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>bantu&apos;uku</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>baurgu&apos;uju</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>bangisulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>bangiku&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>bangenugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>banku&apos;atu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>bancuxe&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>banfu&apos;a&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>banfu&apos;inu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>banvu&apos;olu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>banvelunu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>banku&apos;u&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>banmu&apos;axe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>bansumu&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>banxe&apos;atu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>bancuxe&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>baurnunu&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>baurgurunu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>baurnubulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>baurnuje&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>banlu&apos;itu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>bangi&apos;i&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>bantu&apos;iru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>banje&apos;idu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>banzuxe&apos;o je cu jai cacklu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>banzuxe&apos;o je cu sampu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>drata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation type="unfinished">Other Simplified Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation type="unfinished">Other Traditional Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation type="unfinished">Other Eastern-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation type="unfinished">Other Western-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation type="unfinished">Other Russian languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation type="unfinished">Other Japanese languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation type="unfinished">Other Baltic languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation type="unfinished">Other Greek languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation type="unfinished">Other Korean dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation type="unfinished">Other Turkish dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation type="unfinished">Other Thai dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>.tamazixt.</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>banjubu&apos;o</translation>
     </message>
@@ -2517,207 +2490,207 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation type="unfinished">French</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation type="unfinished">Spanish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation type="unfinished">Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation type="unfinished">Czech</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation type="unfinished">German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation type="unfinished">Greek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation type="unfinished">Finnish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation type="unfinished">Dutch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation type="unfinished">Polish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation type="unfinished">Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation type="unfinished">Russian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation type="unfinished">Turkish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation type="unfinished">German, Switzerland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation type="unfinished">Spanish, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation type="unfinished">Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation type="unfinished">English</translation>
     </message>
@@ -2725,7 +2698,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation type="unfinished">Error loading dictionaries</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation type="unfinished">Error in configuration file. Continue with default settings?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation type="unfinished">F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation type="unfinished">F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation type="unfinished">F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation type="unfinished">F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>se cmima ro da</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>prula&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>.i %1 da vlacku .i %2 da notci .i %3 da valsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>binxo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>datnyvei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>sidju</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>sisku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>sisti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>nabmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>sisti tu&apos;a lo samtci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation type="unfinished">&amp;Close To Tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
-      <translation>.i nabmi fi pa nu co&apos;a vreji fi pa notci kei fa la&apos;o zoi. %1 .zoi</translation>
+      <translation type="unfinished">Can&apos;t save article: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>banro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>datni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>snustu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>prina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>co&apos;a vreji fi pa notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>pa drata co&apos;a vreji fi pa notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation type="unfinished">Minimizes the window to tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>papri te tcimi&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>kibystu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation type="unfinished">New Release Available</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>sisku</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>tolba&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>viska pa cankyuidje poi ralju</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>datni la .goldendikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>kibycpa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>papri te tcimi&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation type="unfinished">Look up in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>no&apos;e barda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation type="unfinished">Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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">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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation type="unfinished">Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation type="unfinished">Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>.i ca&apos;o samymo&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>to no da cmene toi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>te tcimi&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>rinsa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>vlaba&apos;u pa valsi (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>co&apos;a vreji fi pa notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation type="unfinished">Skip This Release</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>bavla&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>prina je cu vreji fi pa notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>.i no da poi primi&apos;i zo&apos;u tcimi&apos;e fi tu&apos;a da .i ko tcimi&apos;e fi tu&apos;a pa primi&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>jvinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>vimcu ro cmima</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>ni barda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>ro valsi cu banri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>ro valsi cu tolba&apos;o</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>ro valsi cu no&apos;e barda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>mipri pa vanbi poi sepli je ca se cuxna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>mipri ro vanbi poi sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>mipri ro vanbi poi sepli je ca na se cuxna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>ca vanbi je cu sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>cupra pa vanbi poi sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>te tcimi&apos;e datnyveimei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>cuxna liste kajna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation type="unfinished">Found in Dictionaries:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>ro se vanbi be pa sepli co&apos;a nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>liste lo&apos;i ca vanbi poi sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>pa se vanbi be lo sepli poi ca se cuxna co&apos;u nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>zoi zoi. %1 .zoi - la&apos;o zoi. %2 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation type="unfinished">You have chosen to hide a menubar. Use %1 to show it back.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>viska</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>co&apos;a vreji</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>mipri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>co&apos;a datnyvei fi pa purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>datnyvei fi pa lerpoi (*.txt);;datnyvei fi da (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>.i mo&apos;u co&apos;a vreji fi pa purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>.i nabmi fi pa nu co&apos;a vreji </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>samymo&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>samymo&apos;i pa se datnyvei be fi pa purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation type="unfinished">Import error: invalid data in file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>.i mo&apos;u co&apos;a samymo&apos;i pa datni be pa purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>.i nabmi fi pa nu nerbei </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>co&apos;a datnyvei fi lo&apos;i nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>datnyvei je cu te bangu fi la .xemel. (*.xml);;datnyvei (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>.i mo&apos;u co&apos;a vreji fi lo&apos;i nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation type="unfinished">Export Favorites to file as plain list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>samymo&apos;i pa se datnyvei be fi lo&apos;i nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>.i mo&apos;u samymo&apos;i pa datni be lo&apos;i nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation type="unfinished">Data parsing error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>datni pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>pa vlacku cu binxo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation type="unfinished">Now indexing for full-text search: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>sisku cankyuidje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>jai se facki trotci cankyuidje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>nelci se tcita cankyuidje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>purzga pa prina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>ca sisku fi lo&apos;i datnyvei</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>cupra pa vanbi poi sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>gapru ro da</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation type="unfinished">Always on Top</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation type="unfinished">Menu Button</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>sisku fi ro lerpoi pe lo papri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>sisku fi ro lerpoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>djunoi fo tu&apos;a la .goldendikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>viska</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>co&apos;a vreji</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>samymo&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>jmina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>pa se vanbi be lo sepli poi ca se cuxna co&apos;a nelci se tcita</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>pa liste co&apos;a vreji</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>ciska ro cmene lo vlacku kajna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>ro pixra poi zvati pa kajna cu cmalu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>trotci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>notci je cu mulno (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>notci je cu se bangu la .xetmel. (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>.i ca&apos;o co&apos;a vreji fi pa notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>.i pa ralju be lo&apos;i cankyuidje cu gapru ro da</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>purci cankyuidje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation type="unfinished">Accessibility API is not enabled</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation type="unfinished">Dictionary file was tampered or corrupted</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>.i nabmi fi pa nu samymo&apos;i lo notci pe la&apos;o zoi. %1 .zoi kei fa la&apos;o zoi. %2 .zoi</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation type="unfinished">XML parse error: %1 at %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>katci</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>pixra</translation>
     </message>
@@ -3504,82 +3477,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation type="unfinished">Form</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>vlacku je cu jai se ganda</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>se zilkancu lo&apos;i notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>ve fanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>te fanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>se zilkancu lo&apos;i valsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation type="unfinished">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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>porsi fi lo&apos;i vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>datnyvei fi pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>datni pa vlacku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>ve skicu</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>porsi tu&apos;a lo cmene</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>porsi tu&apos;a lo bangu</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>.i %1 vlacku jai se katci .i %2 vlacku jai se ganda</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>cmacnrekursi</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation type="unfinished">Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation type="unfinished">Start to system tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation type="unfinished">Left Shift only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation type="unfinished">Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation type="unfinished">Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation type="unfinished">Enable system tray icon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation type="unfinished">Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>judrnporte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation type="unfinished">Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation type="unfinished">Type:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>plicme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation type="unfinished">&amp;Scan Popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ With this on however, new tabs will be opened without
 switching to them.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation type="unfinished">Use proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation type="unfinished">Use the following hotkey to translate a word from clipboard:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation type="unfinished">Windows key or Meta key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation type="unfinished">Auto-pronounce words in main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>co&apos;a katci ba ro nu lo samcmu co&apos;a katci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation type="unfinished">Left Alt only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>vanbi je cu sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation type="unfinished">Right Shift only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation type="unfinished">With this on, an attempt to close main window would hide it instead of closing
 the application.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>snavi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation type="unfinished">Enable if you wish to use a proxy server
 for all program&apos;s network requests.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>bangu pa sazycimde</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation type="unfinished">Left Ctrl only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation type="unfinished">Open new tabs in background</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>te samjo&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation type="unfinished">Right Ctrl only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>la .linvos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation type="unfinished">Right Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation type="unfinished">Left Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation type="unfinished">Auto-pronounce words in scan popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation type="unfinished">Open new tabs after the current one</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>.i pa nu do za&apos;u re&apos;u katcygau lo samtci cu rinka pa nu mo&apos;u basti fi lo ka bangu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation type="unfinished">Alt key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation type="unfinished">Check for new program releases periodically</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ current, active one. Otherwise they are added to
 be the last ones.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation type="unfinished">Close to system tray</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>samcmu ke zmiku se cuxna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation type="unfinished">When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,141 +3812,141 @@ informs the user about it and prompts to open a
 download page.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>co&apos;a katci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>se mipri jaspu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>zmiku se cuxna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>sazycimde</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>basti fi lo ka bangu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation type="unfinished">Ctrl key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation type="unfinished">Use the following hotkey to show or hide the main window:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation type="unfinished">Left Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation type="unfinished">Right Alt only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>te tcimi&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation type="unfinished">Left Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation type="unfinished">Right Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation type="unfinished">Right Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation type="unfinished">Hotkeys</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation type="unfinished">Start with scan popup turned on</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation type="unfinished">With this on, the application starts directly to system tray without showing
 its main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation type="unfinished">Shift key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>.i zmiku lo ka gasnu pa nu la .goldendikt. co&apos;a katci ba ro nu lo samcmu co&apos;a katci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation type="unfinished">Play audio files via built-in audio support</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation type="unfinished">Use internal player:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation type="unfinished">Choose audio back end</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation type="unfinished">Enter audio player command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,84 +3955,84 @@ by disallowing content (images, frames) not originating from the site
 you are browsing. If some site breaks because of this, try disabling this.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation type="unfinished">Disallow loading content from other sites (hides most advertisements)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>te vlaba&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation type="unfinished">Playback</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation type="unfinished">Use external program:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation type="unfinished">Double-click translates the word clicked</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation type="unfinished">Use any external program to play audio files</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation type="unfinished">ESC key hides main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>mipri pa vanbi kajna ca ro nu pa je nai za&apos;u pa da vanbi je cu sepli</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation type="unfinished">Context menu dictionaries limit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation type="unfinished">Send translated word to main window instead of to show it in popup window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation type="unfinished">Send translated word to main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4073,159 +4043,159 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation type="unfinished">Dark Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation type="unfinished">Show scan flag when word is selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation type="unfinished"> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation type="unfinished">System proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation type="unfinished">Custom proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation type="unfinished">Custom settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation type="unfinished">Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation type="unfinished">http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation type="unfinished">Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation type="unfinished">Word</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation type="unfinished">Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation type="unfinished">Maximum network cache size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4234,284 +4204,326 @@ If set to 0 the network disk cache will be disabled.</source>
 If set to 0 the network disk cache will be disabled.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation type="unfinished"> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation type="unfinished">When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation type="unfinished">Clear network cache on exit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>sisku fi ro lerpoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation type="unfinished">Allow full-text search for:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation type="unfinished">articles (0 - unlimited)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>pluja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation type="unfinished">When using clipboard,strip everything after newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation type="unfinished">Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation type="unfinished">Confirmation for items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation type="unfinished">Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation type="unfinished">Ignore input phrases longer than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation type="unfinished">Ignore diacritics while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>.i pa nu katci cu rinka pa nu viska ro pagbu be lo notci be&apos;o poi na vajni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>viska ro pagbu poi na vajni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation type="unfinished">Select this option to automatic collapse big articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>mipri ro notci poi pa lerpoi be fi ke&apos;a cu se cmima za&apos;u</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation type="unfinished">Articles longer than this size will be collapsed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation type="unfinished">Extra search via synonyms</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>lerfu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>la .babilon.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation type="unfinished">Turn this option on to store history of the translated words</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>da vreji fi lo purci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>notci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation type="unfinished">Select word by single click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation type="unfinished">Add-on style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation type="unfinished">Specify the maximum number of entries to keep in history.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation type="unfinished">Maximum history size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>lo&apos;i nu co&apos;a vreji cu simxu lo ka pa mentu be li</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>cu temci</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation type="unfinished">Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>la cabna sarxe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>la .lingos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>la blanu .lingos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation type="unfinished"> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation type="unfinished">Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>snavi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation type="unfinished">Plain Text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation type="unfinished">Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation type="unfinished">Prefix Match</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
@@ -4519,17 +4531,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation type="unfinished">No program name was given.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation type="unfinished">The program has crashed.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation type="unfinished">The program has returned exit code %1.</translation>
     </message>
@@ -4537,27 +4549,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>katci</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>klesi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation type="unfinished">Command Line</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>sinxa pixra</translation>
     </message>
@@ -4565,99 +4577,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation type="unfinished">Article loading error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation type="unfinished">Article decoding error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation type="unfinished">Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation type="unfinished">Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation type="unfinished">Author: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation type="unfinished">E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation type="unfinished">Title: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation type="unfinished">Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation type="unfinished">Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation type="unfinished">A dictionary lookup program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>sisku fi lo&apos;i vlacku (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>sisku no da</translation>
     </message>
@@ -4665,22 +4692,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>.i nabmi fa la&apos;o zoi. %1 .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation type="unfinished">Resource saving error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation type="unfinished">The referenced resource failed to download.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>.i kajde fi la&apos;o zoi. %1 .zoi</translation>
     </message>
@@ -4709,68 +4736,73 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation type="unfinished">Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>vlaba&apos;u (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation type="unfinished">Shows or hides the dictionary bar</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation type="unfinished">Always stay on top of all other windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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">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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation type="unfinished">Send word to main window (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>prula&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>bavla&apos;i</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>zoi zoi. %1 .zoi - la&apos;o zoi. %2 .zoi</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4813,17 +4845,17 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>pixra</translation>
     </message>
@@ -4831,60 +4863,60 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>datnyvei</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>ciste</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>.i xu do djica lo du&apos;u la&apos;o zoi. &lt;b&gt;%1&lt;/b&gt; .zoi noi kibystu co&apos;u cmima lo se liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>la .uikipedi&apos;as.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation type="unfinished">Katakana Japanese syllabary</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>.i cupra pa vlacku tu&apos;a lo te snavi pe lo se judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>.i xu do djica lo du&apos;u lo datnyveimei poi se judri zoi zoi. &lt;b&gt;%1&lt;/b&gt; .zoi co&apos;u cmima lo se liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation type="unfinished">Japanese Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Standardized as ISO 3602
 Not implemented yet in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>samtcise&apos;u fi la .midiiauikis. to mupli fa la .uikipedi&apos;as. toi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>snavi datnyveimei</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation type="unfinished">Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation type="unfinished">The most widely used method of transcription of Japanese,
 based on English phonology</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation type="unfinished">Hiragana Japanese syllabary</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>lerfanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,22 +5015,22 @@ kana writing systems. Standardized as ISO 3602
 Not implemented yet in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>banru&apos;usu lerfanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>vlaturge&apos;a</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>basti</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5007,94 +5039,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation type="unfinished">Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>.i judri pa datnyveimei be pa vlacku pe la .xanspel. ja la .maispel.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>ca sisku</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>bandu&apos;e&apos;u lerfanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>kibystu da .i ro se sisku valsi cu basti zoi zoi. %GDWORD% .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>jmina</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>cuxna fi lo&apos;i datnyveimei</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>vimcu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>kibystu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>.i sisku lo ka datnyvei fi pa vlacku kei lo&apos;i se judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>birti tu&apos;a lo du&apos;u vimcu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation type="unfinished">Syllabaries:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>vlaturge&apos;a vlacku je cu jai se facki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation type="unfinished">Enables to use the Latin alphabet to write the Japanese language</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ Add appropriate dictionaries to the bottoms
 of the appropriate groups to use them.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation type="unfinished">Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>la .forvos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>samtcise&apos;u fi la .dikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>samtcise&apos;u fi la .dikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>te vlaba&apos;u fi pa remna je cu se krasi &lt;a href=&quot;http://www.forvo.com/&quot;&gt;la .forvos.&lt;/a&gt; .i fy. samtcise&apos;u da tu&apos;a lo nu lo te vlaba&apos;u co&apos;a vreji je cu gubni .i do kakne lo ka pilno la .goldendikt. tu&apos;a lo nu tirna</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>katci tu&apos;a lo vlaba&apos;u pe la .forvos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation type="unfinished">API Key:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>bangu te mintu to sepli fi me&apos;o slaka bu toi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>liste lo&apos;i te mintu be pa bangu poi jai se djica do .i mupli fa zoi zoi. en, ru .zoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>.i &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;da&lt;/a&gt; judri pa liste be lo&apos;i bangu te mintu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>bangelulu lerfanva</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation type="unfinished">(not available in portable version)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>samtci</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>.i xu do djica lo du&apos;u la&apos;o zoi. &lt;b&gt;%1&lt;/b&gt; .zoi noi samtci co&apos;u cmima lo se liste</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>banbu&apos;elu lerfanva</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation type="unfinished">Text to Speech</translation>
     </message>
@@ -5212,42 +5234,42 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation type="unfinished">Selected voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>jmina</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>vimcu</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>purzga</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation type="unfinished">Available voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation type="unfinished">Text to be previewed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation type="unfinished">Type text to be previewed here.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>purzga</translation>
     </message>
@@ -5272,17 +5294,17 @@ of the appropriate groups to use them.</translation>
       <translation type="unfinished">Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>te tcimi&apos;e</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation type="unfinished">Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation type="unfinished">Rate:</translation>
     </message>
@@ -5290,12 +5312,12 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation type="unfinished">Type a word or phrase to search dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation type="unfinished">Drop-down</translation>
     </message>
@@ -5326,33 +5348,33 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>cmene</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>judri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>katci</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation type="unfinished">As link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>pixra</translation>
     </message>
@@ -5360,17 +5382,9 @@ of the appropriate groups to use them.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>.i da nabmi fi pa nu sisku fi da pe pa vlacku</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>.i kajde fi la&apos;o zoi. %1 .zoi</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/ko_KR.ts b/locale/ko_KR.ts
index ee727665..b57f7334 100644
--- a/locale/ko_KR.ts
+++ b/locale/ko_KR.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>정보</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>골든딕 사전검색 프로그램，버전 </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
-      <translation type="unfinished">Licensed under GNU GPLv3 or later</translation>
+      <translation>GNU GPLv3 이상 라이선스</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>버전 정보 복사</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>사전 목록 복사</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>개발진:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[모름]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation type="unfinished">Based on Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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 콘스탄틴 이사코프(ikm@goldendict.org)</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Qt %1 (%2, %3) 기준</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: 단어 없이 카드를 만들 수&apos;</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki 검색: AnkiConnect가 활성화되지 않았습니다.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: anki에 게시 실패</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: anki 성공에 게시</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>요소검사</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>사전 펼치기</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>사전 감추기</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>팝업창 사용</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(제목없음)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>환영합니다!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; 에 대한 번역을 찾을 수 없습니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;포럼&lt;/a&gt;을 방문하십시오.&lt;p&gt;프로그램 업데이트는 &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;웹사이트&lt;/a&gt;를 방문하십시오.&lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(그림)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>사전 펼치기</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
-      <translation type="unfinished">From </translation>
+      <translation>에서 </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>사전 감추기</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>새 Anki 메모 만들기</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>검색오류: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>인접 어휘:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>복합 어구:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>개별 어휘:</translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>임시파일을 만들 수 없습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot; 검색(&amp;L)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>새 탭에서 &quot;%1&quot; 검색(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>참조할 리소스가 존재하지 않습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>리소스파일을 여는데 실패했습니다. 수동으로 열어 보십시오: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>%2에서 &quot;%1&quot; 검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>현재 항목 선택</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>텍스트로 복사</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>요소검사</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>새 탭에서 링크 열기(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>외부 브라우저에서 링크 열기(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>리소스</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>오디오</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS 음성</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>그림</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>비디오</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>비디오: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>사전의 정의 &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>정의: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>참조할 오디오 프로그램이 존재하지 않습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>링크 열기(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>북마크 저장(&amp;B) &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>경고: 오디오 플레이어: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>오류: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>사운드 저장</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>이미지 저장</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>이미지 파일 (*.bmp *.jpg *.png *.tif);;모든 파일 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>이미지 저장(&amp;i)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>문구를 찾을 수 없습니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>사운드 저장(&amp;o)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>&quot;%1&quot;을 입력줄로 보냄</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>검색기록에 &quot;%1&quot; 추가(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>Anki에 현재 기사 보내기(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>선택한 텍스트를 Anki로 보내기(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>사운드 파일(*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;모든 파일(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>사운드 파일 재생 실패: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>안키 노트 만들기(&amp;C)</translation>
     </message>
   </context>
   <context>
@@ -414,93 +409,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>중국어 변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>중국어 간체와 번체 간 변환 가능</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>중국어 변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>간체 문자에서 번체(대만 변형) 문자로 변환 가능</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC에서 TC로(대만 변형)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>간체 문자에서 전통(홍콩 변형) 문자로 변환 가능</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC에서 TC로(홍콩 변형)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>번체 문자에서 간체 문자로 변환 가능</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC에서 SC로</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>번체 중국어(대만 변형) 변환으로 간체</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>번체 중국어(홍콩 변형) 변환으로 간체</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>번체에서 간체로 변환</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>맞춤 음역</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>프록시 인증이 필요함</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>프록시를 통해 접근하기 위해서는 사용자명과 암호를 입력해야 합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>사용자 이름:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>암호:</translation>
     </message>
@@ -508,24 +503,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>형태</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>그룹 아이콘:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>단축키:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>즐겨찾기 폴더:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>이미지</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>모든 파일</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>오류</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>지정된 이미지파일을 읽을 수 없습니다.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>확인</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>사전의 언어에 따라 그룹을 만들겠습니까?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>metadata.toml을 기반으로 그룹 세트를 생성하시겠습니까?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>소스언어에 따라 그룹을 합칩니다  &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>번역언어에 따라 그룹을 합칩니다 &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>폴더별 자동 그룹화에 실패했습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>%1 의 상위 디렉터리에 연결할 수 없습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>포함된 폴더를 기반으로 그룹 세트를 생성하시겠습니까?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>양방향 번역그룹을 만듭니다 &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>&quot;%1&quot;와 그룹을 합칩니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>사전: </translation>
     </message>
@@ -635,201 +630,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>검색 모드</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>이 요소는 필터가 어떻게 해석될 것인지 결정합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>체크하면 필터링시에 대소문자가 고려될 것입니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>대소문자 구분</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>표제어들을 파일로 저장합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>내보내기</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>도움말</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>확인</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>표제어목록에 필터를 적용하려면 이 버튼을 누르시오</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>적용</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>체크하면 필터 변경이 즉시 표제어목록에 적용될 것입니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>자동 적용</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>필터:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>필터 (고정문자열, 와일드카드 또는 정규식)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>텍스트</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>와일드카드</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>정규식</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>표제어 로드 중...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>전체 표제어 수: %1, 필터링 후: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>표제어들을 파일로 저장합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>텍스트파일(*.txt);;모든 파일(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>내보낸 파일을 열 수 없습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>표제어 내보내기...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>취소</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>내보내기 프로세스가 중단됨</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>내보내기 완료</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>총항목:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>검색언어:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>총어휘:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>번역언어:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>폴더 열기</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>사전 편집</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>사전의 구성파일:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>설명:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>사전의 모든 표제어들을 표시합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>표제어</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>명령행으로 사전 편집:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>색인 파일 이름:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>색인 폴더 열기</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 항목</translation>
     </message>
@@ -839,7 +844,7 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>URL: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
@@ -854,50 +859,50 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>서버 데이터베이스</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>활성</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>주소</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>데이터베이스</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>조건</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>아이콘</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>콤마로 구분된 데이터베이스 목록
 (공백 또는 &quot;*&quot; 는 데이터베이스 전체)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>콤마로 구분된 검색조건 목록
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>모든 사전 메뉴 확장...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>그룹 편집</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>사전 정보</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>사전 표제어</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>사전 폴더 열기</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>사전 편집</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>사전모음(&amp;D)</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>사전(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>사전</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>수락</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>취소</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>소스가 변경되었습니다</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>그룹(&amp;G)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>일부 소스가 변경되었습니다. 변경을 수락하시겠습니까?</translation>
     </message>
@@ -992,12 +997,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>이전 페이지</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>다음 페이지</translation>
     </message>
   </context>
   <context>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>전문검색</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>단어 단위로 찾기</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>텍스트</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>와일드카드</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>정규식</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>쿼리 단어는 비워둘 수 없습니다.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>AND OR +/- 등과 같은 xapian 검색 구문 지원</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>단어사이의 최대 거리 (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>기본</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>사전당 최대 항목 (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>검색된 항목:</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>목록작성중:</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>없음</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>검색 줄은 적어도 한 개 단어를 포함해야 합니다</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>자 이상</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>전문검색을 위한 사전이 없음</translation>
     </message>
@@ -1087,9 +1072,9 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>즐겨찾기 파일 오류</translation>
     </message>
   </context>
   <context>
@@ -1107,17 +1092,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>폴더 추가</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>즐겨찾기:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>선택한 모든 항목이 삭제됩니다. 계속하다?</translation>
     </message>
   </context>
   <context>
@@ -1135,7 +1120,7 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/forvo.cc" line="267"/>
       <source>by</source>
-      <translation type="unfinished">by</translation>
+      <translation>~에 의해</translation>
     </message>
     <message>
       <location filename="../src/dict/forvo.cc" line="271"/>
@@ -1150,10 +1135,10 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/forvo.cc" line="273"/>
       <source>from</source>
-      <translation type="unfinished">from</translation>
+      <translation>~에서</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
     </message>
@@ -1163,79 +1148,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;이전의</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>다음(&amp;N)</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>대소문자 구분</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>모드:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>검색된 항목:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>그룹에서 이용가능한 사전:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>목록작성을 위해 대기중:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>도움말</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>전체:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>목록작성완료:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>목록작성중: 없음</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>취소</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>델</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>인</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>탭 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>새로운 그룹 이름을 지정합니다:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>사용 가능한 사전:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>그룹 추가(&amp;A)</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>그룹 추가</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>새 사전 그룹을 만듭니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>언어별로 그룹화</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>폴더 기반 그룹을 만듭니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>폴더로 그룹화</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>메타데이터로 그룹화</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>현재 사전 그룹의 이름을 바꿉니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>현재 사전 그룹을 삭제합니다</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>새 그룹의 이름을 지정합니다:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>모든 그룹 삭제</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>선택한 사전들을 그룹에서 삭제합니다(Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>선택한 사전들을 그룹에 추가합니다(Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>그룹 삭제(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>그룹:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>그룹 이름 바꾸기(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>모든 사전 그룹을 삭제합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>언어별로 그룹을 만듭니다</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>검색기록:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>총 검색기록: 최대 %2 중  %1</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>철자법 제안: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 철자법사전</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>활성</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>인덱싱: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>사전 이름</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>골든딕 - 시작 중</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>사전색인을 만드는 동안 기다리십시오</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>기다려 주십시오...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>인덱싱 중...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>에웨어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>이도어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>라오어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>트위어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>아파르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>아칸어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>크리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>이그보어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>코미어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>맨 섬어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>팔리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>태국어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>우르두어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>줄루어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>체코어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>네덜란드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>간다어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>풀라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>그리스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>하우사어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>힌두어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>아일랜드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>크메르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>콩고어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>라틴어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>말레이어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>마오리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>나우루어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>오리야어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>오로모어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>상고어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>쇼나어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>타지키스탄어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>타밀어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>타타르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>스와티어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>통가어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>이누피아크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>벤다어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>우즈베크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>웨일스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>월로프어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>코사어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>이탈리아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>로망슈어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>종카어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>칸나다어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>북부 은데벨레어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>압하스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>키르기스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>룬디어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>게일어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>알바니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>라트비아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>말라얄람어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>쿠르드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>불가리아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>링갈라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>몰타어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>마라티어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>아랍어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>바스크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>아바르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>비하르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>아이마라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>브르타뉴어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>순다어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>덴마크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>디베히어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>루바카탕가어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>피지어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>헝가리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>프랑스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>독일어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>몽골어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>히브리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>헤레로어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>룩셈부르크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>카누리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>카자흐어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>키쿠유어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>한국어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>나바호어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>은동가어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>네팔어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>오지브와어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>파슈토어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>폴란드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>사모아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>오크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>신드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>슬로바키아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>소말리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>텔루구어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>총가어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>츠와나어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>위구르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>세르보크로아티아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>요루바어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>좡어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>루마니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>인도네시아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>펀잡어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>남부 소토어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>코르시칸어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>에스페란토어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>페르시아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>슬로베니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>프리지아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>아라곤어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>타히티어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>마다가스카르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>갈리시아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>아제리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>암하라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>산스크리트어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>일본어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>우크라이나어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>밤바라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>그린란드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>바슈키르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>벨로루시어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>카시미르어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>사르데냐어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>히리 모투어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>케추아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>벵골어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>자바어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>아베스타어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>키냐르완다어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>아프리칸스어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>비슐라마어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>рмянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>노르웨이어, 복말</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>크로아티아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>보스니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>국제어(Interlingua)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>국제어(Interlingue)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>카탈로니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>세르비아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>버마어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>러시아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>림뷔르흐어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>노르웨이어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>체첸어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>중국어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>추바슈어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>싱할라어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>스페인어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>콘월어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>타갈로그어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>아샘어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>오세트어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>에스토니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>스와힐리어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>스웨덴어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>티벳어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>베트남어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>마케도니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>포르투갈어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>터키어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>투르크멘어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>구자라트어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>아이슬란드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>이누크티투트어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>영어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>그루지야어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>슬라브어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>페로어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>핀란드어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>볼라퓌크어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>왈론어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>콰냐마어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>마셜어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>북부 사미어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>아이티어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>차모로어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>노르웨이어, 니노르스크</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>과라니어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>남부 은데벨레어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>니안자어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>리투아니아어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>쓰촨 이어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>티그리냐어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>이디시어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>중국어(번체)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>중국어(간체)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>기타 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>기타 중국어(간체) 방언</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>기타 중국어(번체) 방언</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>기타 동유럽 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>기타 서유럽 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>기타 러시아 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>기타 일본 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>기타 발트 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>기타 그리스 언어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>기타 한국어 방언</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>기타 터키어 방언</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>기타 태국어 방언</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>타마지트어</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>로지반어</translation>
     </message>
@@ -2517,215 +2490,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>프랑스어</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>스페인어</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>벨로루시어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>불가리아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>체코어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>독일어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>그리스어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>핀란드어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>이탈리아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>일본어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>한국어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>리투아니아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>마케도니아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>네덜란드어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>폴란드어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>포르투갈어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>러시아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>슬로바키아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>알바니아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>세르비아어 (키릴문자)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>스웨덴어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>터키어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>우크라이나어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>중국어 간체</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>중국어 번체</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>베트남어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>포르투갈어 (브라질)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>페르시아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>스페인어, 아르헨티나</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>힌두어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>에스페란토어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>독일어, 스위스</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>스페인어, 볼리비아</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>타지키스탄어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>케추아어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>아이마라어</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>아랍어, 사우디아라비아</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>투르크멘 말</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>인터링그</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>로반</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>영어</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>사전 호출 실패</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>설정파일 오류. 기본설정으로 계속하시겠습니까?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>즐겨찾기(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
-      <translation type="unfinished">All</translation>
+      <translation>모두</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>뒤로</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>사전수: %1，항목수: %2，어휘수: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>편집(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>파일(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>도움말(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>종료(&amp;Q)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>오류</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>프로그램 종료</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>트레이로 닫기(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>항목을 저장할 수 없습니다: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>확대</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>사전...(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>정보(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>포럼(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>인쇄(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>검색항목 저장(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>다른 이름으로 항목 저장</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>창을 트레이로 최소화합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>페이지 설정(&amp;U)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>홈페이지(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>새 버전이 있습니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>검색:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>축소</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>메인창 보이기(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>골든딕 정보</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>다운로드</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>페이지 설정</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>검색그룹:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>보통 </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>불러오는 중...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(제목없음)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>설정...(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>환영합니다!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>발음 듣기(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>검색항목을 저장합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>이 버전을 무시합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>앞으로</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>항목 인쇄</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>프린터가 없습니다. 먼저 프린터를 설치하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>보기(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>검색기록(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>기록 비우기(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>글자크기(&amp;Z)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>검색어 확대</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>검색어 축소</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>검색어 보통 </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>현재 탭 닫기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>모든 탭 닫기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>다른 탭 닫기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>열린 탭</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>새 탭</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>설정폴더 열기(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>메뉴 모음(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>검색된 사전:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>즐겨찾기에 모든 탭 추가</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>경고: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>탭 목록을 엽니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>즐겨찾기에서 현재 탭 제거</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>메뉴 모음 숨기기를 선택하셨습니다. 다시 보이게 하려면 %1을 사용하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>보이기(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>내보내기(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>숨기기(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>검색기록을 파일로 저장합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>텍스트파일(*.txt);;모든 파일(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>검색기록 저장을 완료했습니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>저장 오류: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>불러오기(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>검색기록을 파일에서 불러옵니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>불러오기 오류: 파일의 데이타가 유효하지 않습니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>검색기록 불러오기를 완료했습니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>불러오기 오류: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>즐겨찾기를 파일로 내보내기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>XML 파일(*.xml);;모든 파일(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>즐겨찾기 내보내기 완료</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>즐겨찾기를 일반 목록으로 파일로 내보내기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>파일에서 즐겨찾기 가져오기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML 파일(*.xml);;Txt 파일(*.txt);;모든 파일(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>즐겨찾기 가져오기 완료</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>데이터 파싱 오류</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>사전 정보</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>사전 표제어</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>사전 폴더 열기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>사전 편집</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>이제 전체 텍스트 검색을 위한 인덱싱: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>즐겨찾기에서 제목 &quot;%1&quot; 를 제거하시겠습니까?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>검색창(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>검색결과 탐색창(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>즐겨찾기 창(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>인쇄 미리보기(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>파일 다시 읽기(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>새 탭(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>항상 위에(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>항상 위에</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>메뉴 단추</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>페이지 내 검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>전문검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>골든딕 도움말</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>보여주다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>내보내기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>수입</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>추가하다</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>현재 탭을 즐겨찾기에 추가</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>목록으로 내보내기</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>사전모음에 이름 보이기(&amp;B)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>도구모음에 작은 아이콘(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>탐색 도구모음(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>스캔 활성화</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>항목, 전부 (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>항목, HTML 만 (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>항목 저장...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>기사 저장 완료</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>메인창이 항상 위에 보이도록 설정합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>검색기록창(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Accessibility API가 활성화 되지 않았습니다</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>사전파일이 훼손되었습니다</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>%1에서 항목을 표시하지 못함, 이유: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML 문법오류: %2행 %3열에서 %1</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>주소</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>활성</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>아이콘</translation>
     </message>
@@ -3498,88 +3471,88 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>오디오 버퍼를 읽기 위해 열 수&apos;.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>형태</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>비활성(사용중지) 사전:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>이름:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>총항목:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>검색언어:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>번역언어:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>총어휘:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>사전 순서:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>사전의 구성파일:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>사전 정보</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>설명:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>이름순 정렬</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>언어순 정렬</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>사전 표제어</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>사용중: %1, 사용중지: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>   경로</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>   하위 폴더 검색</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>대체</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>시스템 트레이에서 시작</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>왼쪽 Shift 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl 키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>승리/메타</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>트레이 아이콘 사용</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>호스트:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>포트:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>옮기다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>종류:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>사용자:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>스캔팝업(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,137 +3642,137 @@ switching to them.</source>
 배경으로 열립니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proxy 서버 사용</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>단어를 클립보드에 복사하여 검색할 때 다음 단축키를 사용합니다:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>윈도우 단축키 또는 메타 키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>메인창에서 발음 자동 재생</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>시스템 시작시 실행</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>왼쪽 Alt 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>탭 설정</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>오른쪽 Shift 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>음성(&amp;А)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>언어:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>왼쪽 Ctrl 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>새 탭을 배경으로 열기</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>네트워크(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>오른쪽 Ctrl 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>링보</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>오른쪽 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>왼쪽 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>스캔팝업창에서 발음 자동 재생</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>새 탭을 현재 탭 다음에 열기</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>언어변경을 적용하려면 프로그램을 다시 시작하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt 키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>정기적으로 업데이트 검사</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 기본값은 제일 마지막 위치에 새 탭이 열립니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>시스템 트레이로 닫기</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>시스템 기본값</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>이 항목을 선택하면 시스템트레이에 아이콘을 만들어 
 메인창을 열거나 다른 작업을 할 수 있습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3838,141 +3808,141 @@ download page.</source>
 안내합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>시작프로그램</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>암호:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>기본값</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>화면(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>언어 변경</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl 키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>메인창 보이기/감추기를 위해 다음 단축키를 사용합니다:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>왼쪽 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>오른쪽 Alt 키만</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>설정</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>왼쪽 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>오른쪽 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>오른쪽 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>단축키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>프로그램 시작시 스캔팝업 활성화</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>이 항목을 선택하면 프로그램이 실행할 때 메인창을 보이지 않고
 시스템트레이에서 시작합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift 키</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>시스템 시작시 GoldenDict을 자동으로 실행합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>GoldenDict&apos;의 자체 창 변경 중 하나에서 선택 또는 클립보드가 변경될 때 팝업을 표시하지 않음</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>GoldenDict&apos;자체 선택 및 클립보드 변경 사항 무시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>내장 오디오 지원을 통해 오디오 파일 재생</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>내부 플레이어 사용:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>오디오 백엔드 선택</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>오디오 플레이어 명령줄 입력</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3981,533 +3951,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 보인다면 이 항목을 해제해 보십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>사이트 외부 자료 허용 안함(대부분의 광고를 차단함)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>발음</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>재생</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>외부 프로그램 사용:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>더블클릭으로 단어 검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>외부 프로그램을 통하여 음성을 재생합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC 키로 메인창을 숨김</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>탭이 하나뿐이면 숨김</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>컨텍스트메뉴가 너무 커지지 않게 이 값을 조정합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>컨텍스트메뉴 사전 한도:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>검색내용을 팝업창에 표시하지 않고 메인창으로 보냅니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>검색내용을 메인창에 표시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>팝업 창을 표시하기 전에 플래그 창을 표시하고 플래그를 클릭하면 팝업 창이 표시됩니다. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>일반적으로 링크를 클릭하거나 단어를 두 번 클릭하거나 기사에서
+선택 항목을 조회하면 번역이 로드되고 거의 즉시 동일한 사전에서 기사로
+됩니다. 이 옵션을 끄면
+이지만 최상위 사전의 기사가 표시됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>대상 기사로 자동 스크롤</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>기사 표시 스타일:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>UI를 어둡게 합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>다크 모드</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>기사 표시 스타일을 어둡게 설정합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>다크 리더 모드</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU 순서: 가장 최근에 사용한 순서입니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>스캔이 활성화되면 클립보드 변경 사항을 추적합니다. 알아채다! Linux를 사용하지 않는 한 항상 이 기능을 활성화해야 합니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>클립보드 변경 추적</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>트랙 선택 변경</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>선택한 모든 키를 계속 누르고 있을 때만 압정 선택:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>단어 선택 시 스캔 플래그 표시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>지연 시간</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>시스템 Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>사용자 Proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>사용자 설정</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>안키 커넥트</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>갑판:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>모델:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>단어</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>어휘 분야...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>텍스트</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>정의 필드...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>문장</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>문장 필드(비어 있을 수 있음)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>HTTP 헤더에 GoldenDict을 표시하지 않음</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>최대 네트워크 캐시 크기:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>GoldenDict가 차지하는 최대 디스크 공간&apos;네트워크 캐시 in
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+으로 설정하면 네트워크 디스크 캐시가 비활성화됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>이 옵션이 활성화되면 GoldenDict
+은 종료하는 동안 디스크에서 네트워크 캐시를 지웁니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>종료 시 네트워크 캐시 지우기</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>전문검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>전문검색을 허용:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>항목수가 다음을 초과시 검색하지 않음 : </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>항목 (0 - 무제한)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>고급(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>연속 검색 중 수동으로 하나의 사전을 축소하면 다음 검색에서 축소된 상태로 유지됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>세션 축소</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>클립보드를 사용할 때 개행 이후의 모든 항목 제거</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>새 검색에서 기본 또는 팝업 창은&apos;초가 보이더라도 초점을 맞춥니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>즐겨찾기</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>즐겨찾기 저장 간격. 0으로 설정하면 종료 시에만 즐겨찾기가 저장됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>항목 삭제의 모든 작업을 확인하려면 이 옵션을 켜십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>항목 삭제 확인</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>마우스 오버, 선택, 클립보드 또는 명령줄에서 비합리적으로 긴 입력 텍스트
+을 무시하려면 이 옵션을 켭니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>다음보다 긴 입력 문구 무시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>이 크기보다 긴 입력 구문은 무시됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>기사를 검색하는 동안 발음 구별 부호를 무시하려면 이 옵션을 켜십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>검색하는 동안 분음 부호 무시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>이 항목을 선택하면 사전의 옵션항목을 항상 확장하여 보여줍니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>옵셕항목 확장(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>이 옵션을 선택하면 표시내용이 많은 항목을 자동으로 접히게 하여 숨깁니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>자동으로 숨길 항목의 크기: </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>항목의 크기가 이 값을 초과 하면 내용을 접어 표시합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>검색하는 동안 구두점 무시</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Stardict, Babylon 및 GLS 사전에서 동의어 목록
+통해 추가 기사 검색을 활성화하려면 이 옵션을 켜십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>동의어를 통한 추가 검색</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>자 이상</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab키로 탭 이동(최근사용기록순)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>바빌론</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>검색기록</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>이 항목을 선택하면 사전의 검색기록을 저장합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>기록 저장(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>검색내용</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>사전 내용 중에서 마우스를 클릭하여 단어를 선택하려면 선택하십시오</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>클릭으로 단어 선택</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on 스타일:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>검색기록에 저장할 최대 항목수를 지정하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>검색기록 최대크기:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>검색기록을 자동으로 저장하는 간격. 0으로 지정하면 종료시에만 저장됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>저장 간격: </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>분 마다</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
-      <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
-      <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
-      <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>권위 있는</translation>
     </message>
     <message>
       <location filename="../src/ui/preferences.cc" line="132"/>
+      <source>Modern</source>
+      <translation>현대의</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="135"/>
+      <source>Lingoes</source>
+      <translation>링고</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="136"/>
+      <source>Lingoes-Blue</source>
+      <translation>링고-블루</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapian의 구문 검색과 NEAR 연산자를 사용하려면 위치 정보가 필요하지만 데이터베이스 크기가 훨씬 커집니다. 새로 들어오는 사전에만 적용됩니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>위치 정보로 인덱스 사용</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>표준 글꼴</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>모노스페이스 글꼴</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>세리프 글꼴</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>산세리프체</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>모습</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>이러한 글꼴은 사전에서 지정한 글꼴을 찾을 수 없을 때 적용됩니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>대체 글꼴</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>오디오</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>텍스트</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>접두사 검색</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>모름</translation>
     </message>
@@ -4515,17 +4527,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>프로그램 이름이 없습니다.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>프로그램이 다운되었습니다.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>프로그램이 종료코드 %1를 전송했습니다.</translation>
     </message>
@@ -4533,27 +4545,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>활성</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>종류</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>명령행</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>아이콘</translation>
     </message>
@@ -4561,99 +4573,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>사전항목 로딩 오류</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>사전항목 디코딩 오류</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>저작권: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>버전: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>저자: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>이메일: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>제목: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>웹사이트: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>날짜: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>사전 조회 프로그램입니다.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>쿼리할 단어 또는 문장입니다.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>config 폴더의 gd_log.txt에 디버그 메시지를 저장합니다.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>창 상태를 재설정합니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>tts를 비활성화합니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>메인 윈도우의 그룹을 변경합니다.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>팝업 그룹을 변경합니다.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>스캔 팝업을 전환합니다.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>버전 및 진단 정보를 인쇄합니다.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>사전 검색/필터 (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>검색어 지우기</translation>
     </message>
@@ -4661,22 +4688,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>오류: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>리소스 저장 오류: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>참조할 리소스를 다운로드하지 못했습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>경고: %1</translation>
     </message>
@@ -4705,67 +4732,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
-      <translation type="unfinished">Dialog</translation>
+      <translation>대화</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>발음 듣기(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>즐겨찾기에 단어 추가(Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>사전도구상자를 보이거나 숨깁니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>항상 다른 모든 창 위에 유지</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>단어를 메인창으로 보냅니다(Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>뒤로</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>앞으로</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>경고: %1</translation>
     </message>
   </context>
   <context>
@@ -4773,53 +4805,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;이전의</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;다음</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>모두 강조 표시(&amp;A)</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>대소문자 구분(&amp;C)</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>찾다:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>경로</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>아이콘</translation>
     </message>
@@ -4827,60 +4859,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>파일</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>히라가나</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>로마자 표기법:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>일본식</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>위키백과</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>가타가나 일본어 문자표</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>오디오 파일이 있는 경로를 지정해서 음성사전을 만듭니다:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>일본어 로마자 입력</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4891,84 +4923,84 @@ Not implemented yet in GoldenDict.</source>
 골든딕에는 아직 도입되어 있지 않습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>위키백과(MediaWiki) 사이트:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>음성</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>모든 외부 프로그램. 문자열 %GDWORD% 쿼리 단어로 대체됩니다. 문자열 %GDSEARCH% 검색 표시줄의 텍스트로 대체됩니다. 두 매개변수가 모두 제공되지 않으면 표제어가 표준 입력으로 입력됩니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>링구아 리브레</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;발음은 Wikimedia France의 공동 언어 미디어 라이브러리인 &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;에서 제공합니다. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>링구아 리브레 활성화</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 언어 코드</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;현재 Forvo를 사용하려면 API 키가 필요합니다. 사이트에 등록하여 자신의 키를 받으세요.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;나만의 키 가져오기 &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;여기&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>가장 널리 사용되는 일본어 로마자 표기방법으로서, 
 영어 음성학을 기초로 하고 있습니다 </translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>히라가나 일본어 문자표</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>맞춤 음역</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>이것은 검색 구문에만 적용되며 각 줄은 음역을 나타내며 세미콜론으로 구분됩니다. 예를 들어 ae;æ,사용자는 대상 단어에서 æ를 나타내기 위해 ae를 입력할 수 있습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #예시입니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>문자변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4979,118 +5011,108 @@ ISO 3602에서 표준으로 승인되었습니다.
 골든딕에는 아직 도입되어 있지 않습니다.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>러시아어 문자변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>철자법사전</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>변경...(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>예:  &amp;quot;eng&amp;quot; 영어, &amp;quot;fra&amp;quot; 프랑스어 &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+사용 가능한 언어의 전체 목록은 여기에서 찾을 수 있습니다. &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; 여기 &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>가타가나</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>사전 경로:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>파일 재검색(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>독일어 문자변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>검색어가 위치할 자리에 문자열 %GDWORD%를 입력합니다:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>추가...(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>폴더 선택</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>제거(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>웹사이트</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>사전파일을 찾을 경로:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>삭제 확인</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>문자표:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>사용가능한 철자법사전:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>알파벳으로 일본어를 입력할 수 있게 합니다</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5106,32 +5128,32 @@ of the appropriate groups to use them.</source>
 추가하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>헵번식</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>훈령식</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>포보</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT 서버</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT 서버:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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;에서 라이브 음성 듣기. 이 사이트에서는 누구나 자기 목소리로 세계 각 언어의 단어들을 녹음하고 공유할 수 있는 기능을 제공하고 
 있으며. 그것들을 골든딕에서 연결하여 들을 수 있습니다.
@@ -5139,57 +5161,57 @@ of the appropriate groups to use them.</source>
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvo에서 발음 듣기 사용</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API 키:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>언어코드 (콤마로 구분):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>그리스어 문자변환</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(포터블 버전에서는 설정할 수 없습니다)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>프로그램</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>벨라루스어 문자변환</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>≪언어코드형식에 따라 개별지정하는 방법≫
@@ -5197,7 +5219,7 @@ CP1251 → %GD1251%, ISO 8859-1 → %GDISO1%, ISO 8859-16 → %GDISO16%, Big-5 
 GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>음성 합성</translation>
     </message>
@@ -5213,42 +5235,42 @@ GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>선택된 음성엔진:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>추가(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>제거(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>미리듣기</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>설치된 음성엔진:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>미리듣기 할 텍스트:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>여기에 미리듣기 할 텍스트를 언어에 맞게 입력하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>미리듣기(&amp;P)</translation>
     </message>
@@ -5273,30 +5295,30 @@ GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
       <translation>설치된 TTS 음성을 찾을 수 없습니다.&lt;br&gt;컴퓨터에 적어도 하나의 TTS 엔진이 설치되어 있는지 확인하십시오.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>설정</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
-      <translation type="unfinished">Volume:</translation>
+      <translation>용량:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
-      <translation type="unfinished">Rate:</translation>
+      <translation>비율:</translation>
     </message>
   </context>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>사전에서 검색할 단어나 어구를 입력하십시오</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>드롭다운</translation>
     </message>
@@ -5327,33 +5349,33 @@ GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>이름</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>주소</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>활성</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>&lt;iframe&gt; 태그 안에 링크로 기사 삽입</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>링크로</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>아이콘</translation>
     </message>
@@ -5361,17 +5383,9 @@ GBK와 GB18030 → %GDGBK%, Shift-JIS → %GDSHIFTJIS%</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>일부 사전의 검색에 실패했습니다.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>경고: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/lt_LT.ts b/locale/lt_LT.ts
index 06586dcc..c4e6a2ea 100644
--- a/locale/lt_LT.ts
+++ b/locale/lt_LT.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Apie</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng paieškos žodyne programa, versija </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencija: GNU GPLv3 arba vėlesnė</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Nukopijuokite informaciją apie versiją</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Nukopijuokite žodynų sąrašą</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Padėkos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Nežinoma]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Naudoja Qt %1 (%2, %3 bitų)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Remiantis Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: gali&apos;t sukurti kortelę be žodžio</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki paieška: AnkiConnect neįjungta.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: išsiųsti anki nepavyko</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: paskelbti anki sėkmės</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Apžiūrėti</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Išplėsti</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Suskleisti</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Iškylantys langai</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(bevardis)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Jus sveikina GoldenDict!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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;grupėje nerastas &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; vertimas.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;diskusijų puslapyje&lt;/a&gt;.&lt;p&gt;Programos atnaujinimų ieškokite &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(paveikslėlis)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Išplėsti</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation> </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Suskleisti</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Padarykite naują Anki užrašą</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Užklausos klaida: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Panašūs žodžiai: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Žodžių junginiai: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Pavieniai žodžiai: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Nepavyko sukurti laikinojo failo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Ieškoti „%1“</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Ieškoti „%1“ &amp;naujoje kortelėje</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Nurodyto šaltinio nėra.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Ieškoti „%1“ grupėje %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Dabartinio straipsnio pasirinkimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopijuoti kaip tekstą</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Tyrinėti</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Atverti nuorodą naujoje &amp;kortelėje</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Atv&amp;erti nuorodą naršyklėje</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Šaltinis</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Garsas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS balsas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Paveikslėlis</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Vaizdo klipas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Vaizdo klipas: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>„%1“ žodyne esantis apibrėžimas: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Apibrėžimas: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Nėra nurodytos garso programos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Atidaryti nuorodą</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Išsaugoti &amp;žymėti &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ĮSPĖJIMAS: Garso leistuvė: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>Klaida: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Įrašyti garsą</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Įrašyti paveikslą</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Paveikslai (*.bmp *.jpg *.png *.tif);;Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Įrašti pa&amp;veikslą...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Frazė nerasta</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 iš %2 rungtynių</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Įrašyti g&amp;arsą...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>„%1“ siųsti į įvedimo eilutę</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>žodį „%1“ į&amp;traukti į žurnalą</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Siųsti dabartinį straipsnį Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Siųsti pasirinktą tekstą Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Garso failai (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx); Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Nepavyko pagroti garso kūrinio: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Sukurti Anki užrašą</translation>
     </message>
   </context>
   <context>
@@ -413,93 +408,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Kinų kalbos rašto ženklų konvertavimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Įgalinti konvertavimą tarp supaprastintos ir tradicinės kinų kalbos ženklų</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>&amp;Kinų kalbos rašto ženklų konvertavimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Įgalinti konvertavimą iš supaprastintų simbolių į tradicinius (Taivano variantas) simbolius</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>Iš supaprastintos į Taivano</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Įgalinti konvertavimą iš supaprastintų simbolių į tradicinius (Honkongo variantas) simbolius</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Iš supaprastintos į Honkongo</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Įgalinti tradicinių simbolių konvertavimą į supaprastintus simbolius</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>Iš tradicinės į supaprastintą</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Supaprastinta į tradicinę kinų (Taivano variantą) konversiją</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Supaprastinta į tradicinę kinų (Honkongo variantą) konversiją</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Tradicinis konvertavimas į supaprastintą kinų kalbą</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>pasirinktinė transliteracija</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Reikia prisijungti per įgaliotąjį serverį</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <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="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Naudotojo vardas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Slaptažodis:</translation>
     </message>
@@ -507,22 +502,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation> </translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Grupės ženkliukas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Nuoroda:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Žymelių aplankas:</translation>
     </message>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Paveiksliukai</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Visi failai</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Klaida</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Nepavyksta nuskaityti pasirinkto paveiksliuko failo.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Patvirtinimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Tikrai norite sukurti grupes pagal kalbų poras?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Ar tikrai norite sugeneruoti grupių rinkinį pagal metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Apjungti grupes pagal kalbą, iš kurios verčiama („%1-&gt;“)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Apjungti grupes pagal kalbą, į kurią verčiama („-&gt;%1“)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Nepavyko automatiškai sugrupuoti pagal aplanką.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Nepavyko pasiekti pirminio katalogo %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Ar tikrai norite sugeneruoti grupių rinkinį pagal aplankus, kuriuose yra?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Sukurti dvikrypčio vertimo grupę „%1-%2-%1“</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Apjungti grupes pagal „%1“</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Žodynai: </translation>
     </message>
@@ -634,201 +629,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Paieškos veiksena</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Skirti raidžių registrą</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Antraštinius žodžius eksportuoti į failą</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Eksportuoti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Pagalba</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Gerai</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Pritaikyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Atrinkti rašant</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Atranka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Tekstas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Pakaitos simboliai</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Reguliarusis reiškinys</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Įkeliami antraštės...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <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="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Antraštinių žodžių įrašymas į failą</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstiniai failai (*.txt);;Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Nepavyko atidaryti eksportuoto failo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Antraštinių žodžių eksportavimas...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Atšaukti</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Eksportavimo procesas nutraukiamas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Eksportas baigtas</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Iš viso straipsnių:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Verčia iš:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Iš viso žodžių:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Verčia į:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Atverti aplanką</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Keisti žodyną</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Žodyną sudarantys failai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Aprašas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Rodyti visus nesikartojančius žodyno antraštinius žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Antraštiniai žodžiai</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Žodyną keisti naudojant komandą:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Rodyklės failo pavadinimas:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Atidarykite rodyklės aplanką</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>Įrašų: %1</translation>
     </message>
@@ -838,7 +843,7 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>URL: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
@@ -859,44 +864,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Įgalinta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Vardas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Duombazės</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategijos</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ženkliukas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <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="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Paieškos strategijas atskirkite kableliais
@@ -906,37 +911,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Išplėstinis meniu su visais žodynais...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Keisti šią grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informacija apie žodyną</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Žodyno antraštiniai žodžiai</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Atverti žodyno aplanką</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Keisti žodyną</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Žo&amp;dynų juosta</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Žodynai</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Žodynai</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Priimti</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Atšaukti</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Šaltiniai pasikeitė</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupės</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Kai kurie šaltiniai pasikeitė. Priimti pakeitimus?</translation>
     </message>
@@ -991,12 +996,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Ankstesnis puslapis</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Kitas puslapis</translation>
     </message>
   </context>
   <context>
@@ -1010,75 +1015,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Visatekstė paieška</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Ištisi žodžiai</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Grynasis tekstas</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Pakaitos simboliai</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Reguliar. reiškinys</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Užklausos žodžio laukas negali būti tuščias.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>palaiko xapian paieškos sintaksę, pvz., IR ARBA +/- ir kt</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Didžiausias atstumas tarp žodžių (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Numatytas</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Straipsnelių riba vienam žodynui (%1-%2): </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Surasta straipsnelių: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Darbar indeksuojama: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Nieko</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <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="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> simboliai(-ių,-is)</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Nėra žodynų, palaikančių paiešką jų straipsnelių turinyje</translation>
     </message>
@@ -1086,7 +1071,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Žymelių faile yra klaida</translation>
     </message>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>iš</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Jei nenorite matyti šios klaidos, eikite į meniu Taisa &gt; Žodynai &gt; Ištekliai &gt; Forvo ir nurodykite nuosavą API raktą.</translation>
     </message>
@@ -1162,79 +1147,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Ankstesnis</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Kitas</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Paieška</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Skirti raidžių registrą</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Veiksena:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Bet kokia žodžių tvarka</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Nepaisyti diakrininių ženklų</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Surasta straipsneliuose:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Prieinamos žodynų grupės:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Indeksavimo eilėje:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Pagalba</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Iš viso:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Suindeksuoti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Dabar indeksuojama: nieko</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Atšaukti</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Šalinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Įterpti</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Kortelė</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Naujas grupės pavadinimas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Galimi žodynai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Pri&amp;dėti grupę</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Pridėti grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Sukurti naują žodynų grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Grupuoti pagal kalbas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Sukurkite aplankais pagrįstas grupes.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Grupuoti pagal aplankus</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Grupuoti pagal metaduomenis</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Nutempkite žodynus prie (arba iš) grupių, kilnokite juos grupės viduje, pele keiskite grupių tvarką.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Pervadinti esamą žodynų grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Pašalinti esamą žodynų grupę</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Pavadinkite naująją grupę:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Pašalinti visas grupes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Iš grupės pašalinti pasirinktus žodynus (Šalinti/Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Į grupę įtraukti pasirinktus žodynus (Įterpti/Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Pašali&amp;nti grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupės:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Per&amp;vadinti grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Pašalinti visas žodynų grupes</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Kurti grupes pagal kalbas</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Žurnalas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Žurnalo dydis įrašais: %1 iš %2 galimų</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Rašybos spėjimas: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 (morfologija)</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Įgalinta</translation>
     </message>
@@ -1484,1247 +1453,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksavimas: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Žodyno pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Ruošiamas GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Indeksuojamas žodynas</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Palaukite...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indeksuojama...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>evų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>laosiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>tvi kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>afarų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>akanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>krijų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>igbų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>komių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>menksiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>tajų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>zulų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>čekų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>olandų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>fulų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>graikų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>hausų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>airių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>chmerų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>kongiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>lotynų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>malajų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>maorių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>nauriečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>orijų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>omorų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>songo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>šanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>tadžikų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>tamilų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>totorių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>svazių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>tongų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>inupiakų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>uzbekų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>valų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>volofų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>kosų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>italų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>retoromanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>botijų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>kanadų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>šiaurės ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>abchazų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>kirgizų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>škotų gėlų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>albanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>latvių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>malajalių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>kurdų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>bulgarų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>maltiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>marathų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>arabų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>baskų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>avarų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>biharų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>aimarų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>bretonų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>sudaniečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>danų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>maldyvų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>luba-katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>fidžių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>vengrų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>prancūzų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>vokiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>mongolų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>hebrajų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
-      <translation type="unfinished">Herero</translation>
+      <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>liuksemburgiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>karuni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>kazachų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>kikuju</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>korėjiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>navahų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>nepalų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>odžibvės kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>puštūnų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>lenkų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>samojiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>oksitanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>sindhų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>slovakų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>somalių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>telugų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>tsongų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>tsvanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>uigurų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>serbų-kroatų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>jorubų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
-      <translation type="unfinished">Zhuang</translation>
+      <translation>Džuangas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>rumunų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>indoneziečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>pendžabų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>pietų sotų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>korsikiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>persų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>slovėnų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>fryzų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>aragosų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>taitiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>malagasių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>galisų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>azerbadžaniečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>amharų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>sanskritas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>japonų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>ukrainiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>bambarų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>grenlandų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>baškirų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>gudų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>kašmyrų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>sardiniečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
-      <translation type="unfinished">Hiri Motu</translation>
+      <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>kečujų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>bengalų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>javiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>avestianų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>kinjaruanda kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>afrikanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>armėnų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norvegijos Bokmal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>kroatų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>bosnių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>katalonų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>serbų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>birmiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>rusų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>limburgiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>norvegų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>čečėnų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>kinų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>čiuvašų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>sinhalų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>ispanų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>kornų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>tagalų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>asamų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>osetinų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>estų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>suahelių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>švedų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>tibetiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>vietnamiečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>makedonų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>portugalų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>turkų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>turkmėnų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>gudžaratų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>islandų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>inuktikuto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>anglų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>gruzinų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>senoji slavų bažnytinė</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>farerų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>suomių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>volapiukas</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>valonų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>kvanjama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>maršaliečių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>šiaurės samių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haičio kreolų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>čemorų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>norvegų naujoji</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>gvaranių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>pietų ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>čičevų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>lietuvių</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sičuan Ji</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>tigrinų</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>jidiš</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>kinų (tradicinė)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>kinų (supaprastinta)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>kita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>kinų (kitas supaprastintas dialektas)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>kinų (kitas tradicinis dialektas)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>kita Rytų Europos kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>kita Vakarų Europos kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>kita Rusijos kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>kita Japonijos kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>kita baltų kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>kita graikų kalba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>kita korėjiečių tarmė</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>kita turkų tarmė</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>kita tajų tarmė</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Lojbanas</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Prancūzų kalba</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>ispanų</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>baltarusių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulgarų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>čekų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>vokiečių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>graikų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>suomių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>italų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>japonų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>korėjiečių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>lietuvių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Makedonietis</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>olandų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>lenkas</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>portugalų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>rusų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>slovakų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albanų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>serbų (kirilica)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Švedijos</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turkų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ukrainiečių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Supaprastinta kinų kalba</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Kinų tradicinis</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnamiečių</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugalų, brazilų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>ispanų, Argentinos</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Vokietijos, Šveicarijos</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>ispanų, Bolivija</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadžikų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>kečujų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aimara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabų, Saudo Arabija</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmėnų</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojbanas</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Anglų</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Žodynų įkelti nepavyko</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Klaida konfgūracijoje. Tęsti naudojant numatytąsias nuostatas?</translation>
     </message>
@@ -2740,703 +2713,703 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Žy&amp;melės</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Visi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Atgal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Žodynų: %1, straipsnių: %2, žodžių: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Taisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Failas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Pagalba</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Paieška</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Baigti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Klaida</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Užverti programą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>Nuleisti &amp;langą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Nepavyksta įrašyti straipsnio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Padidinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>Žo&amp;dynai...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Apie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Diskusijos internete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Spausdinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Į&amp;rašyti straipsnį</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Įrašyti straipsnį kaip</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Vald+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Vald+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Nuleisti į sistemos dėklą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Puslapio parinktys</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Svetainė</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Yra nauja versija</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Ieškoti:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Sumažinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Rodyti &amp;pagrindinį langą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Apie GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Parsisiųsti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Puslapio parinktys</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Ieškoti grupėje:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Įprastas dydis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Vald+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Vald+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Įkeliama...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(nepavadinta)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Nuostatos...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Jus sveikina GoldenDict!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Ištarti žodį (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Įrašyti straipsnį</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Praleisti šią versiją</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Pirmyn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Spausdinti straipsnį</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Nera jokio spausdintuvo. Įdiekite kokį nors.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>Ro&amp;dymas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>Ž&amp;urnalas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Iš&amp;valyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>M&amp;astelis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Padidinti žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Sumažinti žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Įprastas žodžių dydis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Užverti veikiamąją kortelę</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Užverti visas korteles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Užverti visas korteles, iškyrus veikiamąją</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Atvertos kortelės</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nauja kortelė</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Vald+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Nuostatų aplankas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Meniu juosta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Rasta žodynuose:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Visas korteles įtraukti į žymeles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ĮSPĖJIMAS: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Atverti kortelių sąrašą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Pašalinti veikiamąją kortelę iš žymelių</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 : %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Vald+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>Ro&amp;dyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>Į&amp;rašyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Slėpti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Žurnalą įrašyti į failą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekstiniai failai (*.txt);;Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Žurnalas įrašytas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Eksporto klaida:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Vald+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>Į&amp;kelti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Įkelti žurnalą iš failo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Klaida įkeliant: failo duomenys netinkami</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Įkėlimas į žurnalą baigtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Klaida įkeliant: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Eksportuoti žymeles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML failai (*.xml);;Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Žymelių eksportavimas baigtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Eksportuoti žymeles kaip sąrašą į paprastą tekstinį failą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importuoti žymeles iš failo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML failai (*.xml);;Txt failai (*.txt);;Visi failai (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Žymelių importavimas baigtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Klaida nagrinėjant duomenis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informacija apie žodyną</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Žodyno antraštiniai žodžiai</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Atverti žodyno aplanką</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Keisti žodyną</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indeksuojama visatekstei paieškai: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Pašalinti antraštinį žodį „%1“ iš žymelių?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Paieškos polangis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Ž&amp;odynų polangis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Žymel&amp;ių polangis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Spaudinio p&amp;eržiūra</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Perž&amp;velgti failus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nauja kortelė</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Visada viršuje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Visada viršuje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Vald+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Meniu mygtukas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Ieškoti puslapyje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Vald+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Visatekstė paieška</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Vald+Lyg2+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-ng žinynas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Rodyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Eksportuoti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importuoti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Pridėti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Veikiamąją kortelę įtraukti į žymeles</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Vald+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Eksportuoti paprastai</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>&amp;Pavadinimai žodynų juostoje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Įran&amp;kių juostoje maži ženkliukai</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Pagri&amp;ndiniai mygtukai</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Įgalinti nuskaitymą</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Visas straipsnis (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Straipsnis, tik HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Įrašomas straipsnis...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Išsaugoti straipsnį baigtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Žurnalo polangis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API prieinamumui nėra įgalinta</translation>
     </message>
@@ -3444,12 +3417,12 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Žodyno failas sugadintas</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Nepavyko įkelti straipsnio iš %1 dėl to, kad %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML nagrinėjimo klaida: %1 ties %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Įgalinta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ženkliukas</translation>
     </message>
@@ -3504,82 +3477,82 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Nenaudojami (uždrausti) žodynai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Pavadinimas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Iš viso straipsnių:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Verčia iš:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Verčia į:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Iš viso žodžių:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Žodynų tvarka:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Žodyną sudarantys failai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Žodyno informacija</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Aprašas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Rikiuoti pagal pavadinimą</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Rikiuoti pagal kalbą</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Žodyno antraštiniai žodžiai</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Aktyvių žodynų: %1. Neaktyvių: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Kelias</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursinis</translation>
     </message>
@@ -3600,69 +3573,67 @@ Norėdami rasti „*“, „?“, „[“, „]“ simbolius, atitinkamai įvesk
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Paleisti sistemos dėkle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Tik kairysis Lyg2</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Vald</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win arba Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Įgalinti sistemos dėklo ženkliuką</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Serveris:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Prievadas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Lyg2</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Naudotojo vardas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Iškylantis langas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ Pažymėjus šią parinktį, naujos kortelės nebus aktyvuojamos.
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Naudoti įgaliotąjį serverį</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows arba Meta klavišas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Automatiškai ištarti pagrindinio lango žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Paleisti kartu su sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Tik kairysis Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Naršymas kortelėse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Tik dešinysis Lyg2</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Uždarant programos pagrindinį langą, programa neišjungiama, –
 tiesiog paslepiama.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Garsas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Sąsajos kalba:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Tik kairysis Vald</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Naujas korteles atverti fone</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Tinklas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Tik dešinysis Vald</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Dešinysis Lyg2</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Kairysis Lyg2</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Automatiškai ištarti iškylančio lango žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Naujas korteles atverti už dabartinės</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <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>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt klavišas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Periodiškai tikrinti, ar yra naujų programos versijų</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ greta aktyviosios. Priešingu atveju, jos pridedamos
 prie paskutiniųjų.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Užveriant nuleisti į sistemos dėklą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Sistemoje numatyta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Jei pasirinkta, sistemos dėkle rodomas ženkliukas, kuriuo galite
 atverti pagrindinį langą ir atlikti kitas užduotis.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,673 +3812,715 @@ ir pasiūlys atverti parsisiuntimo puslapį.
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Paleistis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Slaptažodis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Numatytasis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Sąsaja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Kalbos keitimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Vald klavišas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Kairysis Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Tik dešinysis Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Nuostatos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Kairysis Vald</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Dešinysis Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Dešin. Vald</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Spartieji klavišai</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Paleisti su įjungta iškylančių langų funkcija</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Programa paleidžiama, tačiau nerodomas pagrindinis langas;
 rodomas tik ženkliukas sistemos dėkle.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Lyg2 klavišas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>GoldenDict-ng paleisti kartu su naudotojo darbalaukiu sistemos paleidimo metu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Nerodyti iškylančio lango, jei keičiasi pažymimas arba kopijuojamas tekstas viename iš GoldenDict langų</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Nepaisyti žymėjimo ar kopijavimo pakeitimų GoldenDict languose</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Groti garso kūrinius naudojant integruotą garso sistemą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Nautoti integruotą grotuvę:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Pasirinkite garso sąsają</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Įveskite garso leistuvės komandą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Tarimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Grojimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Naudoti išorinę programą:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Versti žodį, jį spragtelėjus du kartus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Paprastai, nuspaudus Gr(įžties) klavišą, fokusas perkeliamas į verčiamą eilutę.
 Tačiau įgalinus šią parinktį, būtų paslepiamas pagrindinis langas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Gr (Esc) klavišas paslepia pagrindinį langą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Rinkitės, jei nenorite matyti kortelių juostos tuomet, kai atverta tik viena kortelė.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Slėpti vienintelę kortelę</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Žodynų kiekio riba kontekstiniame meniu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Perduoti į pagrindinį langą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Pirmiausia rodyti ženkliuką, ir tik jį spragtelėjus rodyti iškylantį langą. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Paprastai spustelėjus nuorodą, dukart spustelėjus žodį arba ieškant
+pasirinkimo straipsnyje, įkeliamas vertimas ir beveik iš karto
+slenka prie straipsnio iš to paties žodyno. Tačiau išjungus šią parinktį
+, rodomas straipsnis iš aukščiausio žodyno.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Automatiškai slinkite iki tikslinio straipsnio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Straipsnio rodymo stilius:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Pasukite vartotojo sąsają į tamsią.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Tamsusis režimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Pakeiskite straipsnio rodymo stilių į tamsų.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Tamsus skaitytuvo režimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU užsakymas: paskutinis naudotas užsakymas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Stebėkite iškarpinės pakeitimus, kai įjungtas nuskaitymas. Pastebėti! Visada turėtumėte tai įjungti, nebent naudojate „Linux“.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Stebėkite iškarpinės keitimą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Takelio pasirinkimo pakeitimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Tack pasirinkimas tik tada, kai visi pasirinkti klavišai laikomi nuspausti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Pažymėjus žodį, pirmiausia rodyti ženkliuką</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Vėlavimo laikas</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Sistemos įgaliotasis serveris</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Savitas įgaliotasis serveris</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Savitos nuostatos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Denis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Modelis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Žodis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Žodyno laukas...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Tekstas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Apibrėžimo laukas...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Sakinys</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Sakinio laukas (gali būti tuščias)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>HTTP antraštėse neidentifikuoti GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Maksimalus tinklo talpyklos dydis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Maksimali vieta diske, kurią užima GoldenDict&apos;s tinklo talpykla per
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Jei nustatyta į 0, tinklo disko talpykla bus išjungta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Kai ši parinktis įjungta, „GoldenDict
+išvalo savo tinklo talpyklą iš disko.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Išvalykite tinklo talpyklą išeinant</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Visatekstė paieška</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Leisti ieškoti šių žodynų straipsneliuose:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Neieškoti, jei žodyne yra virš</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>straipsnelių(-io) (0 = neriboti)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Su&amp;dėtingesni</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Atliekant nuoseklias paieškas, jei vienas žodynas sutraukiamas rankiniu būdu, jis liks sutrauktas kitoje paieškoje</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Sesijos žlugimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Kai naudojate iškarpinę, ištrinkite viską po naujos eilutės</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Atlikdami naują paiešką, sufokusuokite pagrindinį arba iššokantįjį langą, net jei jis matomas&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Žymelės</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Žymelių įsiminimo dažnumas. Jei 0, žymelės įrašysimos tik užveriant programą.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Įjunkite, jei norite patvirtinti kiekvieną pašalinimą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Patvirtinti šalinimą iš sąrašo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Įjunkite šią parinktį, kad nepaisytumėte nepagrįstai ilgo įvesties teksto
+iš pelės žymeklio užvedimo, pasirinkimo, iškarpinės ar komandinės eilutės</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Ignoruoti įvesties frazes, ilgesnes nei</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Įvesties frazės, ilgesnės nei šis dydis, bus ignoruojamos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Jei norite nepaisyti diakritinių ženklų žodžių paieškoje, įjunkite šią parinktį</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ieškant nepaisyti diakritinių ženklų</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Išplėsti papildomas &amp;dalis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Automatiškai suskleisti didelius straipsnius</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Suskleisti straipsnis didesnius nei</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Suskleisti straipsnis, kurių dydis viršija</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Ieškodami nepaisykite skyrybos ženklų</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Papildomai ieškoti straipsnelių, kuriuose aprašyti sinonimai Stardict, Babylon ir GLS žodynuose.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Papildomai ieškoti sinonimų</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>simboliai</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Vald-Tab naršymui kortelėse pagal MRU</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babilonas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Žurnalas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Įsi&amp;minti verstus žodžius</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Straipsneliai</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Įgalinkite šią parinktį, jei žodį norite pasirinkti vieną kartą spustelėdami ties juo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Žodį pasirinkti jį spragtelint</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Papildomas stilius:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Žurnalo įrašų didžiausias kiekis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Įrašyti kas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>min</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Klasika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Šiuolaikinis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes mėlynas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Norint naudoti Xapian frazių paiešką ir NEAR operatorių, reikalinga padėties informacija, tačiau duomenų bazės dydis bus daug didesnis. Taikoma tik naujiems gaunamiems žodynams.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Įgalinti rodyklę su padėties informacija</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standartinis šriftas</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace šriftas</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif šriftas</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif šriftas</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Išvaizda</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Šie šriftai bus taikomi, kai žodyne nurodyti šriftai nebus rasti.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Atsarginiai šriftai</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Garsas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Paprastas tekstas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Priešdėlio atitikimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Nežinoma</translation>
     </message>
@@ -4516,17 +4528,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Neduotas joks programos vardas.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Programa užstrigo.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Programa baigė darbą ir grąžino kodą %1.</translation>
     </message>
@@ -4534,27 +4546,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Įgalinta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Komandinė eilutė</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ženkliukas</translation>
     </message>
@@ -4562,99 +4574,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Straipsnio įkėlimo klaida</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Straipsnio dekodavimo klaida</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Autorinės teisės: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versija: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autoriai: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>El. paštas: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Pavadinimas: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Svetainė: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Žodyno paieškos programa.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Žodis ar sakinys užklausai.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Išsaugokite derinimo pranešimus gd_log.txt konfigūracijos aplanke.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Iš naujo nustatyti lango būseną.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Išjungti tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Pakeiskite pagrindinio lango grupę.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Pakeiskite iššokančiųjų langų grupę.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Perjungti nuskaitymo iššokantįjį langą.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Spausdinimo versija ir diagnostikos informacija.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Žodynų paieška (Vald+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Išvalyti paiešką</translation>
     </message>
@@ -4662,22 +4689,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>Klaida: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Šaltinių įrašymo klaida: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Nepavyko parsiųsti nurodytų šaltinių.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ĮSPĖJIMAS: %1</translation>
     </message>
@@ -4706,67 +4733,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt + S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Langas</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Ištarti žodį (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Įtraukti į žymeles (Vald+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Parodo arba paslepia žodynų juostelę</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Visada rodyti virš kitų langų</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Perduoti į pagrindinį langą (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Atgal</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Pirmyn</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 : %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ĮSPĖJIMAS: %1</translation>
     </message>
   </context>
   <context>
@@ -4774,53 +4806,53 @@ galėsite keisti lango dydį ar atlikti kitus įprastus langų tvarkymo veiksmus
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Ankstesnis</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl + Shift + G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Kitas</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl + G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Paryškinkite &amp;viską</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Skirti didžiąsias ir mažąsias raides</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Rasti:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Kelias</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ženkliukas</translation>
     </message>
@@ -4828,60 +4860,60 @@ galėsite keisti lango dydį ar atlikti kitus įprastus langų tvarkymo veiksmus
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Failai</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Vikipedija</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japonų skiemenenų abėcėlė Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Nurodydami kelius, sukurkite žodynus iš garsų failų rinkinių:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romaji (japonų)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4892,84 +4924,84 @@ Standartizuota kaip ISO 3602
 Dar įtraukta į GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Vikipedijos (Vikitekos) svetainės:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Garsų aplankai</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Bet kokios išorinės programos. %GDWORD% eilutė bus pakeista užklausos žodžiu. %GDSEARCH% eilutė bus pakeista tekstu paieškos juostoje. Jei abu parametrai nepateikti, antraštė bus įvedama į standartinę įvestį.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tarimus pateikė &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, bendradarbiaujanti Wikimedia France lingvistinė medijos biblioteka. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Įgalinti Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 kalbos kodas</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Norint naudoti Forvo šiuo metu reikalingas API raktas, užsiregistruokite svetainėje, kad gautumėte savo raktą.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gaukite savo raktą &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;čia&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japonų skiemenenų abėcėlė Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Pasirinktinė transliteracija</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Tai taikoma tik paieškos frazėje, kiekviena eilutė reiškia transliteraciją, atskirtą kabliataškiu. Pavyzdžiui, ae;æ, vartotojai gali įvesti ae, kad reikštų æ tiksliniame žodyje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #tai pavyzdys</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteracija</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ kana rašto sistemomis. Standartizuota kaip ISO 3602
 Dar neįtraukta į GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteracija (rusų)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologija</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Taisa...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Pavyzdžiai:  &amp;quot;eng&amp;quot; anglų kalba, &amp;quot;fra&amp;quot; prancūzų kalba &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+visą galimų kalbų sąrašą rasite &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; čia &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Kelias iki aplanko su Hunspell/Myspell žodynais:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Pe&amp;ržvelgti dabar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteracija (vokiečių)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Bet kokios svetainės. %GDWORD% rašykite vietoj užklausos žodžio:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>Pri&amp;dėti...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Pasirinkite aplanką</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Pašalinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Svetainės</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Keliai, kuriuose ieškoma žodynų failų:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Šalinimo patvirtinimas</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Skiemenų abėcėlė:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Rasti morfologijos žodynai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5105,94 +5127,94 @@ rašybos spėjimus.
 Žodynus pridėkite atitinkamų grupių apačioje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburnas</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-šiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT serveriai</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT serveriai:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Įgalinti tarimą pagal Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API raktas</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Kalbų kodai (atskirti kableliais):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteracija (graikų)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(neprieinama perkeliamoje versijoje)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programos</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Transliteracija (baltarusių)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Arba naudokite %GD1251% – CP1251, %GDISO1%...%GDISO16% – ISO 8859-1...ISO 8859-16 atitinkamai koduotei,
 %GDBIG5% – Big-5, %GDBIG5HKSCS% – Big5-HKSCS, %GDGBK% – GBK ir GB18030, %GDSHIFTJIS% – Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Balso sintezavimas</translation>
     </message>
@@ -5208,42 +5230,42 @@ rašybos spėjimus.
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Pasirinkite balso modulį:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Pridėti</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Pašalinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Išbandyti</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Galimi moduliai</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Perskaitytinas tekstas</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Parašykite tekstą, kurį norėsite išmėginti.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Skaityti</translation>
     </message>
@@ -5268,17 +5290,17 @@ rašybos spėjimus.
       <translation>Nepavyksta rasti TTS balsų.&lt;br&gt;Įsitikinkite, kad savo kompiuteryje įdiegėte kokį nors TTS variklį.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Nuostatos</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Garsumas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Dažnis:</translation>
     </message>
@@ -5286,12 +5308,12 @@ rašybos spėjimus.
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Įveskite norimą rasti žodį ar frazę</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Išskleisti</translation>
     </message>
@@ -5311,7 +5333,7 @@ rašybos spėjimus.
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5322,33 +5344,33 @@ rašybos spėjimus.
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Pavadinimas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Įgalinta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Straipsnelį tarp &lt;iframe&gt; gairių įterpti kaip nuorodą</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Kaip nuorodą</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ženkliukas</translation>
     </message>
@@ -5356,17 +5378,9 @@ rašybos spėjimus.
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Kai kurių žodynų nepavyko užklausti.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ĮSPĖJIMAS: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/mk_MK.ts b/locale/mk_MK.ts
index 8413c9ee..426910e4 100644
--- a/locale/mk_MK.ts
+++ b/locale/mk_MK.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>За програмот</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Речник GoldenDict, издание </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Лиценца: GNU GPLv3 или понова</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Копирај ги информациите за верзијата</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Копирај список со речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Заслуги:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Непознато]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>На база на Qt %1 (%2, %3 бита)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© Константин Исаков (ikm@goldendict.org), 2008-2011 {2008-2013 ?}</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Врз основа на Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: не може да се создаде картичка без збор</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Пребарување Anki: AnkiConnect не е овозможено.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>анки: пост до анки не успеа</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>анки: пост до успех на анки</translation>
     </message>
   </context>
   <context>
@@ -79,13 +74,13 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Увид</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Користећи сајт Forvo захтева кључ API. Оставите
 ово поље празно, да бисте користили подразумевани кључ, који
@@ -93,42 +88,37 @@
 сајт, да бисте добили свој кључ.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Откриј ја статијата</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Соберија  статијата</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Работа со скан попап</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без име)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Добро дојдовте!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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>Користите интерфејс IAccessibleEx да тражи речи под курсором.
 Ова технологија ради само са програмима који га подржавају
@@ -136,17 +126,22 @@
 Ако не користите такве програме не треба да укључи ову опцију.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Не е пронајден превод за &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; во групата &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt; Форум на програмот&lt;/a&gt;.&lt;p&gt;Ажурирање софтвер достапно на  &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;веб сајту&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2011. Лиценца: GNU GPLv3 или понова.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(слика)</translation>
     </message>
@@ -154,42 +149,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>&amp;Меморирај ја оваа статија</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Од: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Соберија ја статијата</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Направете нова белешка на Анки</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>грешка во Прашање : %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Затвори зборови: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Сложени изрази: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Поединечни зборови: </translation>
     </message>
@@ -197,204 +192,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Неуспешно креирање привремена датотека.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Побарај &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Побарај «%1» во &amp;нова картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Бараниот ресурс не е пронајден.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Грешка при отворање датотека ресурс , пробајте рачно да отворите: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Побарај «%1» во %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Одберете тековна статија</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Копирај како текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Прегледај</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Побарај «%1» во %2 во &amp;нова картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Отворете ја оваа врска во нова &amp;картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Отвори ја врската во надворешен &amp;прегледувач</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Извори на промени</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS глас</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Слика</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Видео</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Видео: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Дефиниција од речник &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Дефиниција: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Бараниот аудио програм не е пронајден.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Отвори ја врската</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Зачувај &amp;Обележите &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>ПРЕДУПРЕДУВАЊЕ: Аудио плеер: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Сочувај звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Сочувај слика</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Слики датотеки (*.bmp *.jpg *.png *.tif);;Сите датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Сочувај &amp;слику...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Фразата не е пронајдена</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 од %2 натпревари</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Сочувај з&amp;вук...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Испрати &quot;%1&quot; во ред за внос</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Додади &quot;%1&quot; во историја</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Испрати Тековна статија до Анки</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Испратете го избраниот текст до Анки</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Звучни датотеки (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;сите датотеки (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Не успеа да се репродуцира звучна датотека: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Креирај белешка Anki</translation>
     </message>
   </context>
   <context>
@@ -420,93 +415,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Кинеска конверзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Овозможете конверзија помеѓу поедноставени и традиционални кинески знаци</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Кинеска конверзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Овозможете конверзија од поедноставени знаци во традиционални (тајванска варијанта) знаци</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC до TC (тајванска варијанта)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Овозможете конверзија од поедноставени знаци во традиционални (варијанта на Хонг Конг) знаци</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC до TC (варијанта на Хонг Конг)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Овозможете конверзија од традиционални знаци во поедноставени знаци</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC до SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Поедноставена конверзија во традиционална кинеска (тајванска варијанта).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Поедноставено конверзија во традиционална кинеска (варјанта на Хонг Конг).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Традиционална во поедноставена кинеска конверзија</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>прилагодена транслитерација</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>Потребна е автентикација на прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>Треба да наведете корисничко име и лозинка за да пристапите преку прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>Корисничко име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Лозинка:</translation>
     </message>
@@ -514,24 +509,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Икона на група:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Брз пристап:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Омилена папка:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -554,17 +549,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Слики</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Сите датотеки</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Не може да се чита одабраната слика</translation>
     </message>
@@ -572,63 +567,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Потврда</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Да ли сте сигурни дека сакате да креирате сет на групи на основа на јазични парови?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Дали сте сигурни дека сакате да генерирате сет на групи базирани на metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Комбинирајте групи од изворниот јазик во &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Комбинирајте групи од целниот јазик во &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Автоматската групација по папка не успеа.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Не може да се достигне родителскиот именик %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Дали сте сигурни дека сакате да генерирате збир на групи базирани на папки што содржат?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Направете двострана група за преведување &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Комбинирајте група со &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Речници:</translation>
     </message>
@@ -641,201 +636,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
-      <translation type="unfinished">Search mode</translation>
+      <translation>Режим на пребарување</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>Овој елемент одредува како ќе се толкува низата на филтерот</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>Ако се провери на симболите, ќе се земе предвид при филтрирање</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
+      <translation>Случај за натпревар</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>Извезува наслови во датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Помош</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>добро</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>Притиснете го ова копче за да го примените филтерот во списокот со насловни зборови</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
+      <translation>Пријавете се</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>Ако се означат какви било промени на филтерот, веднаш ќе ги примениме на списокот со наслови</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>Аплицирај автоматски</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>Филтер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
+      <translation>Низа за филтри (фиксна низа, џокери или регуларен израз)</translation>
     </message>
     <message>
       <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <source>Text</source>
+      <translation>Текст</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
+      <source>Wildcards</source>
+      <translation>Човечки знаци</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Се вчитуваат зборовите...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>Вкупно уникатни наслови: %1, филтрирани: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>Зачувајте насловни зборови во датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстуални датотеки (*.txt);;Сите датотеки (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Не може да се отвори извезената датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>Извезете наслови...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Процесот на извоз е прекинат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Извозот е завршен</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Вкупно статии:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Изворен јазик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Вкупно зборови:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Преведи на:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Отвори папка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Датотеки кои го сочинуваат речникот:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>Прикажи ги сите уникатни наслови на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>Главни зборови</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Уредиго  речникот преку команда:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Име на датотека за индекс:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Отворете ја папката со индекси</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 влезови</translation>
     </message>
@@ -845,105 +850,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>УРЛ: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>Бази на податоци: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>Стратегии за пребарување: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>Серверски бази на податоци</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
-      <translation type="unfinished">Enabled</translation>
+      <translation>Овозможено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
-      <translation type="unfinished">Name</translation>
+      <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
-      <translation type="unfinished">Address</translation>
+      <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>Бази на податоци</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>Стратегии</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>Список на бази на податоци ограничени со запирки
+(празна низа или &quot;*&quot; одговара на сите бази на податоци)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>Список на стратегии за пребарување ограничен со запирки
+(празната низа значи &quot;префикс&quot; стратегија)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Проширено мени со сите речници...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Уреди ја оваа група</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Податоци за речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Зборови на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Отвори папка на речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Лента на речникот</translation>
     </message>
@@ -952,27 +957,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Прифати</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Извори сменети</translation>
     </message>
@@ -983,12 +988,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Некои извори се изменети. Прифаќаш измени?</translation>
     </message>
@@ -998,12 +1003,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Претходна страна</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Следна Страна</translation>
     </message>
   </context>
   <context>
@@ -1017,85 +1022,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Пребарување во цел текст</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>Обичен текст</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <source>Wildcards</source>
+      <translation>Човечки знаци</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Зборот што бара не може да биде празен.</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
+      <source>support xapian search syntax,such as AND OR +/- etc</source>
+      <translation>поддржува синтакса за пребарување xapian, како што е И ИЛИ +/- итн</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Стандардно</translation>
     </message>
     <message>
       <location filename="../src/fulltextsearch.cc" line="243"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
-      <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>Пронајдени статии: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>Сега се индексира: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
-      <translation type="unfinished">None</translation>
+      <translation>Никој</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>Нема речници за пребарување на целосен текст</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Грешка во датотеката со омилени</translation>
     </message>
   </context>
   <context>
@@ -1113,17 +1098,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Додади папка</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Омилени:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Сите избрани ставки ќе бидат избришани. Да продолжиме?</translation>
     </message>
   </context>
   <context>
@@ -1159,7 +1144,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>из</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1169,79 +1154,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Претходно</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следно</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Пребарување</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>Мод:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>Пронајдени статии:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>Достапни речници во групата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>Почекајте индексирање:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Помош</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>Вкупно:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>Индексирано:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>Сега се индексира: Нема</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
@@ -1273,29 +1242,29 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Дел</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Инс</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Картичка 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1310,12 +1279,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/groups.cc" line="29"/>
       <source>Group tabs</source>
-      <translation type="unfinished">Group tabs</translation>
+      <translation>Групни јазичиња</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>Отворете го списокот со групи</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1333,12 +1302,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Внесете ново име на група:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Достапни речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Додади група</translation>
     </message>
@@ -1348,42 +1317,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Додади група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Направи нова групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Групирајте по јазици</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Креирајте групи базирани на папки.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Група по папки</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Група по метаподатоци</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Повлечи па Спушти од/во групите , премести ги внатре во групите, промените го редоследот на групите, со помош на глушецот.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Преименувај ја тековната група на речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Отстрани тековна група речници</translation>
     </message>
@@ -1393,43 +1362,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Внеси име на нова група:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Отрстраните ги сите групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Отстраните ги одбраните речници од група (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Додај го одбраните речници во група (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Отстраните група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Групи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Преименувај група</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Отстраните го сите групи речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Направи групи на основа на јазични парови</translation>
     </message>
@@ -1452,12 +1421,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Историја:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Големина на историјата: %1 внос од максимални %2</translation>
     </message>
@@ -1465,12 +1434,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Предлози за правопис: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 (морфологија)</translation>
     </message>
@@ -1478,12 +1447,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Име</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Вклучено</translation>
     </message>
@@ -1491,1247 +1460,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Индексирање: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Име на речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Стартувај го GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Почекајте додека речникот се индексира </translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Почекајте...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Се индексира...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Еве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Акански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кри</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ибо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Коми</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Пали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тајландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Холандски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Грчки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Галски (Ирска)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кмерски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Латински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малајски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маори</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Орија</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Схона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таџикски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамилски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Инупиак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Велшки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Волоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кхоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Италијански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Романшски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Џонга (Бутан)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Канада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Сев. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазија</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Кирунди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Галски (Шкотска)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Летонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малаиалам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Бугарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Малтешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Марати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арапски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аимаран</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Судански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Дански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Малдиви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиџи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Мађарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Француски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Германски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Монголски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Јеврејски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Ереро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Луксембургшки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канури</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикују</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Корејски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджибва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пуштунски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Пољски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Французски (диалект Occitan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словачки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалиски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ујгурски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Српско-Хрватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Јоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанг</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румынски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Индонезијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панџаби</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Јуж. Сото</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсикански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Есперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Персијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словеначки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризииски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Тахитиан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Мадагаскарац</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галицијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербејџански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Јапански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украјински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалисут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Белоруски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Јаванац</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Кињаруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Афрички</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Јерменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвешки букмол</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хрватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Босански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Интерлингве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Српски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бурмански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Руски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбурзхски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Синхала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Шпански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнвалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалог</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Асамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Естонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахили</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Вијетнамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуџарати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Исландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Англиски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Црквено-словенски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Фински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапук</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваниама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Северна Сами</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Хаићански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Норвешки (нинорск)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гварани</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Јуж. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичева</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литвански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сечуан И</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигриња</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Јидиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Традиционални кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Поједностављени кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Остали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Остали поједностављеном кинеском дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Остали традиционални кинески дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Остали источно-европски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Остали западно-европски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Остали руски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Остали јапански језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Остали балтички језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Остали грчки језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Остали корејски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Остали турски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Остали тајландски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>Тамазит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Лојбан</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>француски</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Шпански</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Белоруски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Бугарски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Чешки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Германски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Грчки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Фински</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Италијански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Јапански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Корејски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Литвански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Македонски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Холандски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Пољски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Португалски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Руски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Словачки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Албански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Српски (Кирилица)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>шведски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>турски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>украински</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Кинески поедноставен</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Кинески традиционален</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>виетнамски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Португалски, Бразилец</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>персиски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>шпански, Аргентина</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>хинди</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>есперанто</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Германец, Швајцарија</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>шпански, Боливија</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Таџикистански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Кечуа</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Ајмара</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Арапски, Саудиска Арабија</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Туркменистански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Интерлинг</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Лојбан</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Англиски</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Грешка при вчитување на статијата</translation>
     </message>
@@ -2739,7 +2712,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Грешка во поставката на датотеката. Да продолжиме со претпоставени нагодувања?</translation>
     </message>
@@ -2747,703 +2720,703 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>Ф1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Омилени и обреди</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Се</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Речник: %1, статии: %2, зборови: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Уреди</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Помош</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Пребарување</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>И&amp;злез</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Затвори апликација</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Затвори во палета(треј)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Не е возможно да се сочува статијата: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Зумирај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Речници...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;За програмот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Печати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Сочувај статија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Сочувај ја оваа статија како</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Смали прозорец во палета</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>П&amp;оставки на страна</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Почетна страна</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Достапна е нова верзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Побарај:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Одзумирај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Прикажи &amp;главен прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>За GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Преземање</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Дотерување/Нагодување на страна</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Побарај во:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Вообичаена големина</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Вчитување...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(неименуван)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Поставки...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Добро дојдовте!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Изговори збор (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Сочувајте статија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Прескокни ја оваа верзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Печати статија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Нема достапен печатач. Ве молиме, прво инсталирајте го.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Приказ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Историја</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>О&amp;чисти</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Зголеми</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Зборови Зумирај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Зборови Одзумирај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Вообичаена големина на букви</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Затвори ја тековната картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Затвори ги сите картички</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Затворите ги сите картички освен тековната</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Отворени картички</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Нова картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Папка за нагодувања</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
-      <translation type="unfinished">&amp;Menubar</translation>
+      <translation>&amp;Мени лента</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Најдено во речниците:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Додадете ги сите картички во Омилени</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ПРЕДУПРЕДУВАЊЕ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
+      <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Отвори листа на картички</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Отстранете ја тековната картичка од Омилени</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Го сокривте главното мени. За да го вратите, користете %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Прикажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Сокри</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Извоз на историја во датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстуални датотеки (*.txt);;Сите датотеки (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Извоз на историјата е завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Извоз грешка:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Увоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Увоз на историја од датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Увоз грешка: неважечки податоци во датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Увоз на историјата е завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Грешка при увоз:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Извезете ги омилените во датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>XML-датотеки (*.xml);;Сите датотеки (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Извозот на омилените е завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Извезете ги омилените за да ги поднесете како обична листа</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Увезете Омилени од датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML-датотеки (*.xml);;Txt-датотеки (*.txt);;Сите датотеки (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Увозот на омилените е завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Грешка при анализа на податоци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Податоци за речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Зборови на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Отвори папка на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Сега се индексира за пребарување на целосен текст: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Да се отстрани насловот &quot;%1&quot; од Омилени?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Пребарај окно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Резултати окно за навигација</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Панел за омилени&amp;ити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Преглед пред п&amp;ечатење</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Повторно сканирај датотеки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Нова картичка(таб)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Секога најгоре</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Секогаш најгоре</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Копче на менито</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>Пребарување на страницата</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Пребарување во цел текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>Референца GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Прикажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Увоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Додадете</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Додајте тековно јазиче во Омилени</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Извези во список</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Прикажи називи во картичките &amp;Лентата на речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Прикажи мала икона во &amp;алатникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навигација</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Овозможи скенирање</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Статија, целосна (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Статија, само HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Меморирање статија...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Зачувајте ја статијата завршена</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Главнен прозорев е поставен секогаш да е најгоре.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Окно историја</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Достапност API не е овозможен</translation>
     </message>
@@ -3451,12 +3424,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Речник датотека је покварен или оштећен</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Неуспешно учитавање чланка из %1, разлог: %2</translation>
     </message>
@@ -3464,7 +3437,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
     </message>
@@ -3480,22 +3453,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -3505,101 +3478,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Не можеше да се отвори аудио баферот за читање.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>збор</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Неактиван (онемогућени) речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Назив:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Укупно чланака:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Изворни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Циљни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Укупно речи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Редослед речника:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Датотеке које чине речник:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Информације о речнику</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Разврстај по имену</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Разврстај по језицима</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Зборови на речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>Активни речници: %1, неактивни: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Патека</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рекурзивно</translation>
     </message>
@@ -3607,69 +3580,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Алт</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Стартувај во системската палета</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Само лев Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Прикажи икона во системската палета</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Сервер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Смена</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тип:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Корисничко име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Скан попап </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3678,138 +3649,138 @@ switching to them.</source>
 отвори, без нивно преминување.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Користи прокси-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Користете следно макро за преведување зборови од остава:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Тастер Windows или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Автоматски изговари зборови во главниот прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Стартувај со системот</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Само лев Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Прегледување со помош на картички</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Само десен Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Омозможи ако користите прокси сервер
 за сите мрежни побарувања на програмот.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Јазик на интерфејсот:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Само лев Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Отворање нова картичка во позадина</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Мрежа</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Само десен Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Лингво</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Десен Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Лев Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Автоматски изговори зборови во скокачки прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Отворање нова картичка по тековната</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Поново покрените програм за промену језика.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Тастер Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Провери нова верзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3818,25 +3789,24 @@ be the last ones.</source>
 се додава на крај.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Затвори во системска палета</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Систем - подразбирано</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Кога е овозможено, икона се појавува во сист.палета која можеда се користи,
 да се отвори главен прозорец и да се извршат други задачи.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3849,140 +3819,140 @@ GoldenDict. Ако се појави нова верзија,  програмо
 од сајтот.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Стартување</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Лозинка:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Подразбирано</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Интерфејс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Промена на јазик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Тастер Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Користете следен макро за прикажување/криење на главниот прозорец:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Лев Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Само десен Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Поставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Лев Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Десен Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Десен Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Макро команди</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Овозможи попап прозорец при стартување</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Када е омозможена оваа опцију, апликацијата ќе работи во систем. палета
 без приказ на главниот прозорец.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Тастер Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Автоматски стартувај го GoldenDict при стартување на оперативниот систем.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Не прикажувај скокачки прозорец кога се менува изборот или таблата со исечоци во еден од сопствените прозорци на GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Игнорирајте ги сопствениот избор и промените на таблата со исечоци на GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Репродуцирајте аудио датотеки преку вградена аудио поддршка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Користете внатрешен плеер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Изберете аудио заден крај</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Внесете командна линија за аудио плеер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3992,534 +3962,576 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 поради оваа функција, обидете се да ја оневозможите оваа опција.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Оневозможи вчитување садржини од други сајтови (отстранува поголем дел од огласите)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Изговор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Репродукција</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Користи надворешен програм:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Преведи го одбраниот збор со двоен клик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Користи некоја надворешна апликација за репродукција на аудио датотеки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Сокриј го главниот прозорец со прит. ESC</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Сокри сингл(една) картичка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Дотерајте ја оваа вредност за да одбегнете огромни контекстни менија</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Ограничи контекст мени на речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Пратете го преведениот збор во главниот прозорец наместо да се прикаже во попап прозорецот</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Испратите го преведениот збор во главниот прозорец</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Прикажи прозорец со знаме пред да се прикаже скокачки прозорец, кликнете на знамето за да се прикаже скокачкиот прозорец. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Вообичаено, кликнувањето на врската, двојното кликнување на зборот или барањето
+избор во статија го вчитува преводот и речиси веднаш
+се прелистува до статијата од истиот речник. Меѓутоа, со исклучена оваа опција
+, се прикажува написот од највисокиот речник.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Автоматски скролувајте до целната статија</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Стил на прикажување написи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Свртете го интерфејсот на темно.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Темниот режим</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Свртете го стилот на прикажување на статијата на темно.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Темниот режим на читач</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>Нарачка MRU: Нарачка неодамна користена.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Таблата со исечоци за песна се менува кога е овозможено скенирањето. Забележете! Секогаш треба да го овозможите ова освен ако не сте на Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Следете ја промената на таблата со исечоци</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Промена на изборот на песна</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Избор на так само кога сите избрани копчиња се држат притиснати:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Прикажи знаменце за скенирање кога зборот е избран</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Време на одложување</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> Госпоѓица</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>Системски прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>Прилагодено прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>Прилагодени поставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Палубата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Модел:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>збор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Поле за вокабулар...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Поле за дефиниција...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Реченица</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Поле за реченица (може да биде празно)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Немојте да го идентификувате GoldenDict у HTTP заглавја</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Максимална големина на кешот на мрежата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Максимален простор на дискот окупиран од мрежната кеш меморија на GoldenDict
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Ако е поставено на 0, кешот на мрежниот диск ќе биде оневозможен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Кога оваа опција е овозможена, GoldenDict
+го брише кешот на мрежата од дискот за време на излегувањето.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Исчистете го кешот на мрежата при излегување</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Пребарување во цел текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>Дозволете пребарување на целосен текст за:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Не барајте во речници што содржат повеќе од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>статии (0 - неограничено)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Напредно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>При последователни пребарувања, ако еден речник се собира рачно, тој ќе остане склопен при следното пребарување</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Колапс на сесијата</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Кога користите таблата со исечоци, извадете сè по нова линија</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>При ново пребарување, фокусирајте го главниот или скокачкиот прозорец дури и ако е видлив</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Омилени</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Интервал за зачувување на омилени. Ако е поставено на 0 Омилени, ќе се зачуваат само за време на излегувањето.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Вклучете ја оваа опција за да ја потврдите секоја операција на бришење ставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Потврда за бришење ставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Вклучете ја оваа опција за да игнорирате неразумно долг внесен текст
+од префрлање на глувчето, избор, таблата со исечоци или командна линија</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Игнорирајте ги внесените фрази подолги од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Внесените фрази подолги од оваа големина ќе бидат игнорирани</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Вклучете ја оваа опција за да ги игнорирате дијакритичките при пребарувањето статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Игнорирајте ги дијакритичните знаци додека пребарувате</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Вклуч. ја оваа можност за секогаш да ги рашири незадолж. делови на стат.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Можност за ширење на &amp;деловите</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Одберете ја оваа можност за авт. да се собираат големите статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Вруши статии поголеми од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Статии подолги од оваа величина ќе бидат срушени</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Игнорирајте ги интерпункциските знаци додека пребарувате</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Вклучете ја оваа опција за да овозможите пребарување на дополнителни статии преку синонимски листи
+од речниците Stardict, Babylon и GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Дополнително пребарување преку синоними</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>симболи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab навигација на картичка во MRU редослед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Вавилон</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Историјат</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Вклучете ја оваа могжност за чување историја на преведените зборови</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Склад на &amp;историјата</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Статии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Вклучете ја оваа можност ако сакате да одбирете зборови со еден клик на глушецот</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Одберете збор со еден клик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Додаток на стилот:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Одреди најголем број ставки кои ќе се чуваат во историјата</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максимална големина на историјата:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Период на чување на историјата. Ако се постави на 0 историјата ќесе чува само додека не излеземе.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Меморирај на секои</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>минути</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Класичен</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Модерен</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> МБ</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Позитивни информации се потребни за да се користи пребарувањето на фрази на Xapian и операторот NEAR, но големината на базата на податоци ќе биде многу поголема. Важи само за новите дојдовни речници.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Овозможете индекс со позициони информации</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандарден фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Моноспејс фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Сериф фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Изглед</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Овие фонтови ќе се применат кога не се пронајдени фонтовите наведени во речник.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Резервни фонтови</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>По префикси</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Непознато</translation>
     </message>
@@ -4527,17 +4539,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Програм није наведен.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Програм је завршио са грешком</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Програм је вратио излазни код %1.</translation>
     </message>
@@ -4545,27 +4557,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Вклучено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тип</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Командна линија</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -4573,99 +4585,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Грешка при вчитување статија</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Грешка декодирања чланка</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Авторски права: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Верзија: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Автор: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>Е-пошта: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>Наслов: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>Веб-страница: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>Датум: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Програма за пребарување на речник.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Збор или реченица до барање.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Зачувајте ги пораките за отстранување грешки во gd_log.txt во папката за конфигурација.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Ресетирајте ја состојбата на прозорецот.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Оневозможи tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Променете ја групата на главниот прозорец.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Променете ја групата на скокачки прозорец.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Вклучете го скокачкиот прозорец за скенирање.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Информации за печатена верзија и дијагноза.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Речник - претрага/филтер (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Очисти претрагу</translation>
     </message>
@@ -4673,24 +4700,24 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Грешка чувања ресурса: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Није могуће учитати повезане ресурсе.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
-      <translation type="unfinished">WARNING: %1</translation>
+      <translation>ПРЕДУПРЕДУВАЊЕ: %1</translation>
     </message>
   </context>
   <context>
@@ -4717,67 +4744,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Дијалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Изговори збор (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Додајте збор во Омилени (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Прикажување или скривање лента на речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Секогаш останете на врвот на сите други прозорци</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Испрати збор во главен прозорец (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ПРЕДУПРЕДУВАЊЕ: %1</translation>
     </message>
   </context>
   <context>
@@ -4785,53 +4817,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Претходно</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следно</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Истакнете ги &amp;сите</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Чувствителен на големи букви</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Најдете:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Патека</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -4839,60 +4871,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Датотеки</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Нихон-шики</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Википедија</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Слоговна азбука &quot;Катакана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Направи речници од куп звучни датотеи со додавање на патека овде:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ромаји (Јапонски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4903,84 +4935,84 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Веб-сајт Википедија (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Папка со звуци</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Сите надворешни програми. Низата %GDWORD% ќе се замени со зборот за барање. Низата %GDSEARCH% ќе се замени со текстот во лентата за пребарување. Ако двата параметри не се обезбедени, главниот збор ќе се внесе во стандардниот влез.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Лингва Либре</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Изговори обезбедени од &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, заедничка лингвистичка медиумска библиотека на Викимедија Франција. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Овозможете Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>Јазичен код ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Користењето на Forvo моментално бара клуч API, регистрирајте се на страницата за да добиете свој клуч.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Земете свој клуч &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;овде&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Најпопуларен метод за транскрипција на Јапонски е,
 заснован на англиска фонологија</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Слоговна азбука &quot;Хирагана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Прилагодена транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Ова се применува само во фразата за пребарување, при што секоја линија претставува транслитерација, одвоена точка-запирка. На пример, ae;æ, корисниците можат да внесат ae за да претставуваат æ во целниот збор.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #ова е пример</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4991,118 +5023,108 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Транслитерација (Руски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфологија</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Промени...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Примери:  &amp;quot;eng&amp;quot; за англиски, &amp;quot;fra&amp;quot; за француски &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Целосната листа на достапни јазици може да се најде &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; овде &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Патека до речник со Hunspell/Myspell речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Пов&amp;торно прегледај</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Транслитерација (Немачки)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Било кој веб-сајт. Низот %GDWORD% ќе биде заменет со зборот од прашалникот:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Додади...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Одбери папка</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Отстрани</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Веб-сајтови</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Патека за пребарување датотеки на речникот:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Потврди отстранување</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Слоговна азбука:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Достапни морфолошки речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Омозможува користење латиница за пишување јапонски</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5119,94 +5141,94 @@ of the appropriate groups to use them.</source>
 на крајот на одредени групи.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хепберн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Кунреј-шики</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Форво</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>DICT сервери</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>DICT сервери:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Укључи изговор из Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Кључ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Листа на јазични кодова (разделени со запирки):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Транслитерација (Грчки)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(не е достапно во преносна верзија)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Програми</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Белоруска транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Текст во говор</translation>
     </message>
@@ -5222,42 +5244,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Изабраи погон на гласот:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Додај</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Уклони</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Преглед</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Доступни гласовни погони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Текст се може погледати:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Укуцајте текст да буде прегледан овде.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Преглед</translation>
     </message>
@@ -5282,17 +5304,17 @@ of the appropriate groups to use them.</source>
       <translation>Не можете да пронађете доступне TTS гласове.&lt;br&gt;Уверите се да је најмање један TTS погон већ инсталиран на рачунару.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Поставке</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Величина:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Мера:</translation>
     </message>
@@ -5300,12 +5322,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Напишете збор или фраза за пребарување на речникот</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Паѓачки</translation>
     </message>
@@ -5325,7 +5347,7 @@ of the appropriate groups to use them.</source>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Ид</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5336,33 +5358,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Додадено %1</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Вклучено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Вметнете статија како врска во ознаката &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>Како врска</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -5370,17 +5392,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Прикажи име во картичката на речникот</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ПРЕДУПРЕДУВАЊЕ: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/nl_NL.ts b/locale/nl_NL.ts
index 415522aa..7ae81f2c 100644
--- a/locale/nl_NL.ts
+++ b/locale/nl_NL.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Over</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng woordenboek zoekprogramma, versie</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Gebruiksrecht verleend onder GNU GPLv3 of nieuwer</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Versie info kopiëren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Woordenboeken lijst kopiëren</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Dankbetuigingen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Onbekend]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Gebaseerd op Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Gebaseerd op Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: kan&apos;t een kaart zonder woord maken</translation>
+      <translation>anki: kan geen kaart maken zonder een woord</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,57 +80,57 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Artikel uitvouwen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Artikel samenvouwen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Met popups werken</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(naamloos)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Welkom!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>In groep &lt;b&gt;%2&lt;/b&gt;is geen vertaling voor &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; gevonden.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;
@@ -143,7 +138,7 @@
 &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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;. Programma updates kunt u vinden op de &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(afbeelding)</translation>
     </message>
@@ -151,42 +146,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Artikel uitvouwen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Uit </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Artikel samenvouwen</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Maak een nieuwe Anki-notitie</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Fout in zoekopdracht: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Soortgelijke woorden: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Samengestelde treffers: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Individuele woorden: </translation>
     </message>
@@ -194,197 +189,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Tijdelijk bestand kan niet worden aangemaakt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Zoeken naar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>De bron waarnaar wordt verwezen bestaat niet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Zoeken naar &quot;%1&quot; in %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Huidig artikel selecteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopiëren als tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspecteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Koppeling openen in nieuw&amp;tabblad</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Koppeling openen in &amp;externe browser</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Bron</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Geluid</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Stem</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Afbeelding</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definitie uit woordenboek &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definitie: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Dit programma voor afspelen van geluiden bestaat niet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Link openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Bladwijzer &amp;opslaan &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>WAARSCHUWING: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>FOUT: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Geluid opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Afbeelding opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Afbeeldingsbestanden (*.bmp *.jpg *.png *.tif);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>&amp;Afbeelding opslaan...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Zin niet gevonden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 van %2 wedstrijden</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>&amp;Geluid opslaan...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Verzend &quot;%1&quot; naar zoekveld</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Voeg &quot;%1&quot; &amp;toe aan geschiedenis</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Stuur Huidig artikel naar Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Stuur geselecteerde tekst naar Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Geluidsbestanden (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle bestanden (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Geluidsbestanden (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Kon geluidsbestand niet afspelen: %1</translation>
     </message>
@@ -417,62 +412,62 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Chinese conversie</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Conversie tussen vereenvoudigde en traditionele Chinese tekens inschakelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Chinese Con&amp;versie</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Schakel conversie van vereenvoudigde tekens naar traditionele (Taiwan-variant) tekens in</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC naar TC (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Schakel conversie van vereenvoudigde tekens naar traditionele (Hong Kong variant) tekens in</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC to TC (Hong Kong variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Schakel conversie van traditionele tekens naar vereenvoudigde tekens in</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC naar SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Vereenvoudigd naar de traditionele Chinese conversie (Taiwan-variant)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Vereenvoudigd naar de traditionele Chinese (Hong Kong variant) conversie</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Traditioneel naar vereenvoudigde Chinese conversie</translation>
     </message>
@@ -480,30 +475,30 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>aangepaste transliteratie</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Proxy-verificatie vereist</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>U moet een gebruikersnaam en wachtwoord invoeren om toegang te krijgen via een proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Gebruikersnaam:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Wachtwoord:</translation>
     </message>
@@ -511,22 +506,22 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulier</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Groeppictogram:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Snelkoppeling:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Favorieten map:</translation>
     </message>
@@ -551,17 +546,17 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>Afbeeldingen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Alle bestanden</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Fout</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Kan opgegeven afbeeldingsbestand niet lezen.</translation>
     </message>
@@ -569,63 +564,63 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Bevestiging</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Willt u werkelijk een set van groepen aanmaken gebaseerd op talenkoppels?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Weet u zeker dat u een set groepen wilt genereren op basis van metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Groepen met dezelfde brontaal combineren tot &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Groepen met dezelfde doeltaal combineren tot &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automatisch groeperen op map is mislukt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>De bovenliggende map van %1 kan niet worden bereikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Weet u zeker dat u een set groepen wilt genereren op basis van mappen?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Groep voor tweezijdig vertalen maken als &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Groepen met &quot;%1&quot; combineren</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Woordenboeken: </translation>
     </message>
@@ -638,133 +633,133 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Zoek modus</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Dit element bepaalt hoe filterstring zal worden geïnterpreteerd</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Indien aangevinkt, zal er rekening mee worden gehouden bij het filteren van symbolen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Hoofdletter van overeenkomst</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Hoofdwoorden exporteren naar bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exporteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Hulp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Ok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Druk op deze knop om filter toe te passen op de headwords lijst</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Toepassen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Indien aangevinkt worden eventuele filterwijzigingen onmiddellijk toegepast op de headwords lijst</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Automatisch toepassen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filter tekenreeks (vaste tekenreeks, wildcards of reguliere expressie)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Tekstveld</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Jokertekens</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Trefwoorden laden...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unieke kopwoorden totaal: %1, gefilterd: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Hoofdwoorden in bestand opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekst bestanden (*.txt);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Kan het geëxporteerde bestand niet openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exporteer hoofdwoorden...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Annuleren</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Exportproces is onderbroken</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exporteren voltooid</translation>
     </message>
@@ -772,67 +767,77 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Totaal aantal artikelen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Vertaalt van:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Totaal aantal woorden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Vertaalt naar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Map openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Woordenboek bewerken</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Woordenboek bestaat uit de volgende bestanden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Beschrijving:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Toon alle unieke hoofdwoorden van het woordenboek</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Hoofdwoorden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Woordenboek bewerken via opdracht:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Index bestandsnaam:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Indexmap openen</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 Vermeldingen</translation>
     </message>
@@ -863,44 +868,44 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Ingeschakeld</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Databases</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategieën</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Pictogram</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Komma-gescheiden lijst van databases
 (lege tekenreeks of &quot;*&quot; komt overeen met alle databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Kommagescheiden lijst van zoekstrategieën
@@ -910,37 +915,37 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menu uitbreiden met alle woordenboeken...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Deze groep bewerken</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Woordenboek informatie</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Woordenboek hoofdwoorden</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Woordenboekmap openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Woordenboek bewerken</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Woordenboekwerkbalk</translation>
     </message>
@@ -949,27 +954,27 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Woordenboeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Woordenboeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Accepteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Annuleren</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Bronnen gewijzigd</translation>
     </message>
@@ -980,12 +985,12 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Groepen</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1014,75 +1019,55 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Volledige-tekst zoeken</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Hele woorden</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Onopgemaakte tekst</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Jokertekens</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Het bevragende woord mag niet leeg zijn.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>ondersteunt xapiaanse zoeksyntax,zoals AND OF +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max afstand tussen woorden (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Standaard</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max. aantal artikelen per woordenboek (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Gevonden artikelen: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Nu indexeren: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Geen</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>De zoekregel moet ten minste één woord bevatten </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> of meer symbolen</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Geen woordenboeken voor full-text zoeken</translation>
     </message>
@@ -1090,7 +1075,7 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Fout in favorietenbestand</translation>
     </message>
@@ -1156,7 +1141,7 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>uit</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Om deze fout te herstellen kiest u Bewerken &gt; Woordenboeken &gt; Forvo en geeft u de standaard API-sleutel op.</translation>
     </message>
@@ -1177,68 +1162,52 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Hoofdletter van overeenkomst</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modus:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Negeer woorden volgorde</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Negeren van diacritica</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Gevonden artikelen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Beschikbare woordenboeken in groep:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Wachten op indexeren:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Hulp</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Totaal:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Geindexeerd:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Nu indexeren: geen</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Annuleren</translation>
     </message>
@@ -1270,27 +1239,27 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1330,12 +1299,12 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>Nieuwe naam voor de groep:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Beschikbare woordenboeken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Groep &amp;toevoegen</translation>
     </message>
@@ -1345,42 +1314,42 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>Groep toevoegen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Nieuwe woordenboekgroep maken</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Groeperen op talen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Maak op mappen gebaseerde groepen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Groeperen op mappen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Groeperen op metagegevens</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Gebruik slepen en neerzetten om woordenboeken te verplaatsen of om groepen te reorganiseren met uw muis.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Huidige groep hernoemen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Huidige groep verwijderen</translation>
     </message>
@@ -1390,43 +1359,43 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>Voer een naam in voor de nieuwe groep:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Alle groepen verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Geselecteerde woordenboeken uit groep verwijderen (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Geselecteerde woordenboeken aan groep toevoegen (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Groep &amp;verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Groepen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Groep &amp;hernoemen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Alle woordenboekgroepen verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Op taal gesorteerde groepen maken</translation>
     </message>
@@ -1449,12 +1418,12 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
       <translation>Geschiedenis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Geschiedenisgrootte: %1 items uit maximum van %2</translation>
     </message>
@@ -1462,12 +1431,12 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Spellingsuggesties:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfologie %1</translation>
     </message>
@@ -1475,12 +1444,12 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Ingeschakeld</translation>
     </message>
@@ -1488,1031 +1457,1035 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexering: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Naam woordenboek</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Initialiseren</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Woordenboek indexeren - een ogenblik geduld</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Een ogenblik geduld...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexeren...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotiaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Zurjeens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx-Gaelisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thaise</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zoeloe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tsjechisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Nederlands</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grieks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindoestani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Iers</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latijn</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Maleis</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Odia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Afaan Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Telefoon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadzjieks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tataars</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Swazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tongaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Winkel</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Oezbeeks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Welsh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retro-Romaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Noord-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abchazisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgizisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Schots-Gaelisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Litouws</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Koerdisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgaars</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Malthees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avaars</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretons</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Deens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Hongaars</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Frans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Duits</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongools</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreeuws</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgs</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazachs</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Gikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pasjtoe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Pools</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slowaaks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Setswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Oeigoers</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Servo-Kroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Roemeens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Zuid-Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corsicaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sloveens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Westlauwers Fries</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Plateaumalagasi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerbeidzjaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amhaars</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskriet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Oekraiens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlands</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Basjkiers</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Wit-Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kasjmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardijns</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengaals</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikaanse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armeens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroatisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Servisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgs</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noors</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tsjetsjeens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tsjoevasjisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singalees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Moeilijk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Zweeds</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmeens</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>IJslands</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Engels</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Kerkslavisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faeröers</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Fins</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Waals</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Oshikwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Noord-Samisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitiaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nieuwnoors</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Zuid-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litouws</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jiddisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Traditioneel Chinees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Vereenvoudigd Chinees</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Andere</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Andere vereenvoudigd Chinese dialecten</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Andere traditioneel Chinese dialecten</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Andere Oost-Europese talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Andere West-Europese talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Andere Russische talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Andere Japanse talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Andere Baltische talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Andere Griekse talen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Andere Koreaanse dialecten</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Andere Turkse dialecten</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Andere Thaise dialecten</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Berbers</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2520,215 +2493,215 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Frans</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Spaans</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Wit-Russisch</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bulgaars</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Tsjechisch</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Duits</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Grieks</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Fins</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italiaans</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japans</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Koreaans</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litouws</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Macedonisch</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Nederlands</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Pools</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugees</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Russisch</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slowaaks</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albanees</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Servisch (Cyrillisch)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Zweeds</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turks</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Oekraïens</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Versimpeld Chinees</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chinese traditionele</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamees</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugees, Braziliaans</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Perzisch</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Spaans, Argentinië</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Duits, Zwitserland</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Spaans, Bolivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tadzjieks</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabisch (Saudi-Arabië)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmeens</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Engels</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Fout bij laden woordenboeken</translation>
     </message>
@@ -2736,7 +2709,7 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Fout in configuratiebestand. Doorgaan met standaardinstellingen?</translation>
     </message>
@@ -2744,702 +2717,702 @@ traditionele en hedendaagse spelling in het cyrillisch)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Randen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Alle groepen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Terug</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 Woordenboeken, %2 Artikelen, %3 Woorden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>Be&amp;werken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Hulp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Afsluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Fout</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Programma afsluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Sluiten naar systeemvak</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Kan artikel niet opslaan: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Vergroten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>Woorden&amp;boeken...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Over</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Af&amp;drukken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Artikel &amp;opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Artikel opslaan als</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimaliseren naar systeemvak</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Pagina-instelling</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Website</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nieuwe versie beschikbaar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Opzoeken:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Verkleinen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Hoofdvenster weergeven</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Over GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Downloaden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Pagina-instelling</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Opzoeken in:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normale grootte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Laden...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(naamloos)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Instellingen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Welkom!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Woord uitspreken (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Artikel opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Deze versie overslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Vooruit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Artikel afdrukken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>Beel&amp;d</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Geschiedenis</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Wissen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Z&amp;oomen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zoekwoorden vergroten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Zoekwoorden verkleinen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Zoekwoorden normale grootte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Huidig tabblad sluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Alle tabbladen sluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Alle andere tabbladen sluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Geopende tabbladen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nieuw tabblad</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Configuratiemap</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menubalk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Gevonden in woordenboeken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Alle tabbladen aan favorieten toevoegen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>WAARSCHUWING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Te zoeken string in woordenboeken. De jokertekens &apos;*&apos;, &apos;?&apos; en sets van symbolen &apos;[...]&apos; zijn toegestaan.
 Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen gebruiken &apos;\*&apos;, &apos;\?&apos; &apos;\[&apos;, &apos;\]&apos; respectievelijk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Tabbladlijst openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Huidige tab uit favorieten verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Weergeven</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exporteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Verbergen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Geschiedenis opslaan als bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekst bestanden (*.txt);;Alle bestanden (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Geschiedenis exporteren voltooid</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Fout bij exporteren:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importeren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Geschiedenis importeren uit bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Fout bij importeren: bestand bevat onjuiste gegevens</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Geschiedenis importeren voltooid</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Fout bij importeren:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Favorieten exporteren naar bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML-bestanden (*.xml);;Alle bestanden (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Favorieten exporteren voltooid</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Favorieten exporteren naar bestand als platte lijst</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Favorieten importeren uit bestand</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-bestanden (*.xml);;Txt bestanden (*.txt);;Alle bestanden (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Favorieten importeren voltooid</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Fout bij verwerken gegevens</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Woordenboekinformatie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Woordenboek hoofdwoorden</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Woordenboekmap openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Woordenboek bewerken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Nu indexeren voor full-text zoeken: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Hoofdwoord &quot;%1&quot; uit favorieten verwijderen?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Zoekvenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Navigatievenster zoek&amp;resultaten</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Favor&amp;ieten Schot</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Afdruk&amp;voorbeeld</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Bestanden opnieuw &amp;inlezen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nieuw tabblad</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Altijd op de voorgrond</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Altijd op de voorgrond</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menuknop</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Zoeken op pagina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Volledige-tekst zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Referentie GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Weergeven</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exporteren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importeren</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Toevoegen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Huidige tabblad aan favorieten toevoegen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exporteren naar lijst</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Woordenboekwerkbalk met &amp;tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Werkbalken met &amp;kleine pictogrammen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigatiewerkbalk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Scannen inschakelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikel, compleet (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artikel, alleen HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Artikel opslaan...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Bewaar artikel voltooid</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Geschiedenisvenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Toegankelijkheid API is niet ingeschakeld</translation>
     </message>
@@ -3447,12 +3420,12 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Woordenboekbestand is gemanipuleerd of beschadigd</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Kan artikel niet laden van %1, reden: %2</translation>
     </message>
@@ -3460,7 +3433,7 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML parseerfout: %1 op %2,%3</translation>
     </message>
@@ -3476,22 +3449,22 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Ingeschakeld</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Pictogram</translation>
     </message>
@@ -3501,88 +3474,88 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>Kan&apos;geen audiobuffer openen om te lezen.</translation>
+      <translation>Kan de audiobuffer niet openen om te lezen.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulier</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Inactieve (uitgeschakelde) woordenboeken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Naam:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Totaal aantal artikelen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Vertaalt van:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Vertaalt naar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Totaal aantal woorden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Woordenboekvolgorde:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Woordenboek bestaat uit de volgende bestanden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informatie over dit woordenboek</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Beschrijving:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sorteren op naam</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sorteren op taal</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Woordenboek hoofdwoorden</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Actieve woordenboeken: %1, inactief: %2</translation>
     </message>
@@ -3590,12 +3563,12 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Pad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursief</translation>
     </message>
@@ -3603,69 +3576,67 @@ Om &apos;*&apos;te vinden, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbolen
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Starten in systeemvak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Alleen Shift-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Systeemvakpictogram inschakelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Poort:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Verschuiving</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Type</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Gebruiker:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Scan &amp;Popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3674,136 +3645,136 @@ Als u deze optie inschakelt worden nieuwe tabbladen
 geopend zonder ze te selecteren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proxyserver gebruiken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windowstoets of Metatoets</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Woorden in hoofdvenster automatisch uitspreken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Met systeem starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Alleen Alt-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Tabbladen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Alleen Shift-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Als dit ingeschakeld is wordt het hoofdvenster alleen verborgen in plaats van gesloten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Geluid</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Toepassingstaal:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Alleen Ctrl-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Nieuwe tabbladen op de achtergrond openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Netwerk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Alleen Ctrl-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Woorden in Scan Popup automatisch uitspreken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Nieuwe tabbladen na de huidige openen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Start het programma opnieuw om de toepassingstaal te wijzigen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt-toets</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Periodiek controleren op nieuwe versies</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 Indien uitgeschakeld worden ze als laatste toegevoegd.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Sluiten naar systeemvak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Systeemstandaard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Indien ingeschakeld wordt een pictogram in het systeemvak weergegeven
 waarmee u het hoofdvenster kunt openen en andere taken uit kunt voeren.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3840,141 +3810,141 @@ een nieuwe versie beschikbaar is en wordt de gebruiker zonodig
 gevraagd een downloadpagina te openen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Het programma starten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Wachtwoord:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Standaard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Weergave</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Toepassingstaal wijzigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl-toets</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Alleen Alt-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Instellingen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl-links</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl-rechts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Sneltoetsen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Starten met Scan Popup ingeschakeld</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Hiermee start het programma direct in het systeemvak, zonder dat het
 hoofdvenster wordt weergegeven.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift-toets</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>GoldenDict-ng automatisch starten wanneer het besturingssysteem opstart.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Pop-up niet tonen wanneer selectie of klembord in een GoldenDict&apos;van eigen vensters verandert</translation>
+      <translation>Toon geen pop-up wanneer selectie of klembord verandert in de eigen vensters van een GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Negeer GoldenDict&apos;eigen selectie en wijzigingen aan klembord</translation>
+      <translation>Negeer de eigen selectie en klembordwijzigingen van GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Audiobestanden afspelen via ingebouwde audioondersteuning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Gebruik interne speler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Kies audio terug einde</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Geef audio speler opdrachtregel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3983,37 +3953,37 @@ andere dan de door u bezochte site niet toe te staan. Als een site
 onjuist functioneert moet u dit mogelijk uitschakelen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Uitspraak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Afspelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Extern programma gebruiken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Dubbelklikken vertaalt het aangeklikte woord</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Standaard verplaatst het indrukken van de Esc-toets de cursor
@@ -4021,47 +3991,47 @@ naar het zoekveld, maar hiermee wordt in plaats daarvan het
 hoofdvenster verborgen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Esc-toets verbergt hoofdvenster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Selecteer deze optie om de tabbladbalk te verbergen als slechts één tabblad geopend is.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Enkel tabblad verbergen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Woordenboeken in contextmenu beperken tot:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Vertaald woord naar hoofdvenster verzenden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Toon een vlaggenvenster voordat het pop-upvenster wordt weergegeven, klik op de vlag om het pop-upvenster weer te geven. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4072,445 +4042,487 @@ schuift direct naar het artikel uit het hetzelfde woordenboek. Met deze optie wo
 het artikel uit het bovenste woordenboek weergegeven.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Automatisch scrollen naar doelartikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Woordenboek letter: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>zet de fallback lettertype-familie voor het woordenboek</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Weergave stijl van artikel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Draai de UI donker.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Donkere modus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Zet de artikelweergavestijl in donker.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Donkere lezer Modus</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU order: meest recent gebruikte bestelling.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Track-klembord verandert wanneer Scannen is ingeschakeld. Let op! U moet dit altijd inschakelen, tenzij u Linux gebruikt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Track Klembord wijzigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Nummer Selectie Wijziging</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Alleen tack selectie als alle geselecteerde toetsen worden ingedrukt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Toon scan-vlag wanneer een woord is geselecteerd</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Vertragingstijd</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Systeem proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Aangepaste proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Aangepaste instellingen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki verbinding</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Model</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Woord</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Woordenboek velden...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Tekstveld</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Definitie velden...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Zin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Zin veld (kan leeg zijn)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>GoldenDict-ng niet identificeren in HTTP-headers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximale netwerkcache grootte:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Maximale schijfruimte bezet door GoldenDict&apos;s netwerk cache in
+      <translation>Maximale schijfruimte ingenomen door de netwerkcache van GoldenDict in
 %1
-Indien ingesteld op 0 zal de netwerk schijfcache uitgeschakeld worden.</translation>
+Indien ingesteld op 0, wordt de cache van de netwerkschijf uitgeschakeld.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Als deze optie is ingeschakeld, verwijdert GoldenDict
 zijn netwerkcache van schijf tijdens het afsluiten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Wis netwerkcache bij afsluiten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Volledige-tekst zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Volledige tekst zoeken toestaan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation>Don&apos;t zoeken in woordenboeken die meer dan</translation>
+      <translation>Zoek niet in woordenboeken met meer dan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artikelen (0 - ongelimiteerd)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Gea&amp;vanceerd</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Bij opeenvolgende zoekopdrachten, als één woordenboek bij een handboek is ingeklapt, blijft het ingeklapt in de volgende zoekopdracht</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Sessie inklappen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Als je klembord gebruikt, strip je alles na de nieuwe regel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>focus op het hoofd- of popup-venster bij een nieuwe zoekopdracht, zelfs als het zichtbaar is&apos;</translation>
+      <translation>Focus bij een nieuwe zoekopdracht op het hoofd- of pop-upvenster, zelfs als het zichtbaar is</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favorieten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Favorieten opslaan interval. Indien ingesteld op 0 favorieten zal alleen worden opgeslagen tijdens het afsluiten.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Schakel deze optie in om elke verwijdering van items te bevestigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Bevestiging voor verwijdering van items</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Schakel deze optie in om onredelijk lange invoertekst
 van muisaanwijzing, selectie, klembord of opdrachtregel te negeren</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Negeer input zinnen langer dan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Invoer zinnen langer dan deze grootte zullen worden genegeerd</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Schakel deze optie in om diakritiek te negeren tijdens het zoeken van artikelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Negeren van diacritica tijdens zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Optionele onderdelen &amp;uitvouwen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Artikelen samenvouwen met meer dan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Langere artikelen automatisch samenvouwen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Leestekens negeren tijdens zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Schakel deze optie in om extra artikelen te zoeken via synoniemlijsten
 van Stardict, Babylon en GLS woordenboeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Extra zoeken via synoniemen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>tekens</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Met Ctrl-Tab navigeren door recent gebruikte tabbladen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Geschiedenis</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Geschiedenis opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Selecteer deze optie om woorden te selecteren met een enkele muisklik</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Woorden selecteren met een enkele muisklik</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on stijl:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maximale grootte geschiedenis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Elke</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minuten opslaan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klassiek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Vernieuwend</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Bellen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Blauw</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> Mb</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Er is positionele informatie nodig om Xapian's frase-zoekfunctie en NEAR-operator te gebruiken, maar de database zal veel groter zijn. Geldt alleen voor nieuwe inkomende woordenboeken.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Activeer index met positionele informatie</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standaard lettertype</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace-lettertype</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif-lettertype</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif-lettertype</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Verschijning</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Deze lettertypen worden toegepast wanneer de lettertypen die door een woordenboek zijn opgegeven, niet worden gevonden.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fallback-lettertypen</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Geluid</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Tekst zonder opmaak</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Overeenkomst op voorvoegsel</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Onbekend</translation>
     </message>
@@ -4518,17 +4530,17 @@ van Stardict, Babylon en GLS woordenboeken</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Geen programmanaam opgegeven.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Het programma is vastgelopen.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Het programma heeft afsluitcode %1 geretourneerd.</translation>
     </message>
@@ -4536,27 +4548,27 @@ van Stardict, Babylon en GLS woordenboeken</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Ingeschakeld</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Type</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Opdrachtregel</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Pictogram</translation>
     </message>
@@ -4564,99 +4576,114 @@ van Stardict, Babylon en GLS woordenboeken</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Fout bij laden artikel</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Fout bij decoderen artikel</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Auteursrecht: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versie: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Auteur: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titel: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Datum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Een woordenboek opzoeken programma.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Woord of zin om te vragen.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Foutopsporingsberichten opslaan in gd_log.txt in de configuratiemap.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Vensterstatus resetten.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Schakel tts uit.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Wijzig de groep van het hoofdvenster.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Wijzig de pop-upgroep.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Printversie en diagnose-info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Woordenboeken zoeken/filteren (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Zoekresultaat wissen</translation>
     </message>
@@ -4664,22 +4691,22 @@ van Stardict, Babylon en GLS woordenboeken</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>FOUT: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Fout bij opslaan bron:</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Kan de bron waarnaar wordt verwezen niet downloaden.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>WAARSCHUWING: %1</translation>
     </message>
@@ -4708,68 +4735,73 @@ van Stardict, Babylon en GLS woordenboeken</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Venster</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Woord uitspreken (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Woord aan favorieten toevoegen (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Woordenboekwerkbalk weergeven of verbergen</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Blijf altijd op de voorgrond van alle andere vensters</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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
 en u het in grootte of anderszins kunt aanpassen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Woord naar hoofdvenster verzenden (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Terug</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Vooruit</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>WAARSCHUWING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4781,7 +4813,7 @@ en u het in grootte of anderszins kunt aanpassen.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4791,7 +4823,7 @@ en u het in grootte of anderszins kunt aanpassen.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4812,17 +4844,17 @@ en u het in grootte of anderszins kunt aanpassen.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Pad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Pictogram</translation>
     </message>
@@ -4830,60 +4862,60 @@ en u het in grootte of anderszins kunt aanpassen.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Bestanden</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systemen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Katakana Japans syllabisch schrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Woordenboeken uit geluidsbestanden samenstellen door hier paden toe te voegen:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japans Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4894,84 +4926,84 @@ Gestandaardiseerd als ISO 3602
 Nog niet geïmplementeerd in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) sites:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Geluidsmappen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Alle externe programma's. Een tekenreeks %GDWORD% wordt vervangen door het trefwoord. Een tekenreeks %GDSEARCH% wordt vervangen door de tekst in de zoekbalk. Als beide parameters niet worden opgegeven, zal het kopwoord worden gevoed in standaard invoer.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncaties geleverd door &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, een gezamenlijke taalmediabibliotheek van Wikimedia Frankrijk. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Lingua Libre inschakelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 taalcode</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Gebruik van Forvo vereist momenteel een API-sleutel, registreer op de site om uw eigen sleutel te verkrijgen.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Krijg je eigen sleutel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;hier&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Hiragana Japans syllabisch schrift</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Aangepaste transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Dit was alleen van toepassing op zoektermen, waarbij elke regel een transliteratie vertegenwoordigt, gescheiden door een puntkomma. Bijvoorbeeld, ae;æ,gebruikers kunnen ae invoeren om æ weer te geven in het doelwoord.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #dit is een voorbeeld</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4982,118 +5014,108 @@ de kana-schrijfmethoden. Gestandaardiseerd als ISO 3602
 Nog niet geïmplementeerd in GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Russische transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Aanpassen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Voorbeelden:  &amp;quot;eng&amp;quot; voor Engels, &amp;quot;fra&amp;quot; voor Frans &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+De volledige lijst met beschikbare talen vindt u &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; hier &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Pad naar de map met Hunspell/Myspell woordenboeken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Opnieuw inlezen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Duitse transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Alle websites. De tekenreeks %GDWORD% wordt automatisch vervangen door het zoekwoord:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Toevoegen...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Kies een map</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Websites</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Mappen waarin naar woordenboeken wordt gezocht:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Verwijderen bevestigen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Lettergrepenschrift:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Beschikbare morfologische woordenboeken:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5108,94 +5130,94 @@ geschikte woordenboeken toe onderaan de juiste
 groep om ze te gebruiken.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT-servers</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT-servers:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Uitspraken van Forvo inschakelen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API-sleutel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Taalcodes (komma-gescheiden):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Griekse transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(niet beschikbaar in de draagbare versie)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programma&apos;s</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Wit-Russische transliteratie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Gebruik als alternatief %GD1251% voor CP1251, %GDISO1%...%GDISO16% voor ISO 8859-1...ISO 8859-16 resp.,
 %GDBIG5% voor Big-5, %GDBIG5HKSCS% voor Big5-HKSCS, %GDGBK% voor GBK en GB18030, %GDSHIFTJIS% voor Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Tekst naar spraak</translation>
     </message>
@@ -5211,42 +5233,42 @@ groep om ze te gebruiken.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Geselecteerde spraakprogramma&apos;s:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Toevoegen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Verwijderen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Voorbeeld</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Beschikbare spraakprogramma&apos;s:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Voorbeeldtekst:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Typ hier een voorbeeldtekst.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Voorbeeld</translation>
     </message>
@@ -5271,17 +5293,17 @@ groep om ze te gebruiken.</translation>
       <translation>Kan beschikbare TTS stem niet vinden.&lt;br&gt;Er moet tenminste één TTS programma geïnstalleerd zijn op uw computer.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Instellingen</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Snelheid:</translation>
     </message>
@@ -5289,12 +5311,12 @@ groep om ze te gebruiken.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Typ een woord of zin waarnaar u wilt zoeken</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Vervolgkeuzelijst</translation>
     </message>
@@ -5325,33 +5347,33 @@ groep om ze te gebruiken.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Naam</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Ingeschakeld</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Artikel invoegen als link binnen &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Als koppeling</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Pictogram</translation>
     </message>
@@ -5359,17 +5381,9 @@ groep om ze te gebruiken.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Enkele woordenboeken konden niet doorzocht worden.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>WAARSCHUWING: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/pl_PL.ts b/locale/pl_PL.ts
index 85fc8de9..c8b6c7ee 100644
--- a/locale/pl_PL.ts
+++ b/locale/pl_PL.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Informacje</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng — program do przeszukiwania słowników, wersja </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencja GNU GPLv3 lub nowsza</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Kopiuj informacje o wersji</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Kopiuj listę słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Podziękowania:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Nieznane]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Oparte na bibliotece  Qt %1 (%2, %3-bitowa)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>c) w latach 2008–2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Na podstawie Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: można&apos;t utworzyć kartę bez słowa</translation>
+      <translation>anki: nie można utworzyć karty bez słowa</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Rozwiń artykuł</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Zwiń artykuł</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Praca z okienkiem wyskakującym</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(bez tytułu)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Witamy!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>W grupie &lt;b&gt;%2&lt;/b&gt;nie znaleziono tłumaczenia dla &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;. &lt;p&gt;Aktualizacje programu są dostępne &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(obraz)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Rozwiń artykuł</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Źródło: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Zwiń artykuł</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Utwórz nową notatkę Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Błąd zapytania: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Podobne słowa: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Wyrażenia złożone: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Pojedyncze słowa: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Nie powiodło się utworzenie pliku tymczasowego.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Wyszukaj „%1”</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Wyszukaj „%1” w &amp;nowej karcie</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Wskazywany zasób nie istnieje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Wyszukaj „%1” w grupie %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Wybierz aktualny artykuł</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopiuj jako tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Zbadaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>O&amp;twórz łącze w nowej karcie</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Otwórz łącze w z&amp;ewnętrznej przeglądarce</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Zasób</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Dźwięk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Głos TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Obraz</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Wideo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Wideo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definicja ze słownika „%1”: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definicja: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Wskazywany program obsługi audio nie istnieje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Zapisz &amp;zakładkę &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>UWAGA: Odtwarzacz audio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>BŁĄD: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Zapisz dźwięk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Zapisz obraz</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Pliki obrazów (*.bmp *.jpg *.png *.tif);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Zap&amp;isz obraz...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Nie znaleziono frazy</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 z %2 dopasowań</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Zapisz &amp;dźwięk...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Wyślij „%1” do wiersza wejściowego</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Dod&amp;aj „%1” do historii</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Wyślij bieżący artykuł do Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Wyślij zaznaczony tekst do Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Pliki dźwiękowe (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Wszystkie pliki (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Pliki dźwiękowe (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Nie udało się odtworzyć pliku dźwiękowego: %1</translation>
     </message>
@@ -414,62 +409,62 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Konwersja chińska</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Włącz konwersję między uproszczonymi i tradycyjnymi chińskimi znakami</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>&amp;Konwersja chińska</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Włącz konwersję z uproszczonych znaków na tradycyjne (Tajwan Wariant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC do TC (wariant Taiwana)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Włącz konwersję z uproszczonych znaków na tradycyjne (wariant Hongkongu)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC do TC (wariant Hongkongu)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Włącz konwersję z tradycyjnych znaków na uproszczone znaki</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC do SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Zmiana uproszczona do tradycyjnego chińskiego (wariant Taiwański)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Zmiana uproszczona do tradycyjnego chińskiego (wariant Hongkongu)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Tradycyjne dla uproszczonej chińskiej konwersji</translation>
     </message>
@@ -477,30 +472,30 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>niestandardowa transliteracja</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Wymagane uwierzytelnienie serwera proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <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="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Nazwa użytkownika:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Hasło:</translation>
     </message>
@@ -508,22 +503,22 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formularz</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ikona grupy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Skrót:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Folder Ulubione:</translation>
     </message>
@@ -548,17 +543,17 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>Obrazy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Wszystkie pliki</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Błąd</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Nie można odczytać podanego pliku obrazu.</translation>
     </message>
@@ -566,63 +561,63 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Potwierdzenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Czy na pewno wygenerować zbiór grup na podstawie par języków?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Czy na pewno chcesz wygenerować zestaw grup na podstawie pliku metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Połącz grupy wg języka źródłowego do „%1-&gt;”</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Połącz grupy wg języka docelowego do „-&gt;%1”</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automatyczne grupowanie według folderu nie powiodło się.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Nie można uzyskać dostępu do katalogu nadrzędnego %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Czy na pewno chcesz wygenerować zestaw grup na podstawie zawierających foldery?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Utwórz grupę tłumaczenia dwukierunkowego „%1-%2-%1”</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Połącz grupy z „%1”</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Słowniki: </translation>
     </message>
@@ -635,133 +630,133 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Tryb wyszukiwania</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Zgodna wielkość liter</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Eksportuje hasła do pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Eksportuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Pomoc</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Zastosuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Stosuj automatycznie</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtr:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Symbole wieloznaczne</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Wyrażenie regularne</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Ładowanie słów kluczowych...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unikalne hasła łącznie: %1, przefiltrowane: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Zapisz hasła do pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Pliki tekstowe (*.txt);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Nie można otworzyć pliku eksportowanego</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Eksportuj hasła...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Anuluj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Proces eksportu został przerwany</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Eksport zakończony</translation>
     </message>
@@ -769,67 +764,77 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Łączna liczba artykułów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Tłumaczenia z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Łączna liczba słów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Tłumaczenia na:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Otwórz folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Edytuj słownik</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Pliki składające się na ten słownik:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Opis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Pokaż wszystkie unikalne hasła słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Hasła</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Edytuj słownik za pomocą komendy:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nazwa pliku indeksu:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Otwórz folder indeksu</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>Liczba pozycji: %1</translation>
     </message>
@@ -860,44 +865,44 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Włączone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Bazy danych</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategie</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <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="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Rozdzielona przecinkami lista strategii wyszukiwania
@@ -907,37 +912,37 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Rozszerzone menu ze wszystkimi słownikami</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Edytuj tę grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informacje o słowniku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Hasła słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Otwórz folder słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Edytuj słownik</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Pasek słowników</translation>
     </message>
@@ -946,27 +951,27 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Słowniki</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Słowniki</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Akceptuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Anuluj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Źródła uległy zmianie</translation>
     </message>
@@ -977,12 +982,12 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupy</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1011,75 +1016,55 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Wyszukiwanie pełnotekstowe</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Całe słowa</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Zwykły tekst</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Symbole wieloznaczne</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Wyrażenie regularne</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Słowo zapytania nie może być puste.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>obsługuje składnię wyszukiwania ksapicznego, taką jak AND OR +/- itp</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Maks. odstęp między słowami (%1–%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Domyślny</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Maks. liczba art. w słowniku (%1–%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Znalezione artykuły: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Trwa indeksowanie: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Brak</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <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="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>lub więcej symboli</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Brak słowników do wyszukiwania pełnotekstowego</translation>
     </message>
@@ -1087,7 +1072,7 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Błąd w pliku ulubionych</translation>
     </message>
@@ -1153,7 +1138,7 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>z</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Wybierz opcję Edycja|Słowniki|Forvo i postaraj się o nasz klucz API, aby wyeliminować wyświetlanie tego błędu.</translation>
     </message>
@@ -1174,68 +1159,52 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Szukaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Zgodna wielkość liter</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Tryb:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignoruj kolejność słów</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignoruj diakrytyczne</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Znalezione artykuły:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dostępne słowniki w grupie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Oczekują na indeksowanie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Pomoc</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Łącznie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Zaindeksowane:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Trwa indeksowanie: Brak</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Anuluj</translation>
     </message>
@@ -1267,27 +1236,27 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Karta 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>Nadaj nową nazwę grupie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dostępne słowniki:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Dod&amp;aj grupę</translation>
     </message>
@@ -1342,42 +1311,42 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>Dodaj grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Utwórz nową grupę słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Grupuj według języków</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Twórz grupy oparte na folderach.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Grupuj według folderów</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Grupuj według metadanych</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Przeciągaj i upuszczaj słowniki między grupami, przenoś je w obrębie grupy i zmieniaj ich kolejność za pomocą myszy.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Zmień nazwę bieżącej grupy słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Usuń bieżącą grupę słowników</translation>
     </message>
@@ -1387,43 +1356,43 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>Nadaj nazwę nowej grupie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Usuń wszystkie grupy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Usuń zaznaczone słowniki z grupy (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Dodaj zaznaczone słowniki do grupy (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Usuń grupę</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Zmień &amp;nazwę grupy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Usuń wszystkie grupy słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Utwórz grupy na podstawie języków</translation>
     </message>
@@ -1446,12 +1415,12 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
       <translation>Historia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Wielkość historii: %1 wpisów z maksymalnej liczby %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Propozycje:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 - morfologia</translation>
     </message>
@@ -1472,12 +1441,12 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Włączone</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksowanie: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nazwa słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - inicjowanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Zaczekaj na zaindeksowanie słowników</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Proszę czekać...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indeksowanie...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tajski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zuluski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Czeski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holenderski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Ful</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grecki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandzki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmerski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Łaciński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malajski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Orija</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Szona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadżycki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamilski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatarski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Suazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbecki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Walijski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Włoski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retoromański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele północny</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abchaski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgiski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaelicki szkocki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Łotewski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malajalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bułgarski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskijski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Awarski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Duński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Malediwski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Kiluba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fidżyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Węgierski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francuski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Niemiecki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebrajski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luksemburski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazachski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navaho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Odżibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Paszto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Oksytański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Słowacki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalijski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ujgurski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbsko-chorwacki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Joruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumuński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonezyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Pendżabski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sotho południowy</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsykański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Perski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Słoweński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Zachodniofryzyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgaski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskryt</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukraiński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Grenlandzki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Baszkirski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Białoruski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kaszmirski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardyński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Keczua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Jawajski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Awestański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Ruanda-rundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrykanerski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Ormiański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norweski (bokmål)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Chorwacki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bośniacki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Kataloński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Rosyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norweski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Czeczeński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chiński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Czuwaski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Syngaleski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Hiszpański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Kornijski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetyjski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Sahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Szwedzki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tybetański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Wietnamski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugalski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turecki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmeński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandzki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Angielski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gruziński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Cerkiewnosłowiański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Farerski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Fiński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Waloński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Osziwambo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marszaleski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Pólnocnolapoński</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitański</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Czamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norweski (nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele południowy</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Cziczewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litewski</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Nuosu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jidysz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chiński tradycyjny</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chiński uproszczony</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Inny</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Inne dialekty chińskiego uproszczonego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Inne dialekty chińskiego tradycyjnego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Inne języki wschodnioeuropejskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Inne języki zachodnioeuropejskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Inne języki rosyjskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Inne języki japońskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Inne języki bałtyckie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Inne języki greckie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Inne dialekty koreańskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Inne dialekty tureckie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Inne dialekty tajskie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Francuski</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>hiszpański</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>białoruski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bułgarski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Czech</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Niemiecki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>grecki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>fiński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Włoski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>język japoński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>koreański</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>litewski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>macedoński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Holenderski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>portugalski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Rosyjski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>słowacki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albański</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>serbski (cyrylica)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>szwedzki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turecki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ukraiński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Uproszczony chiński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chiński tradycyjny</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>wietnamski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugalski, brazylijski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>perski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>hiszpański, argentyński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hinduski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>niemiecki, szwajcarski</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>hiszpański, Boliwia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadżycki</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>keczua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Ajmara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>arabski, Arabia Saudyjska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turkmeński</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>międzyjęzykowy</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lożban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>język angielski</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Błąd podczas ładowania słowników</translation>
     </message>
@@ -2733,7 +2706,7 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Błąd w pliku konfiguracyjnym. Czy kontynuować z ustawieniami domyślnymi?</translation>
     </message>
@@ -2741,702 +2714,702 @@ między ortografią klasyczną i szkolną w cyrylicy)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Unikanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Wszystko</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Wstecz</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Słowniki: %1, artykuły: %2, słowa: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Edycja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Plik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>Po&amp;moc</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Wy&amp;szukiwanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Zakończ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Błąd</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Zakończ aplikację</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>Z&amp;amknij do paska zadań</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Nie można zapisać artykułu: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zwiększ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Słowniki...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Informacje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Drukuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Zapi&amp;sz artykuł</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Zapisz artykuł jako</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl + P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl + Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimalizuje okno do paska zadań</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Ustawienia strony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Strona główna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Dostępna jest nowa wersja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Wyszukaj:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Zmniejsz</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Wyświetl okno &amp;główne</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Informacje o programie GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Pobierz</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Ustawienia strony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Wyszukaj w:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normalna wielkość</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl + F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl + F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Ładowanie...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(bez tytułu)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferencje...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Witamy!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wymowa słowa (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Zapisz artykuł</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Pomiń tę wersję</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Dalej</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Drukuj artykuł</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Drukarka jest niedostępna. Trzeba ją najpierw zainstalować.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Widok</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Wy&amp;czyść</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Po&amp;większenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zwiększ słowa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Zmniejsz słowa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Normalna wielkość słów</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Zamknij bieżącą kartę</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Zamknij wszystkie karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Zamknij wszystkie karty z wyjątkiem bieżącej</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Otwarte karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nowa karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl + T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Folder &amp;konfiguracji</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Pasek &amp;menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Znaleziono w słownikach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Dodaj wszystkie karty do ulubionych</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>UWAGA: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Lista otwartych kart</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Usuń bieżącą kartę z Ulubionych</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Pokaż</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Eksportuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Ukryj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Eksportowanie historii do pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Pliki tekstowe (*.txt);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Eksport historii został zakończony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Błąd eksportu: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl + H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importowanie historii z pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Błąd importu: nieprawidłowe dane w pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import historii został zakończony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>&gt;Błąd importu: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Eksportuj Ulubione do pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Pliki XML (*.xml);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Eksport ulubionych zakończony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Eksportuj Ulubione do pliku jako zwykłą listę</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importuj ulubione z pliku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Pliki XML (*.xml);;Pliki Txt (*.txt);;Wszystkie pliki (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Import ulubionych zakończony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Błąd przetwarzania danych</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informacje o słowniku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Hasła słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Otwórz folder słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Edytuj słownik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indeksowanie dla wyszukiwania pełnotekstowego: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Usunąć słowo nagłówka &quot;%1&quot; z Ulubionych?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Okienko wy&amp;szukiwania</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Okienko nawigacji po wynikach</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>&amp;Ulubione panele</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Podgląd wydruku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Wczytaj pliki ponownie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nowa karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Zawsze na wierzchu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Zawsze na wierzchu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl + O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Przycisk menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Szukaj na stronie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Wyszukiwanie pełnotekstowe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Pomoc do programu GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Pokaż</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Eksportuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importuj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Dodaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Dodaj bieżącą kartę do Ulubionych</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Eksportuj do listy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Pokaż nazwy w pas&amp;ku słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Pokaż małe &amp;ikony w paskach narzędzi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Nawigacja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Włącz skanowanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artykuł, pełny (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artykuł, tylko HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Zapisywanie artykułu...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Zapisz artykuł ukończony</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Okienko &amp;historii</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Nie włączono funkcji API dostępności</translation>
     </message>
@@ -3444,12 +3417,12 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Plik słownika został zmodyfikowany lub uszkodzony</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <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>
@@ -3457,7 +3430,7 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Błąd podczas analizy pliku XML: %1 w %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Włączone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -3498,88 +3471,88 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>Nie można&apos;t otworzyć bufora audio do odczytu.</translation>
+      <translation>Nie można otworzyć bufora audio do odczytu.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formularz</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Słowniki nieaktywne (wyłączone):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nazwa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Łączna liczba artykułów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Tłumaczenia z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Tłumaczenia na:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Łączna liczba słów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Kolejność słowników:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Pliki składające się na ten słownik:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informacje o słowniku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Opis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sortuj wg nazwy</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sortuj wg języków</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Hasła słownika</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Słowniki aktywne: %1, nieaktywne: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ścieżka</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Uwzględniaj podkatalogi</translation>
     </message>
@@ -3600,69 +3573,67 @@ Aby odnaleźć symbole „*”, „?”, „[” i „]”, należy użyć odpow
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Uruchamiaj na pasku zadań</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Tylko lewy Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Włącz ikonę paska zadań</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Zmiana</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Użytkownik:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Skanowanie automatyczne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3670,138 +3641,138 @@ switching to them.</source>
 Włączenie tej opcji powoduje, że nie następuje przejście do nowo otwartej karty.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Używaj serwera proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Klawisz Windows/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Uruchamiaj z systemem</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Tylko lewy Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Przeglądanie w kartach</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Tylko prawy Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Włączenie tej opcji powoduje, że próba zamknięcia okna głównego
 prowadzi do jego ukrycia, a nie do zamknięcia aplikacji.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Dźwięk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Język interfejsu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Tylko lewy Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Otwieraj nowe karty w tle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>Si&amp;eć</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Tylko prawy Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Prawy Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Lewy Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Otwieraj nowe karty za bieżącą</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Uruchom ponownie program, aby zastosować zmianę języka.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Klawisz Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Sprawdzaj okresowo dostępność nowej wersji programu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,25 +3780,24 @@ be the last ones.</source>
 aktywną. W przeciwnym razie są one dodawane na końcu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Zamykaj do paska zadań</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Domyślny systemu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Włączenie tej opcji powoduje, że na pasku zadań obecna jest ikona umożliwiająca
 otwieranie okna głównego i wykonywanie innych zadań.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3840,141 +3810,141 @@ program informuje o tym użytkownika i zachęca go do
 otwarcia strony pobierania.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Uruchamianie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Hasło:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Domyślny</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfejs</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Zmiana języka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Klawisz Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Lewy Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Tylko prawy Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferencje</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Lewy Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Prawy Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Prawy Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>&amp;Klawisze skrótu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Uruchamiaj z włączoną funkcją skanowania automatycznego</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Włączenie tej opcji powoduje, że aplikacja jest uruchamiana od razu
 na pasku zadań bez wyświetlania okna głównego.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Klawisz Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Automatycznie uruchamia program GoldenDict po starcie systemu operacyjnego.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Nie pokazuj wyskakujących okienek podczas wyboru lub schowka w jednym z GoldenDict&apos;zmienia się własne okna</translation>
+      <translation>Nie pokazuj wyskakującego okienka, gdy zmienia się zaznaczenie lub schowek w jednym z własnych okien GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Ignoruj GoldenDict&apos;sam zaznaczenie i zmiany schowka</translation>
+      <translation>Ignoruj własne zaznaczenie i zmiany schowka wprowadzone przez GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Odtwarzaj pliki audio za pomocą wbudowanego wsparcia audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Użyj wewnętrznego gracza:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Wybierz koniec wstecz dźwięku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Wprowadź wiersz polecenia odtwarzacza audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3984,84 +3954,84 @@ nie pochodzą z przeglądanej witryny. Wyłącz ją, jeśli jest przyczyną
 niedziałania niektórych witryn.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Wymowa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Odtwarzanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Używaj programu zewnętrznego:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Dwukrotne kliknięcie powoduje przetłumaczenie klikniętego słowa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Zwykle naciśnięcie klawisza ESC aktywuje wiersz tłumaczenia.
 Zaznaczenie tej opcji powoduje, że ukrywane jest okno główne.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Naciśnięcie klawisza ESC powoduje ukrycie okna głównego</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Zaznacz tę opcję, aby nie wyświetlać głównego paska kart, gdy otwarta jest tylko jedna karta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ukryj pojedynczą kartę</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limit słowników w menu kontekstowym:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Wyślij przetłumaczone słowo do okna głównego</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Pokaż okno flagowe przed wyświetleniem wyskakującego okna, kliknij flagę, aby wyświetlić wyskakujące okno. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4072,445 +4042,487 @@ przewija artykuł z tego samego słownika. Jednak z tą opcją
 wyświetlany jest artykuł z najwyższego słownika.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Automatycznie przewiń do docelowego artykułu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Czcionka słownika: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>ustaw rodzinę domyślnych czcionek dla słownika</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Styl wyświetlania artykułu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Zmień interfejs użytkownika na ciemny.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Tryb ciemny</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Zmień styl wyświetlania artykułu na ciemny.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Tryb ciemnego czytnika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Kolejność MRU: Ostatnio używana kolejność.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Śledź zmiany schowka gdy skanowanie jest włączone. Uwaga! Zawsze powinieneś to włączyć, chyba że jesteś na Linuksie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Śledź zmianę schowka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Zmiana zaznaczenia śladu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Zaznaczenie tosu tylko wtedy, gdy wszystkie zaznaczone klucze są wciśnięte:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Pokaż flagę skanowania, gdy słowo jest zaznaczone</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Czas zwłoki</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Systemowy serwer proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Niestandardowy serwer proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Ustawienia niestandardowe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Tablia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Wzór:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Słowo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Pole słownika...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Pole definicji...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Zdanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Pole zdania (może być puste)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Nie identyfikuj programu GoldenDict w nagłówkach HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maksymalny rozmiar pamięci podręcznej sieci:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Maksymalna ilość miejsca na dysku zajęta przez GoldenDict&apos;s pamięć podręczna w
+      <translation>Maksymalne miejsce na dysku zajmowane przez pamięć podręczną sieci GoldenDict w
 %1
-Jeśli ustawiona na 0 pamięć podręczna dysku sieciowego zostanie wyłączona.</translation>
+Jeśli ustawione na 0, pamięć podręczna dysku sieciowego zostanie wyłączona.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Gdy ta opcja jest włączona, GoldenDict
 czyści swoją pamięć podręczną z dysku podczas wyjścia.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Wyczyść pamięć podręczną po wyjściu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Wyszukiwanie pełnotekstowe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Zezwalaj na wyszukiwanie pełnotekstowe w źródłach:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>(0 — bez ograniczenia)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Zaawansowane</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Podczas kolejnych wyszukiwań,jeśli jeden słownik jest zwinięty ręcznie, pozostanie zwinięty w następnym wyszukiwaniu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Zwinięcie sesji</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Gdy używasz schowka,usuń wszystko po nowej linii</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>Na nowym wyszukiwaniu wyskakuj główne lub wyskakujące okno nawet jeśli&apos;widoczny</translation>
+      <translation>Podczas nowego wyszukiwania zaznacz okno główne lub wyskakujące, nawet jeśli jest widoczne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Ulubione</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Ulubione interwał oszczędzania. Jeśli ustawione na 0 Ulubione zostaną zapisane tylko podczas wyjścia.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Włącz tę opcję, aby potwierdzić każdą operację usuwania elementów</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Potwierdzenie usunięcia elementów</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Włącz tę opcję, aby zignorować niesłusznie długi tekst wejściowy
 z myszki, zaznaczenia, schowka lub wiersza poleceń</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignoruj frazy wejściowe dłuższe niż</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Wprowadź frazy dłuższe niż ten rozmiar będą ignorowane</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Włącz tę opcję, aby zignorować diakrytykę podczas wyszukiwania artykułów</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignoruj diakrytyczne podczas wyszukiwania</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Rozwijaj części o&amp;pcjonalne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Zwijaj artykuły większe niż</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignoruj interpunkcję podczas wyszukiwania</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Włącz tę opcję, aby włączyć wyszukiwanie dodatkowych artykułów za pomocą list synonimów
 ze słowników Stardict, Babylon i GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Dodatkowe wyszukiwanie przez synonimy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>symboli</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab umożliwia nawigację po kartach w kolejności używania</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Zapisuj &amp;historię</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artykuły</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Włącz tę opcję, aby wybierać słowa pojedynczym kliknięciem</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Wybierz słowo pojedynczym kliknięciem</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Styl dodatku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maksymalna wielkość historii:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Zapisuj co</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>min</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klasyczny</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Nowoczesny</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Śliwki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes niebieski</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Informacje o położeniu są wymagane do korzystania z wyszukiwania fraz Xapiana i operatora NEAR, ale rozmiar bazy danych będzie znacznie większy. Dotyczy tylko nowych przychodzących słowników.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Włącz indeks z informacjami o położeniu</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Czcionka standardowa</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Czcionka o stałej szerokości</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Czcionka szeryfowa</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Czcionka bezszeryfowa</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Wygląd</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Te czcionki zostaną zastosowane, gdy czcionki określone przez słownik nie zostaną znalezione.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Czcionki zastępcze</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Dźwięk</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Zwykły tekst</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Zgodność przedrostków</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Nieznane</translation>
     </message>
@@ -4518,17 +4530,17 @@ ze słowników Stardict, Babylon i GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nie określono nazwy programu.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Program uległ awarii.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Program zwrócił kod wyjścia %1.</translation>
     </message>
@@ -4536,27 +4548,27 @@ ze słowników Stardict, Babylon i GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Włączone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Wiersz komend</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4564,99 +4576,114 @@ ze słowników Stardict, Babylon i GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Błąd ładowania artykułu</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Błąd dekodowania artykułu</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Prawa autorskie: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Wersja: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Tytuł: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Strona internetowa: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Program wyszukiwania słowników.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Słowo lub zdanie do zapytania.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Zapisz wiadomości debugowania do gd_log.txt w folderze konfiguracyjnym.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Zresetuj stan okna.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Wyłącz tt.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Zmień grupę głównego okna.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Zmień grupę wyskakujących.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Przełącz wyskakujące okienko skanowania.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Wersja do druku i informacje diagnostyczne.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Przeszukiwanie/filtrowanie słowników (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Wyczyść wyszukiwanie</translation>
     </message>
@@ -4664,22 +4691,22 @@ ze słowników Stardict, Babylon i GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>BŁĄD: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Błąd zapisu zasobu: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Nie powiodło się pobranie wskazywanego zasobu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>OSTRZEŻENIE: %1</translation>
     </message>
@@ -4708,68 +4735,73 @@ ze słowników Stardict, Babylon i GLS</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Okno dialogowe</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Wymowa słowa (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Dodaj słowo do Ulubionych (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Wyświetla lub ukrywa pasek słowników</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Zawsze pozostań na górze wszystkich innych okien</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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
 temu można zmieniać jego wielkość i zarządzać nim w inny sposób.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Głębokość + W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Wstecz</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Dalej</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1– %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>UWAGA: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4781,7 +4813,7 @@ temu można zmieniać jego wielkość i zarządzać nim w inny sposób.</transla
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4791,7 +4823,7 @@ temu można zmieniać jego wielkość i zarządzać nim w inny sposób.</transla
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4812,17 +4844,17 @@ temu można zmieniać jego wielkość i zarządzać nim w inny sposób.</transla
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ścieżka</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4830,60 +4862,60 @@ temu można zmieniać jego wielkość i zarządzać nim w inny sposób.</transla
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Pliki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systemy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japoński zapis sylabiczny Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Utwórz słowniki z plików dźwiękowych, dodając tutaj odpowiednie ścieżki:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japońskie Rōmaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Opisany przez standard ISO 3602.
 Systemu tego nie zaimplementowano jeszcze w programie GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Witryny Wikipedii (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Katalogi plików dźwiękowych</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Wszystkie zewnętrzne programy. Ciąg %GDWORD% zostanie zastąpiony słowem zapytania. Ciąg %GDSEARCH% zostanie zastąpiony tekstem na pasku wyszukiwania. Jeżeli oba parametry nie są podane, słowo nagłówkowe zostanie wprowadzone do standardowego wejścia.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations sprowokowały &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, wspólna biblioteka mediów językowych w Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Włącz Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Kod języka ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Użycie Forvo wymaga obecnie klucza API, zarejestruj się na stronie, aby uzyskać swój własny klucz.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Uzyskaj swój własny klucz &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tutaj&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japoński zapis sylabiczny Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Transliteracja niestandardowa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Dotyczyło to tylko wyszukiwanej frazy, gdzie każda linia reprezentuje transliterację, oddzieloną średnikiem. Na przykład ae;æ,użytkownicy mogą wprowadzić ae, aby reprezentować æ w słowie docelowym.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #to jest przykład</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteracja</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ odpowiedniość z systemem zapisu kana. Opisany przez standard ISO 3602.
 Systemu tego nie zaimplementowano jeszcze w programie GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteracja rosyjska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Zmień...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Przykłady:  &amp;quot;eng&amp;quot; dla angielskiego, &amp;quot;fra&amp;quot; dla francuskiego &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Pełną listę dostępnych języków można znaleźć &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; tutaj &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Ścieżka do katalogu ze słownikami Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Wczytaj ponownie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteracja niemiecka</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Dowolne witryny. Ciąg znaków %GDWORD% zostaje zastąpiony wyszukiwanym słowem:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Dodaj...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Wybierz katalog</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Usuń</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Witryny sieci Web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Ścieżka wyszukiwania plików słownika:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Potwierdzenie usunięcia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Zapisy sylabiczne:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dostępne słowniki morfologiczne:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5110,94 +5132,94 @@ z takiego słownika, należy go dodać na końcu
 właściwej grupy.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Serwery DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Serwery DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Włącz dostęp do wymowy w witrynie Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Klucz API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Kody języków (rozdzielone przecinkami):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteracja grecka</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(niedostępne w wersji przenośnej)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programy</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Transliteracja białoruska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Można też użyć ciągu znaków %GD1251% dla słów w stronie kodowej CP1251, %GDISO1%...%GDISO16% odpowiednio dla ISO 8859-1...ISO 8859-16,
 %GDBIG5% dla Big-5, %GDBIG5HKSCS% dla Big5-HKSCS, %GDGBK% dla GBK i GB18030, %GDSHIFTJIS% dla Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Tekst na mowę</translation>
     </message>
@@ -5213,42 +5235,42 @@ właściwej grupy.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Wybrane mechanizmy głosów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>Dod&amp;aj</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Usuń</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Podgląd</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Dostępne mechanizmy głosów:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Tekst do podglądu</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Wpisz tutaj tekst do podglądu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Podgląd</translation>
     </message>
@@ -5273,17 +5295,17 @@ właściwej grupy.</translation>
       <translation>Nie można znaleźć dostępnego głosu TTS.&lt;br&gt;Upewnij się, że na komputerze zainstalowano już przynajmniej jeden mechanizm TTS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferencje</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Głośność:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Szybkość:</translation>
     </message>
@@ -5291,12 +5313,12 @@ właściwej grupy.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Wpisz słowo lub frazę, aby przeszukać słowniki</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Rozwiń</translation>
     </message>
@@ -5327,33 +5349,33 @@ właściwej grupy.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nazwa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Włączone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Wstaw artykuł jako link wewnątrz tagu &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Jako link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -5361,17 +5383,9 @@ właściwej grupy.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Nie powiodło się przeszukanie niektórych słowników.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>OSTRZEŻENIE: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/pt_BR.ts b/locale/pt_BR.ts
index 9194d357..5079b5d0 100644
--- a/locale/pt_BR.ts
+++ b/locale/pt_BR.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Sobre</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Dicionário Eletrônico GoldenDict, versão </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licença sob os termos da GNU GPLv3 ou posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copiar informações da versão</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copiar lista de dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Créditos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Desconhecido]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Baseado no Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Baseado em Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: pode&apos;t criar um cartão sem palavra</translation>
+      <translation>anki: não pode criar um cartão sem uma palavra</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,63 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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>
+      <translation>&lt;h3 align=&quot;center&quot;&gt;Trabalhando com o pop-up&lt;/h3&gt;Para procurar palavras de outros aplicativos ativos, você precisa primeiro ativar a &lt;i&gt;"Funcionalidade pop-up de digitalização"&lt;/i&gt; em &lt;b&gt;Preferências&lt;/b&gt; e em seguida, habilite-o a qualquer momento ativando o ícone 'Popup' acima ou clicando no ícone da bandeja abaixo com o botão direito do mouse e escolhendo-o no menu exibido.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Expandir artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Recolher artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Trabalhando com janelas de definições/tradução semiautomáticas</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sem título)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Bem-vindo!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Nenhuma tradução para &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; foi encontrada no grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Confira o programa do &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(imagem)</translation>
     </message>
@@ -149,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Expandir artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Resultados de </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Recolher artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Fazer uma nova nota Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Erro de Consulta: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Palavras semelhantes: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Termos compostos: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palavras independentes: </translation>
     </message>
@@ -192,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Não foi possível criar o arquivo temporário.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Procurar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>A fonte de dados procurada não existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Procurar «%1» em %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Selecionar o Artigo Atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copiar como texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspecionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Abrir Ligação em Nova Guia (&amp;G)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir link em &amp;Navegador da Web Externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Fonte de Dados</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Voz TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Imagem</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Vídeo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Vídeo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definição do dicionário &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definição: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>O programa de áudio especificado não existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Optar Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Salvar &amp;Marcador &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>AVISO: Reprodutor de áudio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>Erro: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Salvar som</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Salvar imagem</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Salvar &amp;imagem...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Frase não encontrada</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 de %2 partidas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Salvar S&amp;om...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Enviar &quot;%1&quot; para o campo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Adicionar &quot;%1&quot; ao histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Enviar Artigo Atual para Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Enviar o texto selecionado para Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Arquivos de som (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos os arquivos (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Arquivos de som (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Falha ao reproduzir som do arquivo: %1</translation>
     </message>
@@ -415,62 +409,62 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversão para chinês</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Habilitar conversão entre caracteres de chinês simplificado e tradicional</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Con&amp;versão para chinês</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Habilitar conversão de caracteres de chinês simplificado para tradicional (variante de Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>Chinês simplificado para chinês de Taiwan</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Habilitar conversão de caracteres de chinês simplificado para tradicional (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Chinês simplificado para chinês de Hong Kong</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Habilitar conversão de caracteres de chinês tradicional para simplificado</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>Chinês de Taiwan para chinês simplificado</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Conversão simplificada para chinês tradicional (variante de Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Conversão simplificada para chinês tradicional (variante de Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Conversão tradicional para chinês simplificado</translation>
     </message>
@@ -478,30 +472,30 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>transliteração personalizada</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Autenticação de proxy necessária</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Você precisa fornecer um nome de usuário e uma senha para acessar via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Nome de usuário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Senha:</translation>
     </message>
@@ -509,22 +503,22 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ícone do grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Atalho:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Pasta de favoritos:</translation>
     </message>
@@ -549,17 +543,17 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>Imagens</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Todos os arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Erro</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Não foi possível ler o arquivo de imagem especificado.</translation>
     </message>
@@ -567,63 +561,63 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmação</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Quer mesmo criar um conjunto de grupos baseado em pares de idiomas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Tem certeza de que deseja gerar um conjunto de grupos com base em metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combinar grupos por idioma de origem para &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combinar grupos da língua-alvo para &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Falha no agrupamento automático por pasta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>O diretório pai de %1 não pode ser alcançado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Tem certeza de que deseja gerar um conjunto de grupos com base nas pastas contidas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Faça o grupo traduzir os dois lados &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combinar grupos com &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Dicionários: </translation>
     </message>
@@ -636,133 +630,133 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Modo de pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Este elemento determina como a sequência de filtros será interpretada</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Se marcado na caixa de símbolos, será levado em consideração ao filtrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Diferenciar maiúsculas/minúsculas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Salvar palavras-chave em arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Ajuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Certo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Pressione este botão para aplicar o filtro à lista de palavras-chave</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Aplicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Se marcada alguma alteração no filtro, aplicaremos imediatamente à lista de palavras-chave</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Aplicar automaticamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filtrar conjunto de caracteres (fixo, curingas ou expressão regular)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Curingas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Carregando palavras-chave...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Total de palavras-chave únicas:%1, filtradas:%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Salvar palavras-chave em arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Não foi possível abrir o arquivo exportado</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportar palavras-chave...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Processo de exportação interrompido</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exportação concluída</translation>
     </message>
@@ -770,67 +764,77 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Total de artigos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduz de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Total de palavras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduz para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Abrir pasta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Arquivos pertencentes a este dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descrição:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Mostrar todas as palavras-chave exclusivas do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Palavras-chave</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Editar o dicionário via comando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nome do arquivo de índice:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Abrir pasta de índice</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 verbetes</translation>
     </message>
@@ -861,44 +865,44 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Bancos de dados</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Estratégias</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Lista de bancos de dados delimitada por vírgulas
 (cadeia vazia ou &quot;*&quot; corresponde a todos os bancos de dados)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Lista delimitada por vírgula de estratégias de pesquisa
@@ -908,37 +912,37 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Estender menu com todos os dicionários...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Editar este grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informações do Dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Palavras-chave do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Abrir pasta de dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Barra de Dicionário</translation>
     </message>
@@ -947,27 +951,27 @@ entre clássico e ortografia escolar em cirílico)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Aceitar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fontes modificadas</translation>
     </message>
@@ -978,12 +982,12 @@ entre clássico e ortografia escolar em cirílico)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1012,75 +1016,55 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Pesquisa de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Palavras inteiras</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Texto simples</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Curingas</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>A palavra de consulta não pode estar vazia.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>suporte a sintaxe de pesquisa xapiana, como AND OU +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Distância máxima entre palavras (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Padrão</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Máximo de artigos por dicionário (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Artigos encontrados: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Agora indexando: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Nenhum</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>A linha de pesquisa deve possuir pelo menos uma palavra que contenha </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ou mais símbolos</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Não há dicionários para pesquisa de texto completo</translation>
     </message>
@@ -1088,7 +1072,7 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Erro no arquivo de favoritos</translation>
     </message>
@@ -1154,7 +1138,7 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>de</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Clique em Editar|Dicionários|Fontes|Forvo e aplique a própria chave API para fazer este erro desaparecer.</translation>
     </message>
@@ -1175,68 +1159,52 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Pesquisar</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Diferenciar maiúsculas/minúsculas</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorar ordem das palavras</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorar diacríticos</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Artigos encontrados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dicionários disponíveis no grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Aguarde a indexação:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Ajuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>A indexar agora: Nenhum</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Cancelar</translation>
     </message>
@@ -1268,27 +1236,27 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Guia 2</translation>
     </message>
@@ -1328,12 +1296,12 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>Digite o novo nome do grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dicionários disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Adicionar</translation>
     </message>
@@ -1343,42 +1311,42 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>Adicionar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Cria um novo grupo de dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Agrupar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Crie grupos baseados em pastas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Agrupar por pastas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Agrupar por Metadados</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renomeia o grupo de dicionários selecionado</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Remove o grupo de dicionários atual</translation>
     </message>
@@ -1388,43 +1356,43 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>Digite o nome do grupo que deseja criar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Remover todos os grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Remove do grupo os dicionários selecionados (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Adiciona os dicionários selecionados ao grupo (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>R&amp;emover</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Renomear</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Remover todos os grupos de dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Cria grupos de dicionários com base nos tipos de idioma</translation>
     </message>
@@ -1447,12 +1415,12 @@ entre clássico e ortografia escolar em cirílico)</translation>
       <translation>Histórico:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Tamanho do histórico: %1 entradas de saída de no máximo %2</translation>
     </message>
@@ -1460,12 +1428,12 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugestões ortográficas: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Ortografia de %1</translation>
     </message>
@@ -1473,12 +1441,12 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
@@ -1486,1031 +1454,1035 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexação: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nome do Dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Processando</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Favor aguardar enquanto os dicionários são indexados</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Favor aguardar...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexando...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laotiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Mannese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Monokutuba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malaio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Lona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tagico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tataro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Reto-Romancio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele del nord</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abcaso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Chirghiso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Galês escocês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malaio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Curdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>marata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Árabe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Basco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>biari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dinamarquês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Maldiviano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemão</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebraico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburguês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Cazaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pashtu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovacco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigura</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Servo-Croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Iorubá</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Romeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonésio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsì</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Esloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisone occidentale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgaxe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galício</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azebaijano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amarico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sânscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucraniano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorusso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengáli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Africâner</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norvegese Bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bósnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalão</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Sérvio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmanês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburghese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norueguês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Checheno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chinês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Ciuvascio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singalese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Espanhol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalogue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>assamês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osseto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estoniano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suaíli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedônio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Português brasileiro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faroese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Vallone</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami del nord</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Creolo haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norueguês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele do Sul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Iídiche</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinês tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinês simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Outro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Outros dialetos chineses simplificados</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Outro dialetos chineses tradicionais</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Outros idiomas do leste europeu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Outros idiomas da Europa ocidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Outros idiomas russos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Outros idiomas japoneses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Outros idiomas bálticos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Outros idiomas gregos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Outros idiomas coreanos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Outros dialetos turcos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Outros dialetos tailandeses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Admirável</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2518,215 +2490,215 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Francês</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Espanhol</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>bielorrusso</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>búlgaro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>tcheco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Alemão</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>grego</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>finlandês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>italiano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>japonês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>coreano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>lituano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>macedônio</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Holandês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>polonês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Português</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>russo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>eslovaco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albanês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>sérvio (cirílico)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>sueco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ucraniano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Chinês simplificado</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chinês tradicional</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnamita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>português, brasileiro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Espanhol, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Alemão, Suíça</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Espanhol, Bolívia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadjique</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>aimará</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Árabe, Arábia Saudita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turcomano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlíngua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Inglês</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Erro ao carregar dicionários</translation>
     </message>
@@ -2734,7 +2706,7 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2742,702 +2714,702 @@ entre clássico e ortografia escolar em cirílico)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Favo&amp;ritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Todos os Dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dicionário, %2 verbetes, %3 palavras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>Aj&amp;uda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Pesquisar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Fechar o GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Erro</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Fechar o programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Pôr na Área de Notificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Não foi possível salvar o verbete: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Aumentar as letras das definições</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dicionários...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>S&amp;obre</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Fórum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Imprimir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Salvar verbete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Salvar Verbete como</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimiza a janela como ícone na Área de Notificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Configurar Impressão</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Site do programa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nova Versão Disponível</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Procurar:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Diminuir as letras das definições</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Mostrar a janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Sobre o GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Baixar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Configuração de Página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Procurar em:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Restaurar as letras das definições</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Carregando...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sem título)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Configurar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Bem-vindo!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronuncia a palavra da consulta atual (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Salva o verbete atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Ignorar esta versão</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Seguinte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimir Verbete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Não achei nenhuma impressora. Favor instalar uma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>Exi&amp;bir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>His&amp;tórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Limpar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Ampliar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Aumentar as letras dos verbetes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Diminuir as letras dos verbetes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Restaurar as letras dos verbetes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Fechar a guia atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Fechar todas as guias</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Fechar todas as guias com exceção da atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Guias abertas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nova guia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Pasta de &amp;configuração</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Barra de &amp;Menus</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Achado nos dicionários:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Adicionar todas as guias aos Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>AVISO: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>String para pesquisar em dicionários. Os curingas &apos;*&apos;, &apos;?&apos; e conjuntos de símbolos &apos;[...]&apos; são permitidos.
 Para encontrar os símbolos &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; Use &apos;\ *&apos;, &apos;\?&apos;, &apos;\ [&apos;, &apos;\]&apos; Respectivamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Abrir a lista de guias</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Remover a guia atual dos Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>E&amp;xibir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Ocultar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportar o histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Feita a exportação do histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Erro de exportação: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importar histórico de arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Erro ao tentar importar: dados inválidos no arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Importação do histórico concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Erro de importação: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportar Favoritos para arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Arquivos XML (* .xml) ;; Todos os arquivos (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Exportação de favoritos concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportar Favoritos para arquivo como lista simples</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importar Favoritos do arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Arquivos XML (*.xml);;Arquivos Txt (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Importação de favoritos concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Erro de análise de dados</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Inform. do Dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Palavras-chave do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Abrir pasta de dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Indexando para pesquisa de texto completo: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Remover a palavra-chave &quot;%1&quot; dos Favoritos?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Painel de Pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Painel de Navegação Resultados</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Painel de Favor&amp;itos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Pré-&amp;visualizar Impressão</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Re-escanear Arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nova Aba</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Sempre no Topo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Sempre no Topo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Botão Menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Pesquisar na página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Pesquisa de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Referência GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Mostrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Adicionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Adicionar guia atual aos Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportar para lista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Mostrar Nomes na &amp;Barra de Dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Exibir Ícones Pequenos na &amp;Barra de Tarefas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navegação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Ativar verificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artigo, Completo (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artigo, Apenas HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Salvando artigo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Salvar artigo completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Painel &amp;Histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Acessibilidade a API não está habilitada</translation>
     </message>
@@ -3445,12 +3417,12 @@ Para encontrar os símbolos &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Arquivo dicionário foi adulterado ou corrompido</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Falha ao carregar artigo de %1, motivo: %2</translation>
     </message>
@@ -3458,7 +3430,7 @@ Para encontrar os símbolos &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Erro de análise sintática de XML: %1 em %2,%3</translation>
     </message>
@@ -3474,22 +3446,22 @@ Para encontrar os símbolos &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -3505,83 +3477,83 @@ Para encontrar os símbolos &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulário</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Dicionários desativados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Total de verbetes:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduz do:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Para o:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Total de palavras:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Ordem dos dicionários:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Arquivos deste dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informações sobre dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descrição:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Organizar por nome</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Organizar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Palavras-chave do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Dicionários ativos: %1, inativos: %2</translation>
     </message>
@@ -3589,12 +3561,12 @@ Se quiser desativar dicionários, arraste-os para o grupo de desativados.</trans
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Caminho</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Buscar em subpastas</translation>
     </message>
@@ -3602,69 +3574,67 @@ Se quiser desativar dicionários, arraste-os para o grupo de desativados.</trans
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Ao executar o GoldenDict, pô-lo na Área de Notificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Shift esquerda apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Windows/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Habilitar a exibição do GoldenDict como ícone na Área de Notificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Servidor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Porta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Turno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usuário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Janela de Definições/Tradução Semiautomáticas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3673,47 +3643,47 @@ Porém, se está opção for habilitada, novas guias serão abertas sem que o
 programa as exiba nas frente das outras automaticamente.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Usar servidor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tecla Windows ou Tecla Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Pronunciar palavras na janela principal automaticamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Abrir o GoldenDict com o Windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Alt esquerda apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navegação por guias</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Shift direita apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Com esta opção habilitada, ao se fechar a janela principal do programa,
@@ -3721,91 +3691,91 @@ ela será exibida como ícone na Área de Notificação, em vez de o programa
 ser fechado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Idioma da interface:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Ctrl esquerda apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Abrir novas guias em segundo plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Rede</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Ctrl direita apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift direita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift esquerda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Abrir novas guias após a atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Reinicie o programa para aplicar a mudança de idioma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Procurar atualizações do programa periodicamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3815,18 +3785,17 @@ Do contrário, serão enfileiradas ao lado da
 última.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Pôr o GoldenDict na Área de Notificação ao fechá-lo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Padrão do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Se habilitada esta opção, o programa será exibido
@@ -3835,7 +3804,7 @@ você poderá restaurar a janela principal e executar
 outros comandos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3846,141 +3815,141 @@ no servidor do GoldenDict. Se houver atualizações, ele informa ao usuário
 e pergunta se ele deseja visitar a página de download.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Inicialização</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Senha:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Padrão</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interface</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Modificando Idioma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tecla Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt esquerda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Alt direita apenas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Configuração</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl esquerda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt direita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl direita</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Atalhos de Teclado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Com isso habilitado, o aplicativo inicia diretamente na bandeja do sistema sem mostrar
 sua janela principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Abre o GoldenDict automaticamente com o Windows (como ícone na Área de Notificação).</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Não mostrar pop-up quando a seleção ou a área de transferência em uma das janelas do GoldenDict mudar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignorar as próprias alterações de seleção e área de transferência do GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Reproduzir arquivos de áudio via suporte de áudio embutido</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Usar player interno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Escolha o back-end de áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Digite a linha de comando do reprodutor de áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3990,85 +3959,85 @@ site que estiver visitando. Se alguns sites deixarem de funcionar, desative esta
 para ver se o problema é solucionado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronúncia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reprodução</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Usar programa externo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Traduzir palavra/expressão ou exibir definições com um clique duplo do mouse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalmente, ao se premer a tecla ESC a seleção é transferida para o campo de tradução/
 pesquisa. Com isto, porém, a janela principal será ocultada.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Usar a tecla ESC para ocultar a janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Habilite esta opção se não quiser exibir a guia principal
 quando apenas uma delas estiver aberta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ocultar guia única</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limite de dicionários no menu de contexto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Enviar a palavra traduzida/consultada para a janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Mostrar uma janela de sinalização antes de exibir a janela pop-up, clique na bandeira para mostrar a janela pop-up. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4079,445 +4048,487 @@ rola para o artigo do mesmo dicionário. Com esta opção desligada,
 no entanto, o artigo do dicionário mais alto é mostrado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Rolar automaticamente para um artigo-alvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Fonte do Dicionário: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>definir a família da fonte de fallback para dicionário</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Estilo de exibição do artigo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Vire a interface para escurecer.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Modo Escuro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Torne o estilo de exibição do artigo escuro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Modo Dark Reader</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Ordem MRU: Ordem usada mais recentemente.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Acompanhar alterações da área de transferência quando o escaneamento está habilitado. Aviso! Você deve sempre ativar isso a menos que esteja no Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Rastrear mudança da área de transferência</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Mudança de seleção</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Apenas seleção tack quando todas as chaves selecionadas forem pressionadas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Mostrar sinalizador de verificação quando a palavra é selecionada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Tempo de atraso</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personalizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Configurações personalizadas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Conectar ao Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Baralho:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modelo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Palavra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Campo de vocabulário...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Campo de definição...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Frase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Campo de frase (pode estar vazio)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Não identificar GoldenDict nos cabeçalhos HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Tamanho máximo do cache de rede:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Máximo de espaço em disco ocupado pelo cache de rede GoldenDict&apos;s em
+      <translation>Espaço máximo em disco ocupado pelo cache de rede do GoldenDict em
 %1
-Se definido para 0 o cache de disco da rede será desativado.</translation>
+Se definido como 0, o cache do disco de rede será desabilitado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Quando esta opção estiver ativada, o GoldenDict
 apaga seu cache de rede do disco durante a saída.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Limpar cache de rede ao sair</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Pesquisa de texto completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Permitir pesquisa de texto completo para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Não procure em dicionários que contenham mais de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artigos (0 - ilimitado)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vançada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Durante buscas sucessivas, se um dicionário for recolhido pelo manual, ele permanecerá recolhido na próxima busca</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Colapso da sessão</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Ao usar a área de transferência, remova tudo após a nova linha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>Em uma nova pesquisa, focar a janela principal ou pop-up, mesmo que&apos;seja visível</translation>
+      <translation>Em uma nova pesquisa, coloque o foco na janela principal ou pop-up, mesmo que esteja visível</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Intervalo para salvar Favoritos. Se definido como 0, os Favoritos serão salvos apenas durante a saída.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Ative esta opção para confirmar todas as operações de exclusão de itens</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Confirmação para exclusão de itens</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Ligue esta opção para ignorar texto de entrada excessivamente longo
 do mouse-over, seleção, área de transferência ou linha de comando</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorar frases inseridas maiores que</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Frases de entrada maiores que este tamanho serão ignoradas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Ative esta opção para ignorar sinais diacríticos ao pesquisar artigos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorar diacríticos durante a pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>E&amp;xpandir partes opcionais</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Recolher artigos mais de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignorar pontuação ao pesquisar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Ative esta opção para habilitar a pesquisa de artigos extras por meio de listas de sinônimos
 dos dicionários Stardict, Babylon e GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Pesquisa extra via sinônimos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>símbolos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Usar Ctrl-Tab para navegar pelas guias de acordo com as mais recentes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babilônia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Gravar o &amp;histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artigos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Habilite esta opção se quiser selecionar palavras com um único clique do mouse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Permitir seleção de palavra com clique único</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Tipo de add-on:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Tamanho máximo do histórico:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Salvar tudo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minutos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Clássico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lanoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lais-Cola</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Informações posicionais são necessárias para usar a pesquisa de frase de Xapian e o operador NEAR, mas o tamanho do banco de dados será muito maior. Aplica-se apenas a novos dicionários recebidos.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Ativar índice com informações posicionais</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Fonte Padrão</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Fonte monoespaçada</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Fonte Serifada</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Fonte sem serifa</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Aparência</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Essas fontes serão aplicadas quando as fontes especificadas por um dicionário não forem encontradas.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fontes Alternativas</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Áudio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Texto simples</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Correspondência de prefixo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Desconhecido</translation>
     </message>
@@ -4525,17 +4536,17 @@ dos dicionários Stardict, Babylon e GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nenhum nome de programa foi especificado.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>O programa travou.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>O programa retornou o código de fechamento %1.</translation>
     </message>
@@ -4543,27 +4554,27 @@ dos dicionários Stardict, Babylon e GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Habilitada</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Linha de comando</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -4571,99 +4582,114 @@ dos dicionários Stardict, Babylon e GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Erro ao carregar artigo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Erro ao decodificar artigo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Direitos autorais: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versão: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Título: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Site: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Um programa de pesquisa de dicionário.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Palavra ou frase a consultar.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Salvar mensagens de depuração no gd_log.txt na pasta config.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Redefina o estado da janela.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Desativar tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Altera o grupo da janela principal.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Alterar o grupo de popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Alternar pop-up de verificação.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Versão impressa e informações de diagnóstico.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Dicionário pesquisar/filtro (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Limpar Busca</translation>
     </message>
@@ -4671,22 +4697,22 @@ dos dicionários Stardict, Babylon e GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>Erro: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Erro ao salvar recurso: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>O recurso referenciado não conseguiu baixar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>AVISO: %1</translation>
     </message>
@@ -4715,68 +4741,73 @@ dos dicionários Stardict, Babylon e GLS</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Painel</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Pronunciar a palavra da consulta atual (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Adicionar palavra aos favoritos (Ctrl + E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Mostra ou oculta a barra de dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Ficar sempre acima de todas as outras janelas</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Enviar palavra para a janela principal (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Voltar</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Para Frente</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>AVISO: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4788,7 +4819,7 @@ das outras janelas, redimensioná-la ou geri-la à vontade.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4798,7 +4829,7 @@ das outras janelas, redimensioná-la ou geri-la à vontade.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4819,17 +4850,17 @@ das outras janelas, redimensioná-la ou geri-la à vontade.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Caminho</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -4837,60 +4868,60 @@ das outras janelas, redimensioná-la ou geri-la à vontade.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipédia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabário japonês Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Caminhos de coleções de arquivos de áudio de pronúncia:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonês Romanizado (ideogramas convertidos para caracteres latinos)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4901,84 +4932,84 @@ Padronizado como ISO 3602
 Ainda não implementado no GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sites da Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Pronúncia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Qualquer programa externo. Uma seqüência de caracteres %GDWORD% será substituída pela palavra de consulta. Uma string %GDSEARCH% será substituída pelo texto na barra de pesquisa. Se ambos os parâmetros não forem fornecidos, o headword será alimentado na entrada padrão.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncações fornecidas por &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, uma biblioteca de mídia linguística colaborativa da Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Habilitar Lingua Livre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Código do idioma ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;O uso do Forvo requer uma chave de API, registre-se no site para obter a sua própria chave.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pegue a sua própria chave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;aqui&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabário japonês Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Transliteração personalizada</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Isso se aplica apenas à frase de pesquisa, com cada linha representando uma transliteração, separada por ponto e vírgula. Por exemplo, ae;æ, os usuários podem inserir ae para representar æ na palavra de destino.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #este é um exemplo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteração</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4990,118 +5021,108 @@ como ISO 3602
 Ainda não implementado no GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteração do Russo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Ortografia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Modificar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Exemplos:  &amp;quot;eng&amp;quot; para inglês, &amp;quot;fra&amp;quot; para francês &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+A lista completa de idiomas disponíveis pode ser encontrada &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; aqui &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Caminho da pasta dos dicionários Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Atua&amp;lizar agora</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteração do Alemão</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Especifique qualquer site que desejar. O demarcador %GDWORD% será substituído pela palavra da consulta do usuário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Adicionar...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Escolha uma pasta</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Site da Web</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Caminhos dos arquivos de dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirmar remoção</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silabários:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dicionários de ortografia disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5118,95 +5139,95 @@ Adicione dicionários compatíveis ao fim
 dos grupos apropriados para usá-los.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Romanização hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Servidores DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Servidores DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Habilitar pronúncias do Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Chave API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Códigos de idioma
 (separar por vírgula):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteração do Grego</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(indisponível na versão portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Bielorrusso transliteração</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Alternativamente, usar %GD1251% por CP1251, %GDISO1%...%GDISO16% por ISO 8859-1...ISO 8859-16 respectivamente,
 %GDBIG5% por Big-5, %GDBIG5HKSCS% por Big5-HKSCS, %GDGBK% por GBK e GB18030, %GDSHIFTJIS% por Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Texto para Fala</translation>
     </message>
@@ -5222,42 +5243,42 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Engines de voz selecionadas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Adicionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Pré-Visualizar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Engines de voz disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Texto a ser visualizado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Digite o texto a ser visualizado aqui.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Pré-Visualizar</translation>
     </message>
@@ -5282,17 +5303,17 @@ dos grupos apropriados para usá-los.</translation>
       <translation>Não foi possível encontra voz TTS.&lt;br&gt;Por favor, certifique-se que pelo menos um motor TTS esteja instalado no seu computador.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferências</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Taxa:</translation>
     </message>
@@ -5300,12 +5321,12 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Digite uma palavra ou frase para pesquisar dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Suspensa</translation>
     </message>
@@ -5336,33 +5357,33 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nome</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Habilitado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Inserir artigo como link dentro da tag &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Como link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -5370,17 +5391,9 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Não foi possível consultar alguns dicionários.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>AVISO: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/pt_PT.ts b/locale/pt_PT.ts
index 0452a6ea..02d3fd74 100644
--- a/locale/pt_PT.ts
+++ b/locale/pt_PT.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>SOBRE</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Programa de pesquisa do dicionário GoldenDict-ng, versão </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licenciado sob a GNU GPLv3 ou posterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Copiar informações da versão</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Copiar lista de dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Créditos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Unknown]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Com base no Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Baseado em Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: pode&apos;t criar um cartão sem palavra</translation>
+      <translation>anki: não pode criar um cartão sem uma palavra</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Então pare o cursor sobre a palavra que você deseja procurar em outra aplicação, e uma janela apareceria que a descreveria para você.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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 o pop-up&lt;/h3&gt;Para procurar palavras de outros aplicativos ativos, você precisa primeiro ativar a funcionalidade de &lt;i&gt;&quot;Verificar pop-up&quot;&lt;/i&gt; em &lt;b&gt;Preferências&lt;/b&gt;, e então habilite a qualquer momento disparando o &apos;Popup&apos; ícone acima, ou clicando no ícone da bandeja abaixo, com o botão direito do mouse e escolhendo no menu você&apos;compartilhou. </translation>
+      <translation>&lt;h3 align=&quot;center&quot;&gt;Trabalhando com o pop-up&lt;/h3&gt;Para procurar palavras de outros aplicativos ativos, você precisa primeiro ativar a &lt;i&gt;"Funcionalidade pop-up de digitalização"&lt;/i&gt; em &lt;b&gt;Preferências&lt;/b&gt; e em seguida, habilite-o a qualquer momento ativando o ícone 'Popup' acima ou clicando no ícone da bandeja abaixo com o botão direito do mouse e escolhendo-o no menu exibido.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Expandir artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Recolher artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Nenhuma tradução para &lt;b&gt;%1&lt;/b&gt; foi encontrada no grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Trabalhando com popup</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(sem título)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Bem-vindo!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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>Então selecione qualquer palavra que quiser para procurar em outro aplicativo do seu mouse (clique duas vezes ou deslize com o mouse com o botão pressionado), e uma janela apareceria que descreveria a palavra para você.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Nenhuma tradução foi encontrada no grupo &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
-      <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;website&lt;/a&gt; for the updates. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later.</translation>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Nenhuma tradução para &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; foi encontrada no grupo &lt;b&gt;%2&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="293"/>
+      <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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 procurar os arquivos do dicionário, configurar vários sites da Wikipédia ou outras fontes, ajustar a ordem do dicionário ou criar grupos de dicionários.&lt;p&gt;E então você&apos;está pronto para procurar suas palavras! Você pode fazer isso nesta janela usando um painel à esquerda ou pode &lt;a href=&quot;Working with popup&quot;&gt;pesquisar palavras de outros aplicativos ativos&lt;/a&gt;. &lt;p&gt;Para personalizar o programa, verifique as preferências disponíveis em &lt;b&gt;Edit|Preferences&lt;/b&gt;. Todas as configurações lá têm dicas de ferramentas, certifique-se de lê-las se tiver dúvidas sobre qualquer coisa.&lt;p&gt;Caso precise de mais ajuda, tenha alguma dúvida, sugestão ou apenas queira saber o que os outros pensam, seja bem-vindo ao fórum&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;do programa&lt;/a&gt;.&lt;p&gt;Consulte o site&lt;/a&gt; do programa&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;para obter as atualizações. &lt;p&gt;(c) 2008-2013 Konstantin Isakov. Licenciado sob GPLv3 ou posterior.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(imagem)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Expandir artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>De </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Recolher artigo</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Fazer uma nova nota Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Erro na consulta: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Fechar as palavras: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expressões compostas: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palavras individuais: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Falha ao criar arquivo temporário.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Procurar &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Procurar &quot;%1&quot; no &amp;Novo Separador</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
-      <translation>O recurso referenciado não existe&apos;.</translation>
+      <translation>O recurso referenciado não existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Falha ao auto-abrir o arquivo de recurso, tente abrir manualmente: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Olhar para cima &quot;%1&quot; em %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Selecionar Artigo Atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Copiar como texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Visualizar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Procurar &quot;%1&quot; em %2 na &amp;Nova Aba</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Abrir Link em Nova &amp;Aba</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir Link no Navegador Externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Recurso</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Voz TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Imagem</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Vídeo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Vídeo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definição do dicionário &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definição: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
-      <translation>O programa de áudio referenciado não existe&apos;t.</translation>
+      <translation>O programa de áudio referenciado não existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>&amp;Optar Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Salvar &amp;Marcador &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>AVISO: Player de áudio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ERRO: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Salvar som</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Salvar imagem</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Salvar &amp;imagem...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Frase não encontrada</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 de %2 partidas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Salvar som...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Enviar &quot;%1&quot; para a linha de entrada</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Adicionar &quot;%1&quot; ao histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Enviar Artigo Atual para Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Enviar o texto selecionado para Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Arquivos de som (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos os arquivos (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Arquivos de som (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Falha ao reproduzir arquivo de som: %1</translation>
     </message>
@@ -414,62 +409,62 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Conversão Chinesa</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Habilitar conversão entre caracteres Chineses simplificados e tradicionais</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Con&amp;versão em Chinês</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Ativar conversão de caracteres simplificados para caracteres tradicionais (variante de Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC a TC (variante de Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Habilitar conversão de caracteres simplificados para caracteres tradicionais (variante Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>SC a TC (variante de música Kong)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Habilitar conversão de caracteres tradicionais para caracteres simplificados</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC para SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Convertido para Chinês tradicional (variante de Taiwan)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Simplificado para a conversão tradicional de Chinês (Hong Kong)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Tradicional à conversão Chinesa simplificada</translation>
     </message>
@@ -477,30 +472,30 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>transliteração personalizada</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Autenticação de proxy necessária</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Você precisa fornecer um nome de usuário e uma senha para acessar via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Usuário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Senha:</translation>
     </message>
@@ -508,22 +503,22 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ícone do grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Atalho:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Pasta de Favoritos:</translation>
     </message>
@@ -548,81 +543,81 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>Imagens</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Todos os arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>ERRO</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
-      <translation>Pode&apos;t ler o arquivo de imagem especificado.</translation>
+      <translation>Não é possível ler o arquivo de imagem especificado.</translation>
     </message>
   </context>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmação</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Você tem certeza que deseja gerar um conjunto de grupos baseado em pares de idioma?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Tem certeza que deseja gerar um conjunto de grupos com base em metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Combinar grupos pelo idioma de origem em &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Combinar grupos por idioma de destino para &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Auto grupo por pasta falhou.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>O diretório pai de %1 não pode ser alcançado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Tem certeza de que deseja gerar um conjunto de grupos com base no repositório das pastas?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Fazer grupo de tradução dupla &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Combinar grupos com &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Dicionários: </translation>
     </message>
@@ -635,133 +630,133 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Modo de pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Este elemento determina como a string de filtro será interpretada</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Se marcado no caso dos símbolos serão levados em conta na filtragem</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Diferenciar maiúsculas/minúsculas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Exporta palavras de cabeça para arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportação</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Socorro</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Certo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Pressione este botão para aplicar o filtro à lista de headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Aplicar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Se marcada, qualquer alteração de filtro será imediatamente aplicada à lista de headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Aplicar automaticamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtro:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filtrar string (string fixa, caracteres curinga ou expressão regular)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Caracteres curinga</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Carregando palavras-chave...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Total de cabeçalhos únicos: %1, filtrados: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Salvar headwords em arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Não foi possível abrir o arquivo exportado</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportar palavras-chave...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Processo de exportação interrompido</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Exportação concluída</translation>
     </message>
@@ -769,67 +764,77 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Total de artigos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Traduções de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Palavras no Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Traduz para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Abrir pasta</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Arquivos que incluem este dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Descrição:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Mostrar todos os cabeçalhos de dicionário únicos</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Palavras</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Edite o dicionário via comando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Nome do arquivo de índice:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Abrir pasta de índice</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 entradas</translation>
     </message>
@@ -860,44 +865,44 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Banco de dados</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Estratégias</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Lista de bancos de dados separados por vírgula
 (string vazia ou &quot;*&quot; corresponde a todos os bancos de dados)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Lista de estratégias de pesquisa delimitada por vírgulas
@@ -907,37 +912,37 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Menu estendido com todos os dicionários...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Editar este grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Informações do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Cabeçalhos do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Abrir pasta do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Barra de &amp;dicionário</translation>
     </message>
@@ -946,27 +951,27 @@ entre ortografia clássica e escolar em ciílico)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>Dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Aceitar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>cancelar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fontes alteradas</translation>
     </message>
@@ -977,12 +982,12 @@ entre ortografia clássica e escolar em ciílico)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>Grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Algumas fontes foram alteradas. Você gostaria de aceitar as alterações?</translation>
     </message>
@@ -1011,75 +1016,55 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Busca completa</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Palavras inteiras</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Texto sem formatação</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Caracteres curinga</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>A palavra de consulta não pode estar vazia.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>suporte a sintaxe de pesquisa xapiana, como AND OU +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Distância máxima entre as palavras (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Padrão</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Máximo de artigos por dicionário (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Artigos encontrados: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indexação agora: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Nenhuma</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>A linha de busca deve conter pelo menos uma palavra contendo </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ou mais símbolos</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Não há dicionários para pesquisa em texto completo</translation>
     </message>
@@ -1087,7 +1072,7 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Erro no arquivo de favoritas</translation>
     </message>
@@ -1153,7 +1138,7 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>De</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Vá para Editar (Dictionaries/2002) Sources├Forvo e inscreva-se para nossa própria chave de API para fazer este erro desaparecer.</translation>
     </message>
@@ -1174,68 +1159,52 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Diferenciar maiúsculas/minúsculas</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Modo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorar ordem das palavras</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorar diacríticos</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Artigos encontrados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dicionários disponíveis no grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Aguarde a indexação:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Socorro</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Indexação agora: Nenhuma</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>cancelar</translation>
     </message>
@@ -1267,27 +1236,27 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>Dê um novo nome para o grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Dicionários disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Adicionar grupo</translation>
     </message>
@@ -1342,42 +1311,42 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>Adicionar grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Criar novo grupo de dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Agrupar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Crie grupos baseados em pastas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Agrupar por pastas</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Agrupar por Metadados</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Arrastar e soltar dicionários para e para os grupos, movê-los para dentro dos grupos, reordenar os grupos usando o seu mouse.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renomear grupo de dicionário atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Remover grupo de dicionário atual</translation>
     </message>
@@ -1387,43 +1356,43 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>Dê um nome para o novo grupo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Remover todos os grupos</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Remover dicionários selecionados do grupo (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Adicionar dicionários selecionados ao grupo (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Remover grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Re&amp;nomear grupo</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Remover todos os grupos de dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Criar grupos baseados em idiomas</translation>
     </message>
@@ -1446,12 +1415,12 @@ entre ortografia clássica e escolar em ciílico)</translation>
       <translation>Histórico:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Tamanho do histórico: %1 entradas fora do máximo de %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugestões de ortografia: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologia</translation>
     </message>
@@ -1472,12 +1441,12 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexação: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Nome do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Diagrama de Goldent-ng - Inicializando</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Por favor, aguarde enquanto indexa o dicionário</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Por favor, aguarde...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexando...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>tcheco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Neerlandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulah</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>irlandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>latim</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>malaio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Lona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadjique</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>galês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Raeto-Romance</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele do Norte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abkhazian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirghiz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico Escocês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>albanês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letã</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malaialam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>curdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>marata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arábico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>basco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>avaric</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>biari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Breton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dinamarquês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>francês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>alemão</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebraico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>luxemburguês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazakh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pashto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Eslovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uighur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Servo-croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>romeno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>indonésio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Soto do Sul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corsican</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>persa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovenian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>frísio ocidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>aragonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malagasy</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>galego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>azerbaijano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>japonês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>ucraniano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorrusso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardenha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>bengali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>africâner</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armênio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norwegian Bokmal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>croata</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>bósnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>catalão</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Sérvio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Russo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>norueguês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>checheno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>chinês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvash</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>cingalês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>espanhol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>assamês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estônio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suaíli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>macedônio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Português</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Icelandic</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Portuguese-Brazil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faroese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valão</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalês</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami do Norte</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norwegian Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele do Sul</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>iídiche</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Chinês tradicional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Chinês Simplificado</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Outros</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Outros dialetos chineses simplificados</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Outros dialectos tradicionais chineses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Outras línguas europeias de leste</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Outras línguas ocidentais europeias</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Outros idiomas russos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Outros idiomas japoneses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Outros idiomas bálticos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Outros idiomas gregos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Outros dialectos coreanos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Outros dialectos turcos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Outros dialetos tailandeses</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Admirável</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Francês</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Espanhol</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Bielorrusso</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Búlgaro</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Checo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Alemão</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Grego</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Finlandês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italiano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japonês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Coreano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Lituano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Macedónio</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Neerlandês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polonês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Português</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Russo</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Eslovaco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albanês</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Sérvio (Cirílico)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Sueco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turco</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ucraniano</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Chinês Simplificado</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Chinês (Tradicional)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamese</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Português (Brasileiro)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Persa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Espanhol, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Alemão, Suíça</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Espanhol, Bolívia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tadjique</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Árabe, Arábia Saudita</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Inglês</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Erro ao carregar dicionários</translation>
     </message>
@@ -2733,7 +2706,7 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2741,702 +2714,702 @@ entre ortografia clássica e escolar em ciílico)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>TODOS</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 dicionários, %2 artigos, %3 palavras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Ajuda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Encerrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>ERRO</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Sair do aplicativo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Fechar Para a Bandeja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
-      <translation>&apos;Pode salvar artigo: %1</translation>
+      <translation>Pode&apos;t salvar artigo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Aumentar zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Dicionários...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Sobre</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>Fórum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Print</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Salvar Artigo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Salvar Artigo Como</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimiza a janela para a bandeja</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Page Set&amp;up</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Página inicial</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Nova versão disponível</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Procurar:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Diminuir o zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Mostrar &amp;janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Sobre o GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>BAIXAR</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Configuração de Página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Olhe em:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Tamanho normal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation>Falha ao inicializar o mecanismo de monitoramento das teclas de atalho.&lt;br&gt;Certifique-se de que sua extensão XServer está ligada.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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>Versão &lt;b&gt;%1&lt;/b&gt; do GoldenDict agora está disponível para download.&lt;br&gt;Clique &lt;b&gt;Baixar&lt;/b&gt; para chegar à página de download.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Carregandochar@@0</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(sem título)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferências...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Bem-vindo!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Palavra Pronunciada (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Salvar Artigo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Pular essa versão</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Encaminhar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Imprimir artigo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Nenhuma impressora disponível. Por favor, instale uma primeiro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Visualização</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;História</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Limpar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Ampliar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Palavras aumentando em</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Diminuir o zoom</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Tamanho Normal das Palavras</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Fechar aba atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Fechar todas as abas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Fechar todas as abas, exceto as atuais</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Abas abertas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Pasta de configuração</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Barra de menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Encontrado nos Dicionários:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Adicionar todas as abas aos favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>AVISO: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Sequência de caracteres para pesquisa em dicionários. Os caracteres curinga &apos;*&apos;, &apos;?&apos; e os conjuntos de símbolos &apos;[...]&apos; são permitidos.
 Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbolos usam &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respectivamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Abrir Lista de Abas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Remover a aba atual dos Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Você escolheu ocultar um menu. Use %1 para mostrá-lo de volta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Mostrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Ocultar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportar histórico para arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Arquivos de texto (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Exportação do histórico concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Erro de exportação: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importar histórico do arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Erro de importação: dados inválidos no arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Importação do histórico completa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Erro de importação: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportar Favoritos para Arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Arquivos XML (*.xml);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Exportação de favoritos concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportar Favoritos para arquivo como lista simples</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importar Favoritos do arquivo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>Arquivos XML (*.xml);;Arquivos Txt (*.txt);;Todos os arquivos (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Importação de favoritos concluída</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Erro de análise de dados</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Informações do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Cabeçalhos do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Abrir pasta do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Editar dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Agora indexação para busca por texto: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Remover headword &quot;%1&quot; dos favoritos?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Painel de &amp;Busca</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Painel de &amp;Resultados</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Painel &amp;de Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Visualizar Impressão</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Reescanear arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Novo Separador</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Sempre visível</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Sempre no Topo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Botão Menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Pesquisar na página</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Busca completa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Referência de Dourado</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Apresentar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Adicionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Adicionar aba atual aos Favoritos</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportar para lista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Mostrar nomes na Barra de Dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Mostrar ícones pequenos na barra de ferramentas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navegação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Ativar verificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artigo, Completo (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artigo, Apenas HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Salvando artigo...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Salvar artigo completo</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>A janela principal é definida para estar sempre no topo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Painel de &amp;Histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API de acessibilidade não está habilitado</translation>
     </message>
@@ -3444,12 +3417,12 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Arquivo de dicionário foi adulterado ou corrompido</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Falha ao carregar o artigo de %1, motivo: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Erro de análise XML: %1 em %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -3498,88 +3471,88 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation>Não foi possível&apos;abrir o buffer de áudio para leitura.</translation>
+      <translation>Não foi possível abrir o buffer de áudio para leitura.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulário</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Dicionários inativos (desabilitados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Total de artigos:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Traduções de:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Traduz para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Palavras no Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation>Ajuste a ordem arrastando e soltando itens nele. Solte dicionários no grupo inativo para desativar o uso deles.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Ordem de dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Arquivos que incluem este dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informações do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Descrição:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Classificar por nome</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Ordenar por idiomas</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Cabeçalhos do dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Dicionários ativos: %1, inativo: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Caminho</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursiva</translation>
     </message>
@@ -3600,69 +3573,67 @@ Para encontrar &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; símbo
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Iniciar para a bandeja do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Apenas turno esquerdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Habilitar ícone de bandeja do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Servidor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Porta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Turno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Usuário:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Escanear pop-up</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ Com isso, no entanto, novas abas serão abertas sem
 mudar para elas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Usar servidor proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Use o seguinte atalho para traduzir uma palavra da área de transferência:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Chave do Windows ou Meta key</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Auto-pronunciar palavras na janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Iniciar com o sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Apenas ALT esquerda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Navegação abatida</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Apenas turno direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Com isso ligado, uma tentativa de fechar a janela principal ocultaria em vez de fechar
 a aplicação.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
-      <translation>Ative se você deseja usar um servidor proxy
-para todas as solicitações de rede do programa&apos;s.</translation>
+      <translation>Ative se desejar usar um servidor proxy
+para todas as solicitações de rede do programa&apos;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Idioma da interface:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Apenas Ctrl esquerdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Abrir novas abas em segundo plano</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Rede</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Apenas Ctrl direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>SHIFT Direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift Esquerdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Com isto habilitado, o pop-up só aparecerá se todas as chaves escolhidas estiverem
 no estado pressionado quando a seleção de palavras mudar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Auto-pronunciar palavras em pop-up de verificação</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Abrir novas abas após a atual</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Reinicie o programa para aplicar a mudança de idioma.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Procurar novas versões do programa periodicamente</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ atual, ativa. Caso contrário, elas são adicionadas para
 serem as últimas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Fechar para a bandeja do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Padrão do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Quando ativado, um ícone aparece na área de bandeja do sistema que pode ser utilizado
 para abrir janela principal e executar outras tarefas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,141 +3812,141 @@ informa o usuário sobre isso e pede para abrir uma
 página de download.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Startup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Senha:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Padrão</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interface</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Mudança de Idioma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl tecla</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Use a tecla de atalho a seguir para mostrar ou ocultar a janela principal:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Left Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Apenas ALT direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferências:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl Esquerdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt Direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
       <translation>As teclas de atalho são globais e funcionam de qualquer programa e em qualquer contexto, desde que o GoldenDict esteja rodando em segundo plano.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl Direito</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Atalhos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Iniciar com o popup de verificação ativado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Com isso ligado, o aplicativo inicia diretamente na bandeja do sistema sem mostrar
 sua janela principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Inicia automaticamente o Gold Dict após a inicialização do sistema de operação.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Escolha se o modo popup está ativado por padrão. Se selecionado,
 o programa sempre iniciará com o popup de verificação ativo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Não mostrar pop-up quando a seleção ou a área de transferência em uma das janelas GoldenDict&apos;s mudar</translation>
+      <translation>Não mostrar pop-up quando a seleção ou a área de transferência em uma das próprias janelas do GoldenDict mudar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Ignorar Diagnóstico de Ouro&apos;s própria seleção e alterações na área de transferência</translation>
+      <translation>Ignorar a própria seleção do GoldenDict e as alterações da área de transferência</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Reproduzir arquivos de áudio via suporte de áudio integrado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Usar reprodutor interno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Escolher final de áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Inserir linha de comando no player de áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,84 +3955,84 @@ desativando o conteúdo (imagens, frames) que não são originários do site
 que você está navegando. Se algum site parar por causa disso, tente desativar isto.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Proibir o carregamento de conteúdo de outros sites (oculta a maioria dos anúncios)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Pronunciation</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Reprodução</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Usar programa externo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Clique duplo traduz a palavra clicada</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Usar qualquer programa externo para reproduzir arquivos de áudio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalmente, pressionar a tecla ESC move o foco para a linha de tradução.
 Com isso no entanto, ele irá ocultar a janela principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Tecla ESC esconde a janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Selecione esta opção se você usa&apos;t quer ver a barra de guias principal quando apenas uma única aba é aberta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ocultar aba única</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Ajuste este valor para evitar enormes menus de contexto.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limite de dicionários do menu de contexto:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Enviar palavra traduzida para a janela principal em vez de mostrá-la na janela popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Enviar palavra traduzida para a janela principal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Mostrar uma janela de sinalização antes de mostrar janela pop-up, clique na bandeira para mostrar a janela pop-up. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4073,445 +4043,487 @@ rola para o artigo do mesmo dicionário. Com esta opção desligada,
 no entanto, o artigo do dicionário mais alto é mostrado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Rolar automaticamente para um artigo-alvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Fonte do Dicionário: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>definir a família da fonte de fallback para dicionário</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Estilo de exibição do artigo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Vire a interface para escurecer.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Modo Escuro</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Torne o estilo de exibição do artigo escuro.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Modo Dark Reader</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Ordem MRU: Ordem usada mais recentemente.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Acompanhar alterações da área de transferência quando o escaneamento está habilitado. Aviso! Você deve sempre ativar isso a menos que esteja no Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Rastrear mudança da área de transferência</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Mudança de seleção</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Apenas seleção tack quando todas as chaves selecionadas forem pressionadas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Mostrar marcação de varredura quando for selecionada uma palavra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Tempo de atraso</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy do sistema</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy personalizado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Configurações personalizadas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Conectar ao Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Baralho:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modelo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Palavra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Campo de vocabulário...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>texto</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Campo de definição...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Frase</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Campo de frase (pode estar vazio)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation>Alguns sites detectam GoldenDict através de cabeçalhos HTTP e bloqueiam as solicitações.
 Ative esta opção para contornar o problema.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Não identifique o GoldenDict nos cabeçalhos HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Tamanho máximo do cache de rede:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Máximo de espaço em disco ocupado pelo cache de rede GoldenDict&apos;s em
+      <translation>Espaço máximo em disco ocupado pelo cache de rede do GoldenDict em
 %1
-Se definido para 0 o cache de disco da rede será desativado.</translation>
+Se definido como 0, o cache do disco de rede será desabilitado.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Quando esta opção estiver ativada, o GoldenDict
 apaga seu cache de rede do disco durante a saída.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Limpar cache de rede ao sair</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Busca completa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Permitir a pesquisa textual para:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation>Pesquisar&apos;t em dicionários contendo mais de</translation>
+      <translation>Não procure em dicionários que contenham mais de</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artigos (0 - ilimitado)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Av&amp;ançado</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Durante buscas sucessivas, se um dicionário for recolhido pelo manual, ele permanecerá recolhido na próxima busca</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Colapso da sessão</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>Ao usar a área de transferência, remova tudo após a nova linha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>Em uma nova pesquisa, focar a janela principal ou pop-up, mesmo que&apos;seja visível</translation>
+      <translation>Em uma nova pesquisa, coloque o foco na janela principal ou pop-up, mesmo que esteja visível</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Atalhos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Intervalo de salvamento dos favoritos. Se definido como 0 Favoritos só será salvo durante a saída.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Ative esta opção para confirmar todas as operações de exclusão de itens</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Confirmação para exclusão de itens</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Ligue esta opção para ignorar texto de entrada excessivamente longo
 do mouse-over, seleção, área de transferência ou linha de comando</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorar frases inseridas maiores que</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Frases de entrada maiores que este tamanho serão ignoradas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Ativar esta opção para ignorar diacríticos durante a busca de artigos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorar diacríticos durante a pesquisa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Ativar esta opção para sempre expandir partes opcionais de artigos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Expandir &amp;partes opcionais</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Selecione esta opção para automaticamente recolher artigos grandes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Recolher artigos mais que</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Artigos maiores que este tamanho serão recolhidos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignorar pontuação ao pesquisar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Ative esta opção para permitir que artigos extras pesquisem através de listas de sinônimos
 no Stardict, Babilônia e dicionários GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Pesquisa extra através de sinônimos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>Símbolos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab navega abas na ordem MRU</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babilônia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Histórico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Ative esta opção para armazenar o histórico das palavras traduzidas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>&amp;Histórico de loja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artigos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Ative esta opção se você quiser selecionar palavras com um único clique do mouse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Selecionar palavra com um único clique</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Estilo do complemento:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Tamanho máximo do histórico:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Intervalo de salvamento do histórico. Se definido como 0 o histórico será salvo apenas durante a saída.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Salvar todos os</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>Minutos</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Clássico</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lanoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lais-Cola</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Informações posicionais são necessárias para usar a pesquisa de frase de Xapian e o operador NEAR, mas o tamanho do banco de dados será muito maior. Aplica-se apenas a novos dicionários recebidos.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Ativar índice com informações posicionais</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Fonte padrão</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Fonte monoespaçada</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Fonte Serifada</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Fonte sem serifa</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Aparência</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Essas fontes serão aplicadas quando as fontes especificadas por um dicionário não forem encontradas.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fontes Alternativas</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Áudio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Texto sem Formatação</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Correspondência de prefixo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Desconhecido</translation>
     </message>
@@ -4519,17 +4531,17 @@ no Stardict, Babilônia e dicionários GLS</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nenhum nome de programa foi dado.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>O programa travou.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>O programa retornou o código de saída %1.</translation>
     </message>
@@ -4537,27 +4549,27 @@ no Stardict, Babilônia e dicionários GLS</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>tipo</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Linha de comando</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -4565,99 +4577,114 @@ no Stardict, Babilônia e dicionários GLS</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Erro ao carregar artigo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Erro de decodificação do artigo</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Direitos autorais: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Versão: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Título: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Site: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Um programa de pesquisa de dicionário.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Palavra ou frase a consultar.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Salvar mensagens de depuração no gd_log.txt na pasta config.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Redefina o estado da janela.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Desativar tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Altera o grupo da janela principal.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Alterar o grupo de popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Alternar pop-up de verificação.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Versão impressa e informações de diagnóstico.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Busca/filtro de dicionário (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Limpar Pesquisa</translation>
     </message>
@@ -4665,22 +4692,22 @@ no Stardict, Babilônia e dicionários GLS</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ERRO: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Erro ao salvar recursos: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>O download do recurso referenciado falhou.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>AVISO: %1</translation>
     </message>
@@ -4709,68 +4736,73 @@ no Stardict, Babilônia e dicionários GLS</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Diálogo</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Palavra Pronunciada (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Adicionar palavra aos Favoritos (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Mostra ou oculta a barra de dicionário</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Sempre ficar em cima de todas as outras janelas</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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 isso para fixar a janela para que ela fique na tela,
 poderia ser redimensionado ou gerenciado de outras formas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Enviar palavra para a janela principal (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Anterior</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Encaminhar</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>AVISO: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4782,7 +4814,7 @@ poderia ser redimensionado ou gerenciado de outras formas.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4792,7 +4824,7 @@ poderia ser redimensionado ou gerenciado de outras formas.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4813,17 +4845,17 @@ poderia ser redimensionado ou gerenciado de outras formas.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Caminho</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -4831,60 +4863,60 @@ poderia ser redimensionado ou gerenciado de outras formas.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>arquivos</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover o site &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipédia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Currículo da Katakana Japonesa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Faça dicionários de vários arquivos de áudio, adicionando caminhos aqui:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover diretório &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romaji japonês</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ padronizado como ISO 3602
 não implementado ainda em GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Sites da Wikipédia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Dirs de Som</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Qualquer programa externo. Uma seqüência de caracteres %GDWORD% será substituída pela palavra de consulta. Uma string %GDSEARCH% será substituída pelo texto na barra de pesquisa. Se ambos os parâmetros não forem fornecidos, o headword será alimentado na entrada padrão.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncações fornecidas por &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, uma biblioteca de mídia linguística colaborativa da Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Habilitar Lingua Livre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Código do idioma ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;O uso do Forvo requer uma chave de API, registre-se no site para obter a sua própria chave.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pegue a sua própria chave &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;aqui&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>O método de transcrição do japonês,
 baseado na fonologia em inglês</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>syllabary japonês Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Transliteração personalizada</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Isso se aplica apenas à frase de pesquisa, com cada linha representando uma transliteração, separada por ponto e vírgula. Por exemplo, ae;æ, os usuários podem inserir ae para representar æ na palavra de destino.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #este é um exemplo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliteração</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ sistemas de escrita do kana. Normalizado como ISO 3602
 não implementado ainda em GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Transliteração Russa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Alterar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Exemplos:  &amp;quot;eng&amp;quot; para inglês, &amp;quot;fra&amp;quot; para francês &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+A lista completa de idiomas disponíveis pode ser encontrada &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; aqui &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Caminho para um diretório com dicionários de Hunspell/Myspel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Re&amp;examinar agora</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Transliteração alemã</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Qualquer website. Uma string %GDWORD% será substituída pela palavra de consulta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Adicionar...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Escolha um diretório</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Sites</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Caminhos para procurar nos arquivos de dicionário:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Confirmar remoção</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Programadores:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dicionários morfologia disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Permite usar o alfabeto latino para escrever o idioma japonês</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ Adicione dicionários apropriados para baixo
 dos grupos apropriados para usá-los.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Servidores DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Servidores DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>pronúncias ao vivo de &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. O site permite que as pessoas registrem e compartilhem pronúncias de palavras. Você pode ouvi-las a partir de Divisão Dourada.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Habilitar pronúncias de Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Chave da API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Códigos de idiomas (separados por vírgula):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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. Exemplo: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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 dos códigos de idiomas está disponível &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;aqui&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Transliteração grega</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(não disponível na versão portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programas</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Remover programa &lt;b&gt;%1&lt;/b&gt; da lista?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Transliteração bielorrussa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Alternativamente, use %GD1251% para CP1251, %GDISO1%...%GDISO16% para ISO 8859-1... SO 8859-16 respectivamente,
 %GDBIG5% para Big-5, %GDBIG5HKSCS% para Big5-HKSCS, %GDGBK% para GBK e GB18030, %GDSHIFTJIS% para Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Texto para fala</translation>
     </message>
@@ -5212,42 +5234,42 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Motores de voz selecionados:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Adicionar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Remover</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Pré-visualizar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Mecanismos de voz disponíveis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Texto a ser pré-visualizado:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Digite o texto a ser visualizado aqui.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Pré-visualização</translation>
     </message>
@@ -5272,17 +5294,17 @@ dos grupos apropriados para usá-los.</translation>
       <translation>Não foi possível encontrar a voz disponível TTS.&lt;br&gt;Certifique-se de que pelo menos um mecanismo TTS esteja instalado no seu computador.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferências:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Taxa:</translation>
     </message>
@@ -5290,12 +5312,12 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Digite uma palavra ou frase para pesquisar dicionários</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Suspender</translation>
     </message>
@@ -5326,33 +5348,33 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Nome:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Endereço</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Ativado</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Inserir artigo como link dentro da tag &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Como link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ícone</translation>
     </message>
@@ -5360,17 +5382,9 @@ dos grupos apropriados para usá-los.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Falha ao consultar alguns dicionários.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>AVISO: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/qu_PE.ts b/locale/qu_PE.ts
index 17301c64..6d7f355d 100644
--- a/locale/qu_PE.ts
+++ b/locale/qu_PE.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>GoldenDictmanta</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng simi-pirwapi mask&apos;ana, versión </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>GNU GPL kamachiyuq, versión 3 qhipamantataq</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation type="unfinished">Copy version info</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation type="unfinished">Copy dictionaries list</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Yanapaqkuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[mana yachasqachu]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation type="unfinished">Based on Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation type="unfinished">Based on Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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>
+      <translation>&lt;h3 align=&quot;center&quot;&gt;Popup kaqwan llamk'ay&lt;/h3&gt;Huk ruwaq ruwanakunamanta simikunata maskanapaq, ñawpaqta &lt;i&gt;"Popup ruwayta qhaway"&lt;/i&gt; &lt;b&gt;Munasqakuna&lt;/b&gt; kaqpi llamk'achinayki kanman, chaymanta chaymanta mayk'aqllapas atichiy icha 'Popup' icono patamanta llamk'achispa, utaq uraypi bandeja icono ñit'ispa paña ñit'inaykiwan chaymanta chayta akllaspa menú pop-pi.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation type="unfinished">Expand article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation type="unfinished">Collapse article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Juch&apos;uy qhawanapi mask&apos;anapaq</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(mana sutiyuq)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Qallarinapaq</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation type="unfinished">No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;GoldenDictpa foronpi&lt;/a&gt; tapuyta atinki. Kay programata kunanchanapaq &lt;p&gt;&lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation type="unfinished">(picture)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation type="unfinished">Expand article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation> </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation type="unfinished">Collapse article</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation type="unfinished">Make a new Anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Pantay mask&apos;aspa: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Simikunata wisq&apos;ay:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Expresiones compuestas:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Palabras individuales:</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Temporal archiwuta yurichispa pantay.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot;ta &amp;mask&apos;ay </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>El recurso referido no existe.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>%2pi &quot;%1&quot;ta mask&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation type="unfinished">Select Current Article</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation type="unfinished">Copy as text</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation type="unfinished">Inspect</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Musuq pestañapi t&apos;inkisqata kichay</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Abrir enlace en un &amp;navegador web externo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation type="unfinished">Resource</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation type="unfinished">TTS Voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation type="unfinished">Picture</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation type="unfinished">Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation type="unfinished">Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation type="unfinished">Definition from dictionary &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation type="unfinished">Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
-      <translation type="unfinished">The referenced audio program doesn&apos;t exist.</translation>
+      <translation>Chay referenciasqa uyarina programaqa manan kanchu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation type="unfinished">Op&amp;en Link</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation type="unfinished">WARNING: Audio Player: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation type="unfinished">Save sound</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation type="unfinished">Save image</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation type="unfinished">Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation type="unfinished">Save &amp;image...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation type="unfinished">Phrase not found</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation type="unfinished">%1 of %2 matches</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation type="unfinished">Save s&amp;ound...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation type="unfinished">Send &quot;%1&quot; to input line</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation type="unfinished">&amp;Add &quot;%1&quot; to history</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation type="unfinished">&amp;Send Current Article to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation type="unfinished">&amp;Send selected text to Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation type="unfinished">Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation type="unfinished">Failed to play sound file: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation type="unfinished">Chinese Conversion</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation type="unfinished">Chinese Con&amp;version</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation type="unfinished">SC to TC (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation type="unfinished">TC to SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
     </message>
@@ -477,7 +472,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation type="unfinished">custom transliteration</translation>
     </message>
@@ -485,22 +480,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation type="unfinished">Proxy authentication required</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation type="unfinished">Username:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Pakasqa simi:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Juñuqpa unanchan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Tecla de acceso rápido:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation type="unfinished">Favorites folder:</translation>
     </message>
@@ -548,81 +543,81 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Rikch&apos;aykuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Tukuy archiwukuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Pantay</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
-      <translation>Mana rikch&apos;aywan archiwuta kichayta atinchu</translation>
+      <translation type="unfinished">Can&apos;t read the specified image file.</translation>
     </message>
   </context>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Confirmación</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>¿Estás seguro que quiere generar un conjunto de grupos basado en pares de lengua?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation type="unfinished">Combine groups by source language to &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation type="unfinished">Combine groups by target language to &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation type="unfinished">Auto group by folder failed.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation type="unfinished">Make two-side translate group &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation type="unfinished">Combine groups with &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation type="unfinished">Dictionaries: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation type="unfinished">Search mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation type="unfinished">This element determines how filter string will be interpreted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation type="unfinished">Match case</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation type="unfinished">Exports headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation type="unfinished">OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation type="unfinished">Press this button to apply filter to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation type="unfinished">Apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation type="unfinished">Auto apply</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation type="unfinished">Filter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation type="unfinished">RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation type="unfinished">Loading headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation type="unfinished">Save headwords to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">Text files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation type="unfinished">Can not open exported file</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation type="unfinished">Export headwords...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation type="unfinished">Export process is interrupted</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation type="unfinished">Export finished</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Jayk&apos;a articulokuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Simimanta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Jayk&apos;a simikuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Simiman:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation type="unfinished">Open folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Kay simi-pirwaqa chay archiwukunayoq:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation type="unfinished">Description:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation type="unfinished">Show all unique dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation type="unfinished">Headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation type="unfinished">Edit the dictionary via command:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation type="unfinished">Index filename:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation type="unfinished">Open index folder</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 willaykuna</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Llank&apos;achkanña</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Maypi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation type="unfinished">Databases</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation type="unfinished">Strategies</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation type="unfinished">Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation type="unfinished">Comma-delimited list of search strategies
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation type="unfinished">Extended menu with all dictionaries...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Kay juñuta allinchay</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation type="unfinished">Dictionary info</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation type="unfinished">&amp;Dictionary Bar</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Simi-pirwakuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Simi-pirwakuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Chaskiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Fuentes modificados</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Juñukuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Algunos fuentes fueron cambiados. ¿Quieres aceptar los cambios?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation type="unfinished">Plain text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation type="unfinished">Wildcards</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation type="unfinished">The querying word can not be empty.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation type="unfinished">Default</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation type="unfinished">Articles found: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation type="unfinished">Now indexing: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ni ima</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation type="unfinished">No dictionaries for full-text search</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation type="unfinished">Error in favorities file</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</translation>
       <translation>imamanta</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Vaya a Editar|Diccionarios|Fuentes|Forvo y solicitar su propia clave de API para hacer desaparecer este error.</translation>
     </message>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation type="unfinished">Mode:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation type="unfinished">Articles found:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation type="unfinished">Available dictionaries in group:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation type="unfinished">Wait for indexing:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation type="unfinished">Help</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation type="unfinished">Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation type="unfinished">Indexed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation type="unfinished">Now indexing: None</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Chinkachiy</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation type="unfinished">&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation type="unfinished">&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>DEL</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>INS</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Pestaña 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Churay musuq sutita kay juñuman:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Jap&apos;inapaq simi-pirwakuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Juñuta yapay</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</translation>
       <translation>J&amp;uñuta yapay</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Simi-pirwakunaqpa musuq juñunkuta yurichiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation type="unfinished">Group by Languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation type="unfinished">Create folder-based groups.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation type="unfinished">Group by Folders</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation type="unfinished">Group by Metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Para añadir diccionarios a grupos, utilice el ratón para arrastre y suelte los diccionarios a los grupos utilizando el ratón. Además cambie el orden de los grupos arrastrándolos con el ratón.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Renombrar el grupo actual de diccionarios</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Simi-pirwakunawan kunan juñuta chinkachiy</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</translation>
       <translation>Musuq juñuman churay kay sutita:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>&amp;Tukuy juñukunata chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>(SUPR)wan juñumanta aqllasqa simi-pirwakunata chinkachiy </translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>(INS)wan juñuman aqllasqa simi-pirwakunata yapay </translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Juñuta &amp;chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Juñukuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Juñuqpa &amp;waq sutinta churay</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Simi-pirwakunawan tukuy juñukunata chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Simimanta juñukunata yurichiy</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</translation>
       <translation type="unfinished">History:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation type="unfinished">%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation type="unfinished">History size: %1 entries out of maximum %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Qillqata allinchanapaq: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfología %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Llank&apos;achkanña</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation type="unfinished">Indexing: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Simi-pirwaqpa sutin</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - qallarispa</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Siqipi simi-pirwakunata ñiqichachkan. Suyariy. </translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Suyariy...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation type="unfinished">Indexing...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation type="unfinished">Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation type="unfinished">Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laosiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation type="unfinished">Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation type="unfinished">Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Acano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation type="unfinished">Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation type="unfinished">Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation type="unfinished">Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation type="unfinished">Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation type="unfinished">Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation type="unfinished">Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Checo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation type="unfinished">Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Griego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation type="unfinished">Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Camboyano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latín</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation type="unfinished">Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation type="unfinished">Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation type="unfinished">Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation type="unfinished">Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation type="unfinished">Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tayiko</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation type="unfinished">Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tártaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation type="unfinished">Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation type="unfinished">Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation type="unfinished">Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation type="unfinished">Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbeco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wólof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation type="unfinished">Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Retorrománico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation type="unfinished">Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation type="unfinished">Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ndebele norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abjasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirguís</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation type="unfinished">Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Gaélico escocés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation type="unfinished">Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Búlgaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation type="unfinished">Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation type="unfinished">Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabé</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Vasco (Euskara)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Ávaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation type="unfinished">Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sudanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation type="unfinished">Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation type="unfinished">Luba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fiyiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Húngaro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Alemán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation type="unfinished">Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation type="unfinished">Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Cazaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation type="unfinished">Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Coreano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation type="unfinished">Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation type="unfinished">Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation type="unfinished">Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pastún</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation type="unfinished">Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovaco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation type="unfinished">Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation type="unfinished">Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation type="unfinished">Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uigur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbo-Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation type="unfinished">Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation type="unfinished">Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation type="unfinished">Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Corso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsì</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sloveno</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Frisón occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgache</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Gallego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amárico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanscrito</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ucranio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation type="unfinished">Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Groenlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation type="unfinished">Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bielorruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Cachemir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation type="unfinished">Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua (Runasimi)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avéstico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation type="unfinished">Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikáans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation type="unfinished">Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Noruego bokmål</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Croato</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation type="unfinished">Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Catalán</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birmano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruso</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Noruego</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Chechén</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Chino</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Chuvasio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Cingalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Español</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Córnico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation type="unfinished">Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Asamés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osseto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Suajili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Sueco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamita</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedonio</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugués</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turco</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turcomano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Guyaratí</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation type="unfinished">Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Inglés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Eslavo eclesiástico</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Feroés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation type="unfinished">Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valón</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation type="unfinished">Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshalés</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Sami norteño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Criollo haitiano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation type="unfinished">Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Noruego Nynorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraní</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ndebele sureño</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation type="unfinished">Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituano</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation type="unfinished">Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigriña</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yidis</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation type="unfinished">Traditional Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation type="unfinished">Simplified Chinese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation type="unfinished">Other</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation type="unfinished">Other Simplified Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation type="unfinished">Other Traditional Chinese dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation type="unfinished">Other Eastern-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation type="unfinished">Other Western-European languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation type="unfinished">Other Russian languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation type="unfinished">Other Japanese languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation type="unfinished">Other Baltic languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation type="unfinished">Other Greek languages</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation type="unfinished">Other Korean dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation type="unfinished">Other Turkish dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation type="unfinished">Other Thai dialects</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation type="unfinished">Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
@@ -2517,207 +2490,207 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation type="unfinished">French</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation type="unfinished">Spanish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation type="unfinished">Belarusian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation type="unfinished">Bulgarian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation type="unfinished">Czech</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation type="unfinished">German</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation type="unfinished">Greek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation type="unfinished">Finnish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation type="unfinished">Italian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation type="unfinished">Japanese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation type="unfinished">Korean</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation type="unfinished">Lithuanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation type="unfinished">Macedonian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation type="unfinished">Dutch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation type="unfinished">Polish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation type="unfinished">Portuguese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation type="unfinished">Russian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation type="unfinished">Slovak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation type="unfinished">Albanian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation type="unfinished">Serbian (Cyrillic)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation type="unfinished">Swedish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation type="unfinished">Turkish</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation type="unfinished">Ukrainian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation type="unfinished">Chinese Simplified</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation type="unfinished">Chinese Traditional</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation type="unfinished">Vietnamese</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation type="unfinished">Portuguese, Brazilian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation type="unfinished">Persian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation type="unfinished">Spanish, Argentina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation type="unfinished">Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation type="unfinished">Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation type="unfinished">German, Switzerland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation type="unfinished">Spanish, Bolivia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation type="unfinished">Tajik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation type="unfinished">Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation type="unfinished">Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation type="unfinished">Arabic, Saudi Arabia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation type="unfinished">Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation type="unfinished">Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation type="unfinished">Lojban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation type="unfinished">English</translation>
     </message>
@@ -2725,7 +2698,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Simi-pirwakunata jap&apos;ikuspa pantay </translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation type="unfinished">Error in configuration file. Continue with default settings?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation type="unfinished">F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation type="unfinished">F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation type="unfinished">Favo&amp;rites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation type="unfinished">F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation type="unfinished">F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Tukuy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Ñawpaq</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 simi-pirwakuna, %2 articulokuna, %3 simikuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Allinchay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Archiwu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Yanapa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation type="unfinished">Search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Lluqsiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Pantay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Programa nisqamanta lluqsiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Sistema nisqaqpa chumpinman wisq&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
-      <translation>&quot;%1&quot; articulota mana jallch&apos;ayta atinchu </translation>
+      <translation>Mana qillqasqata waqaychayta atinchu: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Jatunyachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Simi-pirwakuna...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;GoldenDictmanta willaway</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Foro (Rimanakusun)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Raphipi ñit&apos;iy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Articulo nisqata jallch&apos;ay </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Jinata articulota jallch&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation type="unfinished">Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation type="unfinished">Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Sistema nisqaqpa chumpinman programata juch&apos;uyyachin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Raphita kamachina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;GoldenDictpa raphin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Una nueva versión está disponible</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Mask&apos;ay:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Juch&apos;uyyachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Qhapaq qhawanata &amp;rikhuchiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>GoldenDictmanta willaway</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Urayachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Raphita kamachina</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Mask&apos;ay:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Mana aqllasqa chhikan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation type="unfinished">Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation type="unfinished">Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Jap&apos;ikuchkan...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(Mana sutiyuq)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Aqllanakuna...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>¡Bienvenido!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Simita parlachiy (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Articulo nisqata jallch&apos;ay </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Saltar esta versión</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Qhipa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Raphipi articulota ñit&apos;iy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Qhaway</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Yuyaynin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Pichay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Jatunyachiy/Juch&apos;uyachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Simikunata jatunyachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Simikunata juch&apos;uyyachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Mana aqllasqa chhikanpa simikunan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Kunan pestañata wisq&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
-      <translation>Tukuy pestañakunata wisq&apos;ay</translation>
+      <translation>Cierra todas las pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
-      <translation>Tukuy pestañakunata wisq&apos;ay, mana kunan pestañachu </translation>
+      <translation type="unfinished">Close all tabs except current</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Kichasqa Pestañas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation type="unfinished">New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation type="unfinished">Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation type="unfinished">&amp;Configuration Folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation type="unfinished">&amp;Menubar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation type="unfinished">Found in Dictionaries:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation type="unfinished">Add all tabs to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation type="unfinished">Open Tabs List</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation type="unfinished">Remove current tab from Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation type="unfinished">You have chosen to hide a menubar. Use %1 to show it back.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation type="unfinished">Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation type="unfinished">&amp;Show</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation type="unfinished">&amp;Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation type="unfinished">&amp;Hide</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation type="unfinished">Export history to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">Text files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation type="unfinished">History export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation type="unfinished">Export error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation type="unfinished">Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation type="unfinished">&amp;Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation type="unfinished">Import history from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation type="unfinished">Import error: invalid data in file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation type="unfinished">History import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation type="unfinished">Import error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation type="unfinished">Export Favorites to file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation type="unfinished">Favorites export complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation type="unfinished">Export Favorites to file as plain list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation type="unfinished">Import Favorites from file</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation type="unfinished">Favorites import complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation type="unfinished">Data parsing error</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation type="unfinished">Dictionary info</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation type="unfinished">Open dictionary folder</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation type="unfinished">Edit dictionary</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation type="unfinished">Now indexing for full-text search: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation type="unfinished">&amp;Search Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation type="unfinished">&amp;Results Navigation Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation type="unfinished">Favor&amp;ites Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation type="unfinished">Print Pre&amp;view</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation type="unfinished">&amp;Rescan Files</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation type="unfinished">&amp;New Tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation type="unfinished">&amp;Always on Top</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation type="unfinished">Always on Top</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation type="unfinished">Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation type="unfinished">Menu Button</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation type="unfinished">Search in page</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation type="unfinished">Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation type="unfinished">Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation type="unfinished">GoldenDict reference</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation type="unfinished">Show</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation type="unfinished">Export</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation type="unfinished">Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation type="unfinished">Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation type="unfinished">Add current tab to Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation type="unfinished">Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation type="unfinished">Export to list</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation type="unfinished">Show Names in Dictionary &amp;Bar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation type="unfinished">Show Small Icons in &amp;Toolbars</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation type="unfinished">&amp;Navigation</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation type="unfinished">Enable Scanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation type="unfinished">Article, Complete (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation type="unfinished">Article, HTML Only (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation type="unfinished">Saving article...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation type="unfinished">Save article complete</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation type="unfinished">The main window is set to be always on top.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation type="unfinished">&amp;History Pane</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation type="unfinished">Accessibility API is not enabled</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation type="unfinished">Dictionary file was tampered or corrupted</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation type="unfinished">Failed loading article from %1, reason: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XMLta ñawichaspa pantay: %1 &quot;%2,%3&quot;pi </translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Maypi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
-      <translation>Llank&apos;achkanña</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -3498,88 +3471,88 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Mana ñawirinapaq uyarinapaq bufferta kichayta atirqachu.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Mana jap&apos;isqa simi-pirwakuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Suti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Jayk&apos;a articulokuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Simimanta:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Simiman:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Jayk&apos;a simikuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Siqipi simi-pirwakunata ñiqichanapaq:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Kay simi-pirwaqa chay archiwukunayoq:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Simi-pirwamanta willay</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation type="unfinished">Description:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation type="unfinished">Sort by name</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation type="unfinished">Sort by languages</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation type="unfinished">Dictionary headwords</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ñan</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Recursivo</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Sistema nisqaqpa chumpinpi qalliriy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Sola MAYÚSCULA de izquierda</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>WINDOWSchu METAchu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Sistema nisqaqpa chumpinpi unanchata churay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation type="unfinished">Host:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Punku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tipo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>jap&apos;iq masi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Juch&apos;uy qhawanapi mask&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ inmediatamente. Con esta opción pestañas nuevas serán
 abiertas sin trasladar a ellas.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
-      <translation>Servidor proxy nisqawan t&apos;inkichiy</translation>
+      <translation type="unfinished">Use proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tecla de WINDOWS o META</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Qhapaq qhawanapi kunanpacha simikunata parlachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Sistema nisqaqa qallariqtin GoldenDict qallarintaq</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
-      <translation>Sapalla lluq&apos;i ALT</translation>
+      <translation type="unfinished">Left Alt only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
-      <translation>Pestaña nisqawan wamp&apos;una</translation>
+      <translation type="unfinished">Tabbed browsing</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Sapalla paña MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Con esta opción un intento de cerrar la ventana principal la ocultaría sin 
 cerrar la aplicación.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Chanra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>GoldenDictpa simin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
-      <translation>Sapalla lluq&apos;i CTRL </translation>
+      <translation type="unfinished">Left Ctrl only</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Musuq pestañata kichaqtin kunan pestañamanta ama ripuychu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Llika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Sapalla paña CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation type="unfinished">Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Paña MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Lluq&apos;i MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Juch&apos;uy qhawanapi kunanpacha simikunata parlachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Kunan pestañaqpa chirunman musuq pestañata kichay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Musuq simita jap&apos;ikunanpaq hukmanta programata qallarichiy.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tecla ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,24 +3782,23 @@ de la lista. Con está opción pestañas nuevas son
 abiertas al lado de la pestaña actual.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Sistema nisqaqpa chimpunman wisq&apos;ay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Sistema nisqaqpa simin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Cuando activado un icono aparece en la bandeja del sistema que puede ser utilizado para abrir la ventana principal y realizar otras tareas. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,224 +3811,224 @@ el programa le informa al usuario y le apunta a
 la página web para descargarla.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Qallariynin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Pakasqa simi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Mana aqllasqa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Programaqpa uyan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Simita t&apos;ikrachkan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tecla CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Lluq&apos;i ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Sapalla paña ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Aqllanakuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Lluq&apos;i CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Paña ALT</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Paña CTRL</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Teclakuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
-      <translation>Programaqa qallariqtin juch&apos;uy qhawanapi maskay</translation>
+      <translation type="unfinished">Start with scan popup turned on</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Con esta opción, la aplicación inicia directamente en la bandeja del sistema sin mostrar su ventana principal.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tecla MAYÚSCULA</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Sistema nisqaqa qallariqtinkama, GoldenDictqa qallarinpis.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Ama popup rikuchiychu mayk'aq akllay utaq portapapeles huknin GoldenDict kaqpa kikin ventanasninpi tikrakun</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>GoldenDictpa kikin akllasqanta chaymanta portapapeles tikrakuyninta mana qhawaychu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation type="unfinished">Play audio files via built-in audio support</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation type="unfinished">Use internal player:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation type="unfinished">Choose audio back end</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation type="unfinished">Enter audio player command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Parlachina</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Takichina</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Takichiy jawa programawan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Simita mask&apos;anapaq iskay klik ruway</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Usar cualquier programa para reproducir archivos de audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation type="unfinished">ESC key hides main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation type="unfinished">Hide single tab</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation type="unfinished">Context menu dictionaries limit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation type="unfinished">Send translated word to main window instead of to show it in popup window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation type="unfinished">Send translated word to main window</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4069,445 +4039,487 @@ scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation type="unfinished">Automatically scroll to target article</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation type="unfinished">Article Display style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation type="unfinished">Turn the UI to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation type="unfinished">Dark Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation type="unfinished">Turn the article display style to dark.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation type="unfinished">Dark Reader Mode</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation type="unfinished">MRU order: Most recently used order.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation type="unfinished">Track Clipboard change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation type="unfinished">Track Selection change</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation type="unfinished">Show scan flag when word is selected</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation type="unfinished">Delay time</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation type="unfinished">System proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation type="unfinished">Custom proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation type="unfinished">Custom settings</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation type="unfinished">Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation type="unfinished">http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation type="unfinished">Deck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation type="unfinished">Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation type="unfinished">Word</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation type="unfinished">Vocabulary field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation type="unfinished">Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation type="unfinished">Definition field...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation type="unfinished">Sentence</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation type="unfinished">Sentence field (can be empty)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation type="unfinished">Maximum network cache size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Aswan hatun disk espacio GoldenDict llika waqaychasqa kaqwan hap'isqa
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+0 kaqman churasqa kaptinqa llika disk waqaychasqa mana llamk'achisqa kanqa.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation type="unfinished"> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation type="unfinished">When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation type="unfinished">Clear network cache on exit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation type="unfinished">Full-text search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation type="unfinished">Allow full-text search for:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Ama maskaychu aswan achkayuq diccionariokunapi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation type="unfinished">articles (0 - unlimited)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation type="unfinished">Ad&amp;vanced</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation type="unfinished">Session collapse</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation type="unfinished">When using clipboard,strip everything after newline</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Musuq maskaypi, hatun utaq lluqsiq ventanata enfocay, rikukuqña kaptinpas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation type="unfinished">Favorites</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation type="unfinished">Confirmation for items deletion</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation type="unfinished">Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation type="unfinished">Ignore input phrases longer than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation type="unfinished">Ignore diacritics while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation type="unfinished">Turn this option on to always expand optional parts of articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation type="unfinished">Expand optional &amp;parts</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation type="unfinished">Select this option to automatic collapse big articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation type="unfinished">Collapse articles more than</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation type="unfinished">Articles longer than this size will be collapsed</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation type="unfinished">Ignore punctuation while searching</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation type="unfinished">Extra search via synonyms</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation type="unfinished">symbols</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation type="unfinished">Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation type="unfinished">History</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation type="unfinished">Turn this option on to store history of the translated words</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation type="unfinished">Store &amp;history</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation type="unfinished">Articles</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation type="unfinished">Select word by single click</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation type="unfinished">Add-on style:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation type="unfinished">Specify the maximum number of entries to keep in history.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation type="unfinished">Maximum history size:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation type="unfinished">Save every</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation type="unfinished">minutes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation type="unfinished">Classic</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation type="unfinished">Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation type="unfinished">Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation type="unfinished">Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation type="unfinished"> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapianpa frase maskananta chaymanta NEAR operadorta llamk'achinapaq posición willayta mañasqa, ichaqa willaypa tiyapuyninpa sayayninqa aswan hatun kanqa. Musuq yaykuq simi pirwakunallapaqmi.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation type="unfinished">Enable index with positional information</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation type="unfinished">Standard Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation type="unfinished">Monospace Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation type="unfinished">Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation type="unfinished">Sans-serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation type="unfinished">Appearance</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation type="unfinished">These fonts will be applied when the fonts specified by a dictionary are not found.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation type="unfinished">Fallback Fonts</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation type="unfinished">Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation type="unfinished">Plain Text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation type="unfinished">Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation type="unfinished">Prefix Match</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation type="unfinished">Unknown</translation>
     </message>
@@ -4515,17 +4527,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation type="unfinished">No program name was given.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation type="unfinished">The program has crashed.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation type="unfinished">The program has returned exit code %1.</translation>
     </message>
@@ -4533,27 +4545,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Llank&apos;achkanña</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation type="unfinished">Type</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation type="unfinished">Command Line</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -4561,99 +4573,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation type="unfinished">Article loading error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation type="unfinished">Article decoding error</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation type="unfinished">Copyright: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation type="unfinished">Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation type="unfinished">Author: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation type="unfinished">E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation type="unfinished">Title: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation type="unfinished">Website: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation type="unfinished">Date: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation type="unfinished">A dictionary lookup program.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation type="unfinished">Word or sentence to query.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation type="unfinished">Reset window state.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation type="unfinished">Disable tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation type="unfinished">Change the group of main window.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation type="unfinished">Change the group of popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation type="unfinished">Toggle scan popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation type="unfinished">Print version and diagnosis info.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation type="unfinished">Dictionary search/filter (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation type="unfinished">Clear Search</translation>
     </message>
@@ -4661,22 +4688,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation type="unfinished">ERROR: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation type="unfinished">Resource saving error: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>El recurso ha fallado de descargar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>WILLAY: %1</translation>
     </message>
@@ -4705,67 +4732,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation type="unfinished">Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Rimanakuy</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Simita parlachiy (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Simi-pirwakunawan chumpita rikhurichin chaymanta pakachintaq</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation type="unfinished">Always stay on top of all other windows</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation type="unfinished">Send word to main window (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation type="unfinished">Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Ñawpaq</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Qhipa</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation type="unfinished">%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation type="unfinished">WARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4808,17 +4840,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ñan</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -4826,60 +4858,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Archiwukuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation type="unfinished">Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation type="unfinished">Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation type="unfinished">Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Silabario de Japonés Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Crear diccionarios de grupos de archivos de audio, encontrados en rutas aquí:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romano qillqapi japonés simita t&apos;ikray</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4890,84 +4922,84 @@ Estandarizado como ISO 3602
 Todavía no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) raphikuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Chanrawan directoriokuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation type="unfinished">Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation type="unfinished">Enable Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation type="unfinished">ISO 639-3 language code</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Silabario de Japonés Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation type="unfinished">Custom transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation type="unfinished">ae;æ #this is an example</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Waq qillqaman t&apos;ikray</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4978,22 +5010,22 @@ Su estándar es ISO-3602.
 Todavia no implementado en GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Ruso qillqaman t&apos;ikray</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfología</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Allinchay...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -5002,94 +5034,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation type="unfinished">Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Hunspell/Myspell simi-pirwakunawan directoriokunaman ñan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Kunan &amp;hukmanta ñawichay</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Aleman qillqaman t&apos;ikray</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
-      <translation>Web raphikuna: (Mask&apos;asqa simiwan &quot;%GDWORD%&quot;ta rantinqa)</translation>
+      <translation type="unfinished">Any websites. A string %GDWORD% will be replaced with the query word:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Yapay...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Directorio nisqata aqllay</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Web raphikuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Simi-pirwakunaqpa archiwunkuta tarinapaq ñankuna:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Chinkachiyta munankichu?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Silabario:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Jap&apos;ikunapaq morfológicos simi-pirwakuna:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5104,94 +5126,94 @@ mal escritas. Agregar diccionarios a los
 fondos de grupos apropriados para utilizarlos.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation type="unfinished">Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation type="unfinished">Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation type="unfinished">Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation type="unfinished">DICT servers</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation type="unfinished">DICT servers:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvo nisqawan parlachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API nisqaqpa chimpun:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
-      <translation>Simikunaqpa chimpunku (coma nisqakunawan t&apos;aqasqa):</translation>
+      <translation type="unfinished">Language codes (comma-separated):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
-      <translation>Griego qillqaman t&apos;ikray</translation>
+      <translation type="unfinished">Greek transliteration</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(no disponible en versión portátil)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation type="unfinished">Programs</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation type="unfinished">Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation type="unfinished">Belarusian transliteration</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation type="unfinished">Text to Speech</translation>
     </message>
@@ -5207,42 +5229,42 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation type="unfinished">Selected voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation type="unfinished">&amp;Add</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Chinkachiy</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation type="unfinished">Preview</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation type="unfinished">Available voice engines:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation type="unfinished">Text to be previewed:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation type="unfinished">Type text to be previewed here.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation type="unfinished">&amp;Preview</translation>
     </message>
@@ -5267,17 +5289,17 @@ fondos de grupos apropriados para utilizarlos.</translation>
       <translation type="unfinished">Cannot find available TTS voice.&lt;br&gt;Please make sure that at least one TTS engine installed on your computer already.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Aqllanakuna</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation type="unfinished">Volume:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation type="unfinished">Rate:</translation>
     </message>
@@ -5285,12 +5307,12 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation type="unfinished">Type a word or phrase to search dictionaries</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation type="unfinished">Drop-down</translation>
     </message>
@@ -5300,7 +5322,7 @@ fondos de grupos apropriados para utilizarlos.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="280"/>
       <source>Enabled</source>
-      <translation>Llank&apos;achkanña</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="282"/>
@@ -5321,33 +5343,33 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Suti</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Maypi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
-      <translation>Llank&apos;achkanña</translation>
+      <translation type="unfinished">Enabled</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation type="unfinished">As link</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation type="unfinished">Icon</translation>
     </message>
@@ -5355,17 +5377,9 @@ fondos de grupos apropriados para utilizarlos.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
-      <translation>Simi-pirwakunapi mask&apos;aspa pantay</translation>
-    </message>
-  </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>WILLAY: %1</translation>
+      <translation type="unfinished">Failed to query some dictionaries.</translation>
     </message>
   </context>
 </TS>
diff --git a/locale/ru_RU.ts b/locale/ru_RU.ts
index de078179..7f3759bb 100644
--- a/locale/ru_RU.ts
+++ b/locale/ru_RU.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>О программе</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Словарь GoldenDict, версия </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Лицензия: GNU GPLv3 или более поздняя версия</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Скопировать информацию о версии</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Копировать список словарей</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Список участников:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Неизвестно]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>На базе Qt %1 (%2, %3 бит)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© Константин Исаков (ikm@goldendict.org), 2008-2013</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>На основе Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: может&apos;t создать карту без слова</translation>
+      <translation>anki: не могу создать карту без слов</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Развернуть статью</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Свернуть статью</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Работа с всплывающим окном</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без имени)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Добро пожаловать!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;форум программы&lt;/a&gt;.&lt;p&gt;Обновления программы доступны на её &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;вебсайте&lt;/a&gt;.&lt;p&gt;© Константин Исаков (ikm@goldendict.org), 2008-2013. Лицензия: GNU GPLv3 или более поздняя версия.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(картинка)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Развернуть статью</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Из словаря </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Свернуть статью</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation>Создать заметку Anki</translation>
+      <translation>Создать запись Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Ошибка поиска: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Близкие слова: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Составные выражения: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Отдельные слова: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Ошибка создания временного файла.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Поиск «%1»</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Поиск «%1» в &amp;новой вкладке</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Запрошенный ресурс не найден.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Ошибка открытия файла ресурса, попробуйте открыть вручную: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Поиск «%1» в %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Выделить текущую статью</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Копировать как текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Инспектор</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Поиск «%1» в %2 в &amp;новой вкладке</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Открыть ссылку в новой &amp;вкладке</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Открыть ссылку во внешнем &amp;браузере</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ресурс</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Синтезатор голоса</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Картинка</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Видео</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Видео: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Определение из словаря «%1»: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Определение: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Указанная аудио-программа не найдена.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>О&amp;крыть ссылку</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Сохранить &amp;закладку &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ПРЕДУПРЕЖДЕНИЕ: Аудио-плеер: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ОШИБКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Сохранить звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Сохранить изображение</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Файлы изображений (*.bmp *.jpg *.png *.tif);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Сохранить &amp;изображение...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Ничего не найдено</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 из %2 совпадений</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Сохранить &amp;звук...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Поместить «%1» в строку ввода</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Добавить «%1» в журнал</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Отправить текущую статью в Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Отправить выбранный текст в Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Звуковые файлы (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Все файлы (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Звуковые файлы (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Ошибка воспроизведения звукового файла: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Преобразования китайских иероглифов</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Преобразования между упрощёнными и классическими китайскими иероглифами</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Преобразования китайских иероглифов</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Преобразование упрощённых иероглифов в класические (Тайваньский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>Упрощённые в класические (Тайваньский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Преобразование упрощённых иероглифов в класические (Гонконгский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Упрощённые в класические (Гонконгский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Преобразование классических иероглифов в упрощённые</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>Классические в упрощённые</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Преобразование упрощённых иероглифов в класические (Тайваньский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Преобразование упрощённых иероглифов в класические (Гонконгский вариант)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Преобразование классических иероглифов в упрощённые</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>Другая транслитерация</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Прокси-сервер требует авторизацию</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Для доступа к прокси-серверу необходимо ввести имя и пароль</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Имя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Значок группы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Горячая клавиша:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Папка в Избранном:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Изображения</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Все файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Ошибка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Невозможно прочитать выбранный файл изображения.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Подтверждение</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Вы уверены, что хотите создать набор групп на основе языковых пар?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Вы уверены, что хотите создать набор групп на основе metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Собрать группу &quot;%1-&gt;&quot; по исходному языку</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Собрать группу &quot;-&gt;%1&quot; по целевому языку</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>Не удалось автоматически группировать по папке.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Не удаётся открыть родительский каталог %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>Вы уверены, что хотите создать набор групп на основе языковых пар?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Собрать группу двустороннего перевода &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Собрать группу &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Словарей: </translation>
     </message>
@@ -635,135 +630,135 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Режим поиска</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Этот элемент определяет, как будет интерпретироваться строка фильтра</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Если этот флажок установлен, фильтрация будет
 осуществляться с учётом регистра символов</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Учитывать регистр</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Экспортировать заголовки в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Экспортировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Справка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>ОК</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Нажмите эту кнопку чтобы применить фильтр к списку заголовков</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Применить</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Если этот флажок установлен, любые изменения фильтра
 будут применяться к списку заголовков немедленно</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Автоприменение</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Фильтр:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Строка фильтра (простой текст, шаблон или регулярное выражение)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Шаблон</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Рег. выражение</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Загружаются заголовочные слова...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Неповторяющихся заголовков всего: %1, отфильтрованых: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Сохранить заголовки в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстовые файлы (*.txt);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Невозможно открыть экспортированный файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Экспортируются заголовки...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Отмена</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Процесс экспорта прерван</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Экспорт завершён</translation>
     </message>
@@ -771,66 +766,76 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Количество статей:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Исходный язык:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Количество слов:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Целевой язык:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Открыть папку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Редактировать словарь</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлы, из которых состоит словарь:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Описание:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Показать все неповторяющиеся заголовки словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Заголовки</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Редактировать словарь, команда: %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Имя файла индекса:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Открыть индексную папку</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 статей</translation>
     </message>
@@ -861,44 +866,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Название</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Базы</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Стратегии</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Список баз, разделённый запятыми
 (пустая строка или &quot;*&quot; соответствует всем базам сервера)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Список стратегий поиска, разделённый запятыми
@@ -908,37 +913,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Расширенное меню со всеми словарями...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Изменить эту группу</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Информация о словаре</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Заголовки словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Открыть папку словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Редактировать словарь</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Панель словарей</translation>
     </message>
@@ -947,27 +952,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Словари</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Словари</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Принять</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Отмена</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Источники изменены</translation>
     </message>
@@ -978,12 +983,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Группы</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Источники были изменены. Принять внесенные изменения?</translation>
     </message>
@@ -1012,75 +1017,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Полнотекстовый поиск</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Слова точно</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Простой текст</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Шаблоны</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Рег. выр.</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Запрашивающее слово не может быть пустым.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>поддержка xapian поискового синтаксиса, таких как AND OR +/- и т.д.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Промежуточных слов, не более (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>По умолчанию</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Статей на словарь, не более (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Статей найдено: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Индексируется: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Нет</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Строка поиска должна включать как минимум одно слово из </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> или более символов</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Нет словарей для полнотекстового поиска</translation>
     </message>
@@ -1088,7 +1073,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Ошибка в файле избранного</translation>
     </message>
@@ -1154,7 +1139,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>из</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1175,68 +1160,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Искать</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Учитывать регистр</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Режим:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Игнорировать порядок слов</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Игнорировать диакритику </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Статей найдено:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Доступных словарей в группе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Ожидают индексации:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Справка</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Всего:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Проиндексированных:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Индексируется: Нет</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Отмена</translation>
     </message>
@@ -1268,27 +1237,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Tab 2</translation>
     </message>
@@ -1328,12 +1297,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Введите новое название группы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Доступные словари:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Добавить</translation>
     </message>
@@ -1343,42 +1312,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Добавить группу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Создать новую группу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Сгруппировать по языку</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Создать группы на основе папок.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Сгруппировать по папкам</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Сгруппировать по метаданным</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Перетаскивайте словари в группы из списка доступных словарей, изменяйте порядок групп, используя мышь.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Переименовать редактируемую группу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Удалить редактируемую группу</translation>
     </message>
@@ -1388,43 +1357,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Введите название новой группы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Удалить все</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Удалить выбранные словари из группы (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Добавить выбранные словари в группу (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Удалить</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Группы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Переименовать</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Удалить все существующие группы</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Создать группы, базирующиеся на языковых парах</translation>
     </message>
@@ -1447,12 +1416,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Журнал:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Размер журнала: %1 записей из %2 максимально допустимых</translation>
     </message>
@@ -1460,12 +1429,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Варианты написания: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 (морфология)</translation>
     </message>
@@ -1473,12 +1442,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Название</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
@@ -1486,1031 +1455,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Индексация: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Название словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Запуск GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Создаются индексы словарей</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Подождите...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Индексирование...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Эве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Аканский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кри</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ибо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Коми</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Пали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулусский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чешский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Голландский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Греческий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Галльский (Ирландия)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кхмерский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Латинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маори</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Ория</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Схона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таджикский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамильский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Инупиак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Уэльский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Уолоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кшоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Итальянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Романшский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонгка (Бутан)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Каннада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Сев. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Рунди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Галльский (Шотландия)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латышский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малайялам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Болгарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Мальтийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Марати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арабский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Сунданский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Датский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Мальдивский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиджи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Венгерский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Французский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Немецкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Монгольский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Иврит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Эреро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембургский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канури</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казахский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикую</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Корейский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджибва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пуштунский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Польский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Французский (диалект Occitan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словацкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйгурский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Сербо-хорватский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Йоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанг</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румынский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Индонезийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панджаби</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Юж. Сото</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсиканский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Эсперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Персидский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словенский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таитянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Мальгашский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галицийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербайджанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Японский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалисут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Белорусский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Яванский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Киньяруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Африкаанс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Армянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвежский букмол</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хорватский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Боснийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Окциденталь</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Сербский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бирманский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Русский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбуржский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвежский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Китайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Сингальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Испанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнуольский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалог</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Ассамский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Эстонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахили</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Вьетнамский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турецкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуджарати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Исландский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Английский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Церковно-славянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарерский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Финский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапюк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валлонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваньяма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалльский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Северное Саами</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Гаитянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Новонорвежский (нюнорск)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуарани</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Юж. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичева</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литовский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сычуаньский И</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигринья</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Идиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Китайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Упрощённый китайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Другой</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Диалекты упрощённого китайского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Диалекты китайского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Другие восточноевропейские языки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Другие западноевропейские языки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Диалекты русского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Диалекты японского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Другие прибалтийские языки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Диалекты греческого</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Диалекты корейского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Диалекты турецкого</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Диалекты тайского</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Берберские языки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
@@ -2518,207 +2491,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>Французский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>Испанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>Белорусский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>Болгарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>Чешский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>Немецкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>Греческий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>Финский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>Итальянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>Японский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>Корейский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>Литовский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>Македонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>Голландский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>Польский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>Португальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>Русский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>Словацкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>Албанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>Сербский (кириллица)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>Шведский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>Турецкий</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>Украинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>Китайский упрощенный</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>Китайский традиционный</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>Вьетнамский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>Португальский, Бразильский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>Персидский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>Испанский, Аргентина</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>Эсперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>Немецкий, Швейцария</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>Испанский, Боливия</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>Таджикский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>Аймарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>Арабский, Саудовская Аравия</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>Туркменский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>Окциденталь</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>Английский</translation>
     </message>
@@ -2726,7 +2699,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Ошибка при загрузке словарей</translation>
     </message>
@@ -2734,7 +2707,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Ошибка в файле конфигурации. Продолжить с настройками по умолчанию?</translation>
     </message>
@@ -2742,703 +2715,703 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Избранное</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Все</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Словарей: %1, статей: %2, слов: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Правка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Справка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Поиск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>В&amp;ыход</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Ошибка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Выйти из приложения</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Свернуть в лоток</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Невозможно сохранить статью: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Увеличить</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Словари...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;О программе</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Печатать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Сохранить статью</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Сохранить статью как</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Свёртывает окно в лоток</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>П&amp;араметры страницы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Веб-сайт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Доступна новая версия</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Искать:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Уменьшить</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Показать &amp;основное окно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>О программе GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Загрузить</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Параметры страницы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Поиск в:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Обычный размер</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Загрузка...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(без имени)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Параметры...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Добро пожаловать!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Произнести слово (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Сохранить статью</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Пропустить данную версию</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Вперёд</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Печать статьи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>В системе не установлено ни одного принтера.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Вид</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Журнал</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>О&amp;чистить</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Масштаб</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Увеличить список слов</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Уменьшить список слов</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Обычный размер для списка слов</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Закрыть текущую вкладку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Закрыть все вкладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Закрыть все вкладки, кроме текущей</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Открытые вкладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Новая вкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl + T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Папка конфигурации</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Главное меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Найдено в словарях:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Добавить все вкладки в Избранное</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ВНИМАНИЕ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Открыть список вкладок</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Удалить текущую вкладку из Избранного</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Вы скрыли главное меню. Чтобы вернуть его, используйте %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Показать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Экспортировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Спрятать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Экспорт журнала в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстовые файлы (*.txt);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Экспорт журнала завершён</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Ошибка при экспорте: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl + H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Импортировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Импорт журнала из файла</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Ошибка импорта: некорректные данные в файле</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Импорт журнала завершён</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Ошибка импорта:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Экспортировать Избранное в файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Файлы XML (*.xml);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Экспорт Избранного завершён</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Экспортировать Избранное в файл как простой список</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Импортировать Избранное из файла</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-файлы (*.xml);;Txt файлы (*.txt);;Все файлы (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Импорт Избранного завершён</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Ошибка при разборе данных</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Информация о словаре</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Заголовки словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Открыть папку словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Редактировать словарь</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Индексируется для полнотекстового поиска: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Удалить заголовок &quot;%1&quot; из Избранного?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Панель поиска</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Панель на&amp;вигации по переводу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Панель Избранного</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Пр&amp;едварительный просмотр</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Пе&amp;ресканировать файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Новая вкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>П&amp;оверх других окон</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Поверх других окон</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Кнопка меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Поиск на странице</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Полнотекстовый поиск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Справка GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Показать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Экспортировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Импортировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Добавить</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Добавить текущую вкладку в Избранное</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl + E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Экспортировать в простой список</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>По&amp;казывать названия в панели словарей</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>&amp;Маленькие значки в панели инструментов</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навигация</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Включить сканирование</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Статья полностью (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Статья, только HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Сохранение статьи...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Статья сохранена</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Главное окно всегда поверх других окон.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Панель журнала</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Интерфейс Accessibility не включён</translation>
     </message>
@@ -3446,12 +3419,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Файл словаря искажён или повреждён</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Ошибка загрузки статьи из %1, причина: %2</translation>
     </message>
@@ -3459,7 +3432,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Ошибка разбора XML: %1 на строке %2, столбце %3</translation>
     </message>
@@ -3475,22 +3448,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Название</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -3506,82 +3479,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Неактивные (отключенные) словари:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Название:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Количество статей:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Исходный язык:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Целевой язык:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Количество слов:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Порядок словарей:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлы, из которых состоит словарь:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Информация о словаре</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Описание:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Сортировать по имени</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Сортировать по языкам</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Заголовки словаря</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Словарей активных: %1, неактивных: %2</translation>
     </message>
@@ -3589,12 +3562,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Путь</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рекурсивно</translation>
     </message>
@@ -3602,69 +3575,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Запустить в системном лотке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>При зажатии левой клавиши Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Показывать значок в системном лотке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Сервер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Сдвиг</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тип:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Имя пользователя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Всплывающее окно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3673,138 +3644,138 @@ switching to them.</source>
 открываться в фоне, без переключения на них.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Использовать прокси-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Использовать следующую комбинацию для перевода слова из буфера обмена:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>При зажатии клавиши Windows или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Автоматически произносить слова в главном окне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Автозапуск программы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>При зажатии левой клавиши Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Работа со вкладками</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>При зажатии правой клавиши Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Включите, если хотите использовать прокси-сервер
 для всех сетевых запросов программы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Язык программы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>При зажатии левой клавиши Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Открывать новые вкладки в фоне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Сеть</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>При зажатии правой клавиши Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Правый Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Левый Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Автоматически произносить слова во всплывающем окне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Открывать новые вкладки за текущей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Перезапустите программу, чтобы изменение языка вошло в силу.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>При зажатии любой клавиши Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Проверять наличие новой версии</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3813,18 +3784,17 @@ be the last ones.</source>
 добавляться в конец..</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Сворачивать в системный лоток</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>По умолчанию</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>При включении этого параметра в системном лотке появится значок,
@@ -3832,7 +3802,7 @@ to open main window and perform other tasks.</source>
 действий.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3845,140 +3815,140 @@ GoldenDict. Если новая версия появилась, програм
 страницу загрузки.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Запуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>По умолчанию</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Интерфейс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Смена языка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>При зажатии любой клавиши Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Использовать следующую комбинацию для показа/скрытия основного окна:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Левый Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>При зажатии правой клавиши Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Параметры</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Левый Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Правый Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Правый Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Горячие клавиши</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Включить режим всплывающего окна при запуске</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>При включении этого параметра приложение будет запущено в системном лотке
 без показа основного окна.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>При зажатии любой клавиши Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Автоматически запускать GoldenDict при старте операционной системы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Не показывать всплывающее окно при выделении/копировании текста в одном из собственных окон GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Игнорировать выделение/копирование в GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Воспроизводить аудио-файлы через встроенный плеер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Использовать встроенный плеер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Выбор плеера</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Командная строка для запуска аудио-плеера</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3988,85 +3958,85 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 из-за этого функционировать, попробуйте запретить эту опцию.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Запретить загрузку информации с других сайтов (убирает большую часть рекламы)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Произношение</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Воспроизведение</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Воспроизведение через внешнее приложение:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Переводить выбранное слово по двойному щелчку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Использовать любую внешнюю программу для проигрывания аудио-файлов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Прятать главное окно по клавише ESC</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Скрывать закладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Устанавливайте эту величину, чтобы избежать слишком больших контекстных меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Предел количества словарей в контекстном меню:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Отправлять переводимое слово в главное окно программы вместо перевода его во всплывающем окне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Отправлять переводимое слово в главное окно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Показывать флажок вместо всплывающего окна. Чтобы показать само окно, кликните по флажку.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4077,159 +4047,159 @@ however, the article from the topmost dictionary is shown.</source>
 however, the article from the topmost dictionary is shown on the top dictionary .</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Автоматически прокручивать к выбранной статье</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Шрифт словаря</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>установить резервное семейство шрифтов для словаря</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Стиль отображения статьи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Повернуть пользовательский интерфейс в темное состояние.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Темный режим</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Сделать стиль отображения статьи темным.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Темная тема просмотрщика</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Порядок MRU: последний использованный ордер.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Отслеживать изменения буфера обмена при включении. Обратите внимание! Вы всегда должны включать это, если не используете Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Следить за изменениями в буфере обмена</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Следить за выделенным текстом</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Следить за выделенным текстом только когда все эти клавиши зажаты</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Показывать флажок, когда слово выделено</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Время задержки</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Использовать системные настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Использовать свои настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Свои настройки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Подключение Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Колода:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Модель:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Слово</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Поле словаря...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Поле определения...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Предложение</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Поле предложения (может быть пустым)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Не указывать GoldenDict в заголовках HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Максимальный размер кэша:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4238,285 +4208,327 @@ If set to 0 the network disk cache will be disabled.</source>
 Установка параметра в 0 означает отключение кэширования</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation>MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Если опция включена,  GoldenDict удаляет содержимое кэша при выходе из программы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Очищать кэш при выходе</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Полнотекстовый поиск</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Разрешить полнотекстовый поиск для:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Не искать в словарях, содержащих более чем</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>статей (0 - неограниченно)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Дополнительно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>При последовательном поиске,если один словарь свернут вручную, он останется свернутым в следующем поиске</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation>Свернуть сеанс</translation>
+      <translation>Держать свёрнутым в сеансе</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>При использовании буфера обмена игнорировать весь текст после символа перевода строки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>При каждом поиске переводить фокус на окно программы даже если оно уже открыто</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Избранное</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Интервал сохранения Избранного. Если он установлен в 0,
 журнал будет сохраняться только при выходе из программы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Включите эту опцию, чтобы подтверждать каждую операцию удаления элементов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Подтверждать удаление элементов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Включите эту опцию, чтобы игнорировать передачу слишком длинного текста
 через перевод выделения или содержимого буфера обмена, а также через командную строку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Игнорировать запросы длиннее</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Запросы длиннее этого размера будут проигнорированы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Включите эту опцию, чтобы игнорировать диакритику при поиске статей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Игнорировать диакритику при поиске</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Включите эту опцию, если хотите всегда раскрывать дополнительные области статей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Раскрывать дополнительные области</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Включите эту опцию чтобы автоматически сворачивать большие статьи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Сворачивать статьи более чем</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Статьи размером более этой величины будут свёрнуты</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Игнорировать пунктуацию при поиске</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Включите эту опцию, чтобы чтобы разрешить поиск статей по спискам синонимов
 из словарей формата Stardict, Babylon и GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Дополнительный поиск по синонимам</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>символов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab переключает закладки в порядке использования</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Вавилон</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Журнал</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Включите эту опцию, чтобы вести журнал переведённых слов</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Вести журнал</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Статьи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Включите эту опцию, если хотите выделять слова одиночным щелчком мыши</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Выделять слово одиночным щелчком</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Дополнительный стиль:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Определяет максимальное количество записей в журнале</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максимальный размер журнала:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Интервал сохранения журнала. Если он установлен в 0,
 журнал будет сохраняться только при выходе из программы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Сохранять каждые</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>минут</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Классика</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Современный</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Лингосы</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Лингос-синий</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation>MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Позиционная информация требуется для использования поиска Xapian по фразе и оператора NEAR, но размер базы данных будет намного больше. Применяется только к новым входящим словарям.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Включить индекс с позиционной информацией</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандартный шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Моноширинный шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Шрифт с засечками</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Шрифт без засечек</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Появление</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Эти шрифты будут применяться, когда шрифты, указанные в словаре, не будут найдены.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Резервные шрифты</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>По префиксу</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Неизвестно</translation>
     </message>
@@ -4524,17 +4536,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Программа не указана.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Программа завершилась с ошибкой</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Программа вернула значение %1.</translation>
     </message>
@@ -4542,27 +4554,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тип</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Имя программы</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Командная строка</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -4570,99 +4582,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Ошибка загрузки статьи</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Ошибка декодирования статьи</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Копирайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Версия: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Автор: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Название: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Сайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Дата: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Программа поиска словарей.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Слово или фраза для запроса.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Сохранить отладочные сообщения в gd_log.txt в папке конфигурации.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Сбросить состояние окна.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Отключить ттс.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Изменить группу главного окна.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Изменить группу всплывающих окон.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Переключить всплывающее окно сканирования.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Версия для печати и диагностическая информация.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Поиск по названию словарей (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Очистить</translation>
     </message>
@@ -4670,22 +4697,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ОШИБКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Ошибка записи данных: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Невозможно загрузить указанный ресурс.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ПРЕДУПРЕЖДЕНИЕ: %1</translation>
     </message>
@@ -4714,68 +4741,73 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Диалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Произнести слово (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Добавить слово в Избранное</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Показать или спрятать словарную панель</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Оставаться поверх всех окон</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Отправить слово в главное окно (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Вперёд</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ВНИМАНИЕ: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4787,7 +4819,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4797,7 +4829,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4818,17 +4850,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Название</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Путь</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -4836,60 +4868,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Файлы</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системы:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Википедия</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Слоговая азбука &quot;Катакана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Все найденные звуковые файлы каждой папки компонуются в словари:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ромадзи (Японский)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4900,84 +4932,84 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Веб-сайты Википедии (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Папки со звуками</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Любые внешние программы. Строка %GDWORD% будет заменена на запрашиваемое слово. Строка %GDSEARCH% будет заменена на текст в поисковой строке. Если обоих строк нет задано, запрашиваемое слово будет отправлено в стандартный входной поток внешней программы.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Принцессы, предоставленные &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, совместная библиотека лингвистических медиа во Франции. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Включить Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Код языка ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Использование Forvo в настоящее время требует API ключ, зарегистрируйтесь на сайте, чтобы получить свой собственный ключ.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Получите свой собственный ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;здесь&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Наиболее популярный метод транскрибирования Японского,
 основанный на Английской фонологии</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Слоговая азбука &quot;Хирагана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Другая транслитерация</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Применяется только к поисковому запросу. Каждая строка задаёт транслитерацию, где значения разделены точкой с запятой, например: ae;æ. Если ввести «ae» в поиске, то они будут соответствовать «æ» в слове.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #например, вот так</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслитерация</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4988,118 +5020,108 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Транслитерация (Русский)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфология</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Изменить...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Например:  &amp;quot;eng&amp;quot; для английского, &amp;quot;fra&amp;quot; для французского &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Полный список языков можно посмотреть &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; здесь &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Путь к словарям Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Пере&amp;сканировать</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Транслитерация (Немецкий)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Любые веб-сайты. Строка %GDWORD% будет заменена на запрашиваемое слово:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Добавить...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Выбор пути</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Удалить</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Веб-сайты</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Пути для поиска файлов словарей:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Подтверждение удаления</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Слоговые азбуки:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Доступные морфологические словари:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Позволяет использовать латинский алфавит для ввода на Японском</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5117,94 +5139,94 @@ of the appropriate groups to use them.</source>
 в конец соответствующих групп.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хэпбёрн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Серверы DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Серверы DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Включить произношения с Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Ключ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Список языковых кодов (через запятую):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Транслитерация (Греческий)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(не реализовано в переносимой версии)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Программы</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Транслитерация (Белорусский)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Синтез речи</translation>
     </message>
@@ -5220,42 +5242,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Выбранные голоса:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>Добавить</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Убрать</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Прослушивание</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Доступные голоса:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Текст для прослушивания:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Введите сюда текст для прослушивания.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>Прослушать</translation>
     </message>
@@ -5280,17 +5302,17 @@ of the appropriate groups to use them.</source>
       <translation>Нет доступных голосов.&lt;br&gt;Убедитесь, что на комьпютере установлен хотя бы один голосовой движок.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Параметры</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Громкость:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Темп:</translation>
     </message>
@@ -5298,12 +5320,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Введите слово или словосочетание для поиска в словарях</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Выпадающий список</translation>
     </message>
@@ -5334,33 +5356,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Название</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Адрес</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Включено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Вставлять статью как ссылку в теге &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Как ссылку</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Значок</translation>
     </message>
@@ -5368,17 +5390,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Ошибка поиска в некоторых словарях.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>Внимание: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/sk_SK.ts b/locale/sk_SK.ts
index 8178c022..54f82575 100644
--- a/locale/sk_SK.ts
+++ b/locale/sk_SK.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>O programe</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng - prehliadač slovníkov, verzia</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Vydané pod licenciou GNU GPLv3 alebo novšou</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Kopírovať informácie o verzii</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Kopírovať zoznam slovníkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Poďakovanie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Neznámy]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Založené na Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Na základe Qt %1 (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: Nemôžem vytvoriť kartu bez slova</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki vyhľadávanie: AnkiConnect nie je povolené.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: príspevok pre anki zlyhal</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: príspevok k úspechu anki</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Skontrolujte</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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 len podíďte kurzorom nad slovo v inej aplikácií, ktoré chcete vyhľadať, a vyskočí okno, ktoré vám ho popíše.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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 paneli cez pravé tlačidlo myši a následným výberom z ponuky.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Rozbaliť článok</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Skrátiť článok</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Práca s vyskakovacím oknom</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(Bez názvu)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Vitajte!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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;sa nenašiel žiadny preklad pre &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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 ku priečinkom, v ktorých sa budú vyhľadávať slovníky, nastaviť rôzne stránky Wikipedie a iné zdroje, upraviť poradie slovníkov alebo vytvoriť skupiny slovníkov.&lt;/p&gt;&lt;p&gt;Potom môžete začať vyhľadávať slová! Môžete tak urobiť 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ť v ponuke &lt;b&gt;Upraviť|Nastavenia…&lt;/b&gt;. Všetky nastavenia majú popisy, ktoré vám pomôžu, pokiaľ si nebudete niečím istý.&lt;/p&gt;&lt;p&gt;Ak potrebujete ďalšiu pomoc, máte návrhy na zlepšenie alebo sa chcete dozvedieť, čo si myslia iní, ste vítaní na &lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;diskusnom fóre&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;Aktualizácie hľadajte na &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(obrázok)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Rozbaliť článok</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Z </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Skrátiť článok</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Urobte novú poznámku Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Chyba požiadavky: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Blízke slová: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Zložené výrazy: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Jednotlivé slová: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Nepodarilo sa vytvoriť dočasný súbor.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Hľadať &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Referencovaný zdroj neexistuje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Hľadať &quot;%1&quot; v %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Označiť aktuálny článok</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopírovať ako text</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Kontrolovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Otvoriť odkaz v nove kar&amp;te</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Otvoriť odkaz v &amp;externom prehliadači</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Zdroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Hlas</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Obrázok</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
-      <translation type="unfinished">Video</translation>
+      <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
-      <translation type="unfinished">Video: %1</translation>
+      <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definícia zo slovníka &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definícia: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Odkazovaný audio program neexistuje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Otvoriť odkaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Uložiť &amp;záložku &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>VAROVANIE: Audio prehrávač: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>CHYBA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Uložiť zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Uložiť obrázok</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Uložiť &amp;obrázok…</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Fráza sa nenašla</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 z %2 zápasov</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Uložiť &amp;zvuk…</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Odoslať &quot;%1&quot; do vstupného riadku</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>Prid&amp;ať &quot;%1&quot; do histórie</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Odoslať aktuálny článok Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Odoslať vybratý text Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Zvukové súbory (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Nepodarilo sa prehrať zvukový súbor: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Vytvoriť poznámku Anki</translation>
     </message>
   </context>
   <context>
@@ -414,62 +409,62 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Čínska konverzia</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Povoliť konverziu medzi zjednodušenými a tradičnými čínskymi znakmi</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Čínska &amp;konverzia</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Povoliť konverziu zjednodušených znakov na tradičné (Tajvanský variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>ZČ na TČ (Tajvanský variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Povoliť konverziu zjednodušených znakov na tradičné (Hong-Kongský variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>ZČ na TČ (Hong-Kongský variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Povoliť konverziu tradičných znakov na zjednodušené znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TČ na ZČ</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Konverzia zo zjednodušenej do tradičnej čínštiny (Tajvanský variant)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Konverzia zo zjednodušenej do tradičnej čínštiny (Hong-Kongský variant)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Konverzia z tradičnej do zjednodušenej čínštiny</translation>
     </message>
@@ -477,30 +472,30 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>vlastný prepis</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Vyžadovaná proxy autentizácia</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Pre prístup k proxy musíte zadať meno používateľa a heslo</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Meno používateľa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Heslo:</translation>
     </message>
@@ -508,22 +503,22 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulár</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ikona skupiny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Skratky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Priečinok s obľúbenými:</translation>
     </message>
@@ -548,17 +543,17 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>Obrázky</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Všetky súbory</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Chyba</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Nemožno prečítať zadaný súbor s obrázkom.</translation>
     </message>
@@ -566,63 +561,63 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Potvrdenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Ste si istí, že chcete vytvoriť sadu skupín na základe jazykových párov?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Naozaj chcete vygenerovať skupinu skupín na základe metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kombinovať skupiny podľa zdrojového jazyka do &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kombinovať skupiny podľa cieľového jazyka do &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automatické zoskupovanie podľa priečinka zlyhalo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Nadradený adresár %1 nie je dostupný.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Naozaj chcete vygenerovať skupinu skupín na základe priečinkov, ktoré obsahujú?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Urobiť dvojstrannú prekladovú skupinu &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Kombinovať skupiny s &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Slovníky:</translation>
     </message>
@@ -635,201 +630,211 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Režim vyhľadávania</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Tento prvok určuje, ako bude interpretovaný reťazec filtra</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Ak je zaškrtnuté, pri filtrovaní bude zohľadnená veľkosť písmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Rozlišovať veľkosť písmen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Exportovať heslové slová do súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Pomocník</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>OK</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Kliknite na toto tlačidlo pre použitie filtra na zoznam heslových slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Použiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Ak je zaškrtnuté, akákoľvek zmena filtra bude okamžite aplikovaná na zoznam heslových slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Automaticky použiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>Filter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Reťazec filtra (pevný reťazec, zástupné znaky alebo regulárny výraz)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Zástupné znaky</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegVýraz</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Načítavajú sa heslá...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unikátnych heslových slov celkom: %1, filtrovaných: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Uložiť heslové slová do súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textové súbory (*.txt);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Exportovaný súbor nie je možné otvoriť</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportovať heslové slová...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Zrušiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Proces exportu je prerušený</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Export dokončený</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Počet článkov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Prekladá z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Počet slov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Prekladá do:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Otvoriť priečinok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Upraviť slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Súbory obsiahnuté v slovníku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Popis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Zobraziť všetky unikátne heslové slová v slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Heslové slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Upraviť slovník cez príkaz:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Indexový názov súboru:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Otvorte indexový priečinok</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 položiek</translation>
     </message>
@@ -860,44 +865,44 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Povolené</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Názov</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Databázy</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Stratégie</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Čiarkou oddelený zoznam databáz
 (pre všetky databázy použite prázdny reťazec alebo &quot;*&quot;)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Čiarkou oddelený zoznam prehľadávacích stratégií
@@ -907,37 +912,37 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Rozšírená ponuka so všetkými slovníkmi…</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Upraviť túto skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Info o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Heslové slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Otvoriť slovníkový priečinok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Upraviť slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Panel s&amp;lovníkov</translation>
     </message>
@@ -946,27 +951,27 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>S&amp;lovníky</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Slovníky</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Prijať</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Zrušiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Zdroje sa zmenili</translation>
     </message>
@@ -977,12 +982,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>S&amp;kupiny</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Niektoré zdroje boli zmenené. Chcete akceptovať zmeny?</translation>
     </message>
@@ -992,12 +997,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Predchádzajúca strana</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Ďalšia strana</translation>
     </message>
   </context>
   <context>
@@ -1011,75 +1016,55 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Fulltextové vyhľadávanie</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Celé slová</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Jednoduchý text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Zástupné znaky</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegVýraz</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Dopytované slovo nemôže byť prázdne.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>podpora syntaxe vyhľadávania xapian, ako je AND OR +/- atď</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max. vzd. medzi slovami (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Predvolené</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max. článkov na slovník (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Nájdených článkov: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Indexuje sa: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Žiadny</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Riadok s vyhľadávaním musí obsahovať aspoň jedno slovo obsahujúce </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> alebo viac znakov</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Neboli nájdené žiadne slovníky pre fulltextové vyhľadávanie</translation>
     </message>
@@ -1087,7 +1072,7 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Chyba v súbore s obľúbenými</translation>
     </message>
@@ -1153,7 +1138,7 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>z</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Prejsť na Upraviť | Slovníky | Zdroje | Forvo a aplikovať náš vlastný API kľúč, aby táto chyba zmizla.</translation>
     </message>
@@ -1163,79 +1148,63 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Predchádzajúce</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Ďalšie</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Hľadať</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Rozlišovať veľkosť písmen</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Režim:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorovať poradie slov</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorovať diakritiku</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Nájdených článkov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Dostupné slovníky v skupine:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Čakajú na indexovanie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Pomocník</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Celkom:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Zindexované:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Teraz sa indexuje: Žiaden</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Zrušiť</translation>
     </message>
@@ -1267,29 +1236,29 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Karta 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1327,12 +1296,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>Zadajte nový názov skupine:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Slovníky k dispozícii:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Prid&amp;ať skupinu</translation>
     </message>
@@ -1342,42 +1311,42 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>Pridať skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Vytvoriť novú skupinu slovníkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Zoskupiť podľa jazykov</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Vytvorte skupiny založené na priečinkoch.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Zoskupiť podľa priečinkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Zoskupiť podľa metadát</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Chyťte a pretiahnite slovníky do a zo skupín, posuňte ich dovnútra skupiny a meňte ich poradie pomocou myši.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Premenovať aktuálnu slovníkovú skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Odstrániť aktuálnu slovníkovú skupinu</translation>
     </message>
@@ -1387,43 +1356,43 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>Zadajte názov novej skupiny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Odstrániť všetky skupiny</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Odstrániť vybrané slovníky zo skupiny (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Pridať vybrané slovníkov skupiny (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Odst&amp;rániť skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Skupiny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Preme&amp;novať skupinu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Odstrániť všetky slovníkové skupiny</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Vytvoriť skupiny založené na jazykoch</translation>
     </message>
@@ -1446,12 +1415,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
       <translation>História:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Veľkosť histórie: %1 položiek z maxima %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Návrhy k preklepom:</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 morfológia</translation>
     </message>
@@ -1472,12 +1441,12 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Meno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Povolené</translation>
     </message>
@@ -1485,1247 +1454,1251 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexovanie: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Názov slovníka</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Inicializácia</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Počkajte prosím, indexovanie slovníka</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Čakajte prosím ...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexovanie...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
-      <translation type="unfinished">Ewe</translation>
+      <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
-      <translation type="unfinished">Ido</translation>
+      <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
-      <translation type="unfinished">Lao</translation>
+      <translation>Lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
-      <translation type="unfinished">Twi</translation>
+      <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
-      <translation type="unfinished">Afar</translation>
+      <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
-      <translation type="unfinished">Akan</translation>
+      <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
-      <translation type="unfinished">Cree</translation>
+      <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
-      <translation type="unfinished">Igbo</translation>
+      <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
-      <translation type="unfinished">Komi</translation>
+      <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
-      <translation type="unfinished">Pali</translation>
+      <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thajsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
-      <translation type="unfinished">Urdu</translation>
+      <translation>urdčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
-      <translation type="unfinished">Zulu</translation>
+      <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Čeština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
-      <translation type="unfinished">Ganda</translation>
+      <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
-      <translation type="unfinished">Fulah</translation>
+      <translation>Fulah</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grécky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
-      <translation type="unfinished">Hausa</translation>
+      <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Írsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Kmérsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
-      <translation type="unfinished">Kongo</translation>
+      <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latinčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malajzijský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maorský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
-      <translation type="unfinished">Nauru</translation>
+      <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Urijština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
-      <translation type="unfinished">Oromo</translation>
+      <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
-      <translation type="unfinished">Sango</translation>
+      <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
-      <translation type="unfinished">Shona</translation>
+      <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tajisky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
-      <translation type="unfinished">Tamil</translation>
+      <translation>tamilčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatársky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
-      <translation type="unfinished">Swati</translation>
+      <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
-      <translation type="unfinished">Tonga</translation>
+      <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
-      <translation type="unfinished">Inupiaq</translation>
+      <translation>Inupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
-      <translation type="unfinished">Venda</translation>
+      <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbecky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Welský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
-      <translation type="unfinished">Wolof</translation>
+      <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
-      <translation type="unfinished">Xhosa</translation>
+      <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Talianský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Raeto-Románčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
-      <translation type="unfinished">Dzongkha</translation>
+      <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
-      <translation type="unfinished">Kannada</translation>
+      <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Severný Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abcházsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgizský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
-      <translation type="unfinished">Kirundi</translation>
+      <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Škótska gaelština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Lotyšský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
-      <translation type="unfinished">Malayalam</translation>
+      <translation>malajálamčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulharský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
-      <translation type="unfinished">Lingala</translation>
+      <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltézsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
-      <translation type="unfinished">Marathi</translation>
+      <translation>maráthčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskitský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
-      <translation type="unfinished">Avaric</translation>
+      <translation>Avarický</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
-      <translation type="unfinished">Bihari</translation>
+      <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
-      <translation type="unfinished">Breton</translation>
+      <translation>Breton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundánčína</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Dánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
-      <translation type="unfinished">Divehi</translation>
+      <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
-      <translation type="unfinished">Luba-Katanga</translation>
+      <translation>Ľuba-Katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fidži</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Maďarský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Francúzsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Nemčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebrejský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
-      <translation type="unfinished">Herero</translation>
+      <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
-      <translation type="unfinished">Kanuri</translation>
+      <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazašsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
-      <translation type="unfinished">Kikuyu</translation>
+      <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Kórejsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
-      <translation type="unfinished">Navajo</translation>
+      <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
+      <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepálsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
-      <translation type="unfinished">Ojibwa</translation>
+      <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
-      <translation type="unfinished">Pashto</translation>
+      <translation>paštčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Poľský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
-      <translation type="unfinished">Occitan</translation>
+      <translation>okcitánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
-      <translation type="unfinished">Sindhi</translation>
+      <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovenčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somálsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
-      <translation type="unfinished">Telugu</translation>
+      <translation>telugčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
-      <translation type="unfinished">Tsonga</translation>
+      <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
-      <translation type="unfinished">Tswana</translation>
+      <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ujgursky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Srbochorvátčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
-      <translation type="unfinished">Yoruba</translation>
+      <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
-      <translation type="unfinished">Zhuang</translation>
+      <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumunčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonézsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Pandžábsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Južný Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korzický</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Perzský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovinčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Západná frýština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
-      <translation type="unfinished">Aragonese</translation>
+      <translation>aragónsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgašský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galicijský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerbajdžanský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
-      <translation type="unfinished">Amharic</translation>
+      <translation>amharčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
-      <translation type="unfinished">Sanskrit</translation>
+      <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrajinsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
-      <translation type="unfinished">Bambara</translation>
+      <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
-      <translation type="unfinished">Kalaallisut</translation>
+      <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
-      <translation type="unfinished">Bashkir</translation>
+      <translation>Bashkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bieloruský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
-      <translation type="unfinished">Kashmiri</translation>
+      <translation>kašmírsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardínčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
-      <translation type="unfinished">Hiri Motu</translation>
+      <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <translation>kečuánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengálsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Jávsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
-      <translation type="unfinished">Avestan</translation>
+      <translation>Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
-      <translation type="unfinished">Kinyarwanda</translation>
+      <translation>Kinyarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
-      <translation type="unfinished">Bislama</translation>
+      <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armémsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Nórsky (Bokmal)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Chorvátsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosnianský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
-      <translation type="unfinished">Interlingua</translation>
+      <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
+      <translation>Interlingue</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalánsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Srbčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Barmský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ruština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
-      <translation type="unfinished">Limburgish</translation>
+      <translation>limburský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Nórsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Čečenský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Čínsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
-      <translation type="unfinished">Chuvash</translation>
+      <translation>čuvašský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
-      <translation type="unfinished">Sinhala</translation>
+      <translation>sinhálčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Španielský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Cornwallsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
-      <translation type="unfinished">Tagalog</translation>
+      <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
-      <translation type="unfinished">Assamese</translation>
+      <translation>asámsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estónsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Svahilsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Švédčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Macedónsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugalčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turecky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkménsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
-      <translation type="unfinished">Gujarati</translation>
+      <translation>Gudžarátčina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
-      <translation type="unfinished">Inuktitut</translation>
+      <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Angličtina</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gruzínsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Staroslovianský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faerský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Fínsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
-      <translation type="unfinished">Volapuk</translation>
+      <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valónsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
-      <translation type="unfinished">Kwanyama</translation>
+      <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Maršálsky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Severný Sami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
-      <translation type="unfinished">Chamorro</translation>
+      <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nórsky (Nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
-      <translation type="unfinished">Guarani</translation>
+      <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Južný Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
-      <translation type="unfinished">Chichewa</translation>
+      <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litovský</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
-      <translation type="unfinished">Sichuan Yi</translation>
+      <translation>Sichuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
-      <translation type="unfinished">Tigrinya</translation>
+      <translation>Tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jidiš</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Tradičná čínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Zjednodušená čínština</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Iný</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Ostatné dialekty zjednodušenej čínštiny</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Ostatné dialekty tradičnej čínštiny</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Ostatné východoeurópske jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Ostatné západoeurópske jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Ostatné ruské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Ostatné japonské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Ostatné baltické jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Ostatné grécke jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Ostatné kórejské jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Ostatné turecké jazyky</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Ostatné thajské dialekty</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Lojban</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>francúzsky</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>španielčina</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>bieloruský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>bulharčina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>český</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>nemecký</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>grécky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>fínsky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>taliansky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>japončina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>kórejský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>litovský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>macedónsky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>holandský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>poľský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>portugalčina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>ruský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>slovenský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>albánsky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>srbčina (cyrilika)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>švédsky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turecký</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukrajinčina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Zjednodušená čínština</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Tradične čínske</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamci</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugalčina, brazílska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>perzský</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Španielčina, Argentína</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>hindčina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Nemecko, Švajčiarsko</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Španielsko, Bolívia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tadžický</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>kečuánsky</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabčina, Saudská Arábia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turkménskym</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Angličtina</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Chyba pri načítavaní slovníkov</translation>
     </message>
@@ -2733,7 +2706,7 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2741,703 +2714,703 @@ medzi klasickou a školskou ortografiou v azbuke)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>O&amp;bľúbené</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Všetko</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Späť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Slovníky: %1, články: %2, slová: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Upraviť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Súbor</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Pomocník</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Hľadať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Koniec</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Chyba</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Odísť z aplikácie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Minimalizovať do lišty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Nie je možné uložiť článok: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Priblížiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Slovníky...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;O programe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Fórum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Tlač</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Uložiť článok</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Uložiť článok ako</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimalizuje okno do lišty okien</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Nastavenie s&amp;trany</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Domovská stránka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Je dostupná nová verzia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Hľadať:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Oddialiť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Zobraziť &amp;hlavné okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>O GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Stiahnuť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Nastavenie strany</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Hľadať v:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normálna veľkosť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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-ng 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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Načítavanie ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(Bez názvu)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Nastavenia...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Vitajte!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Vysloviť slovo (Alt + S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Uložiť článok</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Preskočiť toto vydanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Vpred</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Vytlačiť článok</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Zobrazenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>H&amp;istória</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Vymazať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>P&amp;riblíženie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zväčšiť slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Zmenšiť slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Bežná veľkosť slov</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Zatvoriť aktuálnu kartu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Zatvoriť všetky karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Zatvoriť všetky karty okrem aktuálnej</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Otvorené karty</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Nová karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Priečinok s &amp;konfiguráciou</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Panel s p&amp;onukou</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Nájdené v slovníkoch:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Pridať všetky taby do Obľúbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>UPOZORNENIE: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Reťazec, ktorý sa má vyhľadávať. Sú povolené aj zástupné znaky &apos;*&apos;, &apos;?&apos; a množiny znakov &apos;[...].
 Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos;, použite &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, a &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Otvorí zoznam kariet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Odstrániť aktuálnu kartu z Obľúbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 : %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Zobraziť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>S&amp;kryť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportovať históriu do súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textové súbory (*.txt);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Export histórie ukončený</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Chyba exportu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Import histórie zo súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Chyba importu: neplatné dáta v súbore</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Import histórie je ukončený</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Chyba importu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportovať Obľúbené do súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>Súbory XML (*.xml);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Export Obľúbených dokončený</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportovať Obľúbené do súboru ako jednoduchý zoznam</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importovať Obľúbené zo súboru</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>Súbory XML (*.xml);;Súbory TXT (*.txt);;Všetky súbory (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Import Obľúbených dokončený</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Chyba pri analýze dát</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Info o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Heslové slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Otvoriť slovníkový priečinok</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Upraviť slovník</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Prebieha indexovanie pre fulltextové vyhľadávanie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Odstrániť heslové slovo &quot;%1&quot; z Obľúbených?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Vy&amp;hľadávací panel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Panel výsledkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Podokno _Obľúbené</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Náhľad pred &amp;tlačou</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Znovu vyhľadať súbory</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Nová karta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Vždy navrchu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Vždy navrchu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Tlačidlo Menu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Vyhľadať na stránke</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Fulltextové vyhľadávanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Príručka GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Zobraziť</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Pridať</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Pridať aktuálnu karty do Obľúbených</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportovať ako zoznam</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Zobraziť názvy v &amp;paneli slovníka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Zobraziť malé ikony v paneli nás&amp;trojov</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigácia</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Povoliť skenovanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Článok, Kompletný (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Článok, iba HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Ukladanie článku…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Uložiť článok dokončený</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Hlavné okno je nastavené, aby bolo vždy navrchu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Panel &amp;histórie</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API Dostupnosti nie je povolené</translation>
     </message>
@@ -3445,12 +3418,12 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Slovníkový súbor bol poškodený alebo sfalšovaný</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Nepodarilo sa načítať článok z %1; dôvod: %2</translation>
     </message>
@@ -3458,7 +3431,7 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Chyba spracovania XML: %1 v %2,%3</translation>
     </message>
@@ -3474,22 +3447,22 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Meno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Povolené</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -3505,82 +3478,82 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulár</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Neaktívne (nepovolené) slovníky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Meno:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Počet článkov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Prekladá z:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Prekladá do:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Počet slov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Poradie slovníkov:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Súbory obsiahnuté v slovníku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informácie o slovníku</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Popis:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Zoradiť podľa názvu</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Zoradiť podľa jazyka</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Heslové slová</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Aktívne slovníky: %1, neaktívne: %2</translation>
     </message>
@@ -3588,12 +3561,12 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Cesta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekurzívne</translation>
     </message>
@@ -3601,206 +3574,204 @@ Pre vyhľadanie znakov &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Štartovať v systémovom paneli</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Iba ľavý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Povoliť ikonu v systémovom paneli</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Hostiteľ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
-      <translation type="unfinished">Port:</translation>
+      <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Používateľ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>Vys&amp;kakovacie okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Normálne sa otvorením novej karty do nej automaticky presuniete. S týmto nastavení sa nová karta otvorí bez toho, aby ste do nej presunuli.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Použiť proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Klávesa Windows alebo Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Automaticky vysloviť slová v hlavnom okne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Spustiť pri štarte systému</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Iba ľavý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Prezeranie v kartách</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Iba pravý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>S touto voľbou pokus o zatvorenie hlavného okna
 skryje program namiesto jeho ukončenia.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
-      <translation type="unfinished">&amp;Audio</translation>
+      <translation>&amp;Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Jazyk rozhrania:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
-      <translation type="unfinished">Left Ctrl only</translation>
+      <translation>Len ľavý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Otvárať nové karty na pozadí</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Sieť</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Iba pravý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Pravý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Ľavý Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Automaticky vysloviť slová vo vyskakovacom okne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Otvoriť nové karty za aktívnou kartou</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Reštartovať program pre aplikovanie zmeny jazyka.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Kláves Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Pravidelne kontrolovať dostupnosť nových verzií</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3809,24 +3780,23 @@ otvorené za aktívnou kartou.
 Inak sú pridané za poslednú kartu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Minimalizovať do systémového panela</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Systémové nastavenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Ak je povolené, zobrazí sa ikona v systémového panelu, ktorú je možné použiť na otvorenie hlavného okna a ďalšie úlohy.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,386 +3809,386 @@ a ponúkne mu možnosť otvoriť stánku s programom
 na stiahnutie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Spustenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Heslo:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Štandardný</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Rozhranie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Zmena jazyka</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Kláves Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Ľavý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Iba pravý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Nastavenia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
-      <translation type="unfinished">Left Ctrl</translation>
+      <translation>Ľavý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Pravý Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 v akomkoľvek kontexte, kým GoldenDict beží na pozadí.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Pravý Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Klávesové skratky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Spustiť s povoleným vyskakovacím oknom</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>S touto voľbou sa aplikácia spustí priamo do systémového panelu bez zobrazenia hlavného okna.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Kláves Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Automaticky spustí GoldenDict  pri štarte operačného systému.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Nezobrazovať vyskakovacie okno, ak sa výber alebo schránka v jednom z okien GoldenDict-u zmení</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignorovať zmeny výberu a schránky patriace GoldenDict-u</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Prehrávať zvukové súbory pomocou vstavanej podpory zvuku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Použiť interný prehrávač:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Vyberte program na prehratie zvuku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Zadajte príkaz pre audio prehrávač</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Výslovnosť</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Prehrávanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Použiť externý program:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Dvojklik preloží označené slovo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Zvyčajne stlačenie klávesa ESC presunie zameranie do prekladateľského riadku. V touto voľbou však skryje hlavné okno.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC kláves skryje hlavné okno</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Vyberte si túto možnosť, pokiaľ nechcete vidieť panel s kartami, keď je otvorená len jedna karta.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Skryť hlavičku pri jednej karte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limit slovníkov pre kontextovú ponuku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Odoslať preložené slovo do hlavného okna</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Pred zobrazením vyskakovacieho okna najprv zobraziť vlajku, okno sa otvorí, až po kliknutí na ňu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Normálne kliknutím na odkaz, dvojitým kliknutím na slovo alebo vyhľadaním
+výberu v článku sa načíta preklad a takmer okamžite
+roluje na článok z toho istého slovníka. Ak je táto možnosť vypnutá,
+sa však zobrazí článok z najvyššieho slovníka.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Automaticky prejdite na cieľový článok</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Štýl zobrazenia článku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Prepnite používateľské rozhranie na tmavé.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Tmavý režim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Zmeňte štýl zobrazenia článku na tmavý.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Tmavý režim čítačky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>Objednávka MRU: Naposledy použitá objednávka.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Sledovať zmeny schránky, keď je zapnuté skenovanie. Všimnite si! Toto by ste mali vždy povoliť, pokiaľ nepoužívate Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Sledovať zmenu schránky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Zmena výberu stopy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Voľba prichytenia len vtedy, keď sú stlačené všetky zvolené klávesy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Pri výbere slova zobraziť najprv vlajku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Čas oneskorenia</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Systémový proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Vlastný proxy server</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Vlastné nastavenia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Paluba:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Slovo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Oblasť slovnej zásoby...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Definičné pole...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Veta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Pole vety (môže byť prázdne)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Neidentifikovať GoldenDict v HTTP hlavičke</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximálna veľkosť vyr. pamäte siete:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4227,284 +4197,326 @@ If set to 0 the network disk cache will be disabled.</source>
 Ak nastavíte na 0, vyrovnávacia pamäť siete bude vypnutá.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Ak zapnete túto možnosť, GoldenDict
 vyčistí vyrovnávaciu pamäť siete pri ukončení aplikácie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Vyčistiť vyr. pamäť siete pri ukončení</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Fulltextové vyhľadávanie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Povoliť fulltextové vyhľadávanie pre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Nevyhľadávať v slovníkoch, ktoré obsahujú viac ako</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>článkov (0 - neobmedzené)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Pokročilé</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Ak je počas po sebe nasledujúcich vyhľadávaní jeden slovník manuálne zbalený, zostane zbalený aj pri ďalšom vyhľadávaní</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Zrútenie relácie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Keď používate schránku, odstráňte všetko po novom riadku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Pri novom vyhľadávaní zamerajte hlavné alebo kontextové okno, aj keď je viditeľné</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Obľúbené</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Interval pre ukladanie Obľúbených. Ak je nastavené na nulu, Obľúbené budú uložené iba pri ukončení aplikácie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Zapnite túto voľbu pre potvrdenie každej operácie odstraňovania položky</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Potvrdenie pri odstraňovaní položiek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Zapnite túto možnosť, ak chcete ignorovať neprimerane
 dlhý text pri navigácií myšou, výbere, v obsahu schránky alebo v príkaze</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorovať vstupné frázy dlhšie ako</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Vstupné frázy dlhšie ako táto veľkosť sa budú ignorovať</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Zapnite túto voľbu pre ignorovanie diakritiky pri hľadaní článkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorovať diakritiku pri hľadaní</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Rozbaliť voliteľné &amp;časti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Skrátiť články väčšie než</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Pri vyhľadávaní ignorujte interpunkciu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Zapnite túto voľbu pre hľadanie dodatočných článkov pomocou zoznamov synoným
 zo slovníkov Stardict, Babylon a GLS.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Dodatočné vyhľadávanie pomocou synoným</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>znakov</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab prepína karty podľa poradia poslednej aktivácie</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>História</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Uchovať &amp;históriu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Články</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Zapnite túto voľbu, ak chcete označiť slovo pomocou jedného kliknutia myšou</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Označiť slovo jedným kliknutím</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Štýl rozšírenia:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Maximálna veľkosť histórie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Uložiť každých</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minút</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>klasické</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Moderné</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Lingoes-Blue</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Informácie o polohe sú potrebné na použitie Xapianovho vyhľadávania fráz a operátora NEAR, ale veľkosť databázy bude oveľa väčšia. Vzťahuje sa len na nové prichádzajúce slovníky.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Povoliť index s informáciami o polohe</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Štandardné písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Jednopriestorové písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif Font</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Bezpätkové písmo</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Vzhľad</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Tieto fonty sa použijú, keď sa nenájdu fonty špecifikované v slovníku.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Záložné písma</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Zvuk</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Obyčajný text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Zhoda predpony</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Neznámy</translation>
     </message>
@@ -4512,17 +4524,17 @@ zo slovníkov Stardict, Babylon a GLS.</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Názov programu nebol zadaný.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Program spadol.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Program vrátil návratový kód %1.</translation>
     </message>
@@ -4530,27 +4542,27 @@ zo slovníkov Stardict, Babylon a GLS.</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Povolené</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Meno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Príkazový riadok</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4558,99 +4570,114 @@ zo slovníkov Stardict, Babylon a GLS.</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Chyba načítania článku</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Chyba dekódovania článku</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Autorské práva: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Verzia: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Autor: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Názov: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Webová stránka: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Dátum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Program na vyhľadávanie v slovníku.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Slovo alebo veta na dotaz.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Uložte ladiace správy do gd_log.txt v konfiguračnom priečinku.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Obnoviť stav okna.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Zakázať tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Zmeňte skupinu hlavného okna.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Zmeňte skupinu kontextových okien.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Prepnúť kontextové okno skenovania.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Vytlačiť verziu a diagnostické informácie.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Vyhľadávanie/filter v slovníku (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Vymazať hľadanie</translation>
     </message>
@@ -4658,22 +4685,22 @@ zo slovníkov Stardict, Babylon a GLS.</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>CHYBA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Chyba ukladania zdroja: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Referencovaný zdroj sa nepodarilo stiahnuť.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>VAROVANIE: %1</translation>
     </message>
@@ -4702,67 +4729,72 @@ zo slovníkov Stardict, Babylon a GLS.</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialóg</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Vysloviť slovo (Alt + S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Pridať slovo do Obľúbených (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Zobrazí alebo skryje panel slovníkov</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Vždy zobrazovať nad ostatnými oknami</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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,
 môžete mu zmeniť veľkosť alebo ho inak spravovať.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Poslať slovo do hlavného okna (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Späť</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Vpred</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 : %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>UPOZORNENIE: %1</translation>
     </message>
   </context>
   <context>
@@ -4770,53 +4802,53 @@ môžete mu zmeniť veľkosť alebo ho inak spravovať.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Predchádzajúce</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Ďalšie</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Zvýrazniť &amp;všetko</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Rozlišovať malé a veľké písmená</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Nájsť:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Meno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Cesta</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4824,60 +4856,60 @@ môžete mu zmeniť veľkosť alebo ho inak spravovať.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Súbory</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Systémy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japonský šlabikár Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Vytvoriť slovníky zo skupiny zvukových súborov pridaním cesty:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonské Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4888,84 +4920,84 @@ Not implemented yet in GoldenDict.</source>
 Zatiaľ nie je implementovaný v GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) stránky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Zvukové prieč.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Akékoľvek externé programy. Reťazec %GDWORD% bude nahradený dopytovaným slovom. Reťazec %GDSEARCH% bude nahradený textom vo vyhľadávacom paneli. Ak nie sú zadané obidva parametre, do štandardného vstupu sa vloží hlavné slovo.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Výslovnosti poskytnuté &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, kolaboratívna lingvistická mediálna knižnica Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Povoliť Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>Kód jazyka ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Používanie Forvo v súčasnosti vyžaduje kľúč API, zaregistrujte sa na stránke a získajte svoj vlastný kľúč.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Získajte svoj vlastný kľúč &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tu&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japonský šlabikár Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Vlastný prepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Platí to len pre hľadanú frázu, pričom každý riadok predstavuje prepis oddelený bodkočiarkou. Napríklad ae;æ,užívatelia môžu zadať ae, aby reprezentovali æ v cieľovom slove.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #toto je príklad</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Prepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4976,118 +5008,108 @@ k systému písania kana. Štandardizovaný ako ISO 3602.
 Zatiaľ nie je implementovaný v GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Ruský prepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfológia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Zmeniť...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Príklady:  &amp;quot;eng&amp;quot; pre angličtinu, &amp;quot;fr&amp;quot; pre francúzštinu &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Úplný zoznam dostupných jazykov nájdete &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; tu &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Cesta k priečinku s Hunspell/MySpell slovníkmi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Znovu &amp;prejsť</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Nemecký prepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Akákoľvek webová stránka. Reťazec %GDWORD% bude nahradený hľadaným slovom:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Pridať ...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Vyberte si priečinok</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>Odst&amp;rániť</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Webové stránky</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Cesty pre hľadanie slovníkových súborov:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Potvrdiť odstránenie</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Šlabikáre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Dostupné morfologické slovníky:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5100,94 +5122,94 @@ pre slová s preklepmi. Aby ste ich mohli použiť, tak si pridajte
 vhodné slovníky dole k vhodným skupinám.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT servery</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT servery:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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;. Strá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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Povoliť výslovnosť z Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API kľúč:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Jazykové kódy (oddelené čiarkou):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Grécky prepis</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(Nie je k dispozícii v prenosnej verzií)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programy</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Bieloruský prepis</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Alternatívne použite %GD1251% pre CP1251, %GDISO1%...%GDISO16% pre ISO 8859-1...ISO 8859-16 respektíve
 %GDBIG5% pre Big-5, %GDBIG5HKSCS% pre Big5-HKSCS, %GDGBK% pre GBK a GB18030, %GDSHIFTJIS% pre Shift-JIS.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Text na reč</translation>
     </message>
@@ -5203,42 +5225,42 @@ vhodné slovníky dole k vhodným skupinám.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Vyberte hlasový systém:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>Prid&amp;ať</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Odst&amp;rániť</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Test</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Dostupné hlasové systémy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Text na otestovanie:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Sem na píšte text na otestovanie.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Test</translation>
     </message>
@@ -5263,17 +5285,17 @@ vhodné slovníky dole k vhodným skupinám.</translation>
       <translation>Nie je možné nájsť dostupný TTS hlas.&lt;br&gt;Uistite sa, že minimálne jeden TTS systém máte nainštalovaný v počítači.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Nastavenia</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Hlasitosť:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Tempo:</translation>
     </message>
@@ -5281,12 +5303,12 @@ vhodné slovníky dole k vhodným skupinám.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Napíšte slovo alebo frázu pre vyhľadanie v slovníkoch</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Rozbaliť</translation>
     </message>
@@ -5306,7 +5328,7 @@ vhodné slovníky dole k vhodným skupinám.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5317,33 +5339,33 @@ vhodné slovníky dole k vhodným skupinám.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Meno</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Povolené</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Vložiť článok ako odkaz medzi značky &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Ako odkaz</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -5351,17 +5373,9 @@ vhodné slovníky dole k vhodným skupinám.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Nepodarilo sa dať požiadavku niektorým slovníkom.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>VAROVANIE: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/sq_AL.ts b/locale/sq_AL.ts
index 2bf0a06f..abf4d7cf 100644
--- a/locale/sq_AL.ts
+++ b/locale/sq_AL.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Për</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, programi i fjalorëve, versioni</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licencuar sipas GNU GPLv3 a më i vonë</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Kopjo informacionin e versionit</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Kopjoni listën e fjalorëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Meritat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[E panjohur]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Bazuar në Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Bazuar në Qt %1 (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: nuk mund të krijosh një kartë pa një fjalë</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Kërkimi Anki: AnkiConnect nuk është i aktivizuar.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: postimi në anki dështoi</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: postim te suksesi anki</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Inspektoni</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Zgjeroj artikullin</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Mbledh artikullin</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
-      <translation type="unfinished">Working with popup</translation>
+      <translation>Duke punuar me popup</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(pa titull)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Mirë se erdhët!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Asnjë përkthim për &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; nuk u gjet në grupin &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forumi&lt;/a&gt;.&lt;p&gt;Kontrolloni edhe &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(figurë)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Zgjeroj artikullin</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Nga </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Mbledh artikullin</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Bëni një shënim të ri Anki</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Gabimi i kërkimit: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Fjalët e përafërta: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Shprehjet e përbëra: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Fjalët e ndara: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Dështoi krijimi i skedës kohëshkurtër.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Shikoj &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Nuk ekziston resursi i referuar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Shikoj &quot;%1&quot; në %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Seleksionoj këtë artikullin</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopjoj tekstin</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Inspektoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Hap lidhësin në fushën e &amp;re</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Hap lidhësin në &amp;shfletuesin e jashtëm</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Resursi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
-      <translation type="unfinished">TTS Voice</translation>
+      <translation>TTS Voice</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Figura</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
-      <translation type="unfinished">Video</translation>
+      <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
-      <translation type="unfinished">Video: %1</translation>
+      <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Përkufizimi nga fjalori &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Përkufizimi: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Programi audio i referuar nuk ekziston.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Link i hapur</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Ruani &amp;shënjoni &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>PARALAJMËRIM: Luajtësi audio: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>GABIM: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Ruaj tingullin</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Ruaj imazhin</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Ruaj &amp;imazhin...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Fraza nuk u gjet</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 nga %2 ndeshje</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Ruaj t&amp;ingullin...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Dërgoj &quot;%1&quot;te radha e inputit</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Shtoj &quot;%1&quot; te historiku</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Dërgo artikullin aktual te Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Dërgo tekstin e përzgjedhur te Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Skedarët e zërit (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Të gjithë skedarët (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Dështoi në luajtjen e skedarit zanor: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Krijoni shënimin Anki</translation>
     </message>
   </context>
   <context>
@@ -413,93 +408,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Konvertimi kinez</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Aktivizo konvertimin midis karaktereve të thjeshtuara dhe tradicionale kineze</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Konvertimi kinez</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Aktivizo konvertimin nga karaktere të thjeshtuara në karaktere tradicionale (varianti i Tajvanit).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC në TC (varianti i Tajvanit)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Aktivizo konvertimin nga karaktere të thjeshtuara në karaktere tradicionale (varianti i Hong Kongut).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC në TC (varianti i Hong Kongut)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Aktivizo konvertimin nga karaktere tradicionale në karaktere të thjeshtuara</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC në SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Konvertimi i thjeshtuar në tradicional kinez (varianti i Tajvanit).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Konvertimi i thjeshtuar në kinezisht tradicional (varianti i Hong Kongut).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Konvertimi tradicional në kinezisht i thjeshtuar</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>transliterim i personalizuar</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>Kërkohet vërtetimi i përfaqësuesit</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>Ju duhet të jepni një emër përdoruesi dhe një fjalëkalim për të hyrë përmes përfaqësuesit</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>Emri i përdoruesit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Fjalëkalimi:</translation>
     </message>
@@ -507,24 +502,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Ikona e grupit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Shkurtore:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Dosja e preferuar:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Imazhe</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Tërë skedat</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Gabim</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Nuk lexon skedën e imazhit të përcaktuar.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Miratimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Jeni i sigurt për prodhimin e disa grupeve sipas gjuhëve të çiftuara?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Jeni i sigurt që dëshironi të krijoni një grup grupesh bazuar në metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kombinoj grupet sipas gjuhës së burimit në &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kombinoj grupet sipas gjuhës së synuar në &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Grupimi automatik sipas dosjes dështoi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Drejtoria mëmë e %1 nuk mund të arrihet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Jeni i sigurt që dëshironi të krijoni një grup grupesh bazuar në dosjet që përmbajnë?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Krijoj grup përkthimi dyanësh &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Kombinoj grupet me &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Fjalorët:</translation>
     </message>
@@ -634,201 +629,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
-      <translation type="unfinished">Search mode</translation>
+      <translation>Mënyra e kërkimit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>Ky element përcakton se si do të interpretohet vargu i filtrit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>Nëse kontrollohet në rastet e simboleve do të merret parasysh gjatë filtrimit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
+      <translation>Rasti i ndeshjes</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>Eksporton fjalët kryesore në skedar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Eksporto</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Ndihmë</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>Ne rregull</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>Shtypni këtë buton për të aplikuar filtrin në listën e fjalëve kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
+      <translation>Aplikoni</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>Nëse kontrollohet ndonjë ndryshim filtri, ne do të aplikojmë menjëherë në listën e fjalëve kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>Aplikoni automatikisht</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>Filtri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
+      <translation>Vargu i filtrit (varg i fiksuar, shkronja të ngurta ose shprehje e rregullt)</translation>
     </message>
     <message>
       <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <source>Text</source>
+      <translation>Teksti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
+      <source>Wildcards</source>
+      <translation>Shenjat e egra</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Fjalët kryesore po ngarkohen...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>Gjithsej kryefjalë unike: %1, e filtruar: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>Ruani kryefjalët në skedar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Skeda tekst (*.txt);;Të gjitha skedat (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Nuk mund të hapet skedari i eksportuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>Eksporto fjalët kryesore...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Anuloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Procesi i eksportit është ndërprerë</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Eksporti përfundoi</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Artikujt totalë:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Përkthen nga:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Totali i fjalëve:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Përkthen në:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Hap dosjen</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Editoj fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Skedat që përbëjnë fjalorin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Përshkrimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>Shfaq të gjitha kryefjalët unike të fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>Kryefjalë</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Editoj fjalorin me komandën:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Emri i skedarit të indeksit:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Hapni dosjen e indeksit</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 artikuj</translation>
     </message>
@@ -838,105 +843,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>Url: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>Bazat e të dhënave: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>Strategjitë e kërkimit: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>Bazat e të dhënave të serverit</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
-      <translation type="unfinished">Address</translation>
+      <translation>Adresë</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>Bazat e të dhënave</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>Strategjitë</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>Lista e bazave të të dhënave të kufizuara me presje
+(vargu bosh ose &quot;*&quot; përputhet me të gjitha bazat e të dhënave)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>Lista e strategjive të kërkimit e kufizuar me presje
+(vargu i zbrazët nënkupton &quot;prefiks&quot; strategji)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Meny e zgjeruar me të gjithë fjalorët...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Editoj grupin</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Info për fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Kryefjalët e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Hap dosjen e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Editoj fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Brezi i fjalorëve</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Fjalorët</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Fjalorët</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Pranoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Anuloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Burimet e ndryshuara</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupet</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Disa burime u ndryshuan. Do i pranoni ndryshimet?</translation>
     </message>
@@ -991,12 +996,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Faqja e meparshme</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Faqja tjetër</translation>
     </message>
   </context>
   <context>
@@ -1010,85 +1015,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Kërkim me tekst të plotë</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>Teksti i thjeshtë</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <source>Wildcards</source>
+      <translation>Shenjat e egra</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Fjala pyetëse nuk mund të jetë bosh.</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
+      <source>support xapian search syntax,such as AND OR +/- etc</source>
+      <translation>mbështet sintaksën e kërkimit xapian, të tilla si AND OSE +/- etj</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>E paracaktuar</translation>
     </message>
     <message>
       <location filename="../src/fulltextsearch.cc" line="243"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
-      <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>Artikujt e gjetur: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>Tani duke indeksuar: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Asnjë</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>Nuk ka fjalorë për kërkim të tekstit të plotë</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Gabim në skedarin e preferencave</translation>
     </message>
   </context>
   <context>
@@ -1106,17 +1091,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Shto dosje</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Të preferuarat:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Të gjithë artikujt e zgjedhur do të fshihen. Të vazhdohet?</translation>
     </message>
   </context>
   <context>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>nga</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Shkon te Editoj|Fjalorët|Burime|Forvo dhe zbaton kodin tonë API për ta zhdukur këtë gabimin.</translation>
     </message>
@@ -1162,79 +1147,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;E mëparshme</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Tjetra</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Kërko</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>Modaliteti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>Artikujt e gjetur:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>Fjalorët e disponueshëm në grup:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>Prisni për indeksimin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Ndihmë</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>Total:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>Indeksuar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>Tani duke indeksuar: Asnjë</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Anuloj</translation>
     </message>
@@ -1266,29 +1235,29 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Skeda 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1303,12 +1272,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/groups.cc" line="29"/>
       <source>Group tabs</source>
-      <translation type="unfinished">Group tabs</translation>
+      <translation>Skedat e grupit</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>Hapni listën e grupeve</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Vini emrin e ri të grupit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Fjalorët e gatshëm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Shtoj grupin</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Shtoj grupin</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Krijoj grupin e ri të fjalorëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Grupi sipas gjuhëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Krijoni grupe të bazuara në dosje.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Grupi sipas dosjeve</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Grupi sipas Meta të dhënave</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Kapini e lëshojini fjalorët midis grupeve, lëvizini, radhitini duke përdorur mausin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Riemërtoj grupin aktual të fjalorëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Heq grupin aktual të fjalorëve</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Vini emrin e grupit të ri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Heq tërë grupet</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Heq fjalorët e përzgjedhur nga grupi (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Shtoj fjalorët e përzgjedhur te grupi (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Heq grupin</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupet:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Ri&amp;emërtoj grupin</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Heq tërë grupet e fjalorëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Krijoj grupet sipas gjuhës</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Historiku:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Masa e historikut: %1 njësi jashtë maksimumit %2</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Sugjerimet e rrokjezimit: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologjia</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
@@ -1484,1247 +1453,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksimi: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Emri i fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Nis</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Prisni, fjalori po indeksohet</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Lutemi të prisni...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Po indekson...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Эве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
-      <translation type="unfinished">Afar</translation>
+      <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Аkan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кри</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ибо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Коми</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Пали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tailandisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
-      <translation type="unfinished">Zulu</translation>
+      <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Çekisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Holandisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Greqisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irlandisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кхмерский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latinisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маори</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Ория</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Схона</translation>
     </message>
-    <message>
-      <location filename="../src/language.cc" line="276"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
-    </message>
     <message>
       <location filename="../src/language.cc" line="274"/>
-      <source>Tamil</source>
-      <translation type="unfinished">Tamil</translation>
+      <source>Tajik</source>
+      <translation>Taxhikisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="272"/>
+      <source>Tamil</source>
+      <translation>Tamile</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
-      <translation type="unfinished">Swati</translation>
+      <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Инупиак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Уэльский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Уолоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кшоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Романшский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонгка (Бутан)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Каннада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Сев. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
-      <translation type="unfinished">Abkhazian</translation>
+      <translation>Abhaziane</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Рунди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Галльский (Шотландия)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Shqip</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латышский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малайялам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bullgarisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Мальтийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Марати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймарский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Мальдивский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиджи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Hungarisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Frëngjisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Gjermanisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongolisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebraisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Эреро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембургский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канури</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казахский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикую</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <translation>Koreane</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджибва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пуштунский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polonisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Французский (диалект Occitan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Sllovakisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
-      <translation type="unfinished">Telugu</translation>
+      <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйгурский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbokroatisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Йоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанг</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumanisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonezisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панджаби</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Souther Sotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсиканский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Эсперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Sllovenisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
-      <translation type="unfinished">Aragonese</translation>
+      <translation>Aragoneze</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таитянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Мальгашский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галицийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербайджанский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
-      <translation type="unfinished">Amharic</translation>
+      <translation>Amharike</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskritisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалисут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Bjellorusisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Яванский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
-      <translation type="unfinished">Avestan</translation>
+      <translation>Avestan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Киньяруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikanisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armenisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвежский букмол</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroatisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Боснийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Окциденталь</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бирманский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Rusisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбуржский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norvegjisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Kinezisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Сингальский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spanjisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнуольский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалог</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Ассамский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетинский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
-      <translation type="unfinished">Swahili</translation>
+      <translation>Suahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Suedisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Maqedonisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugalisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turqisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <translation>Turkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуджарати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Islandisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Anglisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gjeorgjisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Церковно-славянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарерский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finlandisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапюк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валлонский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваньяма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалльский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Северное Саами</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Гаитянский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Новонорвежский (нюнорск)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуарани</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Юж. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичева</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Lituanisht</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сычуаньский И</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
-      <translation type="unfinished">Tigrinya</translation>
+      <translation>Tigrinja</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Идиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Kinezisht tradicionale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Kinezisht e thjeshtuar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Tjetër</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Dialekte të tjera të kinezishtes së thjeshtuar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Dialekte të tjera të kinezishtes tradicionale</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Gjuhë të tjera evropiano-lindore</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Gjuhë të tjera evropiano-perëndimore</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Gjuhë të tjera ruse</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Gjuhë të tjera japoneze</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Gjuhë të tjera baltike</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Gjuhë të tjera greke</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Dialekte të tjera koreane</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Dialekte të tjera turke</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Dialekte të tjera tajlandeze</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>Tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Lojban</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Frëngjisht</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Spanjisht</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Bjellorusisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bullgare</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Çeke</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Gjermanisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Greke</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>finlandez</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>italisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>japoneze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>koreane</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Lituanisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>maqedonase</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>holandeze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>polonisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>portugeze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>rusisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>sllovake</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>shqiptare</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>serbisht (cirilike)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>suedeze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>turk</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>ukrainase</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Kineze e thjeshtuar</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Tradita kineze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>vietnameze</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>portugeze, braziliane</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>persisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Spanjisht, Argjentinë</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>gjermanisht, Zvicër</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Spanjisht, Bolivi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Taxhikisht</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Keçua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabisht, Arabia Saudite</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>turkmen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingu</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>anglisht</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Gabim në ngarkimin e fjalorëve</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Gabim në skedën e konfiguracionit.Do vijoni me parametrat standardë?</translation>
     </message>
@@ -2740,702 +2713,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Të preferuarat dhe ritet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Të gjithë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Pas</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 fjalorë, %2 artikuj, %3 fjalë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Editoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Skedar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Ndihmë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Kërko</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Dal</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Gabim</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Mbyll aplikacionin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Mbyll në shirit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Nuk ruan artikullin: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zmadhoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Fjalorët...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Për</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forumi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Printoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Ruaj artikullin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Ruaj artikullin si</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimizon dritaren në shiritin e sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Sistem&amp;oj faqen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Faqja zyrtare</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Ka dalë version i ri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Shikoj:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Zvogëloj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Shfaq dritaren &amp;kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Për GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Shkarkoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Sistemimi i faqes</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Shikoj në:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Përmasat normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Hap...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(pa titull)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Preferencat...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Mirë se erdhët!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Shqiptoj fjalën (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Ruaj artikullin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Kaloj këtë versionin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Para</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Printoj artikullin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Pamje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>H&amp;istorik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Pastroj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zmadhimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zmadhoj fjalët</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Zvogëloj fjalët</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Fjalët në përmasat normale</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Mbyll fushën</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Mbyll të gjitha fushat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Mbyll të gjitha fushat veç kësaj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Fushat e hapura</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Fushë e re</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Dosja e &amp;konfiguracionit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Brezi i &amp;menysë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Gjetjet në fjalorë:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Shtoni të gjitha skedat te të preferuarat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>PARALAJMËRIM: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
+      <translation>Vargu për të kërkuar në fjalorë. Shenjat &apos;*&apos;, &apos;?&apos; dhe grupe simbolesh &apos;[...]&apos; lejohen.
+Për të gjetur &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; simbole përdorin &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respektivisht</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Hap listën e fushave</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Hiq skedën aktuale nga Të preferuarat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Shfaq</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Eksportoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Fsheh</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Eksportoj historikun në skedë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Skeda tekst (*.txt);;Të gjitha skedat (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Përfundoi eksporti i historikut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Gabim eksporti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importoj historikun nga skeda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Gabim importi: skedë me të dhëna të pasakta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Përfundoi importi i historikut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Gabim importi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Eksporto të preferuarat në skedar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>Skedarët XML (*.xml);;Të gjithë skedarët (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Eksporti i të preferuarave përfundoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Eksporto të preferuarat për të paraqitur si listë të thjeshtë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Importoni të preferuarat nga skedari</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>Skedarët XML (*.xml);;Skedarët Txt (*.txt);;Të gjithë skedarët (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Eksporti i të preferuarave përfundoi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Gabim në analizimin e të dhënave</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Info për fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Kryefjalët e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Hap dosjen e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Editoj fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Tani indeksoni për kërkimin e tekstit të plotë: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Të hiqet kryefjala &quot;%1&quot; nga Të preferuarat?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Paneli i &amp;kërkimit</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Paneli i &amp;rezultateve</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Paneli i të preferuarave</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Parashikoj &amp;shtypjen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Riskanoj skedat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Fushë e re</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Gjithmonë në krye</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Gjithmonë në krye</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Butoni i menysë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>Kërko në faqe</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Kërkim me tekst të plotë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>Referenca GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Shfaqje</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Eksporto</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Importi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Shtoni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Shto skedën aktuale te Të preferuarat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Eksporto në listë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Tregoj emrat e &amp;fjalorëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Tregoj ikonat e &amp;vogla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Lundrimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Aktivizo Skanimin</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikull, i plotë (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artikull, vetëm HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Ruan artikullin...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Ruaj artikullin i plotë</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Paneli i &amp;historikut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Accessibility API është joaktiv</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Skeda e fjalorit u manipulua ose u dëmtua</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Dështoi hapja e artikullit nga %1, arsyeja: %2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Gabim në analizimin e XML: %1 në %2,%3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Аdresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -3497,101 +3470,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Nuk mund të hapte tamponin audio për lexim.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Fjalorët joaktivë (e çaktivizuar):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Emri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Artikujt totalë:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Përkthen nga:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Përkthen në:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Totali i fjalëve:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Radha e fjalorëve:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Skedat që përbëjnë fjalorin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Informacion për fjalorin</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Përshkrimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Radhit sipas emrit</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Radhit sipas gjuhëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Kryefjalët e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>Fjalorë aktivë: %1, joaktiv: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Shtegu</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Brendësia</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Nis në shiritin e sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Vetëm Shift majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Aktivizoj ikonën në shiritin e sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Hosti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Porti:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Ndërrimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Lloji:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Përdoruesi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Skanimi i jashtëm</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,137 +3640,137 @@ switching to them.</source>
 Por, kur e ndez këtë, fushat e reja hapen pa kaluar te to.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Përdor server proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Tasti Windows ose Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Autoshqiptoj fjalët në dritaren kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Nis me sistemin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Vetëm Alt majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Shfletimi me fusha</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Vetëm Shift djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Kur e ndez, dritarja kryesore e aplikacionit nuk mbyllet por do të fshehet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
-      <translation type="unfinished">&amp;Audio</translation>
+      <translation>&amp;Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Gjuha e grafikës:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Vetëm Ctrl majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Hap fushat e reja në sfond</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Rrjeti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Vetëm Ctrl djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Autoshqiptoj fjalët e skanuara</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Hap fushat e reja pas aktuales</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Riniseni programin për të zbatuar ndryshimin e gjuhës.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Tasti Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Verifikoj periodikisht versionet e reja të programit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3807,25 +3778,24 @@ be the last ones.</source>
 asaj aktive. Përndryshe ato i shtohen më të fundit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Mbyll në shiritin e sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Standardi i sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Kur e aktivizon, në shiritin e sistemit shfaqet një ikonë që mund të përdoret
 për të hapur dritaren kryesore dhe për të kryer detyra të tjera.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3836,140 +3806,140 @@ i azhurnuar, i GoldenDict. Atëherë, programi informon rreth tij dhe
 kërkon ta shkarkojë.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Nisja</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Fjalëkalimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Grafika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Ndryshimi i Gjuhës</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Tasti Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Vetëm Alt djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Preferencat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl majtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl djathtas</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Tastet kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Nis me skanuesin e ndezur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Kur e ndez, aplikacioni nis direkt në shiritin e sistemit, pa e shfaqur dritaren kryesore.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Tasti Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Nis automatikisht GoldenDict pas hapjes së sistemit.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Mos shfaq popup kur përzgjedhja ose tabela në një nga dritaret e GoldenDict ndryshon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Injoroni zgjedhjen e vetë GoldenDict dhe ndryshimet e kujtesës</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Luaj skedarë audio përmes mbështetjes së integruar audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Përdorni luajtësin e brendshëm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Zgjidhni fundin e pasëm audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Futni linjën e komandës së riprodhuesit audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3978,532 +3948,574 @@ përmbajtjen (imazhe, korniza) jashtë faqes që shfleton. Nëse ndonjë
 faqe shfaq probleme prej kësaj, çaktivizojeni.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Shqiptimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Riprodhimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Përdor programin e jashtëm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Përkthej fjalën me dy klikime</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Riprodhon skedat zanore me një program tjetër</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalisht, shtypja e tastit ESC e çon fokusin te vija e përkthimit. Kur e ndez këtë, ai fsheh dritaren kryesore.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Tasti ESC fsheh dritaren kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Zgjedh a duhet shfaqur brezi i fushave kur është hapur vetëm një fushë.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Fsheh fushën e vetme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Limiti i fjalorëve në meny:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Dërgoj fjalën e përkthyer te dritarja kryesore</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Shfaq një dritare flamuri përpara se të shfaqet dritarja kërcyese, kliko flamurin për të shfaqur dritaren kërcyese. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Normalisht, duke klikuar në një lidhje, duke klikuar dy herë mbi një fjalë ose duke kërkuar
+përzgjedhje në një artikull ngarkon përkthimin dhe pothuajse menjëherë
+lëviz te artikulli nga i njëjti fjalor. Me këtë opsion të fikur,
+megjithatë, shfaqet artikulli nga fjalori më i lartë.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Lëviz automatikisht te artikulli i synuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Stili i shfaqjes së artikullit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Kthejeni ndërfaqen në të errët.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Modaliteti i errët</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Kthejeni stilin e shfaqjes së artikullit në të errët.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Modaliteti i lexuesit të errët</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>Urdhri MRU: Urdhri më i përdorur së fundmi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Klipboard i gjurmëve ndryshon kur Skanimi është i aktivizuar. Njoftim! Gjithmonë duhet ta aktivizoni këtë nëse nuk jeni në Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Gjurmo ndryshimin e tabelës së fragmenteve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Ndryshimi i përzgjedhjes së pjesëve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Zgjedhja e ngjitjes vetëm kur të gjithë tastet e zgjedhur mbahen të shtypur:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Shfaq flamurin e skanimit kur zgjidhet fjala</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Koha e vonesës</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>Përfaqësuesi i sistemit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>Prokurë e personalizuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>Cilësimet e personalizuara</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Kuvertë:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Modeli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>fjalë</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Fusha e fjalorit...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Teksti</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Fusha e përkufizimit...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Fjali</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Fusha e fjalisë (mund të jetë bosh)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Nuk identifikoj GoldenDict në kokët HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Madhësia maksimale e memories së rrjetit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Hapësira maksimale e diskut të zënë nga cache-i i rrjetit të GoldenDict në
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Nëse vendoset në 0 cache-i i diskut të rrjetit do të çaktivizohet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Kur ky opsion aktivizohet, GoldenDict
+fshin cache-in e rrjetit të tij nga disku gjatë daljes.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Pastro memorien e rrjetit në dalje</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Kërkim me tekst të plotë</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>Lejo kërkimin me tekst të plotë për:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Mos kërkoni në fjalorë që përmbajnë më shumë se</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>artikuj (0 - i pakufizuar)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Av&amp;ancuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Gjatë kërkimeve të njëpasnjëshme, nëse një fjalor paloset manualisht, ai do të mbetet i palosur në kërkimin tjetër</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Kolapsi i seancës</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Kur përdorni clipboard, hiqni gjithçka pas rreshtit të ri</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Në një kërkim të ri, fokusoni dritaren kryesore ose kërcyese edhe nëse është e dukshme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Të preferuarat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Intervali i ruajtjes së të preferuarave. Nëse vendoset në 0 Të preferuarat do të ruhen vetëm gjatë daljes.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Aktivizoni këtë opsion për të konfirmuar çdo operacion të fshirjes së artikujve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Konfirmim për fshirjen e artikujve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Aktivizo këtë opsion për të injoruar tekstin e futur në mënyrë të paarsyeshme të gjatë
+nga vendosja e mausit, përzgjedhja, clipboard ose linja e komandës</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Injoroni frazat hyrëse më të gjata se</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Frazat e dhëna më të gjata se kjo madhësi do të shpërfillen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Aktivizoni këtë opsion për të injoruar diakritikët gjatë kërkimit të artikujve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Injoroni diakritikët gjatë kërkimit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Zgjeroj &amp;pjesët fakultative</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Mbledh artikujt me më shumë se</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Injoroni shenjat e pikësimit gjatë kërkimit</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Aktivizo këtë opsion për të aktivizuar kërkimin e artikujve shtesë nëpërmjet listave sinonimike
+nga fjalorët Stardict, Babylon dhe GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Kërkim shtesë nëpërmjet sinonimeve</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>simbole</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Kaloj fushat me Ctrl+Tab sipas rendit MRU</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babilonia</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historiku</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Depozitoj &amp;historikun</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artikujt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Aktivizoni opsionin nëse doni të seleksiononi fjalët me një klikim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Seleksionoj fjalën me një klikim</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Stili i shtesave:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Masa maksimale e historikut:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Ruaj çdo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minuta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Klasike</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
+      <translation>Moderne</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes Blu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Kërkohet informacion i pozicionit për të përdorur kërkimin e frazës së Xapian dhe operatorin NEAR, por madhësia e bazës së të dhënave do të jetë shumë më e madhe. Zbatohet vetëm për fjalorët e rinj të ardhur.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Aktivizo indeksin me informacionin e pozicionit</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Fonti standard</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Fonti Monospace</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Fonti Serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Fonti Sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Pamja e jashtme</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Këto fonte do të aplikohen kur fontet e specifikuara nga një fjalor nuk gjenden.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Fontet e kthimit</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Audio</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Tekst i thjeshtë</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Krahasoj parashtesën</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>E panjohur</translation>
     </message>
@@ -4511,17 +4523,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Nuk u dha emri i programit.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Programi u prish.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Programi ktheu kodin e daljes %1.</translation>
     </message>
@@ -4529,27 +4541,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Lloji</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Vija e komandës</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4557,99 +4569,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Gabim në hapjen e artikullit</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Gabim në deshifrimin e artikullit</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>E drejta e autorit: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Versioni: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Autori: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>Titulli: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>Faqja e internetit: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>Data: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Një program kërkimi fjalori.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Fjalë ose fjali për të pyetur.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Ruani mesazhet e korrigjimit në gd_log.txt në dosjen e konfigurimit.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Rivendos gjendjen e dritares.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Çaktivizo tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Ndryshoni grupin e dritares kryesore.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Ndryshoni grupin e dritareve kërcyese.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Ndrysho dritaren kërcyese të skanimit.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Versioni i printuar dhe informacioni i diagnozës.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Kërkoj/filtroj fjalorët (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Pastroj kërkimin</translation>
     </message>
@@ -4657,22 +4684,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>GABIM: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Gabim në ruajtjen e resursit: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Dështoi shkarkimi i resursit të referuar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>KUJDES: %1</translation>
     </message>
@@ -4701,67 +4728,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
-      <translation type="unfinished">Dialog</translation>
+      <translation>Dialogu</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Shqiptoj Fjalën (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Shto fjalë te të preferuarat (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Shfaq ose fsheh brezin e fjalorit</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Qëndroni gjithmonë mbi të gjitha dritaret e tjera</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Dërgoj fjalën te dritarja kryesore (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Pas</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Para</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>PARALAJMËRIM: %1</translation>
     </message>
   </context>
   <context>
@@ -4769,53 +4801,53 @@ që të marrë një përmasë të re ose për mënyrat e tjera.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;E mëparshme</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Tjetra</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Thekso &amp;të gjitha</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Ndjeshmëri e rasteve</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Gjej:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Shtegu</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -4823,60 +4855,60 @@ që të marrë një përmasë të re ose për mënyrat e tjera.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Skeda</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Rrokjezimi i Japonishtes Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Krijoni fjalorë me disa skeda zanore duke e shtuar shtegun këtu:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonishtja Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4887,84 +4919,84 @@ I standardizuar si ISO 3602.
 Akoma i pafutur në GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Faqet në Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Direktoritë audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Çdo program i jashtëm. Një varg %GDWORD% do të zëvendësohet me fjalën e pyetjes. Një varg %GDSEARCH% do të zëvendësohet me tekstin në shiritin e kërkimit. Nëse të dy parametrat nuk janë dhënë, kryefjala do të futet në hyrjen standarde.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Shqiptime të ofruara nga &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, një bibliotekë mediatike gjuhësore bashkëpunuese e Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Aktivizo Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>Kodi i gjuhës ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Përdorimi i Forvo-s kërkon aktualisht një çelës API, regjistrohuni në sajt për të marrë çelësin tuaj.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Merrni çelësin tuaj &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;këtu&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Rrokjezimi i Japonishtes Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Transliterim i personalizuar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Kjo zbatohet vetëm në frazën e kërkimit, ku çdo rresht përfaqëson një transliterim, pikëpresje të ndarë. Për shembull, ae;æ, përdoruesit mund të futin ae për të përfaqësuar æ në fjalën e synuar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #ky është një shembull</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Përkthimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4975,118 +5007,108 @@ I standardizuar si ISO 3602.
 Akoma i pafutur në GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Përkthimi Rusisht</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologjia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Ndryshoj...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Shembuj:  &amp;quot;eng&amp;quot; për anglisht, &amp;quot;fra&amp;quot; për frëngjisht &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Lista e plotë e gjuhëve të disponueshme mund të gjendet &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; këtu &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Shtegu i direktorisë me fjalorët Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Ri&amp;skanoj tani</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Përkthimi Gjermanisht</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Çdo faqe në internet. Radha %GDWORD% do zëvendësohet me fjalën e kërkuar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Shtoj...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Zgjedh direktorinë</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Heq</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Faqet në internet</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Shtigjet ku do të kërkohen skedat e fjalorëve:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Miratoj heqjen</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Rrokjezimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Fjalorët morfologjikë të gatshëm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5100,94 +5122,94 @@ Shtojini fjalorët e duhur te fundi i grupeve
 të caktuara për t&apos;i përdorur.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>Serverët DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>Serverët DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Aktivizoj shqiptimet nga Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Кodi API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Kodet e gjuhëve (të ndara me presje):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Përkthimi Greqisht</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(nuk mundësohet në versionin portabël)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programet</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Përkthimi bjellorusisht</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Ndryshe, përdorni %GD1251% për CP1251, %GDISO1%...%GDISO16% për ISO 8859-1...ISO 8859-16 përkatësisht,
 %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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Tekst në tinguj</translation>
     </message>
@@ -5203,42 +5225,42 @@ të caktuara për t&apos;i përdorur.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Motorët e përzgjedhur të zërit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Shtoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Heq</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Parashikoj</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Motorët e gatshëm të zërit:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Teksti që parashikohet:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Shkruani tekstin që do të parashikohet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Parashikoj</translation>
     </message>
@@ -5263,17 +5285,17 @@ të caktuara për t&apos;i përdorur.</translation>
       <translation>Nuk gjen zërin TTS të gatshëm. &lt;br&gt;Lutemi të siguroheni që keni instaluar të paktën një motor TTS në kompjuter.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Preferencat</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volumi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Vlerësimi:</translation>
     </message>
@@ -5281,12 +5303,12 @@ të caktuara për t&apos;i përdorur.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Kërkoni një fjalë a frazë në fjalor</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Ul poshtë</translation>
     </message>
@@ -5306,7 +5328,7 @@ të caktuara për t&apos;i përdorur.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5317,33 +5339,33 @@ të caktuara për t&apos;i përdorur.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Emri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adresa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Aktiv</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Fut artikullin si lidhje brenda etiketës &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>Si lidhje</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikona</translation>
     </message>
@@ -5351,17 +5373,9 @@ të caktuara për t&apos;i përdorur.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Dështoi kërkimi në disa fjalorë.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>KUJDES: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/sr_SP.ts b/locale/sr_SP.ts
index fd6388bb..f0925592 100644
--- a/locale/sr_SP.ts
+++ b/locale/sr_SP.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>О програму</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Речник GoldenDict, издање </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Лиценца: GNU GPLv3 или новија</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Копирај информације о верзији</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Копирај листу речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Заслуге:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Непознато]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>На основу Qt %1 (%2, %3 бита)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© Константин Исаков (ikm@goldendict.org), 2008-2011 {2008-2013 ?}</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>На основу Кт %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>анки: не могу да креирам картицу без речи</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Анки претрага: АнкиЦоннецт није омогућен.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>анки: пост за анки није успео</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>анки: пост то анки успех</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Инспецт</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Прошири чланак</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Скупи чланак</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Рад са искачућим прозором</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без имена)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Добро дошли!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Није пронађен превод за &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; у групи &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt; Форум програма&lt;/a&gt;.&lt;p&gt;Ажурирање софтвера доступно на  &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(слика)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Прошири чланак</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Из: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Скупи чланак</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Направите нову Анки белешку</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Упит грешке: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Затвори речи: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Сложени изрази: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Поједине речи: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Није успело да створи привремену датотеку.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Претражи &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Претражи «%1» у &amp;новој картици</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Тражени ресурс није пронађен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Грешка при отварању ресурс датотеке, покушајте ручно да отворите: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Претражи «%1» у %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Изаберите тренутни чланак</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Умножи као текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Прегледај</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Претражи «%1» у %2 в &amp;новој картици</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Отворите ову везу у новој &amp;картици</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Отворите ову везу у спољнем &amp;прегледачу</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ресурс</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS глас</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Слика</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Видео</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Видео: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Дефиниција из речника &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Одређење: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Одређени аудио програм није пронађен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Отвори линк</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Сачувај &amp;обележи &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>УПОЗОРЕЊЕ: Аудио плејер: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Сачувај звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Сачувај слику</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Сликовне датотеке (*.bmp *.jpg *.png *.tif);;Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Сачувај &amp;слику...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Фраза није пронађена</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 од %2 утакмица</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Сачувај з&amp;вук...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Пошаљи &quot;%1&quot; на ред за унос</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Додај &quot;%1&quot; у историју</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Пошаљи актуелни чланак Анкију</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Пошаљи изабрани текст Анкију</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Звучне датотеке (*.вав *.огг *.ога *.мп3 *.мп4 *.аац *.флац *.мид *.вв *.апе *.спк);;Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Репродукција звучне датотеке није успела: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Креирај Анки белешку</translation>
     </message>
   </context>
   <context>
@@ -414,93 +409,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Кинеска конверзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Омогућите конверзију између поједностављених и традиционалних кинеских знакова</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Кинеска конверзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Омогућите конверзију из поједностављених знакова у традиционалне (тајванска варијанта) знакова</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>СЦ до ТЦ (тајванска варијанта)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Омогућите конверзију из поједностављених знакова у традиционалне знакове (варијанта Хонг Конга).</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>СЦ до ТЦ (варијанта у Хонг Конгу)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Омогућите конверзију традиционалних знакова у поједностављене знакове</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>ТЦ до СЦ</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Поједностављена конверзија у традиционални кинески (тајванска варијанта).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Поједностављена конверзија у традиционални кинески (варијанта у Хонг Конгу).</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Традиционална у поједностављена кинеска конверзија</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>прилагођена транслитерација</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>Потребна је проки аутентификација</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>Морате да унесете корисничко име и лозинку за приступ преко проксија</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>Корисничко име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Лозинка:</translation>
     </message>
@@ -508,24 +503,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Икина групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Пречица:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Фасцикла Фаворити:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Слика</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Све датотеке</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Не можете да читате одабрану слику</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Потврда</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Да ли сте сигурни да желите да креирате скуп група на основу језичких парова?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Да ли сте сигурни да желите да генеришете скуп група на основу метадата.томл?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Комбинујте група из изворног језика у &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Комбинујте група из циљног језика у &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Аутоматско груписање по фолдеру није успело.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Не може се приступити родитељском директоријуму од %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Да ли сте сигурни да желите да генеришете скуп група на основу фасцикли које садрже?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Направите двострану групу превођења &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Комбинујте група са &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Речници:</translation>
     </message>
@@ -635,201 +630,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
-      <translation type="unfinished">Search mode</translation>
+      <translation>Режим претраге</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>Овај елемент одређује како ће се тумачити низ филтера</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>Ако је означено на симболима, мала слова ће се узети у обзир приликом филтрирања</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
+      <translation>Матцх цасе</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>Извози наслове у датотеку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Помоћ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>У реду</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>Притисните ово дугме да примените филтер на листу главних речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
+      <translation>Применити</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>Ако је означено, све промене филтера ћемо одмах применити на листу насловних речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>Аутоматска примена</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>Филтер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
+      <translation>Стринг филтера (фиксни стринг, џокер знакови или регуларни израз)</translation>
     </message>
     <message>
       <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <source>Text</source>
+      <translation>Текст</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
+      <source>Wildcards</source>
+      <translation>Вилдцардс</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>РегЕкп</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Учитавање наслова...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>Укупно јединствених наслова: %1, филтрираних: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>Сачувајте наслове у датотеку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстуалне датотеке (*.txt);;Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Није могуће отворити извезену датотеку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>Извези насловне речи...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Процес извоза је прекинут</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Извоз је завршен</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Укупно чланака:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Изворни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Укупно речи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Циљни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Отвори фасциклу</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Датотеке које чине речник:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>Прикажи све јединствене речи речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>Главне речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Уреди речник преко командне:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Назив датотеке индекса:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Отворите фасциклу индекса</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 уноса</translation>
     </message>
@@ -839,105 +844,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>УРЛ адреса: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>Базе података: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>Стратегије претраге: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>Серверске базе података</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>Базе података</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>Стратегије</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>Листа база података раздвојена зарезима
+(празан низ или &quot;*&quot; одговара свим базама података)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>Листа стратегија претраживања раздвојена зарезима
+(празан низ значи &quot;префикс&quot; стратегија)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Проширени изборник са свим речницима...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Уреди ову групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Подаци о речнику</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Речник заглавља</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Отвори фасциклу речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Картица речника</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Речници</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Прихвати</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Извори промена</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Групе</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Неки извори су промењени. Прихвати измене?</translation>
     </message>
@@ -992,12 +997,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Претходна страница</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Следећа страна</translation>
     </message>
   </context>
   <context>
@@ -1011,85 +1016,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Претрага по целом тексту</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>Обичан текст</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <source>Wildcards</source>
+      <translation>Вилдцардс</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Реч за упит не може бити празна.</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
+      <source>support xapian search syntax,such as AND OR +/- etc</source>
+      <translation>подржава капиан синтаксу претраживања, као што је АНД ОР +/- итд</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Уобичајено</translation>
     </message>
     <message>
       <location filename="../src/fulltextsearch.cc" line="243"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
-      <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>Пронађени чланци: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>Сада индексирам: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ништа</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>Нема речника за претрагу целог текста</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Грешка у датотеци фаворита</translation>
     </message>
   </context>
   <context>
@@ -1107,17 +1092,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Додај фолдер</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Фаворити:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Све изабране ставке ће бити избрисане. Настави?</translation>
     </message>
   </context>
   <context>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>из</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1163,79 +1148,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Претходна</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следећи</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Претрага</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>Режим:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>Пронађени чланци:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>Доступни речници у групи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>Сачекајте индексирање:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Помоћ</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>Укупно:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>Индексирано:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>Сада индексирање: нема</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Откажи</translation>
     </message>
@@ -1267,29 +1236,29 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Дел</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Инс</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>Таб 2</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1304,12 +1273,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/groups.cc" line="29"/>
       <source>Group tabs</source>
-      <translation type="unfinished">Group tabs</translation>
+      <translation>Групне картице</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>Отворите листу група</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Унесите ново име групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Доступни речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Додај групу</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Додај групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Направи нову групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Групирајте по језицима</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Креирајте групе засноване на фасцикли.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Групирајте по фасциклама</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Групирајте према метаподацима</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Превуците речнике у групи са списка доступних речника, промените редослед група, помоћу миша.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Преименуј тренутну групу речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Уклони тренутну групу речника</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Унесите име нове групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Уклоните све групе</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Уклоните изабрани речнике из групе (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Додај изабране речнике у групу (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Уклоните групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Групе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Преименуј групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Уклоните све групе речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Направи групе на основу језичких парова</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Историјат:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Величина историје: %1 уноса од максималних %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Предлога за правопис: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 (морфологија)</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
@@ -1485,1247 +1454,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Индексирање: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Назив речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Покрени GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Сачекајте док индексира речник</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Сачекајте...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Индексирање...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Еве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Акански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Кри</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ибо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Коми</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Пали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тајландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Холандски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Грчки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хинди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Галски (Ирска)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кмерски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Латински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малајски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маори</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Орија</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Схона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таџикски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамилски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Инупиак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбекски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Велшки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Волоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кхоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Италијански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Романшски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Џонга (Бутан)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Канада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Сев. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазија</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Кирунди</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Галски (Шкотска)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Летонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малаиалам</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Бугарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Малтешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Марати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арапски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аимаран</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Судански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Датски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Малдиви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиџи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Мађарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Француски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Немачки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Монголски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Јеврејски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Ереро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Луксембургшки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канури</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикују</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Корејски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджибва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пуштунски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Пољски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Французски (диалект Occitan)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словачки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалиски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Ујгурски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Српско-Хрватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Јоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанг</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румынски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Индонезијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панџаби</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Јуж. Сото</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсикански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Есперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Персијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словеначки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризииски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Тахитиан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Мадагаскарац</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галицијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербејџански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Јапански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украјински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалисут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Белоруски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири-моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Јаванац</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Кињаруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Афрички</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Јерменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвешки букмол</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хрватски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Боснийский</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Интерлингве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Српски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бурмански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Руски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбурзхски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвешки</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Синхала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Шпански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнвалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалог</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Асамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Естонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахили</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Вијетнамски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуџарати</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Исландски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Енглески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузијски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Црквено-словенски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Фински</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапук</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валонски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваниама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалски</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Северна Сами</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Хаићански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Норвешки (нинорск)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гварани</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Јуж. Ндебеле</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичева</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литвански</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сечуан И</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигриња</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Јидиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Традиционални кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Поједностављени кинески</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Остали</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Остали поједностављеном кинеском дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Остали традиционални кинески дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Остали источно-европски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Остали западно-европски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Остали руски језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Остали јапански језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Остали балтички језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Остали грчки језици</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Остали корејски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Остали турски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Остали тајландски дијалекти</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>Тамазигхт</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Лојбан</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Француски</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Шпански</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>белоруски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>бугарски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>чешки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Немачки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>грчки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>фински</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Италијан</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>јапански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>корејски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>литвански</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>македонски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>холандски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Пољски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>португалски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Руски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>словачки</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Албанац</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>српски (ћирилица)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Шведски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>турски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>украјински</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Кинески поједностављени</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Традиционални кинески</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>вијетнамски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>португалски, бразилски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>персијски</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>шпански, Аргентина</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Хинди</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>есперанто</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Немачки, Швајцарска</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>шпански, Боливија</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Тајик</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>кечуа</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Аимара</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>арапски, Саудијска Арабија</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Туркмен</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Интерлингуе</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Лојбан</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>енглески језик</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Грешка при учитавању</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Грешка у поставци датотеке. Наставити са подразумеваним подешавањима?</translation>
     </message>
@@ -2741,703 +2714,703 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>Ф1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>Ф2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Фаворити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>Ф3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>Ф4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Све</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>Речник: %1, чланци: %2, речи: %3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Уреди</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Пимоћ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Претрага</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>И&amp;злаз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Грешка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Затворите апликацију</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Умањи у палету</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Није могуће сачувати чланак: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Увећај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Речници...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;О програму</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Штампај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Сачувајте овај чланак</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Сачувајте овај чланак као</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Цтрл+П</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Цтрл+К</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Умањи прозор у палету</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>П&amp;оставке странице</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Почетна страница</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Доступна је нова верзија</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Претражи:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Умањи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Прикажи &amp;главни прозор</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>О GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Преузми</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Подешавање странице</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Претражи у:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Уобичајена величина</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Цтрл+Ф4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Цтрл+Ф5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Учитавање...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(неименован)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Поставке...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Добро дошли!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Изговори реч (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Сачувајте овај чланак</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Прескочи ову верзију</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Штампај чланак</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Нема доступног тампач. Молимо вас, инсталирајте прво.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Приказ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Историјат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>О&amp;чисти</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Увећај</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Увећај листу речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Умањи листу речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Уобичајена величина слова</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Затвори тренутну картицу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Затворите све картице</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Затворите све картице осим тренутне</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Отворених картица</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Нова картица</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Цтрл+Т</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Фастикла подешавања</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Главни мени</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Пронађено у речницима:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Додајте све картице у Фаворите</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>УПОЗОРЕЊЕ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
+      <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Отвори листу картица</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Уклони тренутну картицу из омиљених</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Сакрили сте главни мени. Да га вратите, користите %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Цтрл+М</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Прикажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Сакривен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Извоз историе у датотеку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстуалне датотеке (*.txt);;Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Извоз историје је завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Извоз грешке:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Цтрл+Х</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Увоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Увоз историје из датотеке</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Увоз грешке: неважећи подаци у датотеци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Увоз историје је завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Грешка при увозу:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Извезите фаворите у датотеку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>КСМЛ датотеке (*.кмл);; Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Извоз омиљених је завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Извезите фаворите у датотеку као обичну листу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Увезите фаворите из датотеке</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>КСМЛ датотеке (*.кмл);;Ткт датотеке (*.ткт);;Све датотеке (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Увоз омиљених је завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Грешка при рашчлањивању података</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Подаци о речнику</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Речник заглавља</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Отвори фасциклу речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Уреди речник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Сада се индексира за претрагу целог текста: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Уклонити насловну реч &quot;%1&quot; из омиљених?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Претражи окно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Резултати окна за навигацију</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Окно са омиљеним&amp;итес</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Преглед пре шта&amp;мпања</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Поново прегледа датотеке</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Нова картица</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Увек на врху</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Увек на врху</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Цтрл+О</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Дугме изборника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>Тражи на страници</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Цтрл+Ф</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Претрага по целом тексту</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Цтрл+Схифт+Ф</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>ГолденДицт референце</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Прикажи</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Извоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Увоз</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Додати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Додајте тренутну картицу у Фаворите</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Цтрл+Е</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Извези на листу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Прикажи називе у картици &amp;речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Прикажи малу икону у &amp;алатној траци</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навигација</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Омогући скенирање</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Чланак, целовит (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Чланак, само HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Чување чланка...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Сачувај чланак је завршен</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Главни прозор је подешен да увек буде на врху.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Окно историје</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Приступачност API није омогућено</translation>
     </message>
@@ -3445,12 +3418,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Речник датотека је покварен или оштећен</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Неуспешно учитавање чланка из %1, разлог: %2</translation>
     </message>
@@ -3458,7 +3431,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Анализа грешке XML: %1 у %2, колони %3</translation>
     </message>
@@ -3474,22 +3447,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -3499,101 +3472,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Није могуће отворити аудио бафер за читање.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Неактиван (онемогућени) речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Назив:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Укупно чланака:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Изворни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Циљни језик:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Укупно речи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Редослед речника:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Датотеке које чине речник:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Информације о речнику</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Разврстај по имену</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Разврстај по језицима</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Речник заглавља</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>Речници активни: %1, неактивни: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Путања</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рекурзивно</translation>
     </message>
@@ -3601,69 +3574,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Алт</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Покрени у системској палети</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Само леви Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Цтрл</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Прикажи икону у системској палети</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Сервер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Смена</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тип:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Корисничко име:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Искачући прозор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3672,138 +3643,138 @@ switching to them.</source>
 отворена, без њиховог пребацивања.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Користи прокси-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Користите следећу пречицу за превођење речи из оставе:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Тастер Windows или Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Аутоматски изговари речи у главном прозору</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Покрени са системом</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Само леви Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Прегледање помоћу картица</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Само десни Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Омогући ако користите прокси сервер
 за све мрежне захтеве програма.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Језик сучеља:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Само леви Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Отварање нове картице у позадини</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Мрежа</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Само десни Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Лингво</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Десни Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Леви Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Аутоматски изговорити речи у искачућем прозору</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Отварање нове картице након тренутне</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Поново покрените програм за промену језика.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Тастер Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Проверите нову верзију</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3812,25 +3783,24 @@ be the last ones.</source>
 додаје се на крају.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Затвори у системску палету</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Систем - подразумевано</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Када је омогућено, појављује се икона у палети која се може користити,
 да отвори главни прозор и врши друге послове.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3843,140 +3813,140 @@ GoldenDict. Ако се појавила нова верзија, програм
 са сајта.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Подизање</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Лозинка:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Подразумевано</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Сучеље</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Промена језика</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Тастер Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Користите следећу пречицу за приказивање/сакривање главног прозора:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Леви Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Само десни Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Поставке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Леви Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Десни Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Десни Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Пречице</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Омогући искачући прозор при покретању</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Када омогућите ову опцију, апликација ће радити у системској палети
 не показујући главни прозор.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Тастер Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Аутоматски покрени GoldenDict када се покрене оперативни систем.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Не приказуј искачући прозор када се промени избор или клипборд у неком од прозора ГолденДицт-а</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Игноришите ГолденДицт-ов сопствени избор и измене међумеморије</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Пустите аудио датотеке преко уграђене аудио подршке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Користите интерни плејер:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Изаберите позадину звука</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Унесите командну линију аудио плејера</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3986,534 +3956,576 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 због ове функције, покушајте да онемогућите ову опцију.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Онемогући учитавање садржаја са других сајтова (уклања већи део оглашавања)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Изговор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Репродукција</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Користи спољни програм:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Преведи изабрану реч дуплим кликом</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Користите неку спољну апликацију за репродукцију аудио датотека</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Сакриј главни прозор притиском ESC</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Сакриј једну картицу</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Подесите ову вредност да бисте избегли огромне падајуће изборнике</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Ограничи падајући изборник речника:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Пошаљите преведену реч на главни прозор уместо да га прикаже у искачућем прозору</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Пошаљите преведену реч у главни прозор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Прикажи прозор са заставицом пре него што се прикаже искачући прозор, кликните на заставицу да бисте приказали искачући прозор. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Обично, клик на везу, двоструки клик на реч или тражење
+избора у чланку учитава превод и скоро одмах
+скролује до чланка из истог речника. Када је ова опција искључена,
+, међутим, приказује се чланак из највишег речника.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Аутоматски скролујте до циљаног чланка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Стил приказа чланка:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Окрените корисничко сучеље у тамно.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Дарк Моде</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Окрените стил приказа чланка у тамни.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Дарк Реадер Моде</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>МРУ налог: Најскорије коришћени налог.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Пратите промене међумеморије када је скенирање омогућено. Објава! Ово увек треба да омогућите осим ако нисте на Линук-у.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Пратите промене међумеморије</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Промена избора нумере</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Одабир хватања само када се сви изабрани тастери држе притиснути:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Прикажи заставицу за скенирање када је реч изабрана</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Кашњење</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>Системски прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>Прилагођени прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>Уобичајена подешавања</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Анки Цоннецт</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>хттп://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>шпил:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Модел:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Реч</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Поље речника...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Поље дефиниције...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Реченица</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Поље за реченицу (може бити празно)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Немојте да идентификујете GoldenDict у HTTP заглављима</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Максимална величина мрежне кеш меморије:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Максимални простор на диску који заузима ГолденДицт мрежна кеш меморија
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Ако је постављено на 0, кеш мрежног диска ће бити онемогућен.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> МиБ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Када је ова опција омогућена, ГолденДицт
+брише своју мрежну кеш меморију са диска током изласка.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Обришите мрежну кеш меморију при изласку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Претрага по целом тексту</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>Дозволи претрагу целог текста за:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Не претражујте речнике који садрже више од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>чланци (0 - неограничено)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Напредно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Током узастопних претрага, ако се један речник скупи ручно, он ће остати скупљен у следећој претрази</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Колапс сесије</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Када користите међуспремник, скините све после новог реда</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Приликом нове претраге фокусирајте главни или искачући прозор чак и ако је видљив</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Фаворитес</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Интервал чувања фаворита. Ако је подешено на 0 Фаворити ће бити сачувани само током изласка.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Укључите ову опцију да бисте потврдили сваку операцију брисања ставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Потврда за брисање ставки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Укључите ову опцију да бисте игнорисали неразумно дуг унос текста
+са преласка миша, селекције, међуспремника или командне линије</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Занемарите уносне фразе дуже од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Унети фразе дуже од ове величине ће бити занемарене</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Укључите ову опцију да игноришете дијакритичке знакове док претражујете чланке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Занемарите дијакритичке знакове док претражујете</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Укључите ову могућност да увек прошири необавезне делове чланака</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Могућност проширења &amp;делова</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Изаберите ову могућност да бисте аутоматски урушити велике чланке</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Уруши чланке опширније од</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Чланци дужи него ове величине ће бити срушени</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Игноришите интерпункцију док претражујете</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Укључите ову опцију да бисте омогућили додатну претрагу чланака преко листа синонима
+из Стардицт, Бабилон и ГЛС речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Додатна претрага преко синонима</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>симболи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab навигација картица у MRU редоследу</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Вавилон</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Историјат</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Укључите ову могућност за чување историје преведених речи</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Складиште &amp;историје</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Чланци</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Укључите ову могућност ако желите да изаберете речи једним кликом миша</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Изаберите реч једним кликом</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Додатак стилу:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Одредите највећи број ставки задржат у историји</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максимална величина историје:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Раздобље чувања историје. Ако се подеси на 0 у историји ће бити сачувана само током излаза.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Сачувај сваких</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>минута</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Цлассиц</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Модеран</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Лингоес</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Лингоес-Блуе</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> МБ</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Информације о позицији су потребне за коришћење Ксапиановог претраживања фраза и НЕАР оператора, али величина базе података ће бити много већа. Односи се само на нове долазне речнике.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Омогући индекс са информацијама о положају</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандардни фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Моноспаце Фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Сериф Фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Санс-сериф фонт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Изглед</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Ови фонтови ће се применити када фонтови наведени у речнику не буду пронађени.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Резервни фонтови</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Хтмл</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>По префиксима</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Непознато</translation>
     </message>
@@ -4521,17 +4533,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Програм није наведен.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Програм је завршио са грешком</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Програм је вратио излазни код %1.</translation>
     </message>
@@ -4539,27 +4551,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тип</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Командна линија</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -4567,99 +4579,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Грешка при учитавању чланка</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Грешка декодирања чланка</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Ауторско право: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Верзија: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Аутор: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>Е-маил: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>Наслов: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>Сајт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>%2: %1</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Програм за претраживање речника.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Реч или реченица за упит.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Сачувајте поруке за отклањање грешака у гд_лог.ткт у фасцикли за конфигурацију.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Ресетујте стање прозора.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Онемогући ттс.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Промените групу главног прозора.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Промените групу искачућих прозора.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Укључите искачући прозор за скенирање.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Верзија за штампање и информације о дијагнози.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Речник - претрага/филтер (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Очисти претрагу</translation>
     </message>
@@ -4667,24 +4694,24 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ГРЕШКА: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Грешка чувања ресурса: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Није могуће учитати повезане ресурсе.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
-      <translation type="unfinished">WARNING: %1</translation>
+      <translation>УПОЗОРЕЊЕ: %1</translation>
     </message>
   </context>
   <context>
@@ -4711,67 +4738,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Алт+С</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Диалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Изговори реч (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Додајте реч у фаворите (Цтрл+Е)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Приказивање или скривање траке речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Увек останите изнад свих осталих прозора</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Пошаљите реч у главни прозор (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Алт+В</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Напред</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>УПОЗОРЕЊЕ: %1</translation>
     </message>
   </context>
   <context>
@@ -4779,53 +4811,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Претходна</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Цтрл+Схифт+Г</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Следећи</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Цтрл+Г</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Истакните &amp;све</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Велика и мала слова</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Нађи:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Путања</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -4833,60 +4865,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Датотеке</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Нихон-шики</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Википедија</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Слоговна азбука &quot;Катакана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Направите речнике из гомиле звучних датотека додавањем путање овде:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ромаји (Јапански)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4897,84 +4929,84 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Веб-сајт Википедија (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Фасцикла са звуковима</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Било који спољни програм. Стринг %GDWORD% ће бити замењен речју упита. Стринг %GDSEARCH% ће бити замењен текстом у траци за претрагу. Ако оба параметра нису дата, главна реч ће бити унета у стандардни улаз.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Лингуа Либре</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Изговоре обезбедио &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Лингуа Либре&lt;/span&gt;&lt;/a&gt;, колаборативна лингвистичка медијска библиотека Викимедије Француске. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Омогућите Лингуа Либре</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ИСО 639-3 код језика</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Коришћење Форво-а тренутно захтева АПИ кључ, региструјте се на сајту да бисте добили сопствени кључ.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Узми свој кључ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;овде&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Најпопуларнији метод преписивања Јапанског је,
 заснован на енглеској фонологији</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Слоговна азбука &quot;Хирагана&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Прилагођена транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Ово се примењује само у фрази за претрагу, при чему сваки ред представља транслитерацију, одвојену тачком и зарезом. На пример, ае;ӕ, корисници могу да унесу ае да представљају ӕ у циљној речи.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ае;ӕ #ово је пример</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4985,118 +5017,108 @@ Not implemented yet in GoldenDict.</source>
 В GoldenDict пока не реализована.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Транслитерација (Руски)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфологија</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Промени...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Примери:  &amp;quot;енг&amp;quot; за енглески, &amp;quot;фра&amp;quot; за француски &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Комплетну листу доступних језика можете наћи &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; овде &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Путања до речника са Hunspell/Myspell речницима:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Пон&amp;ово прегледај</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Транслитерација (Немачки)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Било који веб-сајт. Низ %GDWORD% биће замењен речју упита:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Додај...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Изабери фасциклу</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Уклони</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Веб-сајт</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Путања за тражење датотеке речника:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Потврди уклањање</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Слоговна азбука:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Доступни морфолошки речници:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Омогућава коришћење латинице за писање јапанског</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5113,94 +5135,94 @@ of the appropriate groups to use them.</source>
 на крају појединих група.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хепберн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Кунреи-схики</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Форво</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>ДИЦТ сервери</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>ДИЦТ сервери:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Укључи изговор из Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Кључ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Листа језичких кодова (раздвојене зарезима):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Транслитерација (Грчки)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(није доступан у преносној верзији)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Програми</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Белоруска транслитерација</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Текст у говор</translation>
     </message>
@@ -5216,42 +5238,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Изабрани погон гласа:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Додај</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Уклони</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Преглед</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Доступни гласовни погони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Текст се може погледати:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Укуцајте текст да буде прегледан овде.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Преглед</translation>
     </message>
@@ -5276,17 +5298,17 @@ of the appropriate groups to use them.</source>
       <translation>Не можете да пронађете доступне TTS гласове.&lt;br&gt;Уверите се да је најмање један TTS погон већ инсталиран на рачунару.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Поставке</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Величина:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Мера:</translation>
     </message>
@@ -5294,12 +5316,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Откуцајте реч или фразу за претрагу речника</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Падајући</translation>
     </message>
@@ -5319,7 +5341,7 @@ of the appropriate groups to use them.</source>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Ид</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5330,33 +5352,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Назив</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Укључено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Уметните чланак као везу унутар ознаке &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>Као веза</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Икона</translation>
     </message>
@@ -5364,17 +5386,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Претрага није успео у неким речницима.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>УПОЗОРЕЊЕ: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/sv_SE.ts b/locale/sv_SE.ts
index a4e8b3ba..8380c65e 100644
--- a/locale/sv_SE.ts
+++ b/locale/sv_SE.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Om</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Ordliste- och uppslagsverksprogrammet GoldenDict, version </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Licensierat under GNU GPLv3 eller senare</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Kopiera versionsinformation</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Kopiera ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Tack till:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Okänd]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Baserat på Qt %1 (%2, %3 bitar)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Baserat på Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>anki: kan&apos;inte skapa ett kort utan ett ord</translation>
+      <translation>anki: kan inte skapa ett kort utan ett ord</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Visa artikel</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Dölj artikel</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Arbeta med popuprutor</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(namnlös)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Välkommen!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; hittades i grupp &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Gå till programmets &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(bild)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Visa artikel</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Från </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Dölj artikel</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Skapa en ny Anki-anteckning</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Frågefel: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Närliggande ord: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Sammansättningar: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Enskilda ord: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Det gick inte att skapa en tillfällig fil.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Slå upp &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Den refererade resursen finns inte.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Slå upp &quot;%1&quot; i %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Markera aktuell artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Kopiera som oformaterad text</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Granska källkod</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Öppna länk i ny &amp;flik</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Öppna länk i extern &amp;webbläsare</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Resurs</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Ljud</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Text till tal-modul</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Bild</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Definition ur ordlistan &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Definition: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Det refererade ljudprogrammet finns inte.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Op&amp;nera länk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Spara &amp;bokmärke &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>VARNING: Ljudspelare: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>FEL: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Spara ljud</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Spara bild</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Bildfiler (*.bmp *.jpg *.png *.tif);;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Spara &amp;bild …</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Fras hittades inte</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 av %2 träffar</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Spara l&amp;jud …</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Skicka &quot;%1&quot; till sökfältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Lägg till &quot;%1&quot; i historiken</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Skicka aktuell artikel till Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Skicka markerad text till Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>Ljudfiler (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;;Alla filer (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Ljudfiler (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Det gick inte att spela upp ljudfil: %1</translation>
     </message>
@@ -414,62 +409,62 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Kinesisk konvertering</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Aktivera konvertering mellan förenklade och traditionella kinesiska tecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Kinesisk Con&amp;version</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Aktivera konvertering från förenklade tecken till traditionella (Taiwan variant) tecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>FT to TT (Taiwan variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Aktivera konvertering från förenklade tecken till traditionella (Hong Kong variant) tecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>FT till TT (Hong Kong variant)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Aktivera konvertering från traditionella tecken till förenklade tecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>FT till TT</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Förenklad till traditionell kinesisk (Taiwanesisk variant) konvertering</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Förenklad till traditionell kinesisk (Hong Kong variant) konvertering</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Traditionell till förenklad kinesisk konvertering</translation>
     </message>
@@ -477,30 +472,30 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>anpassad translitterering</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Proxy autentisering krävs</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Du måste ange ett användarnamn och ett lösenord för att komma åt via proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Användarnamn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Lösenord:</translation>
     </message>
@@ -508,22 +503,22 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Formulär</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Gruppikon:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Kortkommando:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Favoriter mapp:</translation>
     </message>
@@ -548,17 +543,17 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>Bilder</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Alla filer</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Fel</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Det gick inte att läsa den angivna bildfilen.</translation>
     </message>
@@ -566,63 +561,63 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Bekräftelse</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Är du säker på att du vill skapa en uppsättning grupper baserade på språkpar?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Är du säker på att du vill skapa en uppsättning grupper baserade på metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kombinera grupper efter källspråk till &quot;%1 &gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kombinera grupper efter målspråk till &quot;&gt; %1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Automatisk gruppering efter mapp misslyckades.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Den överordnade katalogen för %1 kan inte nås.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Är du säker på att du vill skapa en uppsättning grupper baserat på innehållande mappar?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Skapa den dubbelsidiga språkgruppen &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Kombinera grupper med &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Ordlistor: </translation>
     </message>
@@ -635,133 +630,133 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Sökläge</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Detta element bestämmer hur filtersträngen ska tolkas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Om markerad på symbolfallet kommer att beaktas vid filtrering</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Matcha skiftlägeskänslig</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Exportera huvudord till fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Exportera</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Hjälp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Ok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Tryck på den här knappen för att tillämpa filter till huvudordslistan</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Tillämpa</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Om kontrolleras några filterändringar kommer vi omedelbart tillämpas på huvudordslistan</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Tillämpa automatiskt</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Filtrera:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Filtersträng (fast sträng, jokertecken eller reguljärt uttryck)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Jokertecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Läser in sökord...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Unikt huvudord totalt: %1, filtrerat: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Spara huvudord till fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textfiler (*.txt);;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Kan inte öppna exporterad fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Exportera huvudord...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Avbryt</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Exportprocessen avbryts</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Export slutförd</translation>
     </message>
@@ -769,67 +764,77 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Antal artiklar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Källspråk:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Antal ord:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Målspråk:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Öppna mapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Redigera ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Filer som omfattas av ordlistan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Beskrivning:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Visa alla unika ordlistshuvudord</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Huvudord</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Redigera ordlistan via kommando:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Index filnamn:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Öppna indexmappen</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 poster</translation>
     </message>
@@ -860,44 +865,44 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Aktiverad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adress</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Databaser</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Strategier</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Ikon</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Kommaavgränsad lista över databaser
 (tom sträng eller &quot;*&quot; matchar alla databaser)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Kommaavgränsad lista över sökstrategier
@@ -907,37 +912,37 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Visa alla ordlistor i en utökad meny …</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Redigera denna grupp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Ordlisteinformation</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Ordboks huvudord</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Öppna ordlistans lagringsmapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Redigera ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Ordlistefältet</translation>
     </message>
@@ -946,27 +951,27 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Ordlistor</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Ordlistor</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Godkänn</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Avbryt</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Källor har ändrats</translation>
     </message>
@@ -977,12 +982,12 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Grupper</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -1011,75 +1016,55 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Fulltextsökning</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Hela ord</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Enkel text</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Jokertecken</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Frågeordet får inte vara tomt.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>stödja xapian söksyntax, såsom OCH ELLER +/- etc</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Max avstånd mellan ord (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Max artiklar per ordlista (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Hittade artiklar: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Nu indexering: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ingen</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Sökrutan måste innehålla minst ett ord som innehåller</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> eller fler symboler</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Inga ordlistor för fulltextsökning</translation>
     </message>
@@ -1087,7 +1072,7 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Fel i favoriter-fil</translation>
     </message>
@@ -1153,7 +1138,7 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>från</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Gå till Redigera|Ordlistor|Källor|Forvo och ansök om att få vår egen API-nyckel för att få problemet att försvinna.</translation>
     </message>
@@ -1174,68 +1159,52 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Sök</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Skiftlägeskänslig</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Läge:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ignorera ordordning</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ignorera diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Hittade artiklar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Tillgängliga ordlistor i grupp:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Vänta på indexering:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Hjälp</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Totalt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Indexerade:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Nu indexering: Inga</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Avbryt</translation>
     </message>
@@ -1267,27 +1236,27 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Delete</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Insert</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Flik 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>Ange ett nytt namn på gruppen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Tillgängliga ordlistor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Lägg till grupp</translation>
     </message>
@@ -1342,42 +1311,42 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>Lägg till grupp</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Skapa en ny ordlistegrupp</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Gruppera efter språk</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Skapa mappbaserade grupper.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Gruppera efter mappar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Gruppera efter metadata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Byt namn på den aktuella ordlistegruppen</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Ta bort den aktuella ordlistegruppen</translation>
     </message>
@@ -1387,43 +1356,43 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>Ange ett namn på den nya gruppen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Ta bort alla grupper</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Ta bort markerade ordlistor ur gruppen (Delete)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Lägg till markerade ordlistor i gruppen (Insert)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Ta &amp;bort grupp</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Grupper:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Byt &amp;namn på grupp</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Ta bort alla ordlistegrupper</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Skapa språkbaserade grupper</translation>
     </message>
@@ -1446,12 +1415,12 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
       <translation>Historik:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Historikstorlek: %1 poster av maximalt %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Stavningsförslag: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Morfologi för %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Aktiverad</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indexering: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Ordlistans namn</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Initierar</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Var god vänta medan ordlistan indexeras</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Var god vänta …</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indexerar...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ido</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Lao</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manx</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Thailändska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Tjeckiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Nederländska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Luganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grekiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Iriska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kikongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malajiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Shona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tadzjikiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatariska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>SiSwati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Iñupiaq</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Venda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Uzbekiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Kymriska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Wolof</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Italienska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Rätoromanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Nordndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abchaziska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kirgiziska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Skotsk gäliska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Albanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Lettiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malayalam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kurdiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgariska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marathi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arabiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avariska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretonska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijianska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Ungerska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Franska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Tyska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongoliska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Hebreiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Luxemburgiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazakiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navajo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Pashto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Occitanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovakiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somaliska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telugu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uiguriska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Serbokroatiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Zhuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumänska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Indonesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Punjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Sesotho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsikanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Persiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovenska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Västfrisiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malagassiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galiciska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerbajdzjanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amhariska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrainska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Grönländska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Basjkiriska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Vitryska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kashmiri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hiri motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Quechua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengaliska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Javanesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Rwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikaans</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Armeniska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norska (bokmål)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Kroatiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Bosniska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Occidental</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serbiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Ryska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Tjetjenska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Kinesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Tjuvasjiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Singalesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Spanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Korniska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Ossetiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estniska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Swahili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Svenska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetanska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Makedonska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugisiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Turkiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Turkmeniska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Isländska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Engelska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Georgiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Kyrkoslaviska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Färöiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Finska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapük</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Vallonska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marshallesiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Nordsamiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Chamorro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norska (nynorsk)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Sydndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litauiska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Sichuanesisk yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinska</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Jiddisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Kinesiska (traditionell)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Kinesiska (förenklad)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Annat</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Andra förenklade kinesiska dialekter</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Andra traditionella kinesiska dialekter</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Andra östeuropeiska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Andra västeuropeiska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Andra ryska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Andra japanska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Andra baltiska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Andra grekiska språk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Andra koreanska dialekter</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Andra turkiska dialekter</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Andra thailändska dialekter</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Fantastisk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Lojban</translation>
     </message>
@@ -2517,215 +2490,215 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Franska</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Spanska</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Vitryska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bulgariska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Tjeckiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Tyska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Grekisk</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Finska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italienska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japanska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Koreanska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litauiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Makedonska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Holländska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Putsa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugesiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Ryska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slovakiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Albanska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Serbiska (kyrilliska)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Svenska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Turkiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukrainska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Förenklad kinesiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Kinesiska (traditionell)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnamesiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugisiska (brasiliansk)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Persiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Spanska, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Tyska, Schweiz</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Spanska, Bolivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tadzjikiska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arabiska, Saudiarabien</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Turkmeniska</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Interlingue</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Engelska</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Fel vid inläsning av ordlistorna</translation>
     </message>
@@ -2733,7 +2706,7 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Fel i konfigurationsfilen. Vill du använda standardinställningarna istället?</translation>
     </message>
@@ -2741,702 +2714,702 @@ klassisk rättstavning och skolrättstavning i kyrillisk skrift)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>Favo&amp;riter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Alla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Bakåt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 ordlistor, %2 artiklar, %3 ord</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Redigera</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Arkiv</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Hjälp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Sök</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Avsluta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Fel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Avslutar programmet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Stäng till meddelandefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Det gick inte att spara artikeln: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Zooma in</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Ordlistor …</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Om</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>Skriv &amp;ut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Spara artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Spara artikel som</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Minimerar programfönstret till meddelandefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Utskrifts&amp;format</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Webbplats</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Ny version tillgänglig</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Slå upp:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Zooma ut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Visa &amp;huvudfönstret</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Om GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Hämta</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Utskriftsformat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Slå upp i:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normal storlek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Läser in …</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(namnlös)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Inställningar …</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Välkommen!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Läs upp ord (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Spara artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Hoppa över denna version</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Framåt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Skriv ut artikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <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="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Visa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Historik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Rensa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Zooma</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Zooma in ord</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Zooma ut ord</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Normal storlek på ord</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Stäng aktuell flik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Stäng alla flikar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Stäng alla flikar utom aktuell flik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Öppnade flikar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Ny flik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Konfigurationsfilmapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menyrad</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Träffar hittades i följande ordlistor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Lägg till alla flikar i Favoriter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>VARNING: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>Sträng för att söka i ordlistor. Jokertecken &apos;*&apos;, &apos;?&apos; och uppsättningar av symboler &apos;[...]&apos; är tillåtna.
 För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symboler använder &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; respektive</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Öppna lista över flikar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Ta bort aktuell flik från Favoriter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Visa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Exportera</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Dölj</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Exportera historik till fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Textfiler (*.txt);;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Historiken har exporterats</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Fel vid export: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Importera</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Importera historik från fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Fel vid import: felaktiga data i fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Historiken har importerats</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Fel vid import: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Exportera Favoriter till fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML-filer (*.xml);;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Favoriter exportera komplett</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Exportera Favoriter till fil som vanlig lista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Importera Favoriter från fil</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML-filer (*.xml);;Txt-filer (*.txt);;Alla filer (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Favoriter import komplett</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Dataparseringsfel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Information om ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Ordlistans huvudord</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Öppna ordlistans mapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Redigera ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Nu indexering för fulltextsökning: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Ta bort huvudord &quot;%1&quot; från Favoriter?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Sökpanel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Resultatpanel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Rutan Favor&amp;iter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Förhands&amp;granska</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Sök igenom filer &amp;igen</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Ny flik</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Alltid överst</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Alltid överst</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menyknapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Sök på sidan</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Fulltextsökning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Skift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-referens</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Visa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Exportera</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Importera</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Lägg till</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Lägg till aktuell flik i Favoriter</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Exportera till lista</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Visa namn i ordliste&amp;fältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Visa små ikoner i &amp;verktygsfält</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Navigeringsfältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Aktivera skanning</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Artikel, fullständig (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Artikel, endast HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Sparar artikel …</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Spara artikeln klar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Historikpanel</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API för hjälpmedel har inte aktiverats</translation>
     </message>
@@ -3444,12 +3417,12 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Ordlistefilen har manipulerats eller är skadad</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <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>
@@ -3457,7 +3430,7 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML-tolkningsfel: %1 på %2, %3</translation>
     </message>
@@ -3473,22 +3446,22 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adress</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Aktiverad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Ikon</translation>
     </message>
@@ -3504,82 +3477,82 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Formulär</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Inaktiverade ordlistor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Namn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Antal artiklar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Källspråk:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Målspråk:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Antal ord:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Ordlisteordning:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Filer som omfattas av ordlistan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Information om ordlista</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Beskrivning:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sortera efter namn</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sortera efter språk</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Ordlistans huvudord</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Ordlistor aktiva: % 1, inaktiva: % 2</translation>
     </message>
@@ -3587,12 +3560,12 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Sökväg</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursiv</translation>
     </message>
@@ -3600,69 +3573,67 @@ För att hitta &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbol
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Starta programmet minimerat i meddelandefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Endast vänster Skift-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Visa ikon i meddelandefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Värd:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Skift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Typ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Användare:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Sökpopupruta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,59 +3642,59 @@ Aktivera detta alternativ för att öppna nya flikar utan
 att växla till dem på en gång.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Använd proxyserver</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows- eller Meta-tangenten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Läs automatiskt upp ord i huvudfönstret</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Starta automatiskt när datorn startar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Endast vänster Alt-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Flikar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Endast höger Skift-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>När detta alternativ är aktiverat kommer ett klick på stängknappen (X) att
 minimera fönstret till meddelandefältet istället för att avsluta programmet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>L&amp;jud</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3731,79 +3702,79 @@ en proxyserver för programmets alla nätverks-
 förfrågningar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Språk för användargränssnittet:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Endast vänster Ctrl-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Öppna nya flikar i bakgrunden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Nätverk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Endast höger Ctrl-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Höger Skift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Vänster Skift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Läs automatiskt upp ord i popuprutan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Öppna nya flikar bredvid den aktuella fliken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <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>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt-tangenten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Sök med jämna mellanrum efter nya programversioner</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3812,25 +3783,24 @@ bredvid den aktuella, aktiva fliken. Annars öppnas
 de efter den sista fliken i flikfältet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Stäng till meddelandefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Systemstandard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>När detta alternativ är aktiverat visas en ikon i meddelandefältet, som kan
 användas för att öppna huvudfönstret och utföra andra uppgifter.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3843,141 +3813,141 @@ en ny, uppdaterad version av GoldenDict. Om så
 saken och ber denna att öppna en hämtningssida.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Programstart</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Lösenord:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Standard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Gränssnitt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Språkbyte</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl-tangenten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Vänster Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Endast höger Alt-tangent</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Inställningar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Vänster Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Höger Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Höger Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Kortkommandon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Starta med sökpopuprutan påslagen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Aktivera detta alternativ för att öppna programmet direkt i meddelande-
 fältet, utan att visa huvudfönstret.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Skift-tangenten</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Startar GoldenDict automatiskt efter att operativsystemet har startats.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>Visa inte popup när markering eller urklipp i en av GoldenDicts egna fönsterändringar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>Ignorera GoldenDicts egen markering och urklippsförändringar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Spela upp ljudfiler via inbyggt ljudstöd</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Använd intern spelare:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Välj ljud-backend</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Ange ljudspelarkommandoraden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3987,230 +3957,229 @@ som inte ursprungligen kommer från webbplatsen du surfar på. Om en
 webbplats slutar fungera p.g.a. det här, testa att inaktivera alternativet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Text till tal</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Uppspelning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Använd externt program:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Dubbelklick översätter det klickade ordet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Vanligtvis flyttar ett tryck på Esc-tangenten fokus till sökfältet.
 Med detta alternativ aktiverat döljer den istället huvudfönstret.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Esc-tangenten döljer huvudfönstert</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Välj detta alternativ om du inte fill se flikfältet när endast en flik är öppen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Dölj fliken och flikfältet om endast en flik är öppen</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Högsta antal ordlistor i snabbmenyer:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Skicka översatta ord till huvudfönstret</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Visa ett flaggfönster innan du visar popup-fönster klickar du på flaggan för att visa popup-fönster. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Normalt laddas översättningen genom att klicka på en länk, dubbelklicka på ett ord eller slå upp
+urval i en artikel och nästan omedelbart
+rulla till artikeln från samma ordbok. Med det här alternativet av,, visas artikeln från den översta ordboken.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Rulla automatiskt till målartikel</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Ordbok teckensnitt: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>ange reserv typsnitt familj för ordbok</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Artikelns visningsstil:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Vänd UI till mörk.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Mörkt läge</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Vänd artikelns visningsstil till mörk.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Mörkt läsarläge</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU beställning: Senast använda beställning.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Spåra urklipp ändras när skanning är aktiverad. Obs! Du bör alltid aktivera detta om du inte är på Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Spåra ändring av urklipp</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Ändra spårval</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Endast tack val när alla valda nycklar hålls tryckt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Visa skanningsflagga när ord är markerat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Försening</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Systemproxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Anpassad proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Anpassade inställningar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki-anslutning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Däck:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Modell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Ord</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Ordförrådsfältet...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Text</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Definition fält...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Mening</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Meningsfält (kan vara tomt)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -4218,303 +4187,345 @@ blockerar alla förfrågningar. Aktivera detta alternativ för att lösa
 det problemet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Identifiera inte GoldenDict i HTTP-huvuden</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Maximal nätverkscache storlek:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Maximalt diskutrymme upptaget av GoldenDict&apos;s nätverkscache i
+      <translation>Maximalt diskutrymme som upptas av GoldenDicts nätverkscache
 %1
-Om satt till 0 kommer nätverksdisken att inaktiveras.</translation>
+Om inställt på 0 kommer nätverksdiskcachen att inaktiveras.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>När det här alternativet är aktiverat rensar GoldenDict
 sin nätverkscache från disken under avslutning.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Rensa nätverkscachen vid avslut</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Fulltextsökning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Tillåt fulltextsökning för:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Sök inte i ordlistor som innehåller mer än</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>artiklar (0 - obegränsat)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>A&amp;vancerat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Under successiva sökningar, om en ordbok kollapsas av manuell, kommer det att förbli kollapsade i nästa sökning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Sessionen kollapsar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>När du använder urklipp, remsa allt efter ny linje</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>På en ny sökning, fokusera huvudfönstret eller popup-fönstret även om det&apos;s synliga</translation>
+      <translation>På en ny sökning fokuserar du huvud- eller popup-fönstret även om det är synligt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoriter</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Favoriters sparningsintervall. Om inställd på 0 sparas Favoriter endast vid avslutning.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Slå på detta alternativ för att bekräfta varje operation av postborttagning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Bekräftelse för borttagning av poster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Slå på det här alternativet för att ignorera orimligt lång inmatningstext
 från mouse-over, urval, urklipp eller kommandorad</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ignorera inmatningsfraser längre än</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Inmatningsfraser längre än denna storlek kommer att ignoreras</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Aktivera det här alternativet om du vill ignorera diacritics när du söker artiklar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ignorera diacritics medan du söker</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Visa valfria &amp;delar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Dölj artiklar längre än</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ignorera skiljetecken vid sökning</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Aktivera det här alternativet om du vill aktivera extra artiklar sök via synonymlistor
 från Stardict, Babylon och GLS ordböcker</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Extra sökning via synonymer</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>tecken</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl+Tabb bläddrar igenom flikarna i den ordning de senast användes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Historik</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Lagra &amp;historik</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Artiklar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Aktivera detta alternativ om du vill markera ord med ett enkelklick.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Markera ord med enkelklick</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Tilläggsformat:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Största historikstorlek:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Spara var</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minut</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Klassisk</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Modernt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Lingor</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes (blå)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Positionsinformation krävs för att använda Xapians frassökning och NEAR-operator, men databasstorleken blir mycket större. Gäller endast nya inkommande ordböcker.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Aktivera index med positionsinformation</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standard teckensnitt</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace teckensnitt</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif teckensnitt</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif teckensnitt</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Utseende</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Dessa typsnitt kommer att tillämpas när de typsnitt som anges i en ordbok inte hittas.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Reservteckensnitt</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Ljud</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Oformaterad text</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>HTML</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Prefixmatchning</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Okänd</translation>
     </message>
@@ -4522,17 +4533,17 @@ från Stardict, Babylon och GLS ordböcker</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Inget programnamn har angivits.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Programmet har kraschat.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Programmet returnerade avslutningskoden %1.</translation>
     </message>
@@ -4540,27 +4551,27 @@ från Stardict, Babylon och GLS ordböcker</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Aktiverad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Typ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Kommandorad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Ikon</translation>
     </message>
@@ -4568,99 +4579,114 @@ från Stardict, Babylon och GLS ordböcker</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Artikelinläsningsfel</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Artikelavkodningsfel</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Upphovsrätt: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Version: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Författare: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-post: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Titel: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Webbplats: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Datum: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>En ordbok uppslagsprogram.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Ord eller mening att söka.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Spara felsökningsmeddelanden till gd_log.txt i konfigurationsmappen.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Återställ fönstertillstånd.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Inaktivera tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Ändra gruppen av huvudfönstret.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Ändra grupp av popup.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Växla skanning popup.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Utskriftsversion och diagnosinformation.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Sök i/filtrera ordlista (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Rensa sökning</translation>
     </message>
@@ -4668,22 +4694,22 @@ från Stardict, Babylon och GLS ordböcker</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>FEL: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Fel när resurs skulle sparas: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Det gick inte att hämta den refererade resursen.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>VARNING: %1</translation>
     </message>
@@ -4712,68 +4738,73 @@ från Stardict, Babylon och GLS ordböcker</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Läs upp ord (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Lägg till ord i Favoriter (Ctrl + E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Visar/döljer ordlistefältet</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Alltid ovanpå alla andra fönster</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Skicka ord till huvudfönstret (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Bakåt</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Framåt</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>VARNING: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4785,7 +4816,7 @@ Rutan kan storleksändras och hanteras på andra sätt.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Skift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4795,7 +4826,7 @@ Rutan kan storleksändras och hanteras på andra sätt.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4816,17 +4847,17 @@ Rutan kan storleksändras och hanteras på andra sätt.</translation>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Sökväg</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Ikon</translation>
     </message>
@@ -4834,60 +4865,60 @@ Rutan kan storleksändras och hanteras på andra sätt.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Filer</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>System:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Den japanska stavelseskriften katakana.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Skapa ordlistor från samlingar av ljudfiler genom att lägga till sökvägar här:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Romanisering av japanska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4898,84 +4929,84 @@ Standardiserat som ISO 3602.
 Har ännu inte implementerats i  GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikiwebbplatser (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Ljudmappar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Alla externa program. En sträng %GDWORD% kommer att ersättas med frågeordet. En sträng %GDSEARCH% kommer att ersättas med texten i sökfältet. Om båda parametrarna inte anges, kommer huvudordet matas in i standardindata.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prounkeringar som tillhandahålls av &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, ett språkligt mediebibliotek i Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Aktivera Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>Språkkod ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Användning av Forvo kräver för närvarande en API-nyckel, registrera dig på webbplatsen för att få din egen nyckel.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Få din egen nyckel &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;här&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Den japanska stavelseskriften hiragana.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Anpassad translitterering</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Detta gäller endast i sökfraser, där varje rad representerar en translitteration, separerad med semikolon. Till exempel kan ae;æ, användare mata in ae för att representera æ i målordet.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #det här är ett exempel</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Translitterering</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4986,118 +5017,108 @@ stavelseskriftsystemet kana. Standardiserat som ISO 3602.
 Har ännu inte implementerats i  GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Translitterering av ryska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Bläddra …</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Exempel:  &amp;quot;eng&amp;quot; för engelska, &amp;quot;fra&amp;quot; för franska &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Fullständig lista över tillgängliga språk finns &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; här &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Sökväg till mapp som inehåller Hunspell-/Myspell-ordlistor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Sök igenom</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Translitterering av tyska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Ange de webbplatser du vill använda. Strängen %GDWORD% ersätts av sökordet vid sökning:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Lägg till …</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Välj en mapp</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>Ta &amp;bort</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Webbplatser</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Sökvägar där programmet skall söka efter ordlistefiler:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Bekräfta borttagning</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Stavelseskrifter:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Tillgängliga mofologiska ordlistor:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5112,94 +5133,94 @@ nederst i därtill passande grupper för att
 använda dem.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT-servrar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT-servrar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Aktivera orduppläsningar från Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API-nyckel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Språkkoder:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Translitterering av grekiska</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(inte tillgängligt i den portabla versionen)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Program</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Translitterering av vitryska</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Du kan också använda %GD1251% för Windows-1251, %GDISO1%-%GDISO16% för ISO 8859-1 till ISO 8859-16,
 %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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Text till tal</translation>
     </message>
@@ -5215,42 +5236,42 @@ använda dem.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Valda talmoduler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Lägg till</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Ta &amp;bort</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Förhandsgranskning</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Tillgängliga talmoduler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Text som skall förhandsgranskas:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Skriv texten du vill förhandsgranska här.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Förhandsgranska</translation>
     </message>
@@ -5275,17 +5296,17 @@ använda dem.</translation>
       <translation>Det gick inte att hitta någon tillgänglig talmodul.&lt;br&gt;Säkerställ att åtminstone en talmodul finns installerad på din dator.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Inställningar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Volym:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Hastighet:</translation>
     </message>
@@ -5293,12 +5314,12 @@ använda dem.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Ange ett ord eller en fras för att söka i ordlistor</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Rullgardinsmeny</translation>
     </message>
@@ -5329,33 +5350,33 @@ använda dem.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Namn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adress</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Aktiverad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Infoga artikel som länk inuti &lt;iframe&gt; tagg</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Som länk</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Ikon</translation>
     </message>
@@ -5363,17 +5384,9 @@ använda dem.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Det gick inte att fråga några av ordlistorna.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>VARNING: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/tg_TJ.ts b/locale/tg_TJ.ts
index 753d1f74..7dba84d9 100644
--- a/locale/tg_TJ.ts
+++ b/locale/tg_TJ.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Дар бораи барнома</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Луғати GoldenDict, версияи </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Иҷозатномаи GNU GPLv3 ё навтар</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Маълумоти версияро нусхабардорӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Рӯйхати луғатҳоро нусхабардорӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Рӯйхати тарҷумонҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Номаълум]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Дар Qt %1 (%2, %3 бит) асос меёбад</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Константин Исаков (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Дар асоси Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>анки: бе калима корт эчод карда наметавонад</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Ҷустуҷӯи Anki: AnkiConnect фаъол нест.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: паём ба anki ноком шуд</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: пост ба муваффақияти anki</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Тафтиш кунед</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Баркушодани мақола</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Печондани мақола</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Тарҷума бо равзанаи пайдошаванда</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(беном)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Хуш омадед!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; ёфт нашуд.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;форуми луғатро&lt;/a&gt; истифода баред.&lt;p&gt;Барои гирифтани навсозиҳои барнома &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;вебсайти луғатро&lt;/a&gt; истифода баред. &lt;p&gt;(c) 2008-2013 Константин Исаков. Иҷозатномаи GPLv3 ё навтар.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(тасвир)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Баркушодани мақола</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Аз </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Печондани мақола</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Қайдҳои нави Anki созед</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Хатои дархост: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Калимаҳои наздик: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Ифодаҳои алоқадор: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Калимаҳои шахсӣ: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Эҷодкунии файли муваққатӣ қатъ карда шуд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&quot;%1&quot;-ро &amp;дарёфт кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>&quot;%1&quot;-ро дар варақаи &amp;нав дарёфт кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Манбаъи ишорашуда вуҷуд надорад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Кушоиши файл ба таври худкор қатъ карда шуд, кӯшиш кунед, ки онро ба таври дастӣ кушоед: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>&quot;%1&quot;-ро дар %2 дарёфт кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Интихоб кардани мақолаи ҷорӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Нусха бардоштан ҳамчун матн</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Тафтиш кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>&quot;%1&quot;-ро дар %2 дар варақаи &amp;нав дарёфт кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Пайвандро дар &amp;варақаи нав кушодан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Пайвандро дар &amp;браузер кушодан</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Манбаъ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Овози TTS (Матн ба талаффуз)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Тасвир</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Видео</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Видео: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Таъриф аз луғати &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Маъно: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Барномаи аудиоии ишорашуда вуҷуд надорад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Пайвандро кушоед</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>&quot;%1...&quot;захира кунед ва қайд кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>Огоҳӣ: Плеери аудио: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ХАТОГӢ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Захира кардани садо</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Захира кардани тасвир</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Файлҳои тасвирӣ (*.bmp *.jpg *.png *.tif);;Ҳамаи файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Захира &amp;кардани тасвир...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Ибора ёфт нашуд</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 аз %2 бозӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Захира &amp;кардани садо...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Фиристодани &quot;%1&quot; ба хати ворида</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Илова кардани &quot;%1&quot; ба таърих</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Мақолаи ҷорӣро ба Anki фиристед</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Матни интихобшударо ба Anki фиристед</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Файлҳои садо (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx); Ҳама файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Навозиши файли садо: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Эҷод кардани ёддошти Anki</translation>
     </message>
   </context>
   <context>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Табдилдиҳии Чин</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Фаъол кардани табдил байни аломатҳои хитоии оддӣ ва анъанавӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>&amp;Табдилдиҳии хитоӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Фаъол кардани табдил аз аломатҳои оддӣ ба анъанавӣ (Варианти тайванӣ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>ХО ба ХА (Варианти тайванӣ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Фаъол кардани табдил аз аломатҳои оддӣ ба анъанавӣ (Варианти ҳонконгӣ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>ХО ба ХА (Варианти ҳонконгӣ)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Фаъол кардани табдил аз аломатҳои оддӣ ба аломатҳои анъанавӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>ХА ба ХО</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Табдилдиҳӣ аз хитоии оддӣ ба анъанавӣ (Варианти тайванӣ)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Табдилдиҳӣ аз хитоии анъанавӣ ба оддӣ (Варианти ҳонконгӣ)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Табдилдиҳӣ аз хитоии оддӣ ба анъанавӣ</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>транслитератсияи фармоишӣ</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Санҷиши ҳаққонияти прокси лозим аст</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Барои пайдо кардани дастрасӣ тавассути прокси, шумо бояд номи корбар ва паролро ваорид кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Номи корбар:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Парол:</translation>
     </message>
@@ -508,24 +503,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Шакл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Нишонаи гурӯҳ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Миёнбур:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Папкаи дӯстдошта:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Тасвирҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Ҳамаи файлҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Хато</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Файли тасвири интихобшуда кушода нашуд.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Тасдиқ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Шумо мутмаин ҳастед, ки мехоҳед дастаи гурӯҳҳоро дар асоси ҷуфтҳои забонӣ эҷод кунед?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Шумо мутмаин ҳастед, ки мехоҳед маҷмӯи гурӯҳҳоро дар асоси metadata.toml эҷод кунед?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Муттаҳид кардани гурӯҳҳо аз рӯи забони аслӣ ба &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Муттаҳид кардани гурӯҳҳо аз рӯи забони тарҷума ба &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Гурӯҳи худкор аз рӯи ҷузвдон ноком шуд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Ба феҳристи волидайни %1 дастрас шудан мумкин нест.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Шумо мутмаин ҳастед, ки мехоҳед маҷмӯи гурӯҳҳоро дар асоси ҷузвдонҳои дорои ҷузвдонҳо тавлид кунед?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Сохтани гурӯҳи тарҷумаи дусамта &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Муттаҳид кардани гурӯҳҳо бо &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Луғатҳо: </translation>
     </message>
@@ -635,201 +630,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Ҳолати ҷустуҷӯ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Ин унсур муайян мекунад, ки чӣ тавр фитри сатр иҷро мешавад</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Агар интихоб кунед, мавриди аломатҳо ҳангоми филтркунӣ ба ҳисоб гирифта мешавад</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Мавриди мутобиқат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Калимаҳои аввалинро ба файл содир мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Содир кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Кумак</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>ДУРУСТ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Барои татбиқ кардани филтр ба рӯйхати калимаҳои аввалин, ин тугмаро зер кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Татбиқ кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Агар интихоб кунед, тағйироти филтр ба рӯйхати калимаҳои аввалин дарҳол татбиқ карда мешавад</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Табиқи худкор</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Филтр:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Филтркунии сатрҳо (сатрҳои устувор, ифодаҳои оддӣ ва аломатҳои махсус)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Матн</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Аломатҳои махсус</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Ифодаи оддӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Сарлавҳаҳо бор карда мешавад...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Ҳамагӣ калимаҳои аввалини беҳамто: %1, филтршуда: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Захира кардани калимаҳои аввалин ба файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Файлҳои матнӣ (*.txt);;Ҳамаи файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Файли содиршуда кушода намешавад</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Содир кардани калимаҳои аввлин...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Бекор кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Раванди содирот қатъ шудааст</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Содирот анҷом ёфт</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Ҳамагӣ мақолаҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Тарҷума аз забони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Ҳамагӣ калимаҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Тарҷума ба забони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Кушодани ҷузвдон</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Таҳрир кардани луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлҳои ин луғат:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Тавсиф:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Намоиш додани ҳамаи калимаҳои аввалини беҳамтои луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Калимаҳои аввалин</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Таҳрир кардани луғат тавассути фармон:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Номи файли индекс:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Папкаи индексро кушоед</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 вуруд</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Фаъол аст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Суроға</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Пойгоҳи иттилоотӣ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Стратегияҳо</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Нишон</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Рӯйхати пойгоҳи иттилоотӣ бо вергул ҷудошуда
 (сатри холӣ ё &quot;*&quot; ба ҳамаи пойгоҳҳои иттилоотӣ мутобиқат мекунад)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Рӯйхати стратегияҳои ҷустуҷӯ бо вергул ҷудошуда
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Менюи васеъшуда бо ҳамаи луғатҳо...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Гурӯҳи зеринро таҳрир кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Иттилооти луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Калимаҳои аввалини луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Кушодани ҷузвдони луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Таҳрир кардани луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Лавҳаи луғат</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Луғатҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Луғатҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Қабул кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Бекор кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Сарчашмаҳо тағйир дода шудаанд</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Гурӯҳҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Баъзе сарчашмаҳо тағйир дода шудаанд. Шумо мехоҳед ин тағйиротро қабул кунед?</translation>
     </message>
@@ -992,12 +997,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Саҳифаи қаблӣ</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Саҳифаи оянда</translation>
     </message>
   </context>
   <context>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Ҷустуҷӯ дар тамоми матн</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Калимаҳои пурра</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Матни оддӣ</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Аломатҳои махсус</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Ифодаи оддӣ</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Калимаи дархосткунанда холӣ буда наметавонад.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>дастгирии синтаксиси ҷустуҷӯи xapian, ба монанди ВА Ё +/- ва ғайра</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Масофаи ҳадди аксар байни калимаҳо (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Пешфарз</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Ҳадди аксари ифодаҳо дар ҳар як луғат (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Мақолаҳои ёфтшуда: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Мураттабсозӣ: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Ҳеҷ</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Хати ҷустуҷӯ бояд ақаллан як калимаро бо </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ё якчанд аломатро дар бар гирад</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Ягон луғат барои ҷустуҷӯи матни пурра вуҷуд надорад</translation>
     </message>
@@ -1087,9 +1072,9 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Хатогӣ дар файли афзалиятҳо</translation>
     </message>
   </context>
   <context>
@@ -1107,17 +1092,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Илова кардани папка</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Дӯстдоштаҳо:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Ҳамаи ҷузъҳои интихобшуда нест карда мешаванд. Давом додан?</translation>
     </message>
   </context>
   <context>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>аз</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
@@ -1163,79 +1148,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Гузашта</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Баъдӣ</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Ҷустуҷӯ</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Мавриди мутобиқат</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Ҳолат:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Мақолаҳои ёфтшуда:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Луғатҳои дастрас дар гурӯҳ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Дар ҳоли интизори мураттабсозӣ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Кумак</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Ҳамагӣ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Мураттабшуда:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Мураттабсозӣ: Ҳеҷ</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Бекор кардан</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Тугмаи Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Тугмаи Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Варақаи 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ба гурӯҳ номи нав гузоштан:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Луғатҳои дастрас:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Гурӯҳро илова кардан</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Гурӯҳро илова кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Гурӯҳи нави луғатро эҷод кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Гурӯҳ аз рӯи забонҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Эҷоди гурӯҳҳои дар асоси ҷузвдонҳо.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Гурӯҳ аз рӯи ҷузвдонҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Гурӯҳ аз рӯи Метамаълумот</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Номи гурӯҳи луғати ҷориро иваз кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Гурӯҳи луғати ҷориро тоза кардан</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ба гурӯҳи нав ном гузоштан:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Ҳамаи гурӯҳҳоро тоза кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Луғатҳои интихобшударо аз гурӯҳ тоза кардан (тугмаи Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Луғатҳои интихобшударо ба гурӯҳ илова кардан (тугмаи Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Гурӯҳро тоза кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Гурӯҳҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Номи гурӯҳро иваз кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Ҳамаи гурӯҳҳои луғатро тоза кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Гурӯҳи забондонро эҷод кардан</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Таърих:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Андозаи таърих: %1 аз %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Пешниҳоди санҷиши калима: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Морфологияи %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Фаъолшуда</translation>
     </message>
@@ -1485,1031 +1454,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Индексгузорӣ: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Номи луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Омодасозии GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Интизор шавед, луғат татбиқ шуда истодааст</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Интизор шавед...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Индексгузорӣ...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Ив</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Идо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лао</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тви</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афарӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Аконӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Креӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Игбоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Комӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манксӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Палӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тайӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урдӯ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулӯ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чехӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Ҳоландӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганд</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фулахӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Юнонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Хаусагӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Ҳиндӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Ирландӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Хмерӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Лотинӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маорӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Ориёӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Сангоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Шонагӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Тоҷикӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамилӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Тоторӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Сватӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Инупиакӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Ӯзбекӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Уэлсӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Волофӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Кхоса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Итолиёӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Рито-романӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонгкагӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Каннадӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Ндебелӣ-шимолӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхозӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Қирғизӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Кирундӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Шотландӣ-галикӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латишӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малайаламӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Булғорӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Малтӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Маратхӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арабӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварикӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Бихарӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймараӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Сунданезӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Даниягӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Дивехӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-Катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фиҷӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Венгерӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Франсавӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Олмонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Муғулӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Яҳудӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Хереро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембургӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канарӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Қазоқӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кикуйю</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Кореягӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Наваҷоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непалӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оҷибвагӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Паштӯ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Полякӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Окситанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словакӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Тсонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйғурӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Сербӣ-хорватӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Йорубӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Руминӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Индонезӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панҷабӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Сотои ҷанубӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсикӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Эсперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Форсӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словенӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризиани ғарбӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонсӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таитӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Малагасӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галисӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Озарбойҷонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Ҷопонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Украинӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бамбара</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Гренландӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Бошқирдӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Белорусӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмирӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хири моту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Банголӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Ёвонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Киняруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Африкаансӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Бислама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Арманӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвегӣ-букмалӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хорватӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Босниягӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Интерлингва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Интерлингуӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Сербӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бурмезӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Русӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лимбургӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвегӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Хитоӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чувашӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Синхала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Испанӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнишӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тагалогӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Ассамесӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетинӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Эстонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Свахилӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Ветнамӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Мақдунӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португалӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Туркӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркманӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуҷаратӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Исландӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Инуктитутӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Англисӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Гурҷӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Славянии динӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фароесӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Финӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапук</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валлонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваняма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршалӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Самии-шимолӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Гаитӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморроӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Норвегӣ-нюнорскӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуаранӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Ндебелӣ-ҷанубӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чичевагӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литвонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сичуан Юи</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигринӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Ибрӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Хитои анъанавӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Хитои оддӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Лаҳҷаҳои хитои оддии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Лаҳҷаҳои хитои анъанавии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Забонҳои аврупои шарқии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Забонҳои аврупои ғарбии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Дигар забонҳои русӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Дигар забонҳои ҷопонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Дигар забонҳои балтикӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Дигар забонҳои юнонӣ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Лаҳҷаҳои кореягии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Лаҳҷаҳои туркии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Лаҳҷаҳои тайии дигар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Тамазайт</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Лоҷбанӣ</translation>
     </message>
@@ -2517,215 +2490,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>фаронсавӣ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>испанӣ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>белорус</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>булгорӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>чех</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>олмонӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>юнонӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>финландӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Италия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Ҷопон</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Корея</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>литваӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>македонӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Голландия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>полякӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>португалӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>русӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>словакӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>албанӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Сербӣ (кириллӣ)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>шведӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>туркӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>украинӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Чин соддакардашуда</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Анъанавии чинӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Ветнами</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Португалия, Бразилия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>форсӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Испания, Аргентина</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>ҳиндӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>эсперанто</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Олмон, Швейтсария</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Испания, Боливия</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>тоҷикӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Кечуа</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Аймара</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Араб, Арабистони Саудӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>туркман</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Забони байнизабонӣ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Лоҷбон</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>англисӣ</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Ҳангоми боркунии луғатҳо хатогӣ ба вуҷуд омад</translation>
     </message>
@@ -2733,7 +2706,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Хатогӣ дар файли танзимӣ. Бо танзимоти пешфарз давом медиҳед?</translation>
     </message>
@@ -2741,702 +2714,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Оинҳои дӯстдошта</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Умумӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Ба қафо</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 луғат, %2 мақола, %3 калима</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Танзимот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Кумак</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Ҷустуҷӯ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Баромад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Хато</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Аз барнома баромадан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Ба панҷараки огоҳиҳо печондан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Мақола захира нашуд: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Бузург кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Луғатҳо...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Дар бораи барнома</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форуми луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Чоп кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Мақоларо захира кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Мақоларо захира кардан ҳамчун</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Равзанаро ба панҷараки огоҳиҳо мепечонад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Танзими саҳифа</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Вебсайти луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Версияи барномаи нав дастрас аст</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Тарҷума кардан:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Хурд кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Равзанаи асосиро намоиш додан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Дар бораи GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Боргирӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Танзими саҳифа</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Тарҷума дар:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Андозаи муқаррарӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Бор шуда истодааст...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(беном)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Хусусиятҳо...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Хуш омадед!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Калимаро талаффуз кардан (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Мақоларо захира кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Ин версияро нодида гузарондан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Ба пеш</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Мақоларо чоп кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Ягон принтер дастрас нест. Пеш аз ҳама шумо бояд принтерро танзим кунед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Намоиш</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Таърих</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Пок кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Танзими андозаи шрифт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Калимаҳоро бузург кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Калимаҳоро хурд кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Андозаи муқаррарӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Варақаи ҷориро пӯшидан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Ҳамаи варақаҳоро пӯшидан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Ҳамаи варақаҳоро ба ғайр аз ҷорӣ пӯшидан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Варақаҳои кушодашуда</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Варақаи нав</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Ҷузвдони танзимот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Лавҳаи меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Натиҷа дар луғатҳои зерин дарёфт шуд:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Ҳама ҷадвалҳоро ба Favorites илова кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>Огоҳӣ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Рӯйхати варақаҳоро кушодан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Варақаи ҷориро аз Favorites хориҷ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Шумо пинҳон кардани лавҳаи менюро интихоб кардед. Барои аз нав намоиш додани лавҳаи меню, %1-ро истифода баред.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Намоиш додан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Содир кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Пинҳон кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Таърихро ба файл содир кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Файлҳои матнӣ (*.txt);;Ҳамаи файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Содиркунии таърих ба анҷом расид</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Хатои содиркунӣ: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Ворид кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Ворид кардани таърих аз файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Хатои воридот: маълумоти беэътибор дар файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Воридоти таърих ба анҷом расид</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Хатои воридот: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Файлҳои дӯстдоштаро ба файл содир кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>Файлҳои XML (*.xml);; Ҳама файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Содироти дӯстдоштаҳо анҷом ёфт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Содироти мунтахаб ба файл ҳамчун рӯйхати оддӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Воридоти мунтахаб аз файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>Файлҳои XML (*.xml);; Файлҳои Txt (*.txt);; Ҳама файлҳо (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Воридоти дӯстдошта анҷом ёфт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Хатогии таҳлили маълумот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Иттилооти луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Калимаҳои аввалини луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Кушодани ҷузвдони луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Таҳрир кардани луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Дар ҳоли таҳияи индекси ҷустуҷӯ бо матни пурра: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Сарлавҳаи &quot;%1&quot; аз дӯстдоштаҳо хориҷ карда шавад?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Лавҳаи ҷустуҷӯ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Лавҳаи натиҷаҳои ҷустуҷӯ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Панели дӯстдошта ва дӯстдошта</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>&amp;Пешнамоиши чоп</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Файлҳоро аз нав коркард кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Варақаи нав</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>Ҳамеша дар &amp;боло</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Ҳамеша дар боло</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Тугмаи меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Ҷустуҷӯ дар саҳифа</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Ҷустуҷӯ дар матни пурра</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Маълумоти GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Намоиш</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Содир кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Воридот</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Илова</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Ҷадвали ҷорӣ ба Favorites илова кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Ба рӯйхат содирот кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Номҳоро дар &amp;лавҳаи луғат намоиш додан</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
-      <translation type="unfinished">Show Small Icons in &amp;Toolbars</translation>
+      <translation>Нишонаҳои хурдро дар панели асбобҳо нишон диҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Лавҳаи идоракунӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Сканерро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Мақола, Пурра (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Мақола, танҳо HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Захиракунии мақола...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Мақоларо пурра захира кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Равзанаи асосӣ ҳамеша дар боло ҷойгир мешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Лавҳаи таърих</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Қобилияти API фаъол нашудааст</translation>
     </message>
@@ -3444,12 +3417,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Файли луғат тағйир ёфт ё вайрон шуд</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Боркунии мақола аз %1 қатъ шуд; сабаб: %2</translation>
     </message>
@@ -3457,7 +3430,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Хатои таҳлили XML: %1 дар %2,%3</translation>
     </message>
@@ -3473,22 +3446,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Суроға</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Фаъолшуда</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Аломат</translation>
     </message>
@@ -3498,88 +3471,88 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Буфери аудио барои хондан кушода нашуд.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Шакл</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Луғатҳои ғайрифаъол (хомӯшшуда):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Ном:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Ҳамагӣ мақолаҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Тарҷума аз забони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Тарҷума ба забони:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Ҳамагӣ калимаҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Тартиби луғатҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файлҳои луғат:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Маълумоти луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Тавсиф:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Мураттабсозӣ аз рӯи ном</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Мураттабсозӣ аз рӯи забон</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Калимаҳои аввалини луғат</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Луғатҳои фаъол: %1, ғайрифаъол: %2</translation>
     </message>
@@ -3587,12 +3560,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Масир</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Фаъол/ғайрифаъол кардани луғат</translation>
     </message>
@@ -3600,69 +3573,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Баъд аз оғози барнома онро танҳо дар панҷараки огоҳиҳо намоиш додан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Танҳо Shift-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Нишонаи луғатро дар панҷараки огоҳиҳо фаъол кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Мизбон:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Шифт</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Намуд:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Корбар:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Тарҷумаи пайдошаванда</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3671,138 +3642,138 @@ switching to them.</source>
 навро бе табдилдиҳӣ кушода мекунад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Сервери proxy-ро истифода баред</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Барои тарҷума кардани калимаҳо аз ҳофизаи система тугмаҳои зеринро истифода баред:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Тугмаи Windows ё Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Талаффузи худкори калимаҳо дар равзанаи асосӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Луғатро якҷоя бо системаи оператсионӣ оғоз кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Танҳо Alt-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Варақаҳои тарҷума</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Танҳо Shift-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Забони интерфейс:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Танҳо Ctrl-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Варақаҳои навро дар равзанаи асосӣ кушодан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Шабака</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Танҳо Ctrl-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Луғати Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Талаффузи худкори калимаҳо дар тарҷумаи пайдошаванда</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Варақаҳои навро пас аз варақаи ҷорӣ кушодан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Барои татбиқ кардани забони интихобшуда барномаро аз нав оғоз кунед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Тугмаи Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Мавҷуд будани версияи навро такроран тафтиш кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 варақаҳои нав дар охири рӯйхат кушода мешаванд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Ҳангоми пӯшидани луғат онро ба панҷараки огоҳиҳо пинҳон кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Системаи пешфарз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Агар имконоти зерин фаъол бошад, нишонаи луғат дар панели система пайдо мешавад,
 ва шумо аз он ҷо метавонед равзанаи асосии барномаро кушоед ва амалҳои дигарро иҷро кунед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3841,141 +3811,141 @@ download page.</source>
 шуморо огоҳ мекунад ва кушодани сайти луғатро пешниҳод мекунад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Оғози кор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Парол:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Пешфарз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Интерфейс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Забонро иваз кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Тугмаи Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Барои пинҳон ва намоиш додани равзанаи асосӣ тугмаҳои зеринро истифода баред:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Танҳо Alt-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Хусусиятҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl-и чап</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl-и рост</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Тугмаҳои тезкор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Барномаро бо хусусияти тарҷумаи пайдошаванда оғоз кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Агар имконоти зерин фаъол бошад, ҳангоми кушоиши луғат танҳо нишонаи он дар панҷараки огоҳиҳо
 пайдо мешавад ва равзанаи асосии он нишон дода намешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Тугмаи Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Луғати GoldenDict-ро ҳангоми боркунии системаи оператсионӣ ба таври худкор оғоз мекунад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Ҳангоми тағир додани равзанаҳои худи GoldenDict, тирезаи поп-попаро нишон надиҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Интихоби худи GoldenDict ва тағиротҳои буфериро нодида гиред</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Файлҳои аудиоиро тавассути дастгирии аудиои дарунсохт бозӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Плеери дохилиро истифода баред:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Охири аудиоро интихоб кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Сатри фармони плеери аудиоиро ворид кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,533 +3955,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 имконпазир нест, кӯшиш кунед, ки ин имконотро ғайрифаъол созед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Намоиши мӯҳтавои тиҷориро аз вебсайтҳои дигар қатъ кунед (рекламаро пинҳон мекунад)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Талаффуз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Иҷрои аудио</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Ба воситаи барномаи дигар иҷро кунед:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Зеркунии дубора калимаи зершударо тарҷума мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Ягон барномаи беруниро барои иҷрои файлҳои аудиоӣ истифода баред</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Тугмаи ESC равзанаи асосиро пинҳон мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Варақаи ягонаро пинҳон кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Танзим кардани ин қимат барои рад кардани менюҳои марбути бузург.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Ҳудуди луғатҳои менюи марбуд:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Калимаи тарҷумашударо ба ҷои равзанаи пайдошаванда дар равзанаи асосӣ нишон диҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Калимаи тарҷумашударо дар равзанаи нишон диҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Пеш аз нишон додани равзанаи поп-ап равзанаи парчамро нишон диҳед, барои нишон додани равзанаи поп-ап парчамро клик кунед. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Одатан, пахш кардани истинод, ду маротиба пахш кардани калима ё ҷустуҷӯи
+интихоб дар мақола тарҷумаро бор мекунад ва қариб дарҳол
+ба мақола аз ҳамон луғат ҳаракат мекунад. Бо хомӯш кардани ин хосият,
+мақолаи луғати болотарин нишон дода мешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Ба таври худкор ба мақолаи мақсаднок ҳаракат кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Услуби намоиши мақола:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>UI-ро ба торик табдил диҳед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Ҳолати торик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Услуби намоиши мақоларо ба торик табдил диҳед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Ҳолати торикии хонанда</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>Тартиби MRU: Тартиби охирин истифодашуда.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Ҳангоми фаъол кардани сканер тағиротҳои буферро пайгирӣ кунед. Огоҳӣ! Шумо бояд ҳамеша инро фаъол созед, агар шумо дар Linux набошед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Тағироти буферро пайгирӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Тағироти интихобро пайгирӣ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Танҳо вақте ки ҳамаи тугмаҳои интихобшуда пахш карда мешаванд, интихоби такя:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Ҳангоми интихоб кардани калима парчами сканро нишон диҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Вақти таъхир</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Прокси система</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Прокси фармоишӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Танзимоти прокси</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Девор:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Модели:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Калом</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Соҳаи луғат...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Матн</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Майдони таъриф ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Ҳукм</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Майдони ҳукм (метавонад холӣ бошад)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Пешгирии муайянкунии барномаи GoldenDict-ро дар сарварақҳои HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Андозаи максималии кэши шабака:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
-%1
-If set to 0 the network disk cache will be disabled.</translation>
+      <translation>Фазои максималии дискро кэши шабакаи GoldenDict ишғол мекунад
+% 1
+Агар ба 0 муқаррар карда шавад, кэши диски шабакавӣ ғайрифаъол мешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> МБ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Вақте ки ин хосият фаъол аст, GoldenDict
+кэши шабакавии худро аз диск ҳангоми баромадан тоза мекунад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Кэши шабакаро ҳангоми баромадан тоза кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Ҷустуҷӯи матни пурра</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Иҷозати матни пурра барои ҷустуҷӯ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Ҷустуҷӯ накардан дар луғатҳо бо зиёда аз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>мақолаҳо (0 - номаҳдуд)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Иловагӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Ҳангоми ҷустуҷӯҳои пайдарпай, агар як луғат бо дастӣ шикаста шавад, он дар ҷустуҷӯи навбатӣ шикаста боқӣ мемонад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Барбод рафтани сессия</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Ҳангоми истифодаи буфер ҳама чизро пас аз сатри нав кашед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Ҳангоми ҷустуҷӯи нав, диққати равзанаи асосӣ ё поп-апро нигоҳ доред, ҳатто агар он намоён бошад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Дӯстдоштаҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Фосилаи сарфаи дӯстдошта. Агар ба 0 муқаррар карда шавад, дӯстдоштаҳо танҳо ҳангоми баромадан захира карда мешаванд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Барои тасдиқи ҳар як амалиёти ҳазфи ашё ин хосиятро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Тасдиқи нест кардани ашё</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Барои нодида гирифтани матни беасос дарози вуруди
+аз болои муш, интихоб, буфер ё сатри фармон ин хосиятро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Ибораҳои вуруди дарозтар аз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Ибораҳои воридшуда аз ин андоза дарозтар сарфи назар карда мешаванд</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Барои нодида гирифтани диакритика ҳангоми ҷустуҷӯи мақолаҳо ин хосиятро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Ҳангоми ҷустуҷӯ ба диакритикҳо аҳамият надиҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Барои густариш додани қисмҳои интихобии мақолаҳо ин имконотро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Густариш додани &amp;қисмҳои интихобӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Интихоб кардани ин имконот барои печондани мақолаҳои калон ба таври худкор</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Печондани мақолаҳо зиёда аз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Мақалаҳои зиёда аз ин андоза мухтасар мешаванд</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Ҳангоми ҷустуҷӯ ба аломатҳои пунктуатсия аҳамият надиҳед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Барои фаъол кардани ҷустуҷӯи мақолаҳои иловагӣ тавассути рӯйхатҳои калимаҳои муродиф
 аз луғатҳои Stardict, Babylon ва GLS, ин имконро фаъол кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Ҷустуҷӯи иловагӣ тавассути калимаҳои муродиф</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>аломат</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Тугмабандии Ctrl-Tab варақаҳоро дар тартиби MRU табдил мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Луғати Babylon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Таърих</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Барои захира кардани таърихи калимаҳои тарҷумашуда ин имконотро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Захира кардани &amp;таърих</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Мақолаҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Агар шумо мехоҳед калимаҳоро бо зеркунии ягонаи тугмаи муш интихоб намоед, шумо бояд ин имконотро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Зеркунии ягона калимаро интихоб мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Сабки иловагӣ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Муайян кардани ҳаҷми иттилооти захирашуда дар таърих.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Андозаи калонтарини таърих:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Фосилаи вақти захиракунии таърих. Агар ба 0 танзим кунед, таърих танҳо дар хуруҷ захира мешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Захира кардан баъд аз</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>дақиқа</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Классик</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Ҳозира</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Лингоҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Lingoes-кабуд</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> МБ</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Маълумоти мавқеъ барои ҷустуҷӯи ибораи Xapian ва оператори NEAR лозим аст, аммо андозаи пойгоҳи додаҳо хеле калонтар хоҳад буд. Танҳо ба луғатҳои нави воридшаванда дахл дорад.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Индексро бо маълумоти мавқеъ фаъол созед</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Шрифти стандартӣ</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Шрифти Monospace</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Шрифти Serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Шрифти Sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Намуди зоҳирӣ</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Ин ҳуруфҳо вақте истифода мешаванд, ки ҳуруфҳои аз ҷониби луғат муайяншуда ёфт нашуданд.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Шрифтҳои бозгашт</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудио</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Матни оддӣ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Аз рӯи префикс</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Номаълум</translation>
     </message>
@@ -4519,17 +4531,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Ягон номи барнома муайян нашуд.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Барнома вайрон шуд.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Барнома маънои %1-ро намоиш дод.</translation>
     </message>
@@ -4537,27 +4549,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Фаъолшуда</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Намуд</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Сатри иҷрои фармон</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Аломат</translation>
     </message>
@@ -4565,99 +4577,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Хатогии боркунии мақола</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Хатогии рамзкушоии мақола</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Ҳуқуқи муаллиф: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Версия: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Муаллиф: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Почтаи электронӣ: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Унвон: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Саҳифаи веб: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Сана: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Барномаи ҷустуҷӯи луғат.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Калима ё ҷумла барои пурсиш.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Паёмҳои дебагро дар gd_log.txt дар ҷузвдони танзимот захира кунед.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Ҳолати тирезаро барқарор кунед.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Хомӯш кардани tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Гурӯҳи равзанаи асосиро тағир диҳед.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Гурӯҳи поп-апҳоро тағир диҳед.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Ивазкунандаи поп-апаи скан.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Версияи чопӣ ва маълумоти ташхис.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Ҷустуҷӯ/филтри луғат (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Пок кардани ҷустуҷӯ</translation>
     </message>
@@ -4665,22 +4692,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ХАТОГӢ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Хатои захиракунии манбаъ: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Боргирии манбаъи ишорашуда қатъ карда шуд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ОГОҲӢ: %1</translation>
     </message>
@@ -4709,67 +4736,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Диалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Калимаро талаффуз кардан (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Илова кардани калима ба дӯстдоштаҳо (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Лавҳаи луғатро пинҳон ё нишон медиҳад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Ҳамеша дар болои ҳамаи тирезаҳои дигар бимонед</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Калимаро ба равзанаи асосӣ гузоштан (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Ба қафо</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Ба пеш</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>Огоҳӣ: %1</translation>
     </message>
   </context>
   <context>
@@ -4777,53 +4809,53 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Гузашта</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Баъдӣ</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Таъкид &amp; ҳама</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Ҳарф калон ё хурд аст</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Ҷустуҷӯ:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Масир</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Аломат</translation>
     </message>
@@ -4831,60 +4863,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Файлҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хирагана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системаҳо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Ниҳон-шикӣ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Википедиа</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Алифбои ҳиҷои Катаканаи ҷопонӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Луғатҳоро аз файлҳои аудиоӣ (овоздор) эҷод кунед. Масирҳои файлҳои аудиоиро дар зер илова кунед:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ромаҷии ҷопонӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4927,84 @@ Not implemented yet in GoldenDict.</source>
 Системаи дар боло зикршуда ҳоло дар луғати GoldenDict вуҷуд надорад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Сайтҳои Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Ҷузвдонҳои овозҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Ҳама гуна барномаҳои беруна. Сатри %GDWORD% бо калимаи дархост иваз карда мешавад. Сатри %GDSEARCH% бо матн дар сатри ҷустуҷӯ иваз карда мешавад. Агар ҳардуи параметрҳо таъмин нашуда бошанд, сарлавҳа ба вуруди стандартӣ ворид карда мешавад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Тарҷумаҳо аз ҷониби &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, китобхонаи муштараки лингвистии Викимедиа Фаронса. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Lingua Libre-ро фаъол созед</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>Рамзи забони ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Истифодаи Forvo дар айни замон калиди API-ро талаб мекунад, дар сайт сабти ном кунед, то калиди шахсии худро гиред.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Калиди шахсии худро гиред &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;дар ин ҷо&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Машҳуртарин тарзи транскрипткунонии калимаҳои Ҷопонӣ
 дар асоси фонологияи Англисӣ иҷро мешавад</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Алифбои ҳиҷои Хираганаи ҷопонӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Транслитератсияи фармоишӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Ин танҳо дар ибораи ҷустуҷӯ истифода мешавад, ки ҳар як сатр транслитератсия ва нуқта-вергулро ифода мекунад. Масалан, ae;æ,корбарон метавонанд ae-ро барои ифодаи æ дар калимаи мавриди ҳадаф ворид кунанд.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #ин мисол аст</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслитератсия</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5015,108 @@ Not implemented yet in GoldenDict.</source>
 Системаи дар боло зикршуда ҳоло дар луғати GoldenDict вуҷуд надорад.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Транслитератсияи русӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфология</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Тағйир додан...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Намунаҳо:  &amp;quot;eng&amp;quot; барои забони англисӣ, &amp;quot;fra&amp;quot; барои фаронсавӣ &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Рӯйхати пурраи забонҳои дастрасро метавон &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; дар ин ҷо пайдо кард &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Масири феҳрист бо луғатҳои Hunspell/Myspel:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Аз нав коркард кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Транслитератсияи олмонӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Тамоми вебсайтҳо. Сатри %GDWORD% бо калимаи воридшуда ҷойгузин карда мешавад:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Илова кардан...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Ҷузвдонро интихоб кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Тоза кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Вебсайтҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Масирҳо барои ҷустуҷӯи файлҳои луғат:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Тозакуниро тасдиқ кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Алифбои ҳиҷо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Луғатҳои морфологии дастрас:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Истифодаи алифбои лотиниро барои навиштан бо забони ҷопонӣ фаъол мекунад</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5109,94 +5131,94 @@ of the appropriate groups to use them.</source>
 ба поёни гурӯҳҳои муносиб илова кунед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хэпбёрн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Канрей-шикӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Форво</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Серверҳои DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Серверҳои DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Талаффузро аз Forvo фаъол кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Калиди API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Рамзҳои забон (бо вергул ҷудо мешаванд):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Транслитератсияи юнонӣ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(дар версияи кӯчондашаванда дастрас нест)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Барномаҳо</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Транслитератсияи белорусӣ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Матн ба талаффуз</translation>
     </message>
@@ -5212,42 +5234,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Системаҳои овозии интихобшуда:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Илова кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Тоза кардан</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Пешнамоиш</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Системаҳои овозии дастрас:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Матне, ки талаффуз мешавад:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Матне, ки мехоҳед талаффуз кунед, ин ҷо нависед.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Пешнамоиш</translation>
     </message>
@@ -5272,17 +5294,17 @@ of the appropriate groups to use them.</source>
       <translation>Ягон овози TTS дастрас нест.&lt;br&gt;Лутфан, мутмаин шавед, ки ақаллан як системаи TTS дар компютери шумо аллакай насб шудааст.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Хусусиятҳо</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Баландии садо:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Суръат:</translation>
     </message>
@@ -5290,12 +5312,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Барои ҷустуҷӯ дар луғат, калима ё ибораеро ворид кунед</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Зоҳиршаванда</translation>
     </message>
@@ -5326,33 +5348,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Ном</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Суроға</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Фаъолшуда</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Дарҷ кардани мақола ҳамчун пайванди дохили барчаспи &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Ҳамчун пайванд</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Аломат</translation>
     </message>
@@ -5360,17 +5382,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Дархости баъзе луғатҳо қатъ карда шуд.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ОГОҲӢ: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/tk_TM.ts b/locale/tk_TM.ts
index d4210db3..b9644e14 100644
--- a/locale/tk_TM.ts
+++ b/locale/tk_TM.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Hakynda</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng - sozlükleri açmak üçin programma,  wersiýa </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>GNU GPLv3 we ondan soňky çykan lisenziýasy boýunça</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Wersiýa maglumatyny göçüriň</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Sözlükleriň sanawyny göçüriň</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Hormatlar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Näbelli]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Esaslanýar  Qt %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2011 Konstantin Isakow (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Qt %1 (%2, %3) esasynda</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: sözsiz kartoçka döredip bolmaz</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki gözlegi: AnkiConnect açyk däl.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: anki ýazmak şowsuz</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: anki üstünlik</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Barlaň</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Makalany giňelt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Makalany kiçelt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Ýüzüne çykýan penjire (popup) bilen işlemek</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(atsyz)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Hoş geldiňiz!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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;toparda &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; üçin terjime tapylmady.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;foruma giriň&lt;/a&gt;.&lt;p&gt;Programmanyň &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(surat)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Makalany giňelt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Sözlük  </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Makalany kiçelt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Täze Anki belligini ediň</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Sorag ýalňyşlygy: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Ýakyn sözler: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Goşma aňlatmalar: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Aýry sözler: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Wagtlaýyn faýly döredip bolmady.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Tap &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <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="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Salgylanan çeşme ýok.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <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="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Tap &quot;%1&quot; in %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Şu makalany saýla</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Tekst görnüşinde kopiýa et</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Gözden geçir</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Linki täze aç &amp;Tab-dan</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Linki &amp;Daşky Brauzerden aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Çeşme</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Ses</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS sesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Surat</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Wideo</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Wideo: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <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="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Kesgitleme: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Salgylanan audio programa ýok.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Baglanyşyk we baglanyşyk</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Saklaň we bellik ediň &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>DUNDURYŞ: Ses pleýer: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>ÝALŇYŞLYK: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Ýatda sakla sesini</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Surady ýatda sakla</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <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="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Surady &amp;ýatda sakla - ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>Jümle tapylmady</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%2 oýundan %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Ýatda sakla s&amp;esi - ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Iber &quot;%1&quot; girizme setire</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Goş &quot;%1&quot; geçmişe</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp; Häzirki makalany Anki iber</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>Saýlanan teksti Anki iber</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Ses faýllary (* .wav * .ogg * .oga * .mp3 * .mp4 * .aac * .flac * .mid * .wv * .ape * .spx) ;; fileshli faýllar (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Ses faýlyny oýnamak başartmady: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp; Anki belligini dörediň</translation>
     </message>
   </context>
   <context>
@@ -413,93 +408,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Hytaý dili</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Simplönekeýleşdirilen we adaty hytaý nyşanlarynyň arasynda öwrülmegi üpjün ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Hytaýyň wersiýasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Simplönekeýleşdirilen nyşanlardan adaty (Taýwan warianty) nyşanlara öwrülmegi üpjün ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC-den TC (Taýwan görnüşi)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Simplönekeýleşdirilen nyşanlardan adaty (Gonkong warianty) nyşanlara öwrülmegi üpjün ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC-den TC (Gonkong görnüşi)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Adaty nyşanlardan ýönekeýleşdirilen nyşanlara öwrülmegi üpjün ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC-den SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Adaty hytaý (Taýwan warianty) öwrülişine ýönekeýleşdirildi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Adaty hytaý (Gonkong görnüşi) öwrülişine ýönekeýleşdirildi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Chineseönekeýleşdirilen hytaý öwrülişigi</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>adaty terjime</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
-      <translation type="unfinished">Proxy authentication required</translation>
+      <translation>Proksi tassyklamak talap edilýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
-      <translation type="unfinished">You need to supply a Username and a Password to access via proxy</translation>
+      <translation>Proksi arkaly girmek üçin Ulanyjy adyny we paroly üpjün etmeli</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
-      <translation type="unfinished">Username:</translation>
+      <translation>Ulanyjy ady:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Parol:</translation>
     </message>
@@ -507,24 +502,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Toparyň nyşany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Çalt açar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Halanýan bukjasy:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Suratlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Ähli faýllar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Ýalňyş</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Bellenen şekiliň faýlyny okap bolanok.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Tassyklama</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Çyndan hem toparlary dil jübütleriň esasynda gurmak isleýäýäňizmi?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Metadata.toml esasynda bir topar topar döretmek isleýändigiňize ynanýarsyňyzmy?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Toparlary çeşme dillere görä utgaşdyr -  &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Toparlary terjime dillere görä utgaşdyr - &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Papka boýunça awtomatik topar şowsuz boldy.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>%1 -nyň esasy katalogyna baryp bolmaýar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Papkalary öz içine alýan toparlar toplumyny döretmek isleýändigiňize ynanýarsyňyzmy?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Iki-taraplaýyn terjime topary ýasa -  &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Utgaşdyr toparlary we &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Sözlükler: </translation>
     </message>
@@ -634,201 +629,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
-      <translation type="unfinished">Search mode</translation>
+      <translation>Gözleg tertibi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
-      <translation type="unfinished">This element determines how filter string will be interpreted</translation>
+      <translation>Bu element süzgüç setiriniň nähili düşündiriljekdigini kesgitleýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
-      <translation type="unfinished">If checked on the symbols case will be take in account when filtering</translation>
+      <translation>Nyşanlaryň üstünde barlansa, süzülende hasaba alynar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
+      <translation>Gabat gelýän ýagdaý</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
-      <translation type="unfinished">Exports headwords to file</translation>
+      <translation>Faýl üçin söz sözlerini eksport edýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Eksport</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Kömek ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>Bolýar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
-      <translation type="unfinished">Press this button to apply filter to headwords list</translation>
+      <translation>Sözleri söz sözleriniň sanawyna ulanmak üçin şu düwmä basyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
-      <translation type="unfinished">Apply</translation>
+      <translation>Giriş</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
-      <translation type="unfinished">If checked any filter changes will we immediately applied to headwords list</translation>
+      <translation>Süzgüç üýtgeşmeleri barlanylsa, derrew söz sözleriniň sanawyna ýüz tutarys</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
-      <translation type="unfinished">Auto apply</translation>
+      <translation>Awtomatiki usulda ulanylýar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
-      <translation type="unfinished">Filter:</translation>
+      <translation>Süzgüç:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
-      <translation type="unfinished">Filter string (fixed string, wildcards or regular expression)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
-      <source>Text</source>
-      <translation type="unfinished">Text</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
+      <translation>Süzgüç setiri (kesgitli setir, kartoçka ýa-da yzygiderli aňlatma)</translation>
     </message>
     <message>
       <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <source>Text</source>
+      <translation>Tekst</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
+      <source>Wildcards</source>
+      <translation>Waýkard</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Baş sözler ýüklenýär ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
-      <translation type="unfinished">Unique headwords total: %1, filtered: %2</translation>
+      <translation>Üýtgeşik söz sözleri jemi: %1, süzülen: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
-      <translation type="unfinished">Save headwords to file</translation>
+      <translation>Faýl üçin söz sözlerini ýazdyryň</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekst faýllary (*.txt);;Ähli faýllar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Eksport edilen faýly açyp bilemok</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
-      <translation type="unfinished">Export headwords...</translation>
+      <translation>Baş sözleri eksport ediň ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Yza Gaýtar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Eksport prosesi kesilýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Eksport gutardy</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Jemi makala sany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Terjime edýär şu dilden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Jemi söz sany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Terjime edýär şu dile:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Aç bukjany</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Sözlügi üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Şu sözlügiň düzümine girýän faýlllar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Häsiýetnama:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
-      <translation type="unfinished">Show all unique dictionary headwords</translation>
+      <translation>Uniquehli täsin sözlük sözlerini görkeziň</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
-      <translation type="unfinished">Headwords</translation>
+      <translation>Baş sözler</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Sözlügi şu komanda bilen üýtget:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Indeks faýlyň ady:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Indeks bukjasyny açyň</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 girizmeler</translation>
     </message>
@@ -838,105 +843,105 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>Url: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
       <source>Databases: </source>
-      <translation type="unfinished">Databases: </translation>
+      <translation>Maglumatlar bazalary: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="277"/>
       <source>Search strategies: </source>
-      <translation type="unfinished">Search strategies: </translation>
+      <translation>Gözleg strategiýalary: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="281"/>
       <source>Server databases</source>
-      <translation type="unfinished">Server databases</translation>
+      <translation>Serwer maglumat bazalary</translation>
     </message>
   </context>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Işledilen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
-      <translation type="unfinished">Databases</translation>
+      <translation>Maglumatlar bazalary</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
-      <translation type="unfinished">Strategies</translation>
+      <translation>Strategiýalar</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Nyşan</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
-      <translation type="unfinished">Comma-delimited list of databases
-(empty string or &quot;*&quot; matches all databases)</translation>
+      <translation>Maglumatlar bazalarynyň yzygiderli bölünen sanawy
+(boş setir ýa-da &quot;*&quot; ähli maglumat bazalaryna gabat gelýär)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
-      <translation type="unfinished">Comma-delimited list of search strategies
-(empty string mean &quot;prefix&quot; strategy)</translation>
+      <translation>Gözleg strategiýalarynyň yzygiderli bölünen sanawy
+(boş setir &quot;prefiks&quot; strategiýasyny aňladýar)</translation>
     </message>
   </context>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Ähli sözlükleri görkezýän giňeldilen menýu...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Şu topary üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Sözlük sözleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Sözlügiň bukjasyny aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Sözlügi üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Sözlük zolagy</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Sözlükler</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Sözlükler</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Kabul et</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Yza Gaýtar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Çeşmeler üýtgedildi</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Toparlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <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>
@@ -991,12 +996,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Öňki sahypa</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Indiki sahypa</translation>
     </message>
   </context>
   <context>
@@ -1010,85 +1015,65 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Doly tekst gözlegi</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation type="unfinished">Whole words</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
-      <translation type="unfinished">Plain text</translation>
+      <translation>Göni tekst</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <source>Wildcards</source>
+      <translation>Waýkard</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Talap sözi boş bolup bilmez.</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
+      <source>support xapian search syntax,such as AND OR +/- etc</source>
+      <translation>we OR +/- we ş.m. ýaly xapian gözleg sintaksisini goldaň</translation>
+    </message>
+    <message>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Bellenen</translation>
     </message>
     <message>
       <location filename="../src/fulltextsearch.cc" line="243"/>
-      <source>Wildcards</source>
-      <translation type="unfinished">Wildcards</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
-      <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation type="unfinished">Max distance between words (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation type="unfinished">Max articles per dictionary (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
-      <translation type="unfinished">Articles found: </translation>
+      <translation>Tapylan makalalar: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
-      <translation type="unfinished">Now indexing: </translation>
+      <translation>Indi indeksirleme: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Hiç birisi</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation type="unfinished">The search line must contains at least one word containing </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation type="unfinished"> or more symbols</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
-      <translation type="unfinished">No dictionaries for full-text search</translation>
+      <translation>Doly tekst gözlemek üçin sözlük ýok</translation>
     </message>
   </context>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Saýlawlar faýlynda säwlik</translation>
     </message>
   </context>
   <context>
@@ -1106,17 +1091,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Papka goşuň</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>Halanýanlar:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Selectedhli saýlanan elementler pozular. Dowam et?</translation>
     </message>
   </context>
   <context>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>kimden</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Redkatirle|Dictionaries|Çeşmeler|Forvo açyň we öz API açaryňyzy soraň, şeýlelikde bu ýalňyşlyk ýok bolar.</translation>
     </message>
@@ -1162,79 +1147,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp; Öňki</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp; Indiki</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Gözlemek</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation type="unfinished">Match case</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
-      <translation type="unfinished">Mode:</translation>
+      <translation>Reodeim:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
-      <translation type="unfinished">Articles found:</translation>
+      <translation>Tapylan makalalar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
-      <translation type="unfinished">Available dictionaries in group:</translation>
+      <translation>Toparda elýeterli sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
-      <translation type="unfinished">Wait for indexing:</translation>
+      <translation>Indeksirlemäge garaşyň:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
-      <translation type="unfinished">Help</translation>
+      <translation>Kömek ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
-      <translation type="unfinished">Total:</translation>
+      <translation>Jemi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
-      <translation type="unfinished">Indexed:</translation>
+      <translation>Indekslenen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
-      <translation type="unfinished">Now indexing: None</translation>
+      <translation>Indi indeksirleme: Hiç</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Yza Gaýtar</translation>
     </message>
@@ -1266,29 +1235,29 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
-      <translation type="unfinished">Tab 2</translation>
+      <translation>2-nji tab</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="174"/>
@@ -1303,12 +1272,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/groups.cc" line="29"/>
       <source>Group tabs</source>
-      <translation type="unfinished">Group tabs</translation>
+      <translation>Topar goýmalary</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="35"/>
       <source>Open groups list</source>
-      <translation type="unfinished">Open groups list</translation>
+      <translation>Toparlaryň sanawyny açyň</translation>
     </message>
     <message>
       <location filename="../src/ui/groups.cc" line="160"/>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Topara täze adyny ber:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Elýeterli sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Topary goş</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Topary goş</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Täze sözlük toparyny döret</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Diller boýunça topar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Papka esasly toparlary dörediň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Papkalar boýunça topar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Metadata boýunça topar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Häzirki sözlük toparynyň adyny üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Häzirki sözlük toparyny aýyr</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Täze topara at ber:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Ähli toparlary aýyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Saýlanan sözlükleri topardan aýyr (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Saýlanan sözlükleri topara goş (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Topary aýyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Toparlar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Toparyň adyny&amp;üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Ähli sözlük toparlaryny aýyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Dil esasynda toparlary döret</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Geçmiş:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Geçmişde görkeziljek terjimeleriň göwrümi: %1 girizmeler maksimum %2</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Dürs ýazuw kadalary hödürlemek: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfologiýa</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Işledilen</translation>
     </message>
@@ -1484,1031 +1453,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Indeksirleme: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Sözlügiň ady</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng -  başlangyç</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Sözlükler indeksirlenýär, garaşyň</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Haýyş garaşyň...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Indeksirlemek ...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
-      <translation type="unfinished">Ewe</translation>
+      <translation>Ewe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
-      <translation type="unfinished">Ido</translation>
+      <translation>Men edýän</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
-      <translation type="unfinished">Lao</translation>
+      <translation>Laos</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
-      <translation type="unfinished">Twi</translation>
+      <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
-      <translation type="unfinished">Afar</translation>
+      <translation>Afar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
-      <translation type="unfinished">Akan</translation>
+      <translation>Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Kri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Irland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
-      <translation type="unfinished">Komi</translation>
+      <translation>Komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manks</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
-      <translation type="unfinished">Pali</translation>
+      <translation>Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>tayland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
-      <translation type="unfinished">Urdu</translation>
+      <translation>Urdu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zulus</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Çeh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Golland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
-      <translation type="unfinished">Ganda</translation>
+      <translation>Ganda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fula</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Grek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hauza</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Irland</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
-      <translation type="unfinished">Khmer</translation>
+      <translation>Khmer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
-      <translation type="unfinished">Kongo</translation>
+      <translation>Kongo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latyn</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malaý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
-      <translation type="unfinished">Maori</translation>
+      <translation>Maori</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
-      <translation type="unfinished">Nauru</translation>
+      <translation>Nauru</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
-      <translation type="unfinished">Oromo</translation>
+      <translation>Oromo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
-      <translation type="unfinished">Sango</translation>
+      <translation>Sango</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Şona</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Täjik</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
-      <translation type="unfinished">Tamil</translation>
+      <translation>Tamil</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
-      <translation type="unfinished">Tatar</translation>
+      <translation>Tatar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
-      <translation type="unfinished">Swati</translation>
+      <translation>Swati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
-      <translation type="unfinished">Tonga</translation>
+      <translation>Tonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Inupak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Wenda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Özbek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Welş</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
-      <translation type="unfinished">Wolof</translation>
+      <translation>Möjek</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Kosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>italiyan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Rito-Roman</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Jonka</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
-      <translation type="unfinished">Kannada</translation>
+      <translation>Kannada</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Demirgazyk Ndbele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abhaz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Gyrgyz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Şotland gall</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Alban</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Latyş</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malaý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kürt</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bolgar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
-      <translation type="unfinished">Lingala</translation>
+      <translation>Lingala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Malta</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Marati</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arap</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Bask</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Awar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Bengal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aýmar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
-      <translation type="unfinished">Breton</translation>
+      <translation>Breton</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Daniýa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Diweli</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Luba-katanga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
-      <translation type="unfinished">Fijian</translation>
+      <translation>Fijian</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Wenger</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Fransuz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Nemes</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Mongol</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Yewreý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
-      <translation type="unfinished">Herero</translation>
+      <translation>Herero</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Lýuksemburg</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
-      <translation type="unfinished">Kanuri</translation>
+      <translation>Kanuri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Gazak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuýu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Koreý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Nawaho</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
+      <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ojibwe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Puştu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Polýak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Okkitan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
-      <translation type="unfinished">Sindhi</translation>
+      <translation>Sindhi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slowak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
-      <translation type="unfinished">Somali</translation>
+      <translation>Somali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Telügü</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
-      <translation type="unfinished">Tsonga</translation>
+      <translation>Tsonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
-      <translation type="unfinished">Tswana</translation>
+      <translation>Tswana</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uýgur</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Singala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Ýoruba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Žuang</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumyn</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Endoneziýa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
-      <translation type="unfinished">Panjabi</translation>
+      <translation>Panjabi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Günorta Soto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsika</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <translation>Esperanto</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Pars (Parsça)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slowen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Günbatar Friz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Taiti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malagazi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galisiýa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerbeýjan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amhar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
-      <translation type="unfinished">Sanskrit</translation>
+      <translation>Sanskrit</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Ýapon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukrain</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
-      <translation type="unfinished">Bambara</translation>
+      <translation>Bambara</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
-      <translation type="unfinished">Kalaallisut</translation>
+      <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Başkir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Belarus</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Kaşmir</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Hindi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Keçua</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Ýawa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Awest</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinýarwanda</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
-      <translation type="unfinished">Afrikaans</translation>
+      <translation>Afrika</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bihari</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Ermeni</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Norwegiýa bokmal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Horwat</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Boşnýak</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Interlingwa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Interlingwe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Serb</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Birma</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Rus</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburg</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norweg</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Çeçen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Hytay</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Çuvaş</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
-      <translation type="unfinished">Sinhala</translation>
+      <translation>Sinhala</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Ispan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Korniş</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
-      <translation type="unfinished">Tagalog</translation>
+      <translation>Tagalog</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Eston</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
-      <translation type="unfinished">Swahili</translation>
+      <translation>Suwaýili</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Şwed</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibet</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vetnam</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Makedon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portugal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Türki</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Türkmen</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Gujarat</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Island</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Inuktikut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Iňlis</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gruzin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Gadymy slawýan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Friz</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Fin</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Wolapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Walon</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Kwanýama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marşal</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Demirgazyk Sami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Gaiti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Çamoro</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Norwegiýa Ninorsk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
-      <translation type="unfinished">Guarani</translation>
+      <translation>Guarani</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Günorta Ndbele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Çiçewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litwanýa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Syçuan Ýi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinýa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Idiş</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Adaty Hytaý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Ýönekeýleşdirlen Hytaý</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Başgalar</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Başga ýönekeýleşdirlen Hytaý şiweleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Başga adaty Hytaý şiweleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Başga Gündogar-Ýewropa dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Başga Günbatar-Ýewropa dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Başga rus dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Başga ýapon dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Başga baltik dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Başga grek dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Başga koreýa dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Başga türki dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Başga tailand dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Tamazigt</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Ložban</translation>
     </message>
@@ -2516,215 +2489,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Fransuz</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Ispan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Belarus</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bolgar</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Çeh</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Nemes</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Grek</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Fin</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>Italýan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japaneseaponlar</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Koreýçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litwa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>Makedoniýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Gollandiýaly</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Polýak</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portugaliýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Rus</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slowakiýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Alban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Serb (kiril)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Şwesiýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Türk</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukrain</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Hytaý ýönekeýleşdirildi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Hytaý adaty</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Wýetnamly</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portugaliýa, Braziliýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Pars</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Ispan, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hindi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>German, Şweýsariýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Ispan, Boliwiýa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Täjik</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Keçua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aýmara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arap, Saud Arabystany</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Türkmenler</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Aragatnaşyk</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Iňlis</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Sözlük ýüklenende ýalňyşlyk çykdy</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <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>
@@ -2740,702 +2713,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>Favo we dessurlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Ählisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Yza gaýt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 sözlükler, %2 makalalar, %3 sözler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Redaktirle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Faýl</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Kömek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
-      <translation type="unfinished">Search</translation>
+      <translation>Gözlemek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Çyk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Ýalňyş</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Programadan çyk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Panel içine buk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Makalany ýatda saklap bolmady %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Ulalt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Sözlükler...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Maglumat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
-      <translation type="unfinished">&amp;Forum</translation>
+      <translation>&amp; Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Çap et</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Makalany ýatda sakla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Makalany şular ýaly ýatda sakla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl + P.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl + Q.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Penjireleri paneliň içinde gizlemek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Sahypany &amp;sazla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Baş sahypa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Täze neşir elýeterli</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Tap:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Kiçelt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Görkez &amp;Esasy penjiräni</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>GoldenDict-ng barada</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Ýükläp almak</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Sahypany sazlamak</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Tap şu ýerde:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normal ululygy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
-      <translation type="unfinished">Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</translation>
+      <translation>“Hotkeys” -e gözegçilik mehanizmini işe girizip bilmedi.&lt;br&gt;XServer-de RECORD giňeltmesiniň açykdygyna göz ýetiriň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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">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>
+      <translation>“GoldenDict” -iň &lt;b&gt;%1&lt;/b&gt; wersiýasyny indi göçürip alyp bilersiňiz.&lt;br&gt;Göçürip almak sahypasyna girmek üçin &lt;b&gt;ýüklemek&lt;/b&gt; basyň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl + F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl + F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Ýüklenip alynýar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(atsyz)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Saýlamalar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Hoş geldiňiz!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Sözi eşitdirmek (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Ýatda sakla</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Şu neşiri böküp geç</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Ugrukdyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Makalany çap et</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Printer ýok. Ilki bilen gurna ony.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Görnüş</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Geçmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Arassala</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Ulalt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Sözleri ulalt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Sözleri kiçelt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Sözleriň normal ululygy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Şu wagtky wkladkany ýap</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Ähli açyk wkladkalary ýap</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Şu wagtky açylandan daşary ähli başga wkladkalary ýap</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Açyk wkladkalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Täze wkladka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl + T.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Konfigurasiýa bukjasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menýu zolagy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Sözlüklerden tapylan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Tabhli bellikleri Halanýanlara goşuň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>DUNDURYŞ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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">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</translation>
+      <translation>Sözlüklerde gözlemek üçin setir. &apos;*&apos;, &apos;?&apos; we &apos;[...]&apos; nyşan toplumyna rugsat berilýär.
+ &apos;*&apos;, &apos;tapmak üçin?&apos;, &apos;[&apos;, &apos;]&apos; nyşan &apos;\ *&apos;, &apos;\ ulanýar? Degişlilikde&apos;, &apos;\ [&apos;, &apos;\]&apos;</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Açyk wkladkalaryň sanawy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Häzirki goýmany Halanýanlardan aýyryň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <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="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl + M.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Görkez</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Eksport</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Gizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Geçmişi faýl görnüşinde eksport et</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tekst faýllary (*.txt);;Ähli faýllar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Geşmiş eksport edildi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Eksport ýalnyşlygy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl + H.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
-      <translation type="unfinished">&amp;Import</translation>
+      <translation>&amp; Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Faýldan geçmişi import et</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Import ýalňyşlygy: faýlda nädogry maglumatlar bar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Geçmiş import edildi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Import ýalňyşlygy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Halanýanlary faýl etmek üçin eksport ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>XML faýllary (* .xml) ;; fileshli faýllar (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Halanýanlar eksporty doly</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Saýlanan sanaw hökmünde faýl üçin halanýanlary eksport ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Halanýanlary faýldan import ediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML faýllary (* .xml) ;; Txt faýllary (* .txt) ;; fileshli faýllar (*. *)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Halanýanlar importy doly</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Maglumatlary derňemekde ýalňyşlyk</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Sözlük sözleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Sözlügiň bukjasyny aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Sözlügi üýtget</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Indi doly tekst gözlegi üçin indeksirleme: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Halanýanlardan &quot;%1&quot; söz sözüni aýyryň?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Gözleg tagtasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Nawigasiýa tagtasyndan netijeler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Saýlaw we bellikler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Çap edilen &amp;görnüşi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Faýllary täzeden gözden geçirmek</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Täze wkladka</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Mydama ýokarda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Mydama ýokarda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl + O.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menýu düwmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
-      <translation type="unfinished">Search in page</translation>
+      <translation>Sahypada gözläň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl + F.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Doly tekst gözlegi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl + Shift + F.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>GoldenDict salgylanmasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Görkez</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
-      <translation type="unfinished">Export</translation>
+      <translation>Eksport</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Import</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Goş</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Halanýanlara häzirki goýmany goşuň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl + E.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Sanaw üçin eksport</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Sözlük &amp;tagtasynda atlary görkez</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Kiçi nyşanlary görkez &amp;gurallar-tagtasynda</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Nawigasiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Skaneri açyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Makala, taýýar (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Makala, HTML diňe (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Makala ýatda saklanýar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Makalany doly ýazdyryň</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <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="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Geçmiş tagtasy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API elýeterli edilmedik</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <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="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation> %1-den/dan makalany ýükläp bolmady, sebäbi: %2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML analizinde ýalňyşlyk: %1 at %2,%3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Işledilen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Nyşan</translation>
     </message>
@@ -3497,101 +3470,101 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Okamak üçin ses buferini açyp bolmaýar.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Forma</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Işjeň däl (öçürilen) sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Ady:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Jemi makala sany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Terjime edýär şu dilden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Terjime edýär şu dile:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Jemi söz sany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Sözlügiň tertibi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Şu sözlügiň düzümine girýän faýlllar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Sözlük barada maglumat</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Häsiýetnama:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ady boýunça sortla</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Dili boýunça sorla</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
-      <translation type="unfinished">Dictionary headwords</translation>
+      <translation>Sözlük sözleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
-      <translation type="unfinished">Dictionaries active: %1, inactive: %2</translation>
+      <translation>Sözlükler işjeň: %1, hereketsiz: %2</translation>
     </message>
   </context>
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Ýol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Rekursiw</translation>
     </message>
@@ -3599,918 +3572,957 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Sistema panelinden başlat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Çep Shift diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Win / Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Sistema paneli nyşany görkez</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Öy eyesi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
-      <translation type="unfinished">Port:</translation>
+      <translation>Port:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tip:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Ulanyjy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Skan popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, opening a new tab switches to it immediately.
-With this on however, new tabs will be opened without
-switching to them.</translation>
+      <translation>Adatça, täze tab açmak derrew oňa geçýär.
+Şeýle-de bolsa, täze tablar
+e geçmezden açylar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proksi serweri ulan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows düwme ýa-da Meta düwme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Baş penjirede sözleriň awto-aýdylyşy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Sistema bilen bile b</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Çep Alt diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Wkladkaly agdaryp seretmek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Sag Shift diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
-      <translation type="unfinished">With this on, an attempt to close main window would hide it instead of closing
-the application.</translation>
+      <translation>Munuň bilen esasy penjiräni ýapmak synanyşygy,
+programmany ýapmagyň ýerine ony gizlärdi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
-      <translation type="unfinished">&amp;Audio</translation>
+      <translation>&amp; Audio</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
-      <translation type="unfinished">Enable if you wish to use a proxy server
-for all program&apos;s network requests.</translation>
+      <translation>Proksi serwerini ulanmak isleseňiz açyň
+ähli programma we ulgam islegleri üçin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Interfeýs dili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Çep Ctrl diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Yzynda täze wkladkalary aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Baglanyşyk ulgamy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Sag Alt diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Sag Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Çep Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">With this enabled, the popup would only show up if all chosen keys are
-in the pressed state when the word selection changes.</translation>
+      <translation>Bu açyk bolsa, açylan söz saýlama sözi üýtgän mahaly saýlanan düwmeleriň
+basylan ýagdaýynda görkeziler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Skan popup-dan sözleriň awto-aýdylyşy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Täze wkladkalary şu wagtky wkladkadan soň aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <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>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt düwmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Programmanyň täze neşirlerini wagtal-wagtal barlap dur</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">With this on, new tabs are opened just after the
-current, active one. Otherwise they are added to
-be the last ones.</translation>
+      <translation>Munuň bilen täze 0 goýma,
+tokdan soň işjeň açylýar. Otherwiseogsam iň soňkylary
+-e goşulýar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Sistema panelinden ýap</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Sistemanyň başlangyç bahalary</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
-      <translation type="unfinished">When enabled, an icon appears in the system tray area which can be used
-to open main window and perform other tasks.</translation>
+      <translation>Işledilende, esasy penjire açmak we beýleki meseleleri ýerine ýetirmek üçin
+ulanyp boljak ulgam lýuboýynda bir nyşan peýda bolýar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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.</translation>
+      <translation>Bu açyk bolsa, programma GoldenDict
+-iň täze, täzelenen wersiýasyny göçürip alyp bolýandygyny wagtal-wagtal
+barlaýar. Eger şeýle bolsa,
+programma ulanyja bu barada habar berýär we
+göçürip alyş sahypasyny açmagy teklip edýär.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Başlangyç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Parol:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Ilkibaşky ýagdaýy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Interfeýs</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Dili çalşmak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl düwmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Çep Alt </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Sag Alt diňe</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Saýlamalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Çep Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Sag Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Sag Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Gyzgyn düwmeler</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Skan ýüze çykarmany işledip başlat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
-      <translation type="unfinished">With this on, the application starts directly to system tray without showing
-its main window.</translation>
+      <translation>Şunuň bilen, programma esasy penjiresini
+görkezmän göni ulgam lagasyna başlaýar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift düwmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Operasion ulgam açylandan soň, GoldenDict öz işini awtomat başlar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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>
+      <translation>Skaner açylýan re modeimiň deslapkydygyny ýa-da ýokdugyny saýlaýar. Barlanylsa,
+programma elmydama skananyň açylmagy bilen işjeň başlar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>“GoldenDict” -iň öz penjireleriniň birinde saýlama ýa-da gysga paneli açylanda açylma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>GoldenDict &amp; apos-yň öz saýlamalaryna we bufer çalşygyna ähmiýet bermäň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Içindäki ses goldawy arkaly ses faýllaryny oýnaň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Içerki pleýeri ulanyň:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Sesiň arka tarapyny saýlaň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Ses pleýer buýruk setirini giriziň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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.</translation>
+      <translation>Muny açmak, "GoldenDict" -iň gözleýän
+girmeýän mazmunyna (suratlara, ramkalara) rugsat bermezlik bilen mahabatlaryň
+blokirlär. Şol sebäpli käbir sahypa döwülse, muny öçürip görüň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Aýdyş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Oýnatmak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Daşky programmany ulan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Sözüň üstünde iki gezek basylanda ol terjime edilýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Normally, pressing ESC key moves focus to the translation line.
-With this on however, it will hide the main window.</translation>
+      <translation>Adatça, ESC düwmesini basmak ünsi terjime setirine gönükdirýär.
+Şeýle bolsa, esasy penjiräni gizlär.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC düwmesini basmak bilen baş penjire ýapylýar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">Select this option if you don&apos;t want to see the main tab bar when only a single tab is opened.</translation>
+      <translation>Diňe bir tab açylanda esasy goýma setirini görmek islemeýän bolsaňyz, bu opsiýany saýlaň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ýeke wkladkany gizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Kontekst menýu sözlükleriň çägi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Terjime edilen sözleri baş penjirä iber</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Açylýan penjire görkezmezden ozal baýdak penjiresini görkeziň, çykýan penjire görkezmek üçin baýdagy basyň. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Adatça bir baglanyşyga basmak, bir söze iki gezek basmak ýa-da makalada
+saýlamany gözlemek terjimesini ýükleýär we derrew şol bir sözlükden makala
+aýlaw aýlanýar. Bu opsiýany ýapmak bilen
+iň ýokarky sözlükden makala görkezilýär.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Maksatly makalany awtomatiki aýlaň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Makalanyň görkeziş stili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>UI-ni garaňkylyga öwüriň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Garaňky re .im</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Makalanyň görkeziş stilini garaňkylyga öwüriň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Garaňky okaýjy tertibi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU buýrugy: Iň soňky ulanylan sargyt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Skaner açylanda çalşylýan paneli üýtgediň. Üns beriň! Linux-da bolmasaňyz, muny elmydama işletmeli.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Paneli üýtgetmegi yzarlaň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Saýlawyň üýtgemegi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Selectedhli saýlanan düwmeler basylanda diňe saýlamany çözüň:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Söz saýlananda skaner baýdagyny görkeziň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Wagtyň yza süýşürilmegi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
-      <translation type="unfinished">System proxy</translation>
+      <translation>Ulgam proksi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
-      <translation type="unfinished">Custom proxy</translation>
+      <translation>Hususy proksi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
-      <translation type="unfinished">Custom settings</translation>
+      <translation>Omörite sazlamalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki birikmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http: //</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Paluba:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Model:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Söz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Sözlük meýdany ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Tekst</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Kesgitleme meýdany ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Jümle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Jümle meýdany (boş bolup biler) ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>GoldenDict-ng HTTP ady arkaly görkezme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Ulgam keş keşiniň iň uly ululygy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
-%1
-If set to 0 the network disk cache will be disabled.</translation>
+      <translation>GoldenDict-iň tor keşi tarapyndan iň köp disk ýeri
+% 1
+0-a gabat gelse, tor diski keşi ýapylar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Bu opsiýa açyk bolsa, GoldenDict
+çykyş wagtynda tor keşini diskden arassalaýar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Çykyşda tor keşini arassalaň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
-      <translation type="unfinished">Full-text search</translation>
+      <translation>Doly tekst gözlegi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
-      <translation type="unfinished">Allow full-text search for:</translation>
+      <translation>Doly tekst gözlegine rugsat beriň:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation type="unfinished">Don&apos;t search in dictionaries containing more than</translation>
+      <translation>Has köp zady öz içine alýan sözlüklerde gözlemäň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>makalalar (0 - çäksiz)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Has &amp;çylşyrymly</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Yzygiderli gözlegleriň dowamynda bir sözlük gollanma bilen ýykylan bolsa, indiki gözlegde ýykylar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Sessiýa ýykyldy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Paneli ulananyňyzda, täze setirden soň hemme zady aýyryň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Täze gözlegde, görünýän hem bolsa esasy ýa-da açylan penjire üns beriň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>Halanýanlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Halaýan aralygy halaýar. 0 Halanýanlar düzülse, diňe çykyş wagtynda ýatda saklanar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Önümleriň pozulmagynyň her bir amalyny tassyklamak üçin bu opsiýany açyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Harytlary pozmak üçin tassyklama</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Syçanjygyň üstünden, saýlama, bufer ýa-da buýruk setirinden esassyz uzyn giriş tekstini
+äsgermezlik etmek üçin bu opsiýany açyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Giriş sözlemlerinden has uzyn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Bu ululykdan has uzyn giriş sözlemleri hasaba alynmaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Makalalary gözläniňizde diakritikany äsgermezlik etmek üçin bu opsiýany açyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Gözleýän wagtyňyz diakritiklere ähmiýet bermäň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Goşmaça &amp;ýerlerini giňeldip görkez</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Makalalary kiçelt şundan köp - </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Gözleýän wagtyňyz dyngy belgilerine ähmiýet bermäň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Stardict, Wawilon we GLS sözlüklerinden sinonim sanawlary
+arkaly goşmaça makalalary gözlemek üçin bu opsiýany açyň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Sinonimler arkaly goşmaça gözleg</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>nyşanlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab arkaly wkladkalary MRU tertipde nawigasiýa edilýär</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Wawilon</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Geçmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Saklanma &amp;geçmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>makalalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Şuny aç eger-de sözleri bir gezek myşka bilen basyp saýlamak isleseň</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Sözleri bir gezek myşka bilen basyp saýlamak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Add-on stili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Geçmişiň maksimum sany:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Ýatda sakla her</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>minut</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Klassiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Häzirki zaman</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingoes</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Lingoes-Gök</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Positionerleşýän maglumatlar, Xapian sözüni gözlemek we NEAR operatory ulanmak üçin talap edilýär, ýöne maglumat bazasynyň göwrümi has uly bolar. Diňe täze gelýän sözlüklere degişlidir.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Positionerleşýän maglumatlar bilen indeks açyň</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Adaty şrift</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Monospace şrifti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif şrifti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif şrifti</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Daş görnüşi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Bu şriftler sözlükde görkezilen şriftler tapylmasa ulanylar.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Yza gaýdýan şriftler</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
-      <translation type="unfinished">Audio</translation>
+      <translation>Ses</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Düz tekst</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Prefiks gabat getirme</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Näbelli</translation>
     </message>
@@ -4518,17 +4530,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Hiç programma ady berilmedi.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Programma doňdy.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Programma %1 çykyş koduny çykardy.</translation>
     </message>
@@ -4536,27 +4548,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Işledilen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tip</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Komanda setiri</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Nyşan</translation>
     </message>
@@ -4564,99 +4576,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Makala ýüklenende ýalňyşlyk ýüze çykdy</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Makala dekodirlenen wagty ýalňyşlyk ýüze çykdy</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Awtorlyk hukugy: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Wersiýa: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Awtory: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>E-poçta: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>Ady: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>Sahypa: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>Sene: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Sözlük gözlemek programmasy.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Talap üçin söz ýa-da söz.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Düzediş habarlaryny konfigurasiýa bukjasyndaky gd_log.txt-a ýazdyryň.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Penjiräniň ýagdaýyny täzeden düzmek.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Tts-i öçüriň.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Esasy penjiräniň toparyny üýtgediň.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Açylýan topary üýtgediň.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Açylýan paneli açyň.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Wersiýa we diagnoz maglumatlary çap ediň.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Sözlük gözlegi/filtri  (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Gözlegi arassala</translation>
     </message>
@@ -4664,22 +4691,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>ÝALŇYŞLYK: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Çeşmäni ýatda saklamagyň ýalňyşlygy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Salgylanýan çeşmäni ýükläp almak bolmady.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ÄGÄ BOLUŇ %1</translation>
     </message>
@@ -4708,67 +4735,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt + S.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
-      <translation type="unfinished">Dialog</translation>
+      <translation>Dialog</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Sözi eşitdirmek (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Halanýanlara söz goşuň (Ctrl + E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Elmydama beýleki penjireleriň üstünde duruň</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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">Use this to pin down the window so it would stay on screen,
-could be resized or managed in other ways.</translation>
+      <translation>Penjiräni ekranda saklamak üçin ulanyň,
+ölçegini üýtgedip ýa-da başga usullar bilen dolandyryp bolar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Sözi baş penjirä iber (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>Alt + W.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Yza gaýt</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Öňe geç</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>DUNDURYŞ: %1</translation>
     </message>
   </context>
   <context>
@@ -4776,53 +4808,53 @@ could be resized or managed in other ways.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp; Öňki</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl + Shift + G.</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp; Indiki</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl + G.</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Hemmesini belläň</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Ýagdaýa bagly</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Tapmak:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Ýol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Nyşan</translation>
     </message>
@@ -4830,60 +4862,60 @@ could be resized or managed in other ways.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Faýllar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemalar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-şiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Wikipediýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Katakana ýapon bogunlaryň elipbiýi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Birtopar  audiofaýllardan sözlýkleri ýasamak üçin şu ýerde ýollaryny görkez:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Ýapon romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4894,83 +4926,83 @@ ISO 3602 boýunça standartlaşdyrlan.
 Entek GoldenDict-de edilmedik.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki) saýtlary:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Sesli bukjalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Islendik daşarky programmalar. Talap sözi bilen %GDWORD% setir çalşyrylar. Gözleg setirindäki tekst bilen %GDSEARCH% setir çalşyrylar. Parametrleriň ikisi hem üpjün edilmese, sözbaşy adaty giriş bilen üpjün ediler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Wikimedia France-iň bilelikdäki dil metbugat kitaphanasy &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;tarapyndan berlen bildirişler. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Lingua Libre-i işlediň</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 dil kody</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;“Forvo” -ny ulanmak häzirki wagtda API açaryny talap edýär, öz açaryňyzy almak üçin sahypada hasaba alyň.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Açaryňyzy alyň &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;şu ýerden&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Hiragana ýapon bogunlaryň elipbiýi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Omörite terjime</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Bu diňe gözleg sözleminde ulanylýar, her setirde transliterasiýa, nokatly belgili bölünýär. Mysal üçin, ae; æ, ulanyjylar maksat sözünde æ görkezmek üçin ae girizip bilerler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae; æ # bu mysal</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Transliterasiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4980,118 +5012,108 @@ Not implemented yet in GoldenDict.</source>
 Entek GoldenDict-de edilmedik.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Rus transliterasiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfologiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Özgertmek...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Mysallar: Iňlis dili üçin  &amp;quot;eng&amp;quot; , fransuz dili üçin &amp;quot;fra&amp;quot; &lt;br&gt;Elýeterli dilleriň doly sanawyny &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; 
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+tapyp bilersiňiz &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Hunspell/Myspell sözlükli bukjalar ýol:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Şu wagt &amp;gaýtadan skanerle</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Nemes transliterasiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Islendik websaýt %GDWORD% setiri soralýan söz bilen çalşyrylar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Goşmak...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Bukjany saýla</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Aýyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Websaýtlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Sözlük faýllary gözlemegiň ýollary:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Aýyrmagy tassykla</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Bogunlaryň elipbiýi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Bar bolan morfologiýa sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5104,94 +5126,94 @@ we ýalňyş ýazylan sözler üçin dogrylary hödürleýär.
 Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-şiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
-      <translation type="unfinished">DICT servers</translation>
+      <translation>DICT serwerleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
-      <translation type="unfinished">DICT servers:</translation>
+      <translation>DICT serwerleri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvo-dan aýdyşyny aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API açary:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Dil kodlary (otur bilen bölünen):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Grek transliterasiýa</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(ykjam/portable wersiýada elýeterli däl)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programmalar</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Belarus transliterasiýa</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Ýogsam, degişlilikde ulan %GD1251% -  CP1251 üçin, %GDISO1%...%GDISO16% -  ISO 8859-1...ISO 8859-16 üçin,
 %GDBIG5% - Big-5 üçin, %GDBIG5HKSCS% - Big5-HKSCS üçin, %GDGBK% - GBK and GB18030 üçin, %GDSHIFTJIS% - Shift-JIS üçin.</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Teksti gürläp aýtdyrmak</translation>
     </message>
@@ -5207,42 +5229,42 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Saýlanan ses gurallary:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Goş</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Aýyr</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Öňünden barlamak</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Bar bolan ses gurallary:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Öňünden görüljek tekst:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Öňünden görüljek teksti şu ýerden giriz.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Öňünden görmek</translation>
     </message>
@@ -5267,17 +5289,17 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
       <translation>TTS ses tapylanok.&lt;br&gt; TTS gurallaryň azyndan biri kompýuterde gurnalandygyny barlaň.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Saýlamalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Sesiň güýçlüligi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Derejesi:</translation>
     </message>
@@ -5285,12 +5307,12 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Sözlükleri ýa-da söz düzümleri gözlemek üçin söz giriz</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Gaçyrma</translation>
     </message>
@@ -5310,7 +5332,7 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Id</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5321,33 +5343,33 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Ady</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Işledilen</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Makalany &lt;iframe&gt; belligiň içinde baglanyşyk hökmünde salyň</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>Baglanyşyk hökmünde</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Nyşan</translation>
     </message>
@@ -5355,17 +5377,9 @@ Laýyk gelýän sözlükleri degişli toparlaryň aşagyna goşup ulan.</transla
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Käbir sözlükleri tapyp bolmady.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>ÄGÄ BOLUŇ %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/tr_TR.ts b/locale/tr_TR.ts
index 2e315830..2c444308 100644
--- a/locale/tr_TR.ts
+++ b/locale/tr_TR.ts
@@ -4,49 +4,44 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Hakkında</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict, sözlük arama programı, sürüm </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>GNU GPLv3 veya daha üst lisanslıdır</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Sürüm bilgisini kopyala</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Sözlük listesini kopyala</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Teşekkürler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Bilinmeyen]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>%1 Qt baz alınmıştır (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <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>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Qt %1 göre (%2, %3)</translation>
     </message>
   </context>
   <context>
@@ -54,24 +49,24 @@
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: kelime olmadan kart oluşturulamaz</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki araması: AnkiConnect etkin değil.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: anki'ye gönderi başarısız oldu</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: anki başarısına gönder</translation>
     </message>
   </context>
   <context>
@@ -79,18 +74,18 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>İncelemek</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Sonra başka bir uygulamada aramak istediğiniz kelimenin üzerine imleci durdurun ve bir pencere açılır.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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;Ekranda Kelime Yakala ile Çalışma&lt;/h3&gt;Diğer aktif uygulamalarda kelimeleri aramak için,
 ilk önce &lt;b&gt;Tercihler&lt;/b&gt;&apos;de &lt;i&gt;&quot;Ekranda Kelime Yakala Özelliğini&quot;&lt;/i&gt; etkinleştirmelisiniz ve daha sonra
@@ -98,47 +93,47 @@ yukarıda &apos;Ekranda Kelime Yakala&apos; simgesine tıklayarak veya Görev Ç
 tıklatarak seçimini değiştirebilirsiniz.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Maddeyi genişlet</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Maddeyi daralt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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; içinde &lt;b&gt;%1&lt;/b&gt; sözcüğü bulunamadı.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Ekranda Kelime Yakala ile Çalışma</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(başlıksız)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Hoşgeldiniz!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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>Başka bir uygulamada sözcük bakmak için farenizle istediğiniz herhangi bir kelimeyi (klavye tuşu ve fare ile çift tıklayarak veya okutarak) seçin ve sözcüğü açıklayan bir pencere açılacaktır.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>&lt;b&gt;%1&lt;/b&gt; grubunda hiçbir çeviri bulunamadı.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Grup &lt;b&gt;%2&lt;/b&gt;&lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; için çeviri bulunamadı .</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;GoldenDict&apos;e &lt;b&gt;Hoşgeldiniz&lt;/b&gt;!&lt;/h3&gt;&lt;p&gt;Program ile çalışmaya başlamak için, 
 &lt;b&gt;Düzen|Sözlükler&lt;/b&gt; menüsünden, çeşitli Wikipedia siteleri ya da diğer kaynaklardan sözlük dosyaları 
@@ -154,7 +149,7 @@ href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;web sitesinden&lt;/
 GPLv3 veya daha üst lisanslıdır.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(resim)</translation>
     </message>
@@ -162,42 +157,42 @@ GPLv3 veya daha üst lisanslıdır.</translation>
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Maddeyi genişlet</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation> </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Maddeyi daralt</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Yeni bir Anki notu oluştur</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Sorgulama hatası: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Benzer kelimeler: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Bileşik ifadeler:</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Ayrı kelimeler:</translation>
     </message>
@@ -205,204 +200,204 @@ GPLv3 veya daha üst lisanslıdır.</translation>
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Geçici dosya oluşturulması başarısız.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Ara &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>&quot;%1&quot; &amp;yeni sekmede ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>İlgili kaynak yok.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Kaynak, otomatik olarak açılamadı, elle deneyin: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>&quot;%2&quot; içinde %1 ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Mevcut Maddeyi Seç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Metin olarak kopyala</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Denetle</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation> &quot;%2&quot; içinde %1 yeni &amp;sekmede ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Bağlantıyı Yeni &amp;Sekmede Aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Bağlantıyı Harici &amp;Tarayıcıda Aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Kaynağı yenile</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Ses</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS Ses</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Resim</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
-      <translation type="unfinished">Video</translation>
+      <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
-      <translation type="unfinished">Video: %1</translation>
+      <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>&quot;%1&quot; sözlüğündeki tanım: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Tanım: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Referans gösterilen ses programı yok.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Linki aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Kaydet &amp;Yer İşareti &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>UYARI: Müzik Çalar: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>HATA %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Sesi kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Görüntüyü kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Görüntü dosyaları (*.bmp *.jpg *.png *.tif);;Tüm dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>&amp;Görüntüyü kaydet...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>ifade bulunamadı</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 / %2 maç</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>&amp;Sesi kaydet...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Giriş satırına &quot;%1&quot; gönder</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Tarihe &quot;%1&quot; ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Mevcut Makaleyi Anki'ye Gönder</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Seçili metni Anki'ye gönder</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Ses dosyaları (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tüm dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Ses dosyası çalınamadı:%1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Anki notu oluştur</translation>
     </message>
   </context>
   <context>
@@ -428,62 +423,62 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Çince Dönüşüm</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Basitleştirilmiş ve geleneksel Çince karakterler arasında dönüştürmeyi etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Çince &amp;Dönüşüm</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Basitleştirilmiş karakterlerden geleneksel (Tayvan değişkeni) karakterlere dönüştürmeyi etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>TC&apos;den SC&apos;ye (Tayvan varyantı)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Basitleştirilmiş karakterlerden geleneksel (Hong Kong değişken) karakterlere dönüştürmeyi etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>TC&apos;den SC&apos;ye (Hong Kong değişkeni)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Geleneksel karakterlerden basitleştirilmiş karakterlere dönüştürmeyi etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>TC&apos;den SC&apos;ye</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Geleneksel Çince (Tayvan değişkeni) dönüşümüyle basitleştirildi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Geleneksel Çince (Hong Kong değişkeni) dönüşümüyle basitleştirildi</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Basitleştirilmiş Çince dönüşümü için geleneksel</translation>
     </message>
@@ -491,30 +486,30 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>özel harf çevirisi</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Proxy kimlik doğrulaması gerekli</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Proxy üzerinden erişmek için bir Kullanıcı Adı ve Parola girmeniz gerekir</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Kullanıcı adı:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Parola:</translation>
     </message>
@@ -522,22 +517,22 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Biçim</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Grup simgesi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Kısayol:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Sık kullanılan klasörü:</translation>
     </message>
@@ -562,17 +557,17 @@ arasındaki farkı giderir)</translation>
       <translation>Resimler</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Bütün dosyalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Hata</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Belirtilen görüntü dosyası okunamadı.</translation>
     </message>
@@ -580,63 +575,63 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Onay</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Dil çiftlerine dayalı sözlük grupları oluşturmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>metadata.toml tabanlı bir grup grubu oluşturmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Grupları kaynak dile göre &quot;%1-&gt;&quot; ile birleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Grupları hedef dile göre birleştir &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Klasöre göre otomatik gruplama başarısız oldu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>%1 üst dizinine ulaşılamıyor.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>İçerdiği klasörlere göre bir dizi grup oluşturmak istediğinizden emin misiniz?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>İki taraflı çeviri grubunu &quot;%1-%2-%1&quot; yap</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>&quot;%1&quot; ile grupları birleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Sözlükler: </translation>
     </message>
@@ -649,201 +644,211 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Arama kipi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Bu eleman süzgeç dizesinin nasıl yorumlanacağını belirler</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Semboller işaretliyse süzgeçlemede durum dikkate alınacaktır</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Büyük/küçük harfleri eşleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Madde başlarını dosyaya aktarır</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Dışarı aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Yardım</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Tamam</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Madde başları listesine süzgeç uygulamak için bu düğmeye bas</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Uygula</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Herhangi bir süzgeç değişikliğinin işaretlenmesi durumunda madde başı listesine başvur</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Otomatik onayla</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Süzgeç:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Süzgeç dizesi (sabit dize, joker karakterler veya düzenli ifade)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Metin</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Joker karakterler</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>Düzenli İfade</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Başlıklar yükleniyor...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Bütün madde başları: %1 süzülmüş: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Madde başlarını dosyaya kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Metin dosyaları (*.txt);;Bütün dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Dışa aktarılan dosya açılamıyor</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Madde başlarını dışa aktar...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>İptal</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>İhracat işlemi kesintiye uğradı</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Dışa aktarma tamamlandı</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Toplam madde:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Bu dilden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Toplam sözcük:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Bu dile:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Klasörü aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Sözlüğü düzenle</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Bu sözlüğü oluşturan dosyalar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Açıklama:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Bütün ayrı madde başlarını göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Madde başları</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Sözlüğü komut ile düzenleyin:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Dizin dosya adı:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>İndeks klasörünü aç</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 Madde</translation>
     </message>
@@ -853,7 +858,7 @@ arasındaki farkı giderir)</translation>
     <message>
       <location filename="../src/dict/dictserver.cc" line="275"/>
       <source>Url: </source>
-      <translation type="unfinished">Url: </translation>
+      <translation>Url: </translation>
     </message>
     <message>
       <location filename="../src/dict/dictserver.cc" line="276"/>
@@ -874,44 +879,44 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Etkin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Veritabanları</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Stratejiler</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Simge</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Virgülle ayrılmış veritabanı listesi
 (boş dize veya &quot;*&quot; tüm veritabanlarıyla eşleşir)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Virgülle ayrılmış arama stratejileri listesi
@@ -921,37 +926,37 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Bütün sözlüklerle genişletilmiş menü...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Bu grubu düzenle</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Sözlük bilgisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Sözlük madde başları</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Sözlük klasörünü aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Sözlüğü düzenle</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Sözlük Çubuğu</translation>
     </message>
@@ -960,27 +965,27 @@ arasındaki farkı giderir)</translation>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Sözlükler</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Sözlükler</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Onayla</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>İptal</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Kaynaklar değişti</translation>
     </message>
@@ -991,12 +996,12 @@ arasındaki farkı giderir)</translation>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Gruplar</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Bazı kaynaklar değiştirildi. Değişiklikleri kabul etmek ister misiniz?</translation>
     </message>
@@ -1006,12 +1011,12 @@ arasındaki farkı giderir)</translation>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Önceki sayfa</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Sonraki Sayfa</translation>
     </message>
   </context>
   <context>
@@ -1025,75 +1030,55 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Tam metin araması</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Bütün kelimeler</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Düz metin</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Joker karakterler</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>Düzenli İfade</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Sorgulama kelimesi boş olamaz.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>AND OR +/- vb. gibi xapian arama sözdizimini destekler</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Sözcükler arasındaki en fazla uzaklık (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Varsayılan</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Sözlük başına en fazla madde başı (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Bulunan maddeler: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Şimdi dizinleniyor: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Yok</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>Arama metni en az </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ya da daha fazla sembolden oluşmalıdır</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Tam metin araması yapmaya sözlük yok</translation>
     </message>
@@ -1101,7 +1086,7 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Favoriler dosyasında hata</translation>
     </message>
@@ -1167,7 +1152,7 @@ arasındaki farkı giderir)</translation>
       <translation>bundan</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation> Bu hatanın gitmesi için Düzen|Sözlükler|Kaynaklar|Forvo seçeneğine gidip kendi API anahtarınızı uygulayın.</translation>
     </message>
@@ -1177,79 +1162,63 @@ arasındaki farkı giderir)</translation>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Öncesi</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Sonraki</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Büyük/küçük harfleri eşleştir</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Kip:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Kelime sırasını yoksay</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ayırıcı işaretleri yoksay</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Bulunan maddeler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Gruptaki kullanılabilir sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Dizinleme için bekleyin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Yardım</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Toplam:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Dizinlenen:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Şimdi dizinlenen: Yok</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>İptal</translation>
     </message>
@@ -1281,27 +1250,27 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Sil (Delete)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ekle (Insert)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>2. Sekme</translation>
     </message>
@@ -1341,12 +1310,12 @@ arasındaki farkı giderir)</translation>
       <translation>Gruba yeni bir ad verin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Kullanılabilir sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Grup &amp;ekle</translation>
     </message>
@@ -1356,42 +1325,42 @@ arasındaki farkı giderir)</translation>
       <translation>Grup ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Yeni sözlük grubu oluştur</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Dillere Göre Gruplandır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Klasör tabanlı gruplar oluşturun.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Klasörlere Göre Gruplandır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Meta verilere göre gruplandır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>Sözlükleri, grupların içine sürükleyin ve &amp;bırakın, yeniden sıralayın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Geçerli grubu yeniden adlandır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Geçerli grubu sil</translation>
     </message>
@@ -1401,43 +1370,43 @@ arasındaki farkı giderir)</translation>
       <translation>Yeni gruba bir ad koyun:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Bütün grupları kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Seçili sözlükleri gruptan kaldır (Delete)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Seçili sözlükleri gruba ekle (Insert)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>Grubu &amp;kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Gruplar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Grubu &amp; yeniden adlandır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Bütün sözlük gruplarını kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Dil tabanlı gruplar oluştur</translation>
     </message>
@@ -1460,12 +1429,12 @@ arasındaki farkı giderir)</translation>
       <translation>Geçmiş:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Geçmiş boyutu:En fazla %2 girdiden %1 tanesi</translation>
     </message>
@@ -1473,12 +1442,12 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Yazım önerileri: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 Morfoloji</translation>
     </message>
@@ -1486,12 +1455,12 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Etkin</translation>
     </message>
@@ -1499,1247 +1468,1251 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>indeksleme: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Sözlük Adı</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>GoldenDict-ng - Başlatılıyor</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Lütfen sözlükler dizinlenirken bekleyin</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Lütfen bekleyin...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>indeksleniyor...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Evece</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>İdoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Laoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Tivice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Afarca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Akanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Krice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>İgboca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Komice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Manksça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Palice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Tayca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Urduca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Zuluca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Çekçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Flemenkçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Gandaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Fulahça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Yunanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Hausaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Hintçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>İrlandaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Kimerce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Kongoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Latince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Malayca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Maorice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Nauruca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Oriyaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Oromoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Sangoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Şonaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Tacikçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Tamilce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Tatarca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Sıvatice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Tongaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>İnyupikçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Vendaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Özbekçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Galce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Volofça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
-      <translation type="unfinished">Xhosa</translation>
+      <translation>Xhosa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>İtalyanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Rätoromanisch</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
-      <translation type="unfinished">Dzongkha</translation>
+      <translation>Dzongkha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Kannadaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Kuzey Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Abhazca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Kırgızca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Kirundice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>İskoç Galcesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Arnavutça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Letonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Malayalamca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Kürtçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Bulgarca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Lingalaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Maltaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Maratice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Arapça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Baskça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Avarca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Biharice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Aymaraca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Bretonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Sundanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Danca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Divehice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Kiluba</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Fijice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Macarca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Fransızca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Almanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Moğolca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>İbranice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Hereroca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Lüksemburgca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Kanurice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Kazakça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Kikuyuca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Korece</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Navahoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
+      <translation>Ndonga</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Nepalce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Ocibvece</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Peştuca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Lehçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Samoaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Okitçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Sintçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Slovakça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Somalice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Teluguca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Çongaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Çıvanaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Uygurca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Sırp-Hırvatça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Yorubaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Çuangca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Rumence</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Endonezce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Pencapça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Güney Sotoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Korsikaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Esperantoca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Farsça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Slovence</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Batı Frizce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Aragonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Tahitice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Malgaşça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Galiççe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Azerice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Amharca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Sanskritçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Japonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Ukraynaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Bambaraca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
-      <translation type="unfinished">Kalaallisut</translation>
+      <translation>Kalaallisut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Başkurtça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Belarusça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Keşmirce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Sardince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
-      <translation type="unfinished">Hiri Motu</translation>
+      <translation>Hiri Motu</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Keçuvaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Bengalce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Cavaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Avestaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Kinyarvandaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Afrikanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Bislamaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Ermenice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Bokmol Norveççesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Hırvatça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Boşnakça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>İnterlinguaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>İnterlinguece</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Katalanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Sırpça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Burmaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Rusça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Limburgca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Norveççe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Çeçence</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Çince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Çuvaşça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Sinhalaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>İspanyolca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Kernevekçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Tagalogca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Assamca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Osetçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Estonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Svahilice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>İsveççe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Tibetçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Vietnamca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Makedonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Portekizce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Türkçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Türkmence</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Guceratça</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>İzlandaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Doğu Kanada İnuitçesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>İngilizce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Gürcüce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Kilise Slavcası</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Faroece</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Fince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Volapükçe</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Valonca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Oshivambo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Marşalca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Kuzey Laponca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Haitice</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Çamoruca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Nyorsk Norveççesi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Guaraníce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Süd-Ndebele</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
-      <translation type="unfinished">Chichewa</translation>
+      <translation>Çiçeva</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Litvanca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
-      <translation type="unfinished">Sichuan Yi</translation>
+      <translation>Siçuan Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Tigrinyaca</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Yidce</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Geleneksel Çince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Basitleştirilmiş Çince</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Diğer</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Diğer Basitleştirilmiş Çince lehçeleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Diğer Geleneksel Çince lehçeleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Diğer Doğu Avrupa dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Diğer Batı Avrupa dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Diğer Rus dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Diğer Japon dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Diğer Baltık dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Diğer Yunan dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Diğer Kore lehçeleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Diğer Türkçe lehçeleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Diğer Tay lehçeleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Berber Dilleri</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Lojban</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>Fransızca</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>İspanyol</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Belarusça</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Bulgarca</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>Çek</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Almanca</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>Yunan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Fince</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>İtalyan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Japonca</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Koreli</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litvanyalı</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>makedonca</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>Flemenkçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Lehçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>Portekizce</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>Rusça</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>Slovak</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>Arnavut</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Sırpça (Kiril)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>İsveççe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Türkçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>Ukrayna</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Basitleştirilmiş Çince</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Çin geleneği</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Vietnam</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Portekiz, Brezilya</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Farsça</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>İspanyol, Arjantin</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Hintçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Esperanto</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Alman, İsviçre</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>İspanyolca, Bolivya</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>Tacikçe</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>keçuva</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Arapça, Suudi Arabistan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>Türkmen</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>ara dil</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>İngilizce</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Sözlük yükleme hatası</translation>
     </message>
@@ -2747,7 +2720,7 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Yapılandırma dosyasında hata. Varsayılan ayarlarla devam edilsin mi?</translation>
     </message>
@@ -2755,702 +2728,702 @@ arasındaki farkı giderir)</translation>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>&amp;Favoriler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Hepsi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Önceki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 sözlük, %2 madde, %3 sözcük</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Düzenle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Dosya</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Yardım</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>Ç&amp;ıkış</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Hata</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Uygulamadan çık</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Sistem Tepsisine Küçült</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Kurtarılmamış yazı: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Yaklaştır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Sözlükler...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Hakkında</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
-      <translation type="unfinished">&amp;Forum</translation>
+      <translation>&amp;Forum</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Yazdır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>Maddeyi Ka&amp;ydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Maddeyi Farklı Kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Pencereyi sistem tepsisine küçültür</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>Sayfa Ya&amp;pısı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Anasayfa</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Yeni Sürüm Mevcut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Ara:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Uzaklaştır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>&amp;Ana Pencereyi Göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>GoldenDict-ng Hakkında</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>İndir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Sayfa Yapısı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Bunda Ara:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Normal Boyut</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <translation>Kısayol tuşlarını izleme mekanizması başlatılamadı. &lt;br&gt; XServer RECORD uzantısının açık olduğundan emin olun.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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, Sürüm &lt;b&gt;%1&lt;/b&gt; indirilmeye hazır.&lt;br&gt; &lt;b&gt;İndirme&lt;/b&gt; sayfasına ulaşmak için tıklayın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Yükleniyor...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(başlıksız)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Tercihler...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Hoşgeldiniz!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Sözcüğü Seslendir (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Maddeyi Kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Bu Sürümü Geç</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Sonraki</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Maddeyi Yazdır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Kullanılabilir yazıcı yok. Lütfen önce bir yazıcı yükleyin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Görünüm</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Geçmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Temizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Yaklaştır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Sözcükleri Büyüt</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Sözcükleri Küçült</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Normal Sözcük Boyutu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Bu Sekmeyi Kapat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Bütün sekmeleri kapat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Bu sekmenin dışındaki bütün sekmeleri kapat</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Açık Sekmeler</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Yeni Sekme</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Yapılandırma Klasörü</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Menü Çubuğu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Bu Sözlüklerde Bulundu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Bütün sekmeleri favorilere ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
-      <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">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</translation>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>UYARI: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
+      <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>Sözlüklerde aranacak dize. Joker karakterler &apos;*&apos;, &apos;?&apos; ve &apos;[...]&apos; sembol setlerine izin verilir.
+ &apos;*&apos;, &apos;bulmak için ?&apos;, &apos;[&apos;, &apos;]&apos; sembol &apos;\*&apos;, &apos;\?&apos;, &apos;\[&apos;, &apos;\]&apos; sırasıyla</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Sekmeler Listesini Aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Geçerli sekmeyi favorilerden kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Bir menü çubuğunu gizlemeyi seçtiniz. Geri göstermek için %1 kullanın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Dışa Aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>G&amp;izle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Geçmişi dosyaya aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Metin Dosyaları (*.txt);;Bütün Dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Geçmiş aktarması tamamlandı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Aktarma hatası: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>İçe aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Geçmişi dosyadan aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Aktarma hatası: dosyada geçersiz veri</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Geçmiş aktarması tamamlandı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Aktarma hatası: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Favorileri dosyaya aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML dosyaları (*.xml);;Bütün dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Favorilerin aktarılması tamamlandı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Favorileri düz metin olarak aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Favorileri dosyadan aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>XML dosyaları (*.xml);;Txt dosyaları (*.txt);;Tüm dosyalar (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Favorileri aktarma tamamlandı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Veri ayrıştırma hatası</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Sözlük bilgisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Sözlükteki madde başları</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Sözlük klasörünü açın</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Sözlüğü düzenle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Tam metin araması için dizinlenmekte: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>&quot;%1&quot; madde başı favorilerden çıkarılsın mı?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Arama Bölmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Sonuçlar Gezme Bölmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Favoriler Bölmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Yazdırma Önizlemesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Dosyaları Yeniden Tara</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Yeni Sekme</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Her zaman üstte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Her zaman üstte</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Menü Düğmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Sayfada ara</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Tam metin araması</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
-      <translation type="unfinished">GoldenDict reference</translation>
+      <translation>GoldenDict referansı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Dışa aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>İçe aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Geçerli sekmeyi favorilere ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Listeye aktar</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Sözlük Çubuğunda Adları Göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Araç Çubuklarında Küçük İkonlar Göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Gezinti</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Taramayı Etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Madde, Tam (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Madde, Yalnızca HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Madde kaydediliyor...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Makaleyi kaydetme tamamlandı</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Ana pencere her zaman üstte olacak şekilde ayarlanmıştır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Geçmiş Bölmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>Erişilebilirlik API&apos;si açılmadı</translation>
     </message>
@@ -3458,12 +3431,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Sözlük dosyası değiştirilmiş ya da bozulmuş</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>%1 kaynağından yükleme başarısız, nedeni:%2</translation>
     </message>
@@ -3471,7 +3444,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML ayrıştırma hatası: %1 içinde %2,%3</translation>
     </message>
@@ -3487,22 +3460,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Etkin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Simge</translation>
     </message>
@@ -3518,82 +3491,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
-      <translation type="unfinished">Form</translation>
+      <translation>Biçim</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Etkin olmayan (kapatılmış) sözlükler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Ad:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Toplam madde:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Bu dilden:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Bu dile:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Toplam sözcük:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <translation>İçindeki öğeleri sürükleyip bırakarak sırayı ayarlayın. Kullanımlarını devre dışı bırakmak için sözlükleri aktif olmayan gruba bırakın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Sözlük sırası:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Bu sözlüğü içeren dosyalar:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Sözlük bilgisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Açıklama:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Ada göre sırala</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Dillere göre sırala</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Sözlükteki madde başları</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Açık sözlükler: %1, kapalı sözlükler: %2</translation>
     </message>
@@ -3601,12 +3574,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Yol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Klasör Değişikliklerini İzle</translation>
     </message>
@@ -3614,69 +3587,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>Alternatif</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Görev çubuğunda başlat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Yalnızca Sol Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Kazan/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Görev Çubuğu simgesini etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
-      <translation type="unfinished">Host:</translation>
+      <translation>Ev sahibi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
-      <translation type="unfinished">Port:</translation>
+      <translation>Liman:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Vardiya</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Tür:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Kullanıcı:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Ekranda Kelime Yakala</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3684,138 +3655,138 @@ switching to them.</source>
 Bu seçenekleyse, yeni sekmeler açıldığında hemen o sekmeye geçilmeyecek.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Proxy sunucusu kullan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Aşağıdaki kısayolu panodan bir kelime çevirmek için kullanın:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows tuşu yada Veri tuşu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Ana penceredeki kelimeleri otomatik telaffuz et</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Sistem ile başlat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Yalnızca Sol Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Sekmeli dolaşma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Yalnızca Sağ Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Bu açık durumdayken, ana pencereyi kapatma denemesi, uygulamayı kapatmak
 yerine onu gizler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Ses</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Eğer tüm programın ağ istekleri için bir
 proxy sunucusu kullanmak istiyorsanız etkinleştirin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Arayüz dili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Yalnızca Sol Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Yeni sekmeleri arkaplanda aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Ağ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Yalnızca Sağ Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Sağ Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Sol Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Bu seçenek açıkken, yalnızca seçilen bütün düğmeler basılı durumdayken Açılır Pencere&apos;de gösterecektir. 
 Aksi halde fare, sözcüğün üzerine geldiğinde çeviri yapılır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Ekranda Kelime Yakalarken kelimeleri otomatik seslendir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Geçerli sekmeden sonra yeni sekme aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Dil değişikliğini tamamlamak için programı yeniden başlatın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt düğmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Düzenli olarak yeni sürümleri kontrol et</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3823,25 +3794,24 @@ be the last ones.</source>
 Aksi takdirde sekmelerin sonuna eklenecektir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Kapat ve görev çubuğuna yerleş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Sistem varsayılanı</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Etkinleştirildiğinde, ana pencereyi açın, diğer görevleri gerçekleştirmek
 ve kullanabilmek için sistem tepsisinde bir simge belirir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3852,675 +3822,717 @@ Yeni sürüm varsa GoldenDict kullanıcıyı bilgilendirir,
 ve muhtemelen indirme sayfasını açar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Başlangıç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Şifre:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Varsayılan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Arayüz</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Dili Değiştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctrl düğmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Aşağıdaki kısayolu ana pencereyi göstermek ya da gizlemek için kullanın:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Sol Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Yalnızca Sağ Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Tercihler</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Sol Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Sağ Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>The hotkeys are global and work from any program and within any context as long as GoldenDict is running in background.</source>
       <translation>Klavye kısayolları geneldir ve GoldenDict arka planda çalışıyorsa tüm işletim sistemi kapsamında çalışmaktadır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Sağ Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Kısayol tuşu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Ekranda Kelime Yakala&apos;mayı açık olarak başlat</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Bu seçenekle, uygulama ana penceresini göstermeden, doğrudan sistem çubuğu&apos;nda başlar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift düğmesi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>GoldenDict-ng bilgisayarın her açılışında kendiliğinden başlar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Ekranda kelime yakala kipinin öntanımlı olarak etkin olup olmadığını gösterir.
 Etkinse, program her zaman aktif kip ile başlar.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>GoldenDict&apos;kendi pencerelerinden birinde seçim veya pano değiştiğinde açılır pencere gösterme</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>GoldenDict'in kendi seçimini ve pano değişikliklerini yoksay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Yerleşik ses desteği aracılığıyla ses dosyalarını oynatın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Dahili oynatıcı kullan:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Ses arka ucunu seçin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Ses çalar komut satırına girin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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">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.</translation>
+      <translation>Bunu etkinleştirmek, GoldenDict'in göz attığınız siteden
+kaynaklanmayan içeriğe (resimler, çerçeveler) izin vermeyerek çoğu reklamı
+engellemesini sağlar. Bazı siteler bu nedenle bozulursa, bunu devre dışı bırakmayı deneyin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>İçeriğin diğer sitelerden yüklenmesine izin verme (çoğu reklamı gizler)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Söyleniş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Oynatma</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Harici program kullanın:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Çift tıklandığında sözcüğü çevirir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Ses dosyalarını oynatmak için harici bir program kullan</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>Normalde, ESC tuşuna basarak odak çeviri satırına geçer.
 Bununla birlikte ilgili ana pencere gizlenmiş olacaktır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC düğmesi ana pencereyi gizler</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Yalnızca tek bir sekme açtığınızda ana sekme çubuğunun görmek istemiyorsanız bu seçeneği seçin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Tek sekmeyi gizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
-      <translation type="unfinished">Adjust this value to avoid huge context menus.</translation>
+      <translation>Büyük bağlam menülerinden kaçınmak için bu değeri ayarlayın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
-      <translation type="unfinished">Context menu dictionaries limit:</translation>
+      <translation>Bağlam menüsü sözlükleri sınırı:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Ana pencereye çevrilmiş kelime göndermek yerine açılır pencerede göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Ana pencereye çevrilmiş kelime gönder</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Açılır pencereyi göstermeden önce bir bayrak penceresi gösterin, açılır pencereyi göstermek için bayrağa tıklayın. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Normalde, bir bağlantıya tıklamak, bir kelimeye çift tıklamak veya bir makalede
+seçim aramak çeviriyi yükler ve neredeyse aynı sözlükten
+makaleye kaydırır. Ancak bu seçenek kapalıyken
+, en üstteki sözlükteki makale gösterilir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Hedef makaleye otomatik olarak kaydır</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Makale Görüntüleme stili:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Kullanıcı arayüzünü karanlığa çevirin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Karanlık Mod</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Makale görüntüleme stilini karartın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Karanlık Okuyucu Modu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>MRU sırası: En son kullanılan sıra.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Tarama etkinleştirildiğinde pano değişikliklerini izleyin. Fark etme! Linux'ta olmadığınız sürece bunu her zaman etkinleştirmelisiniz.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Pano değişikliğini izle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Seçim değişikliğini izle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Yalnızca tüm seçili tuşlar basılı tutulduğunda teyel seçimi:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Kelime seçildiğinde tarama bayrağını göster</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Gecikme süresi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Sistem vekil sunucusu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Özel vekil sunucusu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Özel ayarlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Anki Bağlantı</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Güverte:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>modeli:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Kelime</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Kelime alanı...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Metin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>tanım alanı...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Cümle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Cümle alanı (boş olabilir)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
-      <translation type="unfinished">Some sites detect GoldenDict via HTTP headers and block the requests.
-Enable this option to workaround the problem.</translation>
+      <translation>Bazı siteler GoldenDict'i HTTP başlıkları aracılığıyla algılar ve istekleri engeller.
+Sorunu çözmek için bu seçeneği etkinleştirin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
-      <translation type="unfinished">Do not identify GoldenDict in HTTP headers</translation>
+      <translation>GoldenDict'i HTTP başlıklarında tanımlamayın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Maksimum ağ önbelleği boyutu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Goldendict'in ağ önbelleğinin kapladığı maksimum disk alanı
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+0 olarak ayarlanırsa, ağ disk önbelleği devre dışı bırakılır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Bu seçenek etkinleştirildiğinde, GoldenDict
+çıkış sırasında ağ önbelleğini diskten temizler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Çıkışta ağ önbelleğini temizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Tam metin araması</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Tam metin aramaya izin ver:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>Daha fazlasını içeren sözlüklerde arama yapılmasın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
-      <translation type="unfinished">articles (0 - unlimited)</translation>
+      <translation>makaleler (0 - sınırsız)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>Geli&amp;şmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Art arda yapılan aramalarda, bir sözlük manuel olarak daraltılırsa, bir sonraki aramada da daraltılmış olarak kalır.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>oturum çöküşü</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Pano kullanırken, yeni satırdan sonraki her şeyi soyun</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Yeni bir aramada, görünür olsa bile ana veya açılır pencereye odaklanın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Favoriler</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Favori kaydetme aralığı. 0 olarak ayarlanırsa Favoriler yalnızca çıkış sırasında kaydedilecektir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Her öğe silme işlemini onaylamak için bu seçeneği açın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Öğelerin silinmesi için onay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Fareyle üzerine gelindiğinde, seçimde, panoda veya komut satırında yapılan makul olmayan uzun giriş metni
+yoksaymak için bu seçeneği açın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Şundan daha uzun giriş cümlelerini yoksay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Bu boyuttan daha uzun giriş cümleleri göz ardı edilecek</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Makaleleri ararken aksanları yoksaymak için bu seçeneği etkinleştirin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Arama yaparken aksanları yoksay</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
-      <translation type="unfinished">Turn this option on to always expand optional parts of articles</translation>
+      <translation>Makalelerin isteğe bağlı bölümlerini her zaman genişletmek için bu seçeneği etkinleştirin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
-      <translation type="unfinished">Expand optional &amp;parts</translation>
+      <translation>İsteğe bağlı &amp;parçaları genişletin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
-      <translation type="unfinished">Select this option to automatic collapse big articles</translation>
+      <translation>Büyük makaleleri otomatik olarak daraltmak için bu seçeneği belirleyin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
-      <translation type="unfinished">Collapse articles more than</translation>
+      <translation>Şundan fazla makaleyi daralt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Bu ölçüden daha uzun maddeler daraltılacak</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Arama yaparken noktalama işaretlerini dikkate almayın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Stardict, Babylon ve GLS sözlüklerinden
+eşanlamlı listeleri aracılığıyla ekstra makale aramasını etkinleştirmek için bu seçeneği açın</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Eş anlamlı sözcüklerle ek arama</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>semboller</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
-      <translation type="unfinished">Ctrl-Tab navigates tabs in MRU order</translation>
+      <translation>Ctrl-Tab sekmelerde MRU sırasına göre gezinir</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Babil</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Geçmiş</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Tercüme edilen kelimelerin geçmişini saklamak için bu seçeneği aç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Geçmişi depola</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Maddeler</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
-      <translation type="unfinished">Turn this option on if you want to select words by single mouse click</translation>
+      <translation>Tek fare tıklamasıyla kelimeleri seçmek istiyorsanız bu seçeneği açın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Sözcüğü tek tıkla seç</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Eklenti biçimi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Geçmişte tutulacak en fazla girdi sayısını girin</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Azami geçmiş boyutu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
-      <translation type="unfinished">History saving interval. If set to 0 history will be saved only during exit.</translation>
+      <translation>Tarih kaydetme aralığı. 0 olarak ayarlanırsa, geçmiş yalnızca çıkış sırasında kaydedilir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Hepsini kaydet</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>dakika</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
+      <translation>Klasik</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
+      <translation>Modern</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
+      <translation>Lingolar</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Lingoes-Mavi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Xapian'ın ifade arama ve NEAR operatörünü kullanmak için konum bilgisi gereklidir, ancak veritabanı boyutu çok daha büyük olacaktır. Yalnızca yeni gelen sözlükler için geçerlidir.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Konum bilgisi içeren dizini etkinleştir</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Standart Yazı Tipi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Tek Aralıklı Yazı Tipi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Serif Yazı Tipi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Sans-serif Yazı Tipi</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Dış görünüş</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Bu yazı tipleri, bir sözlük tarafından belirtilen yazı tipleri bulunamadığında uygulanacaktır.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Yedek Yazı Tipleri</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Ses</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Düz Metin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Önek Eşleşmesi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Bilinmeyen</translation>
     </message>
@@ -4528,17 +4540,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Hiçbir program ismi verilmedi.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Program çöktü.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Program %1 çıkış kodu verdi.</translation>
     </message>
@@ -4546,27 +4558,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Etkin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Tür</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Komut Satırı</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Simge</translation>
     </message>
@@ -4574,99 +4586,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Madde yüklenme hatası</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
-      <translation type="unfinished">Article decoding error</translation>
+      <translation>Makale çözme hatası</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Telif: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Sürüm: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Yazar: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>E-posta: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Başlık</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Ağ sitesi</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Tarih:%1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Bir sözlük arama programı.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Sorgulanacak kelime veya cümle.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Hata ayıklama mesajlarını yapılandırma klasöründeki gd_log.txt dosyasına kaydedin.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Pencere durumunu sıfırla.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>tts'yi devre dışı bırak</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Ana pencerenin grubunu değiştirin.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Açılır pencere grubunu değiştirin.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Tarama açılır penceresini aç / kapat.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Sürümü ve teşhis bilgilerini yazdırın.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Sözlük arama/süzgeç (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Aramayı Temizle</translation>
     </message>
@@ -4674,22 +4701,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>HATA: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Kaynak kaydetme hatası: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Başvurulan kaynak indirilemedi.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>UYARI: %1</translation>
     </message>
@@ -4718,67 +4745,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>İletişim</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Sözcüğü Seslendir (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Favorilere kelime ekle (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Sözlükler Çubuğu&apos;nu Göster/Gizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Her zaman bütün diğer pencerelerin üstünde dur</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
       <translation>Bu ekranda kalır ve böylece bu pencere, sabitlenebilir.
 Yeniden boyutlandırma, ya da başka bir şekilde yönetilebilir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Sözcüğü ana pencereye gönder (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
-      <translation type="unfinished">Alt+W</translation>
+      <translation>alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Önceki</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Sonraki</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>UYARI: %1</translation>
     </message>
   </context>
   <context>
@@ -4786,53 +4818,53 @@ Yeniden boyutlandırma, ya da başka bir şekilde yönetilebilir.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Öncesi</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Sonraki</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>&amp;tümünü vurgula</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Harfe duyarlı</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Bulmak:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Yol</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Simge</translation>
     </message>
@@ -4840,60 +4872,60 @@ Yeniden boyutlandırma, ya da başka bir şekilde yönetilebilir.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Dosyalar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Sistemler:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Listeden &lt;b&gt;%1 &lt;/b&gt; sitesi kaldırılsın mı?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Vikipedi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Japon Katakana hece yazısı</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Ses dosyalarının dizinlerini buraya ekleyin:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Listeden &lt;b&gt;%1 &lt;/b&gt; dizini kaldırılsın mı?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Japonca Romaji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4904,83 +4936,83 @@ ISO 3602 gibi standart
 Henüz GoldenDict uygulanmadı.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Vikipedia (MediaWiki) Siteleri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Ses Dizinleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Herhangi bir harici program. %GDWORD% dizesi, sorgu sözcüğüyle değiştirilecektir. Bir dize %GDSEARCH% arama çubuğundaki metinle değiştirilecektir. Her iki parametre de sağlanmazsa, ana sözcük standart girdiye beslenir.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>Serbest Dil</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Telaffuz &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;tarafından sağlanmıştır, Wikimedia Fransa'nın işbirliğine dayalı bir dilbilimsel ortam kitaplığı. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Lingua Libre'yi Etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>ISO 639-3 dil kodu</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Forvo kullanımı şu anda bir API anahtarı gerektiriyor, kendi anahtarınızı almak için siteye kaydolun.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Kendi anahtarınızı alın &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;buradan&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Japon harf çevirisinde en çok kullanılan, İngilizce fonolojisi üzerine kurulmuş yöntem</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Japon Hiragana hece yazısı</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Özel harf çevirisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Bu yalnızca arama ifadesinde uygulanır, her satır noktalı virgülle ayrılmış bir harf çevirisini temsil eder. Örneğin, ae;æ,kullanıcılar hedef kelimede æ'yi temsil etmek için ae girebilirler.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #bu bir örnektir</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Harf Çevirisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4991,118 +5023,108 @@ ISO 3602 gibi standart.
 GoldenDict için henüz uygulanmadı.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Rusça Harf Çevisiri</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Morfoloji</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>D&amp;eğiştir...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Örnekler: İngilizce için  &amp;quot;eng&amp;quot; , Fransızca için &amp;quot;fra&amp;quot; &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Mevcut dillerin tam listesi burada bulunabilir &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Hunspell / Myspell sözlükleri bulunan dizinin yolu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Yenide&amp;n Tara</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Almanca Harf Çevirisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Herhangi bir web sitesi. Metin, %GDWORD% arama kelimesi ile değiştirilecektir:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Ekle...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Bir dizin seç</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Ağ Siteleri</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Sözlük dosyalarının aranacağı yer:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Kaldırmayı Onayla</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Hece yazıları:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Kullanılabilir Morfoloji Sözlükleri:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Japonca yazmak için Latin alfabesinin kullanılmasını sağlar</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5116,94 +5138,94 @@ görünür.Bunları kullanmak için uygun sözlükleri
 uygun grupların altlarına ekleyin.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT sunucuları</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT sunucuları:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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; dan canlı telafuzlar. Bu site, insanların kelime telaffuzlarını kaydetmeye ve paylaşmaya izin verir. GoldenDict ile onları dinleyebilirsiniz.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Forvo ile telaffuzu etkinleştir</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API Anahtarı:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Dil kodları (virgülle ayrılmış):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Kullanmak istediğiniz dil kodlarının listesi. Örneğin, &apos;tr, en &quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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 kodlarının tam listesi için &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;buraya tıklayın&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Yunanca harf çevirisi</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(taşınabilir sürümü yok)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Programlar</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Programı &lt;b&gt;%1&lt;/b&gt; listeden çıkar?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Belarusça harf çevirisi</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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">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.</translation>
+      <translation>Alternatif olarak, sırasıyla CP1251 için %GD1251% , ISO 8859-1...ISO 8859-16 için %GDISO1%...%GDISO16% , Big-5 için
+%GDBIG5% , Big5-HKSCS için %GDBIG5HKSCS% , GBK için %GDGBK% ve Shift-JIS için GB18030, %GDSHIFTJIS% kullanın. .</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Metinden Sese</translation>
     </message>
@@ -5219,42 +5241,42 @@ uygun grupların altlarına ekleyin.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Seçili ses motorları:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Ekle</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Kaldır</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Önizle</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Mevcut ses motorları:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Önizlenecek metin:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Önizlenecek metni buraya yazın.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Önizle</translation>
     </message>
@@ -5279,17 +5301,17 @@ uygun grupların altlarına ekleyin.</translation>
       <translation>Kullanılabilir TTS sesi bulunamıyor.&lt;br&gt;Lütfen bilgisayarınızda en az bir tane TTS motoru yüklü olduğundan emin olun.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Tercihler</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Ses:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Oran:</translation>
     </message>
@@ -5297,12 +5319,12 @@ uygun grupların altlarına ekleyin.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Sözlükleri aramak için bir kelime veya kelime öbeği yaz</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Açılır menü</translation>
     </message>
@@ -5333,33 +5355,33 @@ uygun grupların altlarına ekleyin.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Ad</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Adres</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Etkin</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Maddeyi &lt;iframe&gt; etiketinin içine bağlantı olarak ekle</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Bağlantı olarak</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Simge</translation>
     </message>
@@ -5367,17 +5389,9 @@ uygun grupların altlarına ekleyin.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Bazı sözlükler sorgulanamadı.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>UYARI: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/uk_UA.ts b/locale/uk_UA.ts
index 53225be6..b50c9448 100644
--- a/locale/uk_UA.ts
+++ b/locale/uk_UA.ts
@@ -4,57 +4,52 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Про програму</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng — програма для роботи зі словниками, версія </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Ліцензовано за GNU GPLv3 або пізніше</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>Копіювати інформацію про версію</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>Копіювати список словників</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Подяки:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Невідомий]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Основано наQt %1 (%2, %3 біт) </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>© 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>На основі Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation>анкі: можна&apos;t створити картку без слова</translation>
+      <translation>anki: неможливо створити картку без слова</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Розкрити статтю</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Згорнути статтю</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Контекстні вікна</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(без назви)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Ласкаво просимо!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Немає перекладу для &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; у групі &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;форумі&lt;/a&gt; програми.&lt;p&gt;Відвідайте &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&quot;&gt;сайт&lt;/a&gt; програми щодо оновлень. &lt;p&gt;© 2008–2013 Konstantin Isakov. Ліцензовано за GPLv3 або пізнішої версії.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(зображення)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Розкрити статтю</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Зі словника</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Згорнути статтю</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>Створити нову нотатку Анкі</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Помилка запиту: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Близькі за значенням: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Словосполучення: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Окремі слова: </translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Не вдалось створити тимчасовий файл.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>&amp;Пошук «%1»</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Пошук «%1» в &amp;новій вкладці</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Вказаного ресурсу не існує.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Не вдалось відкрити файл ресурсу, спробуйте відкрити вручну: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Пошук «%1» в %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Вибрати поточний об&apos;єкт</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Скопіювати як текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>Дослідити</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Пошук «%1»в %2 в &amp;новій вкладці</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Відкрити посилання в новій в&amp;кладці</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Відкрити посилання у &amp;зовнішньому переглядачі</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Ресурс</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Аудіо</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Голос TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Зображення</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>Відеозапис</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>Відеозапис: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Визначення зі словника &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Визначення: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Вказана аудіо програма не існує.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>Відкрити &amp;посилання</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>Зберегти Закладку &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>ПОПЕРЕДЖЕННЯ: Аудіо-плеєр: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>Помилка:%1 </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Зберегти звук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Зберегти малюнок</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Графічні файли (*.bmp *.jpg *.png *.tif);;Усі файли (*.*) </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Зберегти &amp;зображення…</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>Фраза не знайдена</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1 з %2 збігів</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Зберегти з&amp;вук</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Послати &quot;%1&quot; до стрічки введення</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Додати &quot;%1&quot; до історії</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>&amp;Надіслати поточну статтю Анкі</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>&amp;Надіслати текст анекдоту</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
       <translation>Звукові файли (*.wav *.oga *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);Всі файли (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>Не вдалося відтворити звуковий файл: %1</translation>
     </message>
@@ -414,62 +409,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>Перетворення китайської</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>Ввімкнути перетворення між спрощеними та традиційними китайськими символами</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>Перетворення &amp;китайської</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>Ввімкнути перетворення від спрощених символів до традиційних (варіант Тайвань)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>SC до ТК (варіант Тайвань)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>Увімкнути перетворення з спрощених символів на традиційні (гонконгські варіанти) символи</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>Маш до ТК (варіант Гонконгу)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>Включити перетворення з традиційних символів на спрощені символи</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>До СК</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>Спрощено до традиційного китайського (ваньського варіанту) перетворення</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>Спрощено до традиційної китайської (варіант Гонконгу)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>Традиційне формулювання китайської конверсії</translation>
     </message>
@@ -477,30 +472,30 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>спеціальна транслітерація</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Потрібна автентифікація на проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>Потрібно вказати ім'я користувача та пароль для доступу через проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Ім'я користувача:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
@@ -508,22 +503,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Піктограма групи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Скорочення:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>Тека Обране:</translation>
     </message>
@@ -548,17 +543,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Зображення</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Усі файли</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Помилка</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Неможливо прочитати вказане зображення.</translation>
     </message>
@@ -566,63 +561,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Підтвердження</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>Бажаєте створити групи, впорядковані за різними мовами?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Ви впевнені, що хочете створити набір груп на основі metadata.toml?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Об&apos;єднати групи за основною мовою у &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Об&apos;єднати групи за бажаною мовою у &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Помилка автоматичного групування за папками.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Батьківський каталог %1 недоступний.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Ви впевнені, що хочете створити набір груп на основі папок?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Зробити двох-бокову групу перекладу &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Об&apos;єднати групи з &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Словники: </translation>
     </message>
@@ -635,133 +630,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Режим пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>Цей елемент визначає, як буде інтерпретовано фільтром</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>Якщо відмічено, то при фільтруванні буде враховано регістр символів</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>З урахуванням регістру</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Експортує заголовки у файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Експорт</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Довідка</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>Гаразд</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>Натисніть цю кнопку, щоб застосувати фільтр до списку заголовків</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Прийняти</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>Якщо відмічено, то будь-які зміни у фільтрі ми відразу ж будемо застосовані до списку заголовків</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Авто застосування</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Фільтр:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>Фільтр рядка (фіксована стрічка, підстановка або регулярний вираз)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Шаблони</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Завантаження заголовків...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Унікальний загальний заголовок: %1, фільтрувати: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Зберігати заголовки у файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстові файли (*.txt);;Всі файли (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>Не вдалося відкрити експортований файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Експортувати слова заголовків...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Скасувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>Процес експорту перервано</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>Експорт завершено</translation>
     </message>
@@ -769,67 +764,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Статей загалом:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Перекладає з:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Слів загалом:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Перекладає на:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Відкрити теку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Редагувати словник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файли,що містяться в цьому словнику:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>Показати всі унікальні заголовки словника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Заголовки</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Редагувати словник через команду:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Ім'я файлу індексу:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Відкрити індексну папку</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 статей</translation>
     </message>
@@ -860,44 +865,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Увімкнено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Бази даних</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Стратегії</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Іконка</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>Список баз даних, через кому, розділені комами
 (порожній рядок або &quot;*&quot; відповідає всім базам даних)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Список запитів, розділених комами пошукових стратегій
@@ -907,37 +912,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Розширене меню з усіма словниками</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Редагувати цю групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Інфа словника</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Словник для заголовків</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Відкрити словникову теку</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Редагувати словник</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>&amp;Панель словника</translation>
     </message>
@@ -946,27 +951,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>&amp;Словники</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Словники</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Прийняти</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Скасувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Джерела змінено</translation>
     </message>
@@ -977,12 +982,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>&amp;Групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Деякі джерела змінено. Бажаєте прийняти ці зміни?</translation>
     </message>
@@ -1011,75 +1016,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Повнотекстовий пошук</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Цілі слова</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Простий текст</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Шаблони</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Слово запиту не може бути порожнім.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>підтримати синтаксис пошуку xapian наприклад AND +/- тощо</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Максимальна відстань між словами (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>За замовчуванням</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>Максимум статей на словник (%1-%2):</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Знайдено статей: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Зараз індексування: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Без ефекту</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>У рядку пошуку повинно міститися хоча б одне слово </translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> або більше символів</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Немає словників для повнотекстового пошуку</translation>
     </message>
@@ -1087,7 +1072,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>Помилка в файлі уподобань</translation>
     </message>
@@ -1153,7 +1138,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>з</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <source>Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear.</source>
       <translation>Перейдіть до меню &lt;b&gt;Зміни|Словники|Джерела|Forvo&lt;/b&gt; та застосуйте наш власний ключ API, щоб усунути цю проблему.</translation>
     </message>
@@ -1174,68 +1159,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>З урахуванням регістру</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Режим:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>Ігнорувати порядок слів</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>Ігнорувати діакритичні знаки</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Знайдено статей:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Доступні словники в групі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Чекайте індексації:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Довідка</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Загалом:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Знайдено:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Індексація: немає</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Скасувати</translation>
     </message>
@@ -1267,27 +1236,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Вкладка 2</translation>
     </message>
@@ -1327,12 +1296,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Надайте нову назву групі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Доступні словники:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>&amp;Додати групу</translation>
     </message>
@@ -1342,42 +1311,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Додати групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Створити нову групу словників</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Групування за мовами</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Створення груп на основі папок.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Групування за папками</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Групування за метаданими</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Перейменувати поточну групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Вилучити поточну групу</translation>
     </message>
@@ -1387,43 +1356,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Надайте назву новій групі:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Вилучити всі групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Вилучити вибрані словники з групи (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>І додати вибрані словники у групу (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Вилучити групу</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Групи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>&amp;Перейменувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Вилучити всі групи</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Створити групи, впорядковані за мовою</translation>
     </message>
@@ -1446,12 +1415,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Історія:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Розмір історії: %1 статей з максимальних %2</translation>
     </message>
@@ -1459,12 +1428,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Орфографічні підказки: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Морфологія %1</translation>
     </message>
@@ -1472,12 +1441,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Увімкнено</translation>
     </message>
@@ -1485,1032 +1454,1036 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Індексація: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Назва словника</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Запуск GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Заждіть, будь ласка, поки розпізнаються словники</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Зачекайте, будь ласка…</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Індексація...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>Еве</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>Ідо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>Лаоська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>Тві</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>Афар</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>Акан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>Крі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>Ігбо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>Комі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>Манкс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>Палі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>Тайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>Урду</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>Зулуська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>Чеська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>Голландська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>Ганда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>Фула</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>Грецька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>Гауса</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>Хінді</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>Ірландська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>Кхмерська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>Конґолезька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>Латинська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>Малайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>Маорі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>Науру</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>Орія</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>Оромо
 </translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>Санго</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>Шона</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>Таджицька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>Тамільська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>Татарська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>Свазі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>Тонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>Інупіак</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>Венда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>Узбецька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>Уельська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>Волоф</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>Хоза</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>Італійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>Ретороманська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>Дзонг-ке</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>Каннада</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>Північна Ндебелє</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>Абхазька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>Киргизька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>Рунді</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>Гаельська (Шотландія)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>Албанська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>Латвійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>Малайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>Курдська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>Болгарська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>Лінгала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>Мальтійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>Мараті</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>Арабська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>Баскська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>Аварська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>Біхарі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>Аймарська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>Бретонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>Сунданська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>Данська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>Дівехі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>Луба-катанга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>Фіджійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>Угорська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>Французька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>Німецька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>Монгольська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>Єврейська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>Гереро</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>Люксембурзька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>Канурі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>Казахська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>Кікуйю</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>Корейська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>Навахо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>Ндонга</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>Непальська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>Оджібва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>Пуштунська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>Польська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>Самоанська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>Оксітанська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>Синдхі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>Словацька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>Сомалійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>Телугу</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>Цонґа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>Уйгур</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>Сербсько-хорватська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>Йоруба</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>Чжуань</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>Румунська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>Індонезійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>Панджабська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>Південна Сото</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>Корсиканська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>Есперанто</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>Перська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>Словенська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>Фризька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>Арагонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>Таїтянська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>Малагасійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>Галісійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>Азербайджанська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>Амхарська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>Санскрит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>Японська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>Українська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>Бенгальська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>Калаалісут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>Башкирська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>Білоруська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>Кашмірська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>Сардинська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>Хірімоту</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>Кечуа</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>Бенгальська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>Яванська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>Авестан</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>Кіньяруанда</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>Африкаанс</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>Біслама</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>Вірменська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>Норвезька (Букмол)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>Хорватська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>Боснійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>Інтерлінгва</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>Окциденталь</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>Каталонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>Сербська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>Бірманська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>Російська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>Лімбурганська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>Норвезька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>Чеченська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>Китайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>Чуваська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>Сингала</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>Іспанська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>Корнійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>Тсвана</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>Асамійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>Осетинська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>Естонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>Суахілі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>Шведська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>Тибетська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>В&apos;єтнамська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>Македонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>Португальська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>Турецька</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>Туркменська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>Гуджараті</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>Ісландська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>Інуктітут</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>Англійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>Грузинська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>Церковнослов&apos;янська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>Фарерська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>Фінська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>Волапюк</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>Валлонська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>Кваньяма</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>Маршальська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>Північна Саамі</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>Гаїтянська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>Чаморо</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>Норвезька (Нюношк)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>Гуарані</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>Південна Ндебелє</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>Чічеванська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>Литовська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>Сичуань</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>Тигринійська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>Ідиш</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>Традиційна китайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>Спрощена китайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>Інша</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>Інша спрощена китайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>Інша традиційна китайська</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>Інші східно-європейські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>Інші західно-європейські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>Інші слов&apos;яньські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>Інш японські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>Інші балтійські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>Інші грецькі мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>Інші корейські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>Інші турецькі мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>Інші тайські мови</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>Тамазит</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>Ложбан</translation>
     </message>
@@ -2518,215 +2491,215 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>французька</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>Іспанська</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>білоруська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>Болгарська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>чеська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>Німецький</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>грецька</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>фінська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>італійська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>Японський</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>корейська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>литовський</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>македонська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>голландська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>польський</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>португальська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>російський</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>словацький</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>албанець</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>сербська (кирилиця)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>шведська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>турецька</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>українська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>Китайська спрощена</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Китайський традиційний</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>в'єтнамська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>португальська, бразильська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>перська</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Іспанська, Аргентина</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>Хінді</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>Есперанто</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Німецька, Швейцарія</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Іспанська, Болівія</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>таджицька</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>Кечуа</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>аймара</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>арабська, Саудівська Аравія</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>туркменський</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>Інтерлінгва</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Ложбан</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>англійська</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Помилка завантаження словників</translation>
     </message>
@@ -2734,7 +2707,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Помилка в файлі налаштувань. Продовжити з типовими параметрами?</translation>
     </message>
@@ -2742,702 +2715,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>Ф1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>Ф2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>У&amp;кинути</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>Ф3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>Ф4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Усьому</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 словників, %2 статей, %3 слів</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>З&amp;міни</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Файл</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Довідка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>&amp;Вихід</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Помилка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Вийти з програми</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>&amp;Сховати в лоток</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Неможливо зберегти статтю: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Зблизити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Словники…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>П&amp;ро програму</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Форум</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;Надрукувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Зберегти статтю</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Зберегти статтю як</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Сховати вікно в лоток</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Параметри сторінки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>&amp;Сторінка проекту</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Доступний новий випуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Шукати:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Віддалити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Показати &amp;головне вікно</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Про GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Звантажити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Параметри сторінки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Пошук в:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Нормальний розмір</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Завантаження…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(без назви)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>&amp;Налаштування…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Ласкаво просимо!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Вимовити слово (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Зберегти статтю</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Пропустити цей випуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Вперед</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>Надрукувати статтю</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Не знайдено жодного принтера. Будь ласка, спершу встановіть хоч якийсь.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>П&amp;ерегляд</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Журнал</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>&amp;Очистити</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>&amp;Масштаб</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Зблизити слова</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Віддалити слова</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Звичайний розмір слів</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Закрити поточну вкладку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Закрити всі вкладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Закрити всі вкладки заодно з поточною</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Відкриті вкладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Нова вкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>&amp;Тека конфігурації</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>&amp;Лоток меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Знайдено у словниках:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>Додати всі вкладки в Улюблене</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
-      <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">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</translation>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>ПОПЕРЕДЖЕННЯ: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
+      <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="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Відчинити список вкладок</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>Вилучити поточну вкладку з Обраного</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Ви вирішили сховати лоток меню. Викор. %1 аби показувати його знову.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+М</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Показати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Експортувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>&amp;Сховати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Експортувати файл історії</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Текстові файли (*.txt);;Всі файли (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Експорти історії завершено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Помилка експортування:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl + H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>&amp;Імпортувати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Імпортувати історію з файлу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Помилка імпорту: недійсна дата у файлі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Імпорти історії завершено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Помилка імпортування:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>Експорт уподобань до файлу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML файли (*.xml);;Всі файли (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>Експорт уподобань завершено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>Експорт уподобань до файлу як звичайний список</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>Імпорт уподобань із файлу</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML файли (*.xml);;Txt файли (*.txt);Всі файли (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>Імпорт уподобань завершено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>Помилка під час аналізу даних</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Інфа про словник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Словник для заголовків</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Відкрити словникову теку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Редагувати словник</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>Індексування для повнотекстового пошуку: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>Видалити заголовки &quot;%1&quot; з вибраного?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>&amp;Лоток пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>&amp;Лоток результатів</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>Улюблена панель</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>Попередній перегляд дру&amp;ку</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>&amp;Повт. просканувати файли</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>&amp;Нова вкладка</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Завжди зверху</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Завжди зверху</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Кнопка меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Пошук на сторінці</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Повнотекстовий пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Посилання на золото</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>Показати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Експорт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>Імпорт</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>Додати</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>Додати поточну вкладку до Обраного</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>Експортувати у список</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Відображувати назви у &amp;Рядку словника</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Показувати малі налички у &amp;тулбарі</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>&amp;Навігація</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>Увімкнути сканування</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Стаття, Повна (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Стаття, тільки HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Збередення статті…</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Зберегти статтю завершено</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Головне меню налаштовано аби завжди бути зверху.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>&amp;Лоток історії</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API доступності не ввімкнено</translation>
     </message>
@@ -3445,12 +3418,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Словниковий файл пошкоджено</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Не вдалося завантажити статтю з%1, причина: %2</translation>
     </message>
@@ -3458,7 +3431,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Помилка аналізу XML: %1 в %2,%3</translation>
     </message>
@@ -3474,22 +3447,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Увімкнено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Наличка</translation>
     </message>
@@ -3499,88 +3472,88 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Не вдалося відкрити аудіобуфер для читання.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Форма</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Вимкнені словники:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Назва:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Статей загалом:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Переклад з:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Переклад на:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Слів загалом:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Порядок словників:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Файли, які охоплює словник:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Інформація про словник</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Опис:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Сортувати за іменем</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Сортувати за мовою</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Словник для заголовків</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Словники активні: %1, неактивний: %2</translation>
     </message>
@@ -3588,12 +3561,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Шлях</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Рекурсивно</translation>
     </message>
@@ -3601,69 +3574,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Запускати в системному лотку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Лише лівий Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Сtrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Увімкнути піктограму системного лотка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Вузол:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Порт:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Зсув</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Тип:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Користувач:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Контекстне вікно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3672,137 +3643,137 @@ switching to them.</source>
 відкриватимуться без перемикання на них.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Використати проксі-сервер</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Щоб перекладати слово з кишені, використовується така комбінація клавіш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Будь-яка Windows або Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Автоматично вимовляти слово в головному меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Запускати разом із системою</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Лише лівий Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Вкладки</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Лише правий Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>&amp;Аудіо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Увімкніть, якщо ви бажаєте використовувати 
 проксі-сервер для всіх мережевих запитів.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Мова інтерфейсу:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Лише лівий Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Відкрити нові вкладки фоново</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>&amp;Мережа</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Лише правий Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Правий Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Лівий Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Автоматично вимовляти слова в контекстному меню</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Відкрити нові вкладки за поточною</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Перезапустіть програму, щоб змінити мову.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Будь-який Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Періодично перевіряти на випуски нової версії</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3811,25 +3782,24 @@ be the last ones.</source>
 до останніх.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Згорнути до системного лотка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Системна</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>Коли це ввімкнено, піктограма з&apos;явиться в системному лотку, якою можна
 буде відкривати головне вікно і здійснювати інші задачі.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3842,141 +3812,142 @@ download page.</source>
 відкрити сторінку звантаження.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Запуск</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Пароль:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Типово</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>&amp;Інтерфейс</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Зміна мови</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Будь-яка Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Щоб показувати і ховати головне вікно, використовується така комбінація клавіш:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Лівий Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Лише правий Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Налаштування</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Лівий Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Правий Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Правий Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Гарячі клавіші</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Увімкнути контекстні меню при запуску</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>Коли це ввімкнено, програма запускається відразу в системному лотку без 
 запуску головного вікна.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Будь-який Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Автоматично запускати GoldenDict при завантаженні системи.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation>Не показувати спливаюче вікно під час вибору або буфера обміну в одному з GoldenDict&apos;змінює власні вікна</translation>
+      <translation>Не показувати спливаюче вікно, коли змінюється вибір або буфер обміну в одному з власних вікон GoldenDict</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation>Ігнорувати золотий словник&apos;вибір і зміни буфера обміну</translation>
+      <translation>Увімкніть, якщо ви бажаєте використовувати проксі-сервер
+для всіх мережевих запитів програми.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>Відтворення аудіо файлів через вбудовану підтримку аудіо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>Використовувати внутрішній програвач:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>Виберіть повернутися до кінця аудіо</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>Введіть командний рядок аудіо програвача</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3985,533 +3956,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 Якщо деякі сайти не працюють, вимкніть це.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>Заборонити завантажувати вміст з інших сайтів (ховає більшість реклами)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Вимова</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Відтворення</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Використовувати сторонню програму:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Подвійний клац перекладе слово натиснувши</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>Використовувати якусь сторонню програму для відтворення звукових файлів</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Кнопка ESC  приховує основне вікно</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Сховати єдину вкладку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Скоригуйте це значення, щоб уникнути величезних контекстних меню.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Обмеження контекстного меню для словників:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Послилати перекладене слово до головного вікна, замість того аби показувати його у виринаючому вікні</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Послилати перекладене слово до головного вікна</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>Перед відображенням спливаючого вікна показувати спливаюче вікно, натисніть на прапорець, щоб показати спливаюче вікно. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Зазвичай клацання посиланням, подвійним клацанням слова або пошуком
+вибраного фрагмента в статті завантажує переклад і майже відразу
+прокручує статтю з того самого словника. Якщо цю опцію вимкнено,
+буде показано статтю з самого верхнього словника.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>Автоматичне прокручування до цільової статті</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>Словник шрифту: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>встановити сімейство резервних шрифтів для словника</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>Стиль відображення статей:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>Перетворіть інтерфейс для затемнення.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>Темний режим</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>Перетворіть стиль відображення статті в темряву.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>Темний режим читання</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>Замовлення MRU: найдавніше використовуване замовлення.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>Відстежувати зміни в буфері обміну, коли ввімкнено сканування. Зверніть увагу! Ви завжди повинні увімкнути це, якщо не використовуєте Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>Зміна буфера обміну</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>Зміна виділення пісні</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>Вибір буде скинуто лише коли всі вибрані ключі будуть збережені:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>Показувати позначку сканування, коли вибрано слово</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Час затримки</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> мс</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Системний проксі</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Власний проксі</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Користувацькі налаштування</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Анкі Коннехт</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>Колода:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>Модель:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>Слово</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>Словникове поле...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>Текст</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>Поле визначення...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>Речення</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>Поле речення (може бути порожнім)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Не отожнювати GoldenDict в заголовках HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>Максимальний розмір кеша в мережі :</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation>Максимальний дисковий простір, зайнятий GoldenDict&apos;s файл кеша мережі
+      <translation>Максимальний дисковий простір, який займає мережевий кеш GoldenDict
 %1
-Якщо встановлено 0 мережевого кешу на диску буде вимкнено.</translation>
+Якщо встановлено значення 0, кеш мережевого диска буде вимкнено.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> Міб</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>Коли цю опцію ввімкнено, Золотик
 очищує з диска кеш у мережі.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>Очистити кеш мережі при виході</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Повнотекстовий пошук</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Дозволити повнотекстовий пошук для:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
-      <translation>Дон&apos;t пошук в словниках, що містить більше ніж</translation>
+      <translation>Не шукайте в словниках, які містять більше ніж</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>Статті (0 - необмежено)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>До&amp;даткові</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>Під час послідовних пошуків, якщо один словник згортається вручну, він залишатиметься згорнутим у наступному пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>Згорнути сесію</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>При використанні буфера обміну, відрізати все після нової лінії</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation>Під час нового пошуку сфокусуватися на головному або спливаючому вікні, навіть якщо воно&apos;видиме</translation>
+      <translation>Під час нового пошуку сфокусуйте головне або спливаюче вікно, навіть якщо воно видиме</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>Вподобання</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>Інтервал збереження уподобань. Якщо встановлено 0 Обраних буде збережено тільки під час виходу.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>Увімкніть цю опцію, щоб підтвердити кожну операцію видалення елементів</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>Підтвердження видалення елементів</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>Увімкніть цю функцію, щоб ігнорувати необґрунтовано довгий текст введення
 з імені мишки, виділення, буфера обміну чи командного рядка</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>Ігнорувати вхідні фрази довші, ніж</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>Вхідні фрази довші, ніж цей розмір ігнорується</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>Увімкніть цю опцію, щоб ігнорувати діакритики під час пошуку статей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>Ігнорувати діакритики під час пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Увімкніть цю опцію аби завжди додаткові частини статтей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Показувати додаткові &amp;частини</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Виберіть це, щоб автоматично згортати великі статті</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Згортати статті з понад</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Статті довші за цей розмір буде згорнуто</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>Ігнорувати пунктуацію при пошуку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>Увімкніть цю опцію, щоб увімкнути додаткові статті пошуку за допомогою списків синонімів
 з Stardict, Babylon та GLS словників</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>Додатковий пошук за синонімами</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>символів</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab керує вкладками у MRU порядку</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>Вавилон</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Історія</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Увімкніть цю опцію аби зберігати історію перекладених слів</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Зберегти &amp;Історію</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Статей</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Оберіть цю опцію, якщо ви волієте обирати слова одним кліком миші</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Обрати слово одним кліком миші</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Стиль додатку:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Зазначте максимальну кількість статей, що зберігають в історії.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Максимальний розмір історії:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>Проміжок збереження історії. Якщо вказати 0, то історія зберігатиметься тільки після виходу з програми.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Зберігати кожні</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>хвилин</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>Класичний</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>Модерн</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>Лінго</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>Лінго-Блю</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> МБ</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Позиційна інформація потрібна для використання фразового пошуку Xapian і оператора NEAR, але розмір бази даних буде набагато більшим. Застосовується лише до нових вхідних словників.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Увімкнути індекс із позиційною інформацією</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Стандартний шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Моноширинний шрифт</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Шрифт із засічками</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Шрифт без засічок</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Зовнішній вигляд</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Ці шрифти будуть застосовані, якщо шрифти, визначені словником, не знайдені.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Резервні шрифти</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Аудіо</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Звичайний текст</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Співпадання префіксу</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Невідомий</translation>
     </message>
@@ -4519,17 +4532,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Назва програми не була надана.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Програма зламалася.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Програма повідомила про код виходу %1.</translation>
     </message>
@@ -4537,27 +4550,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Увімкнено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Тип</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Командний рядок</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Наличка</translation>
     </message>
@@ -4565,99 +4578,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Помилка завантаження статті</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Помилка розкодування статті</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>Авторські права: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>Версія: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>Автор: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>Електронна пошта: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>Назва: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>Веб-сайт: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>Дата: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>Словник програми фільтрування.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>Слово або речення запиту.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>Зберігати повідомлення налагодження в gd_log.txt в теці конфігурації.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Скинути стан вікна.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Вимкнути tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>Змінити групу головного вікна.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>Змінити групу виринаючого вікна.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>Увімкнути або вимкнути вікно сканування.</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Друкована версія та інформація про діагностику.</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Словниковий пошук/фільтр (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Очистити пошук</translation>
     </message>
@@ -4665,22 +4693,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>Помилка: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Помилка зберігання ресурсів: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Не вдалось звантажити поданий ресурс.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>ПОПЕРЕДЖЕННЯ: %1</translation>
     </message>
@@ -4709,68 +4737,73 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Діалог</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Вимовити слово (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>Додати слово до обраного (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Показує або ховає панель словника</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>Завжди залишатися поверх інших вікон</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Послати слово до основного вікна (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+клавiша переходу</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Назад</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Вперед</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>ПОПЕРЕДЖЕННЯ: %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4782,7 +4815,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
@@ -4792,7 +4825,7 @@ could be resized or managed in other ways.</source>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
@@ -4813,17 +4846,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Шлях</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Піктограма</translation>
     </message>
@@ -4831,60 +4864,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Файли</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>Хіраґана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Системи:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>Ніхон-сікі</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>Вікіпедія</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Складова азбука японської катакани</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Зробіть словники зі зв&apos;язки аудіофайлів, додавши шляхи сюди:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Японська романдзі</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4895,84 +4928,84 @@ Not implemented yet in GoldenDict.</source>
 Ще не реалізовано в GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Теки зі звуками</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>Будь-які зовнішні програми. Рядок %GDWORD% буде замінено словом запиту. Рядок %GDSEARCH% буде замінено на текст в рядку пошуку. Якщо обидва параметри не надано, заголовок буде передано до стандартного вводу.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Вимова надано &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, спільною лінгвістичною медіа-бібліотекою Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>Увімкнути Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 код мови</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Використання Forvo в даний час необхідний ключ API, зареєструйтесь на сайті, щоб отримати власний ключ.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;отримати ваш власний ключ &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;тут&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Найпоширеніший спосіб транскрибування японської,
 яка ґрунтується на англійській фонології</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Складова азбука японської хіраґани</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Спеціальна транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Це стосується лише пошукової фрази, де кожен рядок представляє транслітерацію, розділену крапкою з комою. Наприклад, ae;æ, користувачі можуть ввести ae, щоб представити æ у цільовому слові.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #це приклад</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4983,118 +5016,108 @@ Not implemented yet in GoldenDict.</source>
 Поки що не підтримується в GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Російська транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Морфологія</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Змінити…</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Приклади:  &amp;quot;eng&amp;quot; для англійської, &amp;quot;fra&amp;quot; для французької &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Повний список доступних мов можна знайти &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; тут &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>Катакана</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>Шлях до тезаурусів Hunspell/Myspell:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>Пере&amp;глянути зараз же</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Німецька транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>Будь-які сайти. Рядок %GDWORD% буде замінено на потрібне слово:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>&amp;Додати…</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Вибрати теку</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Вилучити</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Сайти</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Шляхи для пошуку файлів словника:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Підтвердження вилучення</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Складові азбуки:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Доступні морфологічні словники:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Вмикає латинську абетку для японського письма</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5108,94 +5131,94 @@ of the appropriate groups to use them.</source>
 словники до низу відповідних груп.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>Хепбьорн</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>Кунрей-сікі</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Кількість серверів DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Сервер DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Увімкнути вимову з Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Ключ API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Коди мов (виділяючи комою):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Грецька транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(не доступно в портативній версії)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Програми</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Білоруська транслітерація</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>Текст для вимови</translation>
     </message>
@@ -5211,42 +5234,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Вибрані голосові рушії:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Додати</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>&amp;Вилучити</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Огляд</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Доступні голосові рушії:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Текст для огляду:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Введіть текст, щоб його оглянути тут.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Огляд</translation>
     </message>
@@ -5271,17 +5294,17 @@ of the appropriate groups to use them.</source>
       <translation>Неможливо знайти доступний голос TTS.&lt;br&gt;Переконайтесь, що рушій TTS хоча би встановлено на комп&apos;ютері.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Параметри</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Гучність:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Частота:</translation>
     </message>
@@ -5289,12 +5312,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Введіть слово або словосполучення шоб шукати у словниках</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Виринаючи</translation>
     </message>
@@ -5325,33 +5348,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Назва</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Адреса</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Увімкнено</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>Вставте статтю як посилання всередині тега &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>Як посилання</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Наличка</translation>
     </message>
@@ -5359,17 +5382,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Не вдалось здійснити пошук по деяких словниках.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>УВАГА: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/vi_VN.ts b/locale/vi_VN.ts
index e3a1cd72..258686e1 100644
--- a/locale/vi_VN.ts
+++ b/locale/vi_VN.ts
@@ -4,74 +4,69 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>Giới thiệu</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>Chương trình tra từ điển Từ điển Vàng, phiên bản </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>Cấp phép theo GNU GPLv3 hoặc mới hơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
-      <translation type="unfinished">Copy version info</translation>
+      <translation>Copy thông tin phiên bản</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
-      <translation type="unfinished">Copy dictionaries list</translation>
+      <translation>Copy danh sách từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>Công trạng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[Không biết]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>Dựa trên Qt %1 (%2, %3 bit) </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>Bản quyền 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>Dựa trên Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
     <message>
       <location filename="../src/ankiconnector.cc" line="23"/>
       <source>anki: can&apos;t create a card without a word</source>
-      <translation type="unfinished">anki: can&apos;t create a card without a word</translation>
+      <translation>anki: không thể tạo thẻ mà không có từ nào</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="65"/>
       <source>Anki search: AnkiConnect is not enabled.</source>
-      <translation type="unfinished">Anki search: AnkiConnect is not enabled.</translation>
+      <translation>Anki search: AnkiConnect chưa được kích hoạt.</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="96"/>
       <location filename="../src/ankiconnector.cc" line="113"/>
       <source>anki: post to anki failed</source>
       <translatorcomment>anki:发布成功</translatorcomment>
-      <translation type="unfinished">anki: post to anki failed</translation>
+      <translation>anki: lỗi khi gửi tới anki</translation>
     </message>
     <message>
       <location filename="../src/ankiconnector.cc" line="110"/>
       <source>anki: post to anki success</source>
-      <translation type="unfinished">anki: post to anki success</translation>
+      <translation>anki: gửi tới anki thành công</translation>
     </message>
   </context>
   <context>
@@ -79,68 +74,68 @@
     <message>
       <location filename="../src/ui/article_inspect.cc" line="8"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Kiểm tra</translation>
     </message>
   </context>
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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>Sau đó chỉ cần dừng chuột trên từ mà bạn muốn tra trong ứng dụng khác, và một cửa sổ sẽ bật ra để dịch nghĩa cho bạn.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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, 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>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>Mở rộng bài viết</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>Thu gọn bài viết</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <source>No translation for &lt;b&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
-      <translation>Không có dịch nghĩa cho &lt;b&gt;%1&lt;/b&gt; được tìm thấy trong nhóm &lt;b&gt;%2&lt;/b&gt;.</translation>
-    </message>
-    <message>
-      <location filename="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>Làm việc với popup</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(chưa đặt tên)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>Chào mừng!</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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 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>
-      <location filename="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <source>No translation was found in group &lt;b&gt;%1&lt;/b&gt;.</source>
       <translation>Không có dịch nghĩa được tìm thấy trong nhóm &lt;b&gt;%1&lt;/b&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; was found in group &lt;b&gt;%2&lt;/b&gt;.</source>
+      <translation>Không tìm thấy bản dịch nào cho &lt;b dir=&quot;%3&quot;&gt;%1&lt;/b&gt; trong nhóm &lt;b&gt;%2&lt;/b&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;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;https://github.com/xiaoyifang/goldendict/discussions&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;https://github.com/xiaoyifang/goldendict&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>
-      <location filename="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(hình ảnh)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>Mở rộng bài viết</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>Từ </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>Thu gọn bài viết</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
-      <translation type="unfinished">Make a new Anki note</translation>
+      <translation>Tạo ghi chú Anki mới</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>Lỗi truy vấn: %1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>Các từ tương tự: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>Các từ phức: </translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>Các từ đơn: </translation>
     </message>
@@ -191,204 +186,204 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>Lỗi tạo tệp tạm.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>T&amp;ra từ &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>Tra từ &quot;%1&quot; trong &amp;Thẻ mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>Nguồn tham chiếu không tồn tại.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>Lỗi tự động mở tệp nguồn, thử mở thủ công: %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>Tra từ &quot;%1&quot; trong%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>Chọn bài viết hiện tại</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>Chỉ sao chữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
-      <translation type="unfinished">Inspect</translation>
+      <translation>Kiểm tra</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <source>Look up &quot;%1&quot; in %2 in &amp;New Tab</source>
       <translation>Tra từ &quot;%1&quot; trong %2 trong &amp;Thẻ mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>Mở liên kết trong &amp;Thẻ mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>Mở liên kết trong &amp;Trình duyệt</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>Nguồn</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>Âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>Giọng nói TTS</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>Hình ảnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
-      <translation type="unfinished">Video</translation>
+      <translation>Video</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
-      <translation type="unfinished">Video: %1</translation>
+      <translation>Video: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>Định nghĩa trong từ điển &quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>Định nghĩa: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>Chương trình âm thanh tham chiếu không có.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
-      <translation type="unfinished">Op&amp;en Link</translation>
+      <translation>Mở liên kết</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
-      <translation type="unfinished">Save &amp;Bookmark &quot;%1...&quot;</translation>
+      <translation>Lưu &amp;Đánh dấu &quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
-      <translation type="unfinished">WARNING: Audio Player: %1</translation>
+      <translation>CẢNH BÁO: Trình phát âm thanh: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>LỖI: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>Lưu âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>Lưu hình ảnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>Các tệp hình ảnh (*.bmp *.jpg *.png *.tif);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>Lưu &amp;hình ảnh...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
-      <translation type="unfinished">Phrase not found</translation>
+      <translation>không tìm thấy cụm từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
-      <translation type="unfinished">%1 of %2 matches</translation>
+      <translation>%1 trên %2 trận đấu</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>Lưu â&amp;m thanh...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>Gửi &quot;%1&quot; đến dòng đầu vào</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>&amp;Thêm &quot;%1&quot; vào lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
-      <translation type="unfinished">&amp;Send Current Article to Anki</translation>
+      <translation>&amp;Gửi bài báo hiện tại tới Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
-      <translation type="unfinished">&amp;Send selected text to Anki</translation>
+      <translation>&amp;Gửi văn bản đã chọn tới Anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation type="unfinished">Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>Tệp âm thanh (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
-      <translation type="unfinished">Failed to play sound file: %1</translation>
+      <translation>Không thể phát tệp âm thanh: %1</translation>
     </message>
     <message>
       <location filename="../src/ui/articleview.hh" line="59"/>
       <source>&amp;Create Anki note</source>
-      <translation type="unfinished">&amp;Create Anki note</translation>
+      <translation>&amp;Tạo ghi chú Anki</translation>
     </message>
   </context>
   <context>
@@ -413,93 +408,93 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
-      <translation type="unfinished">Chinese Conversion</translation>
+      <translation>Chuyển đổi tiếng Trung</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
-      <translation type="unfinished">Enable conversion between simplified and traditional Chinese characters</translation>
+      <translation>Cho phép chuyển đổi giữa các ký tự tiếng Trung giản thể và phồn thể</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
-      <translation type="unfinished">Chinese Con&amp;version</translation>
+      <translation>Phiên bản&amp;Chuyển đổi tiếng Trung</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Taiwan variant) characters</translation>
+      <translation>Cho phép chuyển đổi từ ký tự giản thể sang ký tự truyền thống (biến thể Đài Loan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
-      <translation type="unfinished">SC to TC (Taiwan variant)</translation>
+      <translation>SC đến TC (biến thể Đài Loan)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
-      <translation type="unfinished">Enable conversion from simplified characters to traditional (Hong Kong variant) characters</translation>
+      <translation>Cho phép chuyển đổi từ ký tự giản thể sang ký tự truyền thống (biến thể Hồng Kông)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
-      <translation type="unfinished">SC to TC (Hong Kong variant)</translation>
+      <translation>SC đến TC (biến thể Hồng Kông)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
-      <translation type="unfinished">Enable conversion from traditional characters to simplified characters</translation>
+      <translation>Cho phép chuyển đổi từ chữ phồn thể sang chữ giản thể</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
-      <translation type="unfinished">TC to SC</translation>
+      <translation>TC sang SC</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Taiwan variant) conversion</translation>
+      <translation>Chuyển đổi tiếng Trung giản thể sang tiếng Trung phồn thể (biến thể Đài Loan)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
-      <translation type="unfinished">Simplified to traditional Chinese (Hong Kong variant) conversion</translation>
+      <translation>Chuyển đổi tiếng Trung giản thể sang tiếng Trung phồn thể (biến thể Hồng Kông)</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
-      <translation type="unfinished">Traditional to simplified Chinese conversion</translation>
+      <translation>Chuyển đổi tiếng Trung phồn thể sang giản thể</translation>
     </message>
   </context>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
-      <translation type="unfinished">custom transliteration</translation>
+      <translation>phiên âm tùy chỉnh</translation>
     </message>
   </context>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>Yêu cầu xác thực proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <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>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>Tài khoản:</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>Mật khẩu:</translation>
     </message>
@@ -507,24 +502,24 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>Mẫu</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>Biểu tượng nhóm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>Lối tắt:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
-      <translation type="unfinished">Favorites folder:</translation>
+      <translation>Thư mục yêu thích:</translation>
     </message>
     <message>
       <location filename="../src/ui/groups_widgets.cc" line="45"/>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>Ảnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>Tất cả tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>Lỗi</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>Không thể đọc tệp ảnh được chỉ định.</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>Xác nhận</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <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>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on metadata.toml?</translation>
+      <translation>Bạn có chắc chắn muốn tạo một tập hợp các nhóm dựa trên metadata.toml không?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>Kết hợp nhóm theo ngôn ngữ nguồn &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>Kết hợp nhóm theo ngôn ngữ đích &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
-      <translation type="unfinished">Auto group by folder failed.</translation>
+      <translation>Tự động nhóm theo thư mục không thành công.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
-      <translation type="unfinished">The parent directory of %1 can not be reached.</translation>
+      <translation>Không thể truy cập thư mục mẹ của %1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
-      <translation type="unfinished">Are you sure you want to generate a set of groups based on containing folders?</translation>
+      <translation>Bạn có chắc chắn muốn tạo một tập hợp các nhóm dựa trên các thư mục chứa không?</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>Tạo nhóm dịch song ngữ &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>Kết hợp nhóm với &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>Từ điển:</translation>
     </message>
@@ -634,201 +629,211 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>Kiểu tìm kiếm</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>Khớp hoa thường</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>Trích xuất danh sách từ ra tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>Trích xuất</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>Trợ giúp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
-      <translation type="unfinished">OK</translation>
+      <translation>ĐƯỢC RỒI</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>Áp dụng</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <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>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>Tự động áp dụng</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>Bộ lọc:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <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>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>Chữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>Wildcard</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <translation>RegExp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
-      <translation type="unfinished">Loading headwords...</translation>
+      <translation>Đang tải tiêu đề...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>Tổng danh sách từ: %1, đã lọc: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>Lưu danh sách từ vào tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <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>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
-      <translation type="unfinished">Can not open exported file</translation>
+      <translation>Không thể mở tệp đã xuất</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>Trích xuất danh sách từ...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>Hủy bỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
-      <translation type="unfinished">Export process is interrupted</translation>
+      <translation>Quá trình xuất bị gián đoạn</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
-      <translation type="unfinished">Export finished</translation>
+      <translation>Xuất xong</translation>
     </message>
   </context>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>Tổng số bài viết:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>Dịch từ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>Tổng số từ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>Dịch sang:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>Mở thư mục</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>Chỉnh sửa từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Tệp chứa từ điển này:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>Mô tả:</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <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>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>Danh sách từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>Chỉnh sửa từ điển với lệnh:
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>Tên tệp chỉ mục:</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>Mở thư mục chỉ mục</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 mục từ</translation>
     </message>
@@ -859,44 +864,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>Bật</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>Địa chỉ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>Cơ sở dữ liệu</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>Cách thức</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>Biểu tượng</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <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>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>Ngăn cách các cách thức tìm kiếm bằng dấu phẩy
@@ -906,37 +911,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>Mở trình đơn với tất cả từ điển...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>Chỉnh sửa nhóm này</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>Thông tin từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>Danh sách từ của từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>Mở thư mục từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>Sửa đổi từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>Thanh Từ đ&amp;iển</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>Từ đ&amp;iển</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>Từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>Chấp nhận</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>Hủy bỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>Nguồn đã thay đổi</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>N&amp;hóm</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>Một vài nguồn đã được thay đổi. Bạn có muốn chấp nhận các thay đổi không?</translation>
     </message>
@@ -991,12 +996,12 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/dict/epwing.cc" line="348"/>
       <source>Previous Page</source>
-      <translation type="unfinished">Previous Page</translation>
+      <translation>Trang trước</translation>
     </message>
     <message>
       <location filename="../src/dict/epwing.cc" line="384"/>
       <source>Next Page</source>
-      <translation type="unfinished">Next Page</translation>
+      <translation>Trang tiếp theo</translation>
     </message>
   </context>
   <context>
@@ -1010,75 +1015,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>Tìm toàn văn</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>Toàn bộ từ</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>Văn bản thuần</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>Ký tự đại diện</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation type="unfinished">RegExp</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>Từ truy vấn không được để trống.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
-      <translation type="unfinished">support xapian search syntax,such as AND OR +/- etc</translation>
+      <translation>hỗ trợ cú pháp tìm kiếm xapian, chẳng hạn như AND OR +/-, v.v.</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>Khoảng cách tối đa giữa các từ (%1-%2):</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>Mặc định</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <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>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>Số bài viết tìm thấy: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>Đang chỉ mục: </translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>Không</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <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>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation> ký tự</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>Không có từ điển để tìm toàn văn</translation>
     </message>
@@ -1086,9 +1071,9 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
-      <translation type="unfinished">Error in favorities file</translation>
+      <translation>Lỗi trong tệp yêu thích</translation>
     </message>
   </context>
   <context>
@@ -1106,17 +1091,17 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="47"/>
       <source>Add folder</source>
-      <translation type="unfinished">Add folder</translation>
+      <translation>Thêm thư mục</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="61"/>
       <source>Favorites:</source>
-      <translation type="unfinished">Favorites:</translation>
+      <translation>yêu thích:</translation>
     </message>
     <message>
       <location filename="../src/ui/favoritespanewidget.cc" line="164"/>
       <source>All selected items will be deleted. Continue?</source>
-      <translation type="unfinished">All selected items will be deleted. Continue?</translation>
+      <translation>Tất cả các mục đã chọn sẽ bị xóa. Tiếp tục?</translation>
     </message>
   </context>
   <context>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>từ</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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 riêng để tắt lỗi này.</translation>
     </message>
@@ -1162,79 +1147,63 @@ between classic and school orthography in cyrillic)</source>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="19"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Trước</translation>
     </message>
     <message>
       <location filename="../src/ui/ftssearchpanel.cc" line="20"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Kế tiếp</translation>
     </message>
   </context>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>Tìm</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>Khớp hoa thường</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>Kiểu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation type="unfinished">Ignore words order</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation type="unfinished">Ignore diacritics</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>Số bài viết tìm thấy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>Từ điển có trong nhóm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>Chờ chỉ mục:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>Trợ giúp</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>Tổng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>Đã chỉ mục:</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>Đang chỉ mục: Không</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>Hủy bỏ</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
-      <translation type="unfinished">&lt;</translation>
+      <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
-      <translation type="unfinished">&gt;</translation>
+      <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
-      <translation type="unfinished">Del</translation>
+      <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
-      <translation type="unfinished">Ins</translation>
+      <translation>trong</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>Thẻ 2</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Đặt một tên mới cho nhóm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>Các từ điển đã có:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>Thê&amp;m nhóm</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>Thêm nhóm</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>Tạo một nhóm từ điển mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
-      <translation type="unfinished">Group by Languages</translation>
+      <translation>Nhóm theo ngôn ngữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
-      <translation type="unfinished">Create folder-based groups.</translation>
+      <translation>Tạo các nhóm dựa trên thư mục.</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
-      <translation type="unfinished">Group by Folders</translation>
+      <translation>Nhóm theo thư mục</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
-      <translation type="unfinished">Group by Metadata</translation>
+      <translation>Nhóm theo siêu dữ liệu</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <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>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>Đổi tên nhóm từ điển hiện tại</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>Xóa nhóm hiện tại</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>Đặt tên cho nhóm mới:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>Xóa hết nhóm</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>Xóa những từ điển đã chọn ra khỏi nhóm (Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>Thêm những từ điển đã chọn vào nhóm (Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>&amp;Xóa nhóm</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>Nhóm:</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>Đổi tên &amp;nhóm</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>Xóa hết các nhóm từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>Tạo các nhóm dựa-trên-ngôn-ngữ</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>Lược sử:</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation type="unfinished">%1/%2</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>Số lược sử: %1 mục trên tối đa %2</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>Gợi ý chính tả: </translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>Hình thái học %1</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>Bật</translation>
     </message>
@@ -1484,1247 +1453,1251 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>Lập chỉ mục: </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>Tên Từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>Từ điển Vàng - Đang khởi chạy</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>Xin chờ trong khi đang lập chỉ mục từ điển</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>Xin chờ...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>Lập chỉ mục...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
-    <message>
-      <location filename="../src/language.cc" line="153"/>
-      <source>Ewe</source>
-      <translation type="unfinished">Ewe</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="188"/>
-      <source>Ido</source>
-      <translation type="unfinished">Ido</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="214"/>
-      <source>Lao</source>
-      <translation type="unfinished">Lao</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="286"/>
-      <source>Twi</source>
-      <translation type="unfinished">Twi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="118"/>
-      <source>Afar</source>
-      <translation type="unfinished">Afar</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="122"/>
-      <source>Akan</source>
-      <translation type="unfinished">Akan</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="144"/>
-      <source>Cree</source>
-      <translation type="unfinished">Cree</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="185"/>
-      <source>Igbo</source>
-      <translation type="unfinished">Igbo</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="206"/>
-      <source>Komi</source>
-      <translation type="unfinished">Komi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="172"/>
-      <source>Manx</source>
-      <translation type="unfinished">Manx</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="245"/>
-      <source>Pali</source>
-      <translation type="unfinished">Pali</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="277"/>
-      <source>Thai</source>
-      <translation type="unfinished">Thai</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="290"/>
-      <source>Urdu</source>
-      <translation type="unfinished">Urdu</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="302"/>
-      <source>Zulu</source>
-      <translation type="unfinished">Zulu</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="145"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="233"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="211"/>
-      <source>Ganda</source>
-      <translation type="unfinished">Ganda</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="161"/>
-      <source>Fulah</source>
-      <translation type="unfinished">Fulah</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="154"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="173"/>
-      <source>Hausa</source>
-      <translation type="unfinished">Hausa</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="175"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="167"/>
-      <source>Irish</source>
-      <translation type="unfinished">Irish</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="200"/>
-      <source>Khmer</source>
-      <translation type="unfinished">Khmer</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="195"/>
-      <source>Kongo</source>
-      <translation type="unfinished">Kongo</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="209"/>
-      <source>Latin</source>
-      <translation type="unfinished">Latin</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="225"/>
-      <source>Malay</source>
-      <translation type="unfinished">Malay</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="220"/>
-      <source>Maori</source>
-      <translation type="unfinished">Maori</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="228"/>
-      <source>Nauru</source>
-      <translation type="unfinished">Nauru</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="242"/>
-      <source>Oriya</source>
-      <translation type="unfinished">Oriya</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="241"/>
-      <source>Oromo</source>
-      <translation type="unfinished">Oromo</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="259"/>
-      <source>Sango</source>
-      <translation type="unfinished">Sango</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="265"/>
-      <source>Shona</source>
-      <translation type="unfinished">Shona</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="276"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="274"/>
-      <source>Tamil</source>
-      <translation type="unfinished">Tamil</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="285"/>
-      <source>Tatar</source>
-      <translation type="unfinished">Tatar</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="269"/>
-      <source>Swati</source>
-      <translation type="unfinished">Swati</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="282"/>
-      <source>Tonga</source>
-      <translation type="unfinished">Tonga</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="187"/>
-      <source>Inupiaq</source>
-      <translation type="unfinished">Inupiaq</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="292"/>
-      <source>Venda</source>
-      <translation type="unfinished">Venda</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="291"/>
-      <source>Uzbek</source>
-      <translation type="unfinished">Uzbek</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="148"/>
-      <source>Welsh</source>
-      <translation type="unfinished">Welsh</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="296"/>
-      <source>Wolof</source>
-      <translation type="unfinished">Wolof</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="297"/>
-      <source>Xhosa</source>
-      <translation type="unfinished">Xhosa</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="190"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="250"/>
-      <source>Raeto-Romance</source>
-      <translation type="unfinished">Raeto-Romance</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="152"/>
-      <source>Dzongkha</source>
-      <translation type="unfinished">Dzongkha</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="201"/>
-      <source>Kannada</source>
-      <translation type="unfinished">Kannada</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="230"/>
-      <source>North Ndebele</source>
-      <translation type="unfinished">North Ndebele</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="119"/>
-      <source>Abkhazian</source>
-      <translation type="unfinished">Abkhazian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="208"/>
-      <source>Kirghiz</source>
-      <translation type="unfinished">Kirghiz</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="251"/>
-      <source>Kirundi</source>
-      <translation type="unfinished">Kirundi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="168"/>
-      <source>Scottish Gaelic</source>
-      <translation type="unfinished">Scottish Gaelic</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="267"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="217"/>
-      <source>Latvian</source>
-      <translation type="unfinished">Latvian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="222"/>
-      <source>Malayalam</source>
-      <translation type="unfinished">Malayalam</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="205"/>
-      <source>Kurdish</source>
-      <translation type="unfinished">Kurdish</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="132"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="213"/>
-      <source>Lingala</source>
-      <translation type="unfinished">Lingala</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="226"/>
-      <source>Maltese</source>
-      <translation type="unfinished">Maltese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="224"/>
-      <source>Marathi</source>
-      <translation type="unfinished">Marathi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="125"/>
-      <source>Arabic</source>
-      <translation type="unfinished">Arabic</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="159"/>
-      <source>Basque</source>
-      <translation type="unfinished">Basque</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="127"/>
-      <source>Avaric</source>
-      <translation type="unfinished">Avaric</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="133"/>
-      <source>Bihari</source>
-      <translation type="unfinished">Bihari</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="128"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="138"/>
-      <source>Breton</source>
-      <translation type="unfinished">Breton</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="271"/>
-      <source>Sundanese</source>
-      <translation type="unfinished">Sundanese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="149"/>
-      <source>Danish</source>
-      <translation type="unfinished">Danish</translation>
-    </message>
     <message>
       <location filename="../src/language.cc" line="151"/>
-      <source>Divehi</source>
-      <translation type="unfinished">Divehi</translation>
+      <source>Ewe</source>
+      <translation>Cừu cái</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
-      <source>Luba-Katanga</source>
-      <translation type="unfinished">Luba-Katanga</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="163"/>
-      <source>Fijian</source>
-      <translation type="unfinished">Fijian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="179"/>
-      <source>Hungarian</source>
-      <translation type="unfinished">Hungarian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="165"/>
-      <source>French</source>
-      <translation type="unfinished">French</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="150"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="223"/>
-      <source>Mongolian</source>
-      <translation type="unfinished">Mongolian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="174"/>
-      <source>Hebrew</source>
-      <translation type="unfinished">Hebrew</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="181"/>
-      <source>Herero</source>
-      <translation type="unfinished">Herero</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="210"/>
-      <source>Luxembourgish</source>
-      <translation type="unfinished">Luxembourgish</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="203"/>
-      <source>Kanuri</source>
-      <translation type="unfinished">Kanuri</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="198"/>
-      <source>Kazakh</source>
-      <translation type="unfinished">Kazakh</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="196"/>
-      <source>Kikuyu</source>
-      <translation type="unfinished">Kikuyu</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="202"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="237"/>
-      <source>Navajo</source>
-      <translation type="unfinished">Navajo</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="232"/>
-      <source>Ndonga</source>
-      <translation type="unfinished">Ndonga</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="231"/>
-      <source>Nepali</source>
-      <translation type="unfinished">Nepali</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="240"/>
-      <source>Ojibwa</source>
-      <translation type="unfinished">Ojibwa</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="247"/>
-      <source>Pashto</source>
-      <translation type="unfinished">Pashto</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="246"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="264"/>
-      <source>Samoan</source>
-      <translation type="unfinished">Samoan</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="239"/>
-      <source>Occitan</source>
-      <translation type="unfinished">Occitan</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="257"/>
-      <source>Sindhi</source>
-      <translation type="unfinished">Sindhi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="262"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="266"/>
-      <source>Somali</source>
-      <translation type="unfinished">Somali</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="275"/>
-      <source>Telugu</source>
-      <translation type="unfinished">Telugu</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="284"/>
-      <source>Tsonga</source>
-      <translation type="unfinished">Tsonga</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="281"/>
-      <source>Tswana</source>
-      <translation type="unfinished">Tswana</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="288"/>
-      <source>Uighur</source>
-      <translation type="unfinished">Uighur</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="260"/>
-      <source>Serbo-Croatian</source>
-      <translation type="unfinished">Serbo-Croatian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="299"/>
-      <source>Yoruba</source>
-      <translation type="unfinished">Yoruba</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="300"/>
-      <source>Zhuang</source>
-      <translation type="unfinished">Zhuang</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="252"/>
-      <source>Romanian</source>
-      <translation type="unfinished">Romanian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="183"/>
-      <source>Indonesian</source>
-      <translation type="unfinished">Indonesian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="244"/>
-      <source>Panjabi</source>
-      <translation type="unfinished">Panjabi</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="270"/>
-      <source>Southern Sotho</source>
-      <translation type="unfinished">Southern Sotho</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="143"/>
-      <source>Corsican</source>
-      <translation type="unfinished">Corsican</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="156"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="160"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="263"/>
-      <source>Slovenian</source>
-      <translation type="unfinished">Slovenian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="166"/>
-      <source>Western Frisian</source>
-      <translation type="unfinished">Western Frisian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="124"/>
-      <source>Aragonese</source>
-      <translation type="unfinished">Aragonese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="287"/>
-      <source>Tahitian</source>
-      <translation type="unfinished">Tahitian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="218"/>
-      <source>Malagasy</source>
-      <translation type="unfinished">Malagasy</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="169"/>
-      <source>Galician</source>
-      <translation type="unfinished">Galician</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="129"/>
-      <source>Azerbaijani</source>
-      <translation type="unfinished">Azerbaijani</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="123"/>
-      <source>Amharic</source>
-      <translation type="unfinished">Amharic</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="255"/>
-      <source>Sanskrit</source>
-      <translation type="unfinished">Sanskrit</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="192"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="289"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="135"/>
-      <source>Bambara</source>
-      <translation type="unfinished">Bambara</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="199"/>
-      <source>Kalaallisut</source>
-      <translation type="unfinished">Kalaallisut</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="130"/>
-      <source>Bashkir</source>
-      <translation type="unfinished">Bashkir</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="131"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="204"/>
-      <source>Kashmiri</source>
-      <translation type="unfinished">Kashmiri</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="256"/>
-      <source>Sardinian</source>
-      <translation type="unfinished">Sardinian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="176"/>
-      <source>Hiri Motu</source>
-      <translation type="unfinished">Hiri Motu</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="249"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="136"/>
-      <source>Bengali</source>
-      <translation type="unfinished">Bengali</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="193"/>
-      <source>Javanese</source>
-      <translation type="unfinished">Javanese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="120"/>
-      <source>Avestan</source>
-      <translation type="unfinished">Avestan</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="254"/>
-      <source>Kinyarwanda</source>
-      <translation type="unfinished">Kinyarwanda</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="121"/>
-      <source>Afrikaans</source>
-      <translation type="unfinished">Afrikaans</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="134"/>
-      <source>Bislama</source>
-      <translation type="unfinished">Bislama</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="180"/>
-      <source>Armenian</source>
-      <translation type="unfinished">Armenian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="229"/>
-      <source>Norwegian Bokmal</source>
-      <translation type="unfinished">Norwegian Bokmal</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="177"/>
-      <source>Croatian</source>
-      <translation type="unfinished">Croatian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="139"/>
-      <source>Bosnian</source>
-      <translation type="unfinished">Bosnian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="182"/>
-      <source>Interlingua</source>
-      <translation type="unfinished">Interlingua</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="184"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="140"/>
-      <source>Catalan</source>
-      <translation type="unfinished">Catalan</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="268"/>
-      <source>Serbian</source>
-      <translation type="unfinished">Serbian</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="227"/>
-      <source>Burmese</source>
-      <translation type="unfinished">Burmese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="253"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <location filename="../src/language.cc" line="186"/>
+      <source>Ido</source>
+      <translation>Tôi làm</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="212"/>
-      <source>Limburgish</source>
-      <translation type="unfinished">Limburgish</translation>
+      <source>Lao</source>
+      <translation>Lào</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
-      <source>Norwegian</source>
-      <translation type="unfinished">Norwegian</translation>
+      <location filename="../src/language.cc" line="284"/>
+      <source>Twi</source>
+      <translation>Twi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
-      <source>Chechen</source>
-      <translation type="unfinished">Chechen</translation>
+      <location filename="../src/language.cc" line="116"/>
+      <source>Afar</source>
+      <translation>Xa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
-      <source>Chinese</source>
-      <translation type="unfinished">Chinese</translation>
+      <location filename="../src/language.cc" line="120"/>
+      <source>Akan</source>
+      <translation>tiếng Akan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
-      <source>Chuvash</source>
-      <translation type="unfinished">Chuvash</translation>
+      <location filename="../src/language.cc" line="142"/>
+      <source>Cree</source>
+      <translation>Cree</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
-      <source>Sinhala</source>
-      <translation type="unfinished">Sinhala</translation>
+      <location filename="../src/language.cc" line="183"/>
+      <source>Igbo</source>
+      <translation>tiếng Igbo</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <location filename="../src/language.cc" line="204"/>
+      <source>Komi</source>
+      <translation>komi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
-      <source>Cornish</source>
-      <translation type="unfinished">Cornish</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="280"/>
-      <source>Tagalog</source>
-      <translation type="unfinished">Tagalog</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="126"/>
-      <source>Assamese</source>
-      <translation type="unfinished">Assamese</translation>
+      <location filename="../src/language.cc" line="170"/>
+      <source>Manx</source>
+      <translation>Manx</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="243"/>
-      <source>Ossetian</source>
-      <translation type="unfinished">Ossetian</translation>
+      <source>Pali</source>
+      <translation>tiếng Pali</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
-      <source>Estonian</source>
-      <translation type="unfinished">Estonian</translation>
+      <location filename="../src/language.cc" line="275"/>
+      <source>Thai</source>
+      <translation>tiếng Thái</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
-      <source>Swahili</source>
-      <translation type="unfinished">Swahili</translation>
+      <location filename="../src/language.cc" line="288"/>
+      <source>Urdu</source>
+      <translation>tiếng Urdu</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="300"/>
+      <source>Zulu</source>
+      <translation>Zulu</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="143"/>
+      <source>Czech</source>
+      <translation>tiếng séc</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="231"/>
+      <source>Dutch</source>
+      <translation>tiếng Hà Lan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="209"/>
+      <source>Ganda</source>
+      <translation>Ganda</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="159"/>
+      <source>Fulah</source>
+      <translation>Phúc âm</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="152"/>
+      <source>Greek</source>
+      <translation>người Hy Lạp</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="171"/>
+      <source>Hausa</source>
+      <translation>Hausa</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="173"/>
+      <source>Hindi</source>
+      <translation>tiếng Hin-ddi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="165"/>
+      <source>Irish</source>
+      <translation>người Ireland</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="198"/>
+      <source>Khmer</source>
+      <translation>khmer</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="193"/>
+      <source>Kongo</source>
+      <translation>Kongo</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="207"/>
+      <source>Latin</source>
+      <translation>Latin</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="223"/>
+      <source>Malay</source>
+      <translation>tiếng Mã Lai</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="218"/>
+      <source>Maori</source>
+      <translation>người Maori</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="226"/>
+      <source>Nauru</source>
+      <translation>Nauru</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="240"/>
+      <source>Oriya</source>
+      <translation>Oriya</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="239"/>
+      <source>Oromo</source>
+      <translation>tiếng Oromo</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="257"/>
+      <source>Sango</source>
+      <translation>sango</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="263"/>
+      <source>Shona</source>
+      <translation>Shona</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="274"/>
+      <source>Tajik</source>
+      <translation>tajik</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="272"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Tamil</source>
+      <translation>tiếng Tamil</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="283"/>
+      <source>Tatar</source>
+      <translation>tatar</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="267"/>
+      <source>Swati</source>
+      <translation>chữ Swati</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="280"/>
+      <source>Tonga</source>
+      <translation>tonga</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="185"/>
+      <source>Inupiaq</source>
+      <translation>Inupiaq</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="290"/>
+      <source>Venda</source>
+      <translation>Venda</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="289"/>
+      <source>Uzbek</source>
+      <translation>tiếng Uzbek</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="146"/>
+      <source>Welsh</source>
+      <translation>người xứ Wales</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="294"/>
+      <source>Wolof</source>
+      <translation>chó sói</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="295"/>
+      <source>Xhosa</source>
+      <translation>Xhosa</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="188"/>
+      <source>Italian</source>
+      <translation>người Ý</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="248"/>
+      <source>Raeto-Romance</source>
+      <translation>Raeto-Lãng Mạn</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="150"/>
+      <source>Dzongkha</source>
+      <translation>Dzongkha</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="199"/>
+      <source>Kannada</source>
+      <translation>tiếng Kannada</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="228"/>
+      <source>North Ndebele</source>
+      <translation>Bắc Ndebele</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="117"/>
+      <source>Abkhazian</source>
+      <translation>tiếng Abkhazia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="206"/>
+      <source>Kirghiz</source>
+      <translation>Ki-ri-gít</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="249"/>
+      <source>Kirundi</source>
+      <translation>Kirundi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="166"/>
+      <source>Scottish Gaelic</source>
+      <translation>Tiếng Gaelic Scotland</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="265"/>
+      <source>Albanian</source>
+      <translation>tiếng Albania</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="215"/>
+      <source>Latvian</source>
+      <translation>tiếng Latvia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="220"/>
+      <source>Malayalam</source>
+      <translation>tiếng Malayalam</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="203"/>
+      <source>Kurdish</source>
+      <translation>người Kurd</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="130"/>
+      <source>Bulgarian</source>
+      <translation>tiếng Bungari</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="211"/>
+      <source>Lingala</source>
+      <translation>Lingala</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="224"/>
+      <source>Maltese</source>
+      <translation>cây nho</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="222"/>
+      <source>Marathi</source>
+      <translation>tiếng Marathi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="123"/>
+      <source>Arabic</source>
+      <translation>tiếng Ả Rập</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="157"/>
+      <source>Basque</source>
+      <translation>xứ Basque</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="125"/>
+      <source>Avaric</source>
+      <translation>Avaric</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="131"/>
+      <source>Bihari</source>
+      <translation>Bihari</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="126"/>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="136"/>
+      <source>Breton</source>
+      <translation>Breton</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="269"/>
+      <source>Sundanese</source>
+      <translation>tiếng Sundan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="147"/>
+      <source>Danish</source>
+      <translation>người Đan Mạch</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="149"/>
+      <source>Divehi</source>
+      <translation>lặn</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="214"/>
+      <source>Luba-Katanga</source>
+      <translation>Luba-Katanga</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="161"/>
+      <source>Fijian</source>
+      <translation>người Fiji</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="177"/>
+      <source>Hungarian</source>
+      <translation>người Hungary</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="163"/>
+      <source>French</source>
+      <translation>người Pháp</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="148"/>
+      <source>German</source>
+      <translation>tiếng Đức</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="221"/>
+      <source>Mongolian</source>
+      <translation>Mông Cổ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="172"/>
+      <source>Hebrew</source>
+      <translation>tiếng Do Thái</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="179"/>
+      <source>Herero</source>
+      <translation>Herero</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="208"/>
+      <source>Luxembourgish</source>
+      <translation>tiếng Luxembourg</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="201"/>
+      <source>Kanuri</source>
+      <translation>Kanuri</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="196"/>
+      <source>Kazakh</source>
+      <translation>tiếng Kazakh</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="194"/>
+      <source>Kikuyu</source>
+      <translation>Kikuyu</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="200"/>
+      <source>Korean</source>
+      <translation>Hàn Quốc</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="235"/>
+      <source>Navajo</source>
+      <translation>Navajo</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="230"/>
+      <source>Ndonga</source>
+      <translation>Ndonga</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="229"/>
+      <source>Nepali</source>
+      <translation>tiếng Nepal</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="238"/>
+      <source>Ojibwa</source>
+      <translation>Ojibwa</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="245"/>
+      <source>Pashto</source>
+      <translation>pashto</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="244"/>
+      <source>Polish</source>
+      <translation>Đánh bóng</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="262"/>
+      <source>Samoan</source>
+      <translation>tiếng Samoa</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="237"/>
+      <source>Occitan</source>
+      <translation>tiếng Occitan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="255"/>
+      <source>Sindhi</source>
+      <translation>Sindhi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="260"/>
+      <source>Slovak</source>
+      <translation>tiếng Slovak</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="264"/>
+      <source>Somali</source>
+      <translation>người Somali</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="273"/>
+      <source>Telugu</source>
+      <translation>tiếng Telugu</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="282"/>
+      <source>Tsonga</source>
+      <translation>Tsonga</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="279"/>
+      <source>Tswana</source>
+      <translation>Tswana</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="286"/>
+      <source>Uighur</source>
+      <translation>người Duy Ngô Nhĩ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="258"/>
+      <source>Serbo-Croatian</source>
+      <translation>Tiếng Serbo-Croatia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="297"/>
+      <source>Yoruba</source>
+      <translation>Yoruba</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="298"/>
+      <source>Zhuang</source>
+      <translation>Choang</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="250"/>
+      <source>Romanian</source>
+      <translation>Rumani</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="181"/>
+      <source>Indonesian</source>
+      <translation>tiếng Indonesia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="242"/>
+      <source>Panjabi</source>
+      <translation>Panjabi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="268"/>
+      <source>Southern Sotho</source>
+      <translation>Nam Sotho</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="141"/>
+      <source>Corsican</source>
+      <translation>Corsican</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="154"/>
+      <source>Esperanto</source>
+      <translation>quốc tế ngữ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="158"/>
+      <source>Persian</source>
+      <translation>Ba Tư</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="261"/>
+      <source>Slovenian</source>
+      <translation>tiếng Slovenia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="164"/>
+      <source>Western Frisian</source>
+      <translation>Tây Frisia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="122"/>
+      <source>Aragonese</source>
+      <translation>tiếng Aragon</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="285"/>
+      <source>Tahitian</source>
+      <translation>Tahiti</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="216"/>
+      <source>Malagasy</source>
+      <translation>Malagasy</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="167"/>
+      <source>Galician</source>
+      <translation>tiếng Galicia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="127"/>
+      <source>Azerbaijani</source>
+      <translation>tiếng azerbaijan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="121"/>
+      <source>Amharic</source>
+      <translation>tiếng Amharic</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="253"/>
+      <source>Sanskrit</source>
+      <translation>tiếng Phạn</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="190"/>
+      <source>Japanese</source>
+      <translation>tiếng Nhật</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="287"/>
+      <source>Ukrainian</source>
+      <translation>tiếng Ukraina</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="133"/>
+      <source>Bambara</source>
+      <translation>Bambara</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="197"/>
+      <source>Kalaallisut</source>
+      <translation>kalaallisut</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="128"/>
+      <source>Bashkir</source>
+      <translation>Bashkir</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="129"/>
+      <source>Belarusian</source>
+      <translation>Người Belarus</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="202"/>
+      <source>Kashmiri</source>
+      <translation>người Kashmir</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="254"/>
+      <source>Sardinian</source>
+      <translation>Sardinia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="174"/>
+      <source>Hiri Motu</source>
+      <translation>Hiri Motu</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="247"/>
+      <source>Quechua</source>
+      <translation>quechua</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="134"/>
+      <source>Bengali</source>
+      <translation>tiếng Bengali</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="191"/>
+      <source>Javanese</source>
+      <translation>người Java</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="118"/>
+      <source>Avestan</source>
+      <translation>Avestan</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="252"/>
+      <source>Kinyarwanda</source>
+      <translation>Kinyarwanda</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="119"/>
+      <source>Afrikaans</source>
+      <translation>tiếng Nam Phi</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="132"/>
+      <source>Bislama</source>
+      <translation>Hồi giáo</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="178"/>
+      <source>Armenian</source>
+      <translation>người Armenia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="227"/>
+      <source>Norwegian Bokmal</source>
+      <translation>Na Uy Bokmal</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="175"/>
+      <source>Croatian</source>
+      <translation>tiếng Croatia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="137"/>
-      <source>Tibetan</source>
-      <translation type="unfinished">Tibetan</translation>
+      <source>Bosnian</source>
+      <translation>người Bosnia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="180"/>
+      <source>Interlingua</source>
+      <translation>liên ngôn ngữ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="182"/>
+      <source>Interlingue</source>
+      <translation>xen kẽ</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="138"/>
+      <source>Catalan</source>
+      <translation>tiếng Catalunya</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="266"/>
+      <source>Serbian</source>
+      <translation>tiếng Serbia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="225"/>
+      <source>Burmese</source>
+      <translation>người Miến Điện</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="251"/>
+      <source>Russian</source>
+      <translation>tiếng Nga</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="210"/>
+      <source>Limburgish</source>
+      <translation>Limburgish</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="233"/>
+      <source>Norwegian</source>
+      <translation>tiếng na uy</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="139"/>
+      <source>Chechen</source>
+      <translation>Chechnya</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="299"/>
+      <source>Chinese</source>
+      <translation>người Trung Quốc</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="145"/>
+      <source>Chuvash</source>
+      <translation>Chuvash</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="259"/>
+      <source>Sinhala</source>
+      <translation>Sinhala</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="155"/>
+      <source>Spanish</source>
+      <translation>người Tây Ban Nha</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="205"/>
+      <source>Cornish</source>
+      <translation>tiếng Cornwall</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="278"/>
+      <source>Tagalog</source>
+      <translation>Tagalog</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="124"/>
+      <source>Assamese</source>
+      <translation>tiếng Assam</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="241"/>
+      <source>Ossetian</source>
+      <translation>Ossetia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="156"/>
+      <source>Estonian</source>
+      <translation>tiếng Estonia</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="271"/>
+      <source>Swahili</source>
+      <translation>tiếng Swahili</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="270"/>
+      <source>Swedish</source>
+      <translation>Thụy Điển</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="135"/>
+      <source>Tibetan</source>
+      <translation>Tây Tạng</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>Tiếng Việt</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <translation>tiếng Macedonia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <translation>tiếng Bồ Đào Nha</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <translation>Thổ Nhĩ Kỳ</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <translation>người Turkmenistan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
-      <translation type="unfinished">Gujarati</translation>
+      <translation>Gujarati</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="187"/>
+      <source>Icelandic</source>
+      <translation>tiếng Iceland</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="189"/>
-      <source>Icelandic</source>
-      <translation type="unfinished">Icelandic</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="191"/>
       <source>Inuktitut</source>
-      <translation type="unfinished">Inuktitut</translation>
+      <translation>Inuktitut</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Tiếng Anh</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
-      <translation type="unfinished">Georgian</translation>
+      <translation>Gruzia</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
-      <translation type="unfinished">Church Slavic</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="164"/>
-      <source>Faroese</source>
-      <translation type="unfinished">Faroese</translation>
+      <translation>nhà thờ Slavic</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="162"/>
+      <source>Faroese</source>
+      <translation>tiếng Faroe</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <translation>Phần Lan</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
-      <translation type="unfinished">Volapuk</translation>
+      <translation>Volapuk</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
-      <translation type="unfinished">Walloon</translation>
+      <translation>Wallonie</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
-      <translation type="unfinished">Kwanyama</translation>
+      <translation>Kwanyama</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
-      <translation type="unfinished">Marshallese</translation>
+      <translation>người Marshall</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
-      <translation type="unfinished">Northern Sami</translation>
+      <translation>Bắc Sami</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
-      <translation type="unfinished">Haitian</translation>
+      <translation>Haiti</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
-      <translation type="unfinished">Chamorro</translation>
+      <translation>Chamorro</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="232"/>
+      <source>Norwegian Nynorsk</source>
+      <translation>Na Uy Nynorsk</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="168"/>
+      <source>Guarani</source>
+      <translation>Guarani</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="234"/>
-      <source>Norwegian Nynorsk</source>
-      <translation type="unfinished">Norwegian Nynorsk</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="170"/>
-      <source>Guarani</source>
-      <translation type="unfinished">Guarani</translation>
+      <source>South Ndebele</source>
+      <translation>Nam Ndebele</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="236"/>
-      <source>South Ndebele</source>
-      <translation type="unfinished">South Ndebele</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="238"/>
       <source>Chichewa</source>
-      <translation type="unfinished">Chichewa</translation>
+      <translation>Chichewa</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <translation>Litva</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
-      <translation type="unfinished">Sichuan Yi</translation>
+      <translation>Tứ Xuyên Yi</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
-      <translation type="unfinished">Tigrinya</translation>
+      <translation>tigrinya</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
-      <translation type="unfinished">Yiddish</translation>
+      <translation>tiếng Yiddish</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="437"/>
+      <source>Traditional Chinese</source>
+      <translation>Truyền thống Trung Quốc</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="438"/>
+      <source>Simplified Chinese</source>
+      <translation>Tiếng Trung giản thể</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="439"/>
-      <source>Traditional Chinese</source>
-      <translation type="unfinished">Traditional Chinese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="440"/>
-      <source>Simplified Chinese</source>
-      <translation type="unfinished">Simplified Chinese</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="441"/>
       <source>Other</source>
       <translation>Khác</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
-      <translation type="unfinished">Other Simplified Chinese dialects</translation>
+      <translation>Các phương ngữ tiếng Trung giản thể khác</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="441"/>
+      <source>Other Traditional Chinese dialects</source>
+      <translation>Các phương ngữ Trung Quốc truyền thống khác</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="442"/>
+      <source>Other Eastern-European languages</source>
+      <translation>Các ngôn ngữ Đông Âu khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="443"/>
-      <source>Other Traditional Chinese dialects</source>
-      <translation type="unfinished">Other Traditional Chinese dialects</translation>
+      <source>Other Western-European languages</source>
+      <translation>Các ngôn ngữ Tây-Âu khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="444"/>
-      <source>Other Eastern-European languages</source>
-      <translation type="unfinished">Other Eastern-European languages</translation>
+      <source>Other Russian languages</source>
+      <translation>Các ngôn ngữ Nga khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="445"/>
-      <source>Other Western-European languages</source>
-      <translation type="unfinished">Other Western-European languages</translation>
+      <source>Other Japanese languages</source>
+      <translation>Các ngôn ngữ Nhật Bản khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="446"/>
-      <source>Other Russian languages</source>
-      <translation type="unfinished">Other Russian languages</translation>
+      <source>Other Baltic languages</source>
+      <translation>Các ngôn ngữ Baltic khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="447"/>
-      <source>Other Japanese languages</source>
-      <translation type="unfinished">Other Japanese languages</translation>
+      <source>Other Greek languages</source>
+      <translation>Các ngôn ngữ Hy Lạp khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="448"/>
-      <source>Other Baltic languages</source>
-      <translation type="unfinished">Other Baltic languages</translation>
+      <source>Other Korean dialects</source>
+      <translation>Các phương ngữ tiếng Hàn khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="449"/>
-      <source>Other Greek languages</source>
-      <translation type="unfinished">Other Greek languages</translation>
+      <source>Other Turkish dialects</source>
+      <translation>Các phương ngữ Thổ Nhĩ Kỳ khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="450"/>
-      <source>Other Korean dialects</source>
-      <translation type="unfinished">Other Korean dialects</translation>
+      <source>Other Thai dialects</source>
+      <translation>Các phương ngữ tiếng Thái khác</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="451"/>
-      <source>Other Turkish dialects</source>
-      <translation type="unfinished">Other Turkish dialects</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="452"/>
-      <source>Other Thai dialects</source>
-      <translation type="unfinished">Other Thai dialects</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="453"/>
       <source>Tamazight</source>
-      <translation type="unfinished">Tamazight</translation>
+      <translation>tamazight</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
+      <translation>Lojban</translation>
     </message>
   </context>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
-      <translation type="unfinished">French</translation>
+      <translation>người Pháp</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="40"/>
+      <source>Spanish</source>
+      <translation>người Tây Ban Nha</translation>
+    </message>
+    <message>
+      <location filename="../src/language.cc" line="41"/>
+      <source>Belarusian</source>
+      <translation>Người Belarus</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="42"/>
-      <source>Spanish</source>
-      <translation type="unfinished">Spanish</translation>
+      <source>Bulgarian</source>
+      <translation>tiếng Bungari</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="43"/>
-      <source>Belarusian</source>
-      <translation type="unfinished">Belarusian</translation>
+      <source>Czech</source>
+      <translation>tiếng séc</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="44"/>
-      <source>Bulgarian</source>
-      <translation type="unfinished">Bulgarian</translation>
+      <source>German</source>
+      <translation>tiếng Đức</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="45"/>
-      <source>Czech</source>
-      <translation type="unfinished">Czech</translation>
+      <source>Greek</source>
+      <translation>người Hy Lạp</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="46"/>
-      <source>German</source>
-      <translation type="unfinished">German</translation>
+      <source>Finnish</source>
+      <translation>Phần Lan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="47"/>
-      <source>Greek</source>
-      <translation type="unfinished">Greek</translation>
+      <source>Italian</source>
+      <translation>người Ý</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="48"/>
-      <source>Finnish</source>
-      <translation type="unfinished">Finnish</translation>
+      <source>Japanese</source>
+      <translation>tiếng Nhật</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="49"/>
-      <source>Italian</source>
-      <translation type="unfinished">Italian</translation>
+      <source>Korean</source>
+      <translation>Hàn Quốc</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="50"/>
-      <source>Japanese</source>
-      <translation type="unfinished">Japanese</translation>
+      <source>Lithuanian</source>
+      <translation>Litva</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="51"/>
-      <source>Korean</source>
-      <translation type="unfinished">Korean</translation>
+      <source>Macedonian</source>
+      <translation>tiếng Macedonia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="52"/>
-      <source>Lithuanian</source>
-      <translation type="unfinished">Lithuanian</translation>
+      <source>Dutch</source>
+      <translation>tiếng Hà Lan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="53"/>
-      <source>Macedonian</source>
-      <translation type="unfinished">Macedonian</translation>
+      <source>Polish</source>
+      <translation>Đánh bóng</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="54"/>
-      <source>Dutch</source>
-      <translation type="unfinished">Dutch</translation>
+      <source>Portuguese</source>
+      <translation>tiếng Bồ Đào Nha</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="55"/>
-      <source>Polish</source>
-      <translation type="unfinished">Polish</translation>
+      <source>Russian</source>
+      <translation>tiếng Nga</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="56"/>
-      <source>Portuguese</source>
-      <translation type="unfinished">Portuguese</translation>
+      <source>Slovak</source>
+      <translation>tiếng Slovak</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="57"/>
-      <source>Russian</source>
-      <translation type="unfinished">Russian</translation>
+      <source>Albanian</source>
+      <translation>tiếng Albania</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="58"/>
-      <source>Slovak</source>
-      <translation type="unfinished">Slovak</translation>
+      <source>Serbian (Cyrillic)</source>
+      <translation>Tiếng Serbia (Cyrillic)</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="59"/>
-      <source>Albanian</source>
-      <translation type="unfinished">Albanian</translation>
+      <source>Swedish</source>
+      <translation>Thụy Điển</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="60"/>
-      <source>Serbian (Cyrillic)</source>
-      <translation type="unfinished">Serbian (Cyrillic)</translation>
+      <source>Turkish</source>
+      <translation>Thổ Nhĩ Kỳ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="61"/>
-      <source>Swedish</source>
-      <translation type="unfinished">Swedish</translation>
+      <source>Ukrainian</source>
+      <translation>tiếng Ukraina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="62"/>
-      <source>Turkish</source>
-      <translation type="unfinished">Turkish</translation>
+      <source>Chinese Simplified</source>
+      <translation>tiếng trung giản thể</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="63"/>
-      <source>Ukrainian</source>
-      <translation type="unfinished">Ukrainian</translation>
+      <source>Chinese Traditional</source>
+      <translation>Truyền thống Trung Hoa</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="64"/>
-      <source>Chinese Simplified</source>
-      <translation type="unfinished">Chinese Simplified</translation>
+      <source>Vietnamese</source>
+      <translation>Tiếng Việt</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="65"/>
-      <source>Chinese Traditional</source>
-      <translation type="unfinished">Chinese Traditional</translation>
+      <source>Portuguese, Brazilian</source>
+      <translation>Bồ Đào Nha, Brazil</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="66"/>
-      <source>Vietnamese</source>
-      <translation type="unfinished">Vietnamese</translation>
+      <source>Persian</source>
+      <translation>Ba Tư</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="67"/>
-      <source>Portuguese, Brazilian</source>
-      <translation type="unfinished">Portuguese, Brazilian</translation>
+      <source>Spanish, Argentina</source>
+      <translation>Tây Ban Nha, Argentina</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="68"/>
-      <source>Persian</source>
-      <translation type="unfinished">Persian</translation>
+      <source>Hindi</source>
+      <translation>tiếng Hin-ddi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="69"/>
-      <source>Spanish, Argentina</source>
-      <translation type="unfinished">Spanish, Argentina</translation>
+      <source>Esperanto</source>
+      <translation>quốc tế ngữ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="70"/>
-      <source>Hindi</source>
-      <translation type="unfinished">Hindi</translation>
+      <source>German, Switzerland</source>
+      <translation>Đức, Thụy Sĩ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="71"/>
-      <source>Esperanto</source>
-      <translation type="unfinished">Esperanto</translation>
+      <source>Spanish, Bolivia</source>
+      <translation>Tây Ban Nha, Bôlivia</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="72"/>
-      <source>German, Switzerland</source>
-      <translation type="unfinished">German, Switzerland</translation>
+      <source>Tajik</source>
+      <translation>tajik</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="73"/>
-      <source>Spanish, Bolivia</source>
-      <translation type="unfinished">Spanish, Bolivia</translation>
+      <source>Quechua</source>
+      <translation>quechua</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="74"/>
-      <source>Tajik</source>
-      <translation type="unfinished">Tajik</translation>
+      <source>Aymara</source>
+      <translation>Aymara</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="75"/>
-      <source>Quechua</source>
-      <translation type="unfinished">Quechua</translation>
+      <source>Arabic, Saudi Arabia</source>
+      <translation>Ả Rập, Ả Rập Saudi</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="76"/>
-      <source>Aymara</source>
-      <translation type="unfinished">Aymara</translation>
+      <source>Turkmen</source>
+      <translation>người Turkmenistan</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="77"/>
-      <source>Arabic, Saudi Arabia</source>
-      <translation type="unfinished">Arabic, Saudi Arabia</translation>
+      <source>Interlingue</source>
+      <translation>xen kẽ</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="78"/>
-      <source>Turkmen</source>
-      <translation type="unfinished">Turkmen</translation>
+      <source>Lojban</source>
+      <translation>Lojban</translation>
     </message>
     <message>
       <location filename="../src/language.cc" line="79"/>
-      <source>Interlingue</source>
-      <translation type="unfinished">Interlingue</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="80"/>
-      <source>Lojban</source>
-      <translation type="unfinished">Lojban</translation>
-    </message>
-    <message>
-      <location filename="../src/language.cc" line="81"/>
       <source>English</source>
-      <translation type="unfinished">English</translation>
+      <translation>Tiếng Anh</translation>
     </message>
   </context>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>Lỗi nạp từ điển</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>Tệp cấu hình lỗi. Tiếp tục với thiết lập mặc định?</translation>
     </message>
@@ -2740,702 +2713,702 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
-      <translation type="unfinished">F1</translation>
+      <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
-      <translation type="unfinished">F2</translation>
+      <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
-      <translation type="unfinished">Favo&amp;rites</translation>
+      <translation>&amp;yêu thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
-      <translation type="unfinished">F3</translation>
+      <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
-      <translation type="unfinished">F4</translation>
+      <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>Tất cả</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>Trở lại</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>%1 từ điển, %2 bài viết, %3 từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>&amp;Biên tập</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>&amp;Tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>&amp;Giúp đỡ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>Tìm kiếm</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>Th&amp;oát</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>Lỗi</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>Thoát khỏi ứng dụng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>Đóng &amp;xuống khay hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>Không thể lưu Bài viết: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>Phóng to</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>&amp;Từ điển...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>&amp;Giới thiệu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>&amp;Diễn đàn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>&amp;In</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>&amp;Lưu Bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>Lưu Bài viết như</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
-      <translation type="unfinished">Ctrl+P</translation>
+      <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
-      <translation type="unfinished">Ctrl+Q</translation>
+      <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>Thu gọn cửa sổ xuống khay hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>&amp;Thiết lập Trang</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>T&amp;rang chủ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>Phiên bản mới đã có</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>Tra từ:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>Thu nhỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>Hiện cử&amp;a sổ chính</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>Về Từ điển Vàng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>Tải về</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>Thiết lập Trang</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>Tra từ trong:</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>Cỡ bình thường</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <source>Failed to initialize hotkeys monitoring mechanism.&lt;br&gt;Make sure your XServer has RECORD extension turned on.</source>
       <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>
-      <location filename="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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>Phiên bản &lt;b&gt;%1&lt;/b&gt; của Từ điển Vàng đã sẵn sàng để tải về.&lt;br&gt;Nhấn &lt;b&gt;Tải về&lt;/b&gt; để tới trang tải.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
-      <translation type="unfinished">Ctrl+F4</translation>
+      <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
-      <translation type="unfinished">Ctrl+F5</translation>
+      <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>Đang tải...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(chưa đặt tên)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>Tùy thí&amp;ch...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>Chào mừng!</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Phát âm (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>Lưu Bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>Bỏ qua phiên bản này</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>Tiếp tục</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>In Bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>Không có máy in. Hãy cài máy in trước.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>&amp;Hiển thị</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>&amp;Lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>Xóa sạ&amp;ch</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>Thu &amp;Phóng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>Phóng to Từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>Thu nhỏ Từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>Cỡ Từ bình thường</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>Đóng thẻ hiện tại</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>Đóng tất cả các thẻ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>Đóng tất cả thẻ trừ thẻ hiện tại</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>Các thẻ đã mở</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>Thẻ mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
-      <translation type="unfinished">Ctrl+T</translation>
+      <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>Thư mục &amp;cấu hình</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>Thanh Trì&amp;nh đơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>Từ điển tìm thấy:</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
-      <translation type="unfinished">Add all tabs to Favorites</translation>
+      <translation>Thêm tất cả các tab vào Mục ưa thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>CẢNH BÁO: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>Mở danh sách Thẻ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
-      <translation type="unfinished">Remove current tab from Favorites</translation>
+      <translation>Xóa tab hiện tại khỏi Mục ưa thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>Bạn đã chọn ẩn thanh trình đơn. Dùng %1 để hiển thị lại.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
-      <translation type="unfinished">Ctrl+M</translation>
+      <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>&amp;Hiện</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>&amp;Xuất</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>Ẩ&amp;n</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>Xuất lược sử sang tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>Tệp văn bản (*.txt);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>Hoàn tất xuất lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>Lỗi trích xuất: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
-      <translation type="unfinished">Ctrl+H</translation>
+      <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>Nhậ&amp;p</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>Nhập lược sử từ tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>Lỗi nhập: dữ liệu tệp không đúng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>Hoàn tất nhập lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>Lỗi nhập: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
-      <translation type="unfinished">Export Favorites to file</translation>
+      <translation>Xuất yêu thích sang tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;All files (*.*)</translation>
+      <translation>Tệp XML (*.xml);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
-      <translation type="unfinished">Favorites export complete</translation>
+      <translation>Hoàn tất xuất yêu thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
-      <translation type="unfinished">Export Favorites to file as plain list</translation>
+      <translation>Xuất Mục ưa thích sang tệp dưới dạng danh sách thuần túy</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
-      <translation type="unfinished">Import Favorites from file</translation>
+      <translation>Nhập Mục ưa thích từ tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation type="unfinished">XML files (*.xml);;Txt files (*.txt);;All files (*.*)</translation>
+      <translation>Tệp XML (*.xml);;Tệp Txt (*.txt);;Tất cả tệp (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
-      <translation type="unfinished">Favorites import complete</translation>
+      <translation>Yêu thích nhập khẩu hoàn tất</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
-      <translation type="unfinished">Data parsing error</translation>
+      <translation>Lỗi phân tích dữ liệu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>Thông tin từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>Danh sách từ của từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>Mở thư mục từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>Chỉnh sửa từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
-      <translation type="unfinished">Now indexing for full-text search: </translation>
+      <translation>Hiện đang lập chỉ mục cho tìm kiếm toàn văn: </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
-      <translation type="unfinished">Remove headword &quot;%1&quot; from Favorites?</translation>
+      <translation>Xóa tiêu đề &quot;%1&quot; khỏi Mục ưa thích?</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>Ô Tìm &amp;kiếm</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>Ô Điều hướng Kết &amp;quả</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
-      <translation type="unfinished">Favor&amp;ites Pane</translation>
+      <translation>Ngăn&amp;Ưa thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>X&amp;em trước khi In</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>Q&amp;uét lại các tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>Thẻ &amp;mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>&amp;Luôn hiện</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>Luôn hiện</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
-      <translation type="unfinished">Ctrl+O</translation>
+      <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>Nút Trình đơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>Tìm trong trang</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
-      <translation type="unfinished">Ctrl+F</translation>
+      <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>Tìm toàn văn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
-      <translation type="unfinished">Ctrl+Shift+F</translation>
+      <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>Trợ giúp Từ điển Vàng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
-      <translation type="unfinished">Show</translation>
+      <translation>Trình diễn</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>Trích xuất</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
-      <translation type="unfinished">Import</translation>
+      <translation>Nhập khẩu</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
-      <translation type="unfinished">Add</translation>
+      <translation>Thêm vào</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
-      <translation type="unfinished">Add current tab to Favorites</translation>
+      <translation>Thêm tab hiện tại vào Mục ưa thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
-      <translation type="unfinished">Ctrl+E</translation>
+      <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
-      <translation type="unfinished">Export to list</translation>
+      <translation>Xuất sang danh sách</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>Hiện tên từ điển trên Thanh &amp;Từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>Hiện &amp;biểu tượng nhỏ trên Thanh công cụ</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>Điều hướn&amp;g</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
-      <translation type="unfinished">Enable Scanning</translation>
+      <translation>Bật tính năng quét</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>Bài viết, Toàn bộ (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>Bài viết, chỉ HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>Lưu bài viết...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
-      <translation type="unfinished">Save article complete</translation>
+      <translation>Lưu bài viết hoàn tất</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>Cửa sổ chính luôn hiện trên các trình khác.</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>Thanh Lược &amp;sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>API Khả năng truy cập không được bật</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>Tệp từ điển đã bị xáo trộn hoặc hỏng</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>Lỗi nạp bài viết từ %1, nguyên nhân: %2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>Lỗi phân tích XML: %1 ở %2,%3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>Địa chỉ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>Bật</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>Biểu tượng</translation>
     </message>
@@ -3497,88 +3470,88 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
     <message>
       <location filename="../src/multimediaaudioplayer.cc" line="35"/>
       <source>Couldn&apos;t open audio buffer for reading.</source>
-      <translation type="unfinished">Couldn&apos;t open audio buffer for reading.</translation>
+      <translation>Không thể mở bộ đệm âm thanh để đọc.</translation>
     </message>
   </context>
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>Mẫu</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>Các từ điển không hoạt động (đã vô hiệu hoá):</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>Tên:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>Tổng số bài viết:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>Dịch từ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>Dịch sang:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>Tổng số từ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Adjust the order by dragging and dropping items in it. Drop dictionaries to the inactive group to disable their use.</source>
       <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>
-      <location filename="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>Sắp xếp Từ điển:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>Tệp chứa từ điển này:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>Thông tin từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>Mô tả:</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>Sắp xếp theo tên</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>Sắp xếp theo ngôn ngữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>Danh sách từ của từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>Từ điển hoạt động:%1, không hoạt động: %2</translation>
     </message>
@@ -3586,12 +3559,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>Đường dẫn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>Đệ quy</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
-      <translation type="unfinished">Alt</translation>
+      <translation>thay thế</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>Khởi động xuống khay hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>Phím Shift trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
-      <translation type="unfinished">Ctrl</translation>
+      <translation>Điều khiển</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
-      <translation type="unfinished">Win/Meta</translation>
+      <translation>Thắng/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>Bật biểu tượng trên khay hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>Máy chủ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>Cổng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
-      <translation type="unfinished">Shift</translation>
+      <translation>Sự thay đổi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>Kiểu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>Người dùng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>&amp;Quét Popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3670,136 +3641,136 @@ switching to them.</source>
 không cần chuyển ngay sang chúng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>Sử dụng máy chủ proxy</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>Sử dụng phím tắt sau đây để dịch từ clipboard:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Phím Windows hoặc phím Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>Tự động phát âm trong cửa sổ chính</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>Khởi động cùng hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>Phím Alt trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>Duyệt theo thẻ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>Phím Shift phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, an attempt to close main window would hide it instead of closing
 the application.</source>
       <translation>Ứng dụng sẽ thu gọn xuống khay hệ thống khi đóng cửa sổ chính.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>Âm th&amp;anh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>Bật nếu bạn muốn sử dụng một máy chủ proxy
 cho tất cả các yêu cầu mạng của chương trình.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>Ngôn ngữ giao diện:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>Phím Ctrl trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>Mở thẻ mới dưới nền</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>Mạ&amp;ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>Phím Ctrl phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
-      <translation type="unfinished">Lingvo</translation>
+      <translation>linh vo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>Shift phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>Shift trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Khi chọn từ cần tra nghĩa, nhấn phím tắt đã chọn để hiện popup.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>Tự động phát âm trong quét popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>Mở thẻ mới ngay sau thẻ hiện tại</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>Khởi động lại chương trình để áp dụng thay đổi ngôn ngữ.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Phím Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>Kiểm tra định kỳ phiên bản mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3808,25 +3779,24 @@ thẻ hiện tại (thẻ đang mở). Nếu không chúng sẽ được
 thêm vào sau cùng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>Đóng xuống khay hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>Mặc định hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <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>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3836,140 +3806,140 @@ download page.</source>
  Nếu có, chương trình sẽ thông báo và gợi ý mở trang tải về.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>Khởi động</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>Mật khẩu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>Mặc định</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>G&amp;iao diện</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>Thay đổi ngôn ngữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Phím Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>Sử dụng phím tắt sau đây để ẩn hiện cửa sổ chính:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>Alt trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>Phím Alt phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>Tùy thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>Ctrl trái</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>Alt phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 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>
-      <location filename="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>Ctrl phải</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>Phím tắt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>Khởi động với quét popup được bật</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <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>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Phím Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>Tự động khởi chạy Từ điển Vàng sau khi hệ điều hành khởi động.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>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>
-      <location filename="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
-      <translation type="unfinished">Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</translation>
+      <translation>Không hiển thị cửa sổ bật lên khi lựa chọn hoặc khay nhớ tạm trong một trong các cửa sổ riêng của GoldenDict thay đổi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
-      <translation type="unfinished">Ignore GoldenDict&apos;s own selection and clipboard changes</translation>
+      <translation>Bỏ qua lựa chọn riêng của GoldenDict và thay đổi khay nhớ tạm</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
-      <translation type="unfinished">Play audio files via built-in audio support</translation>
+      <translation>Phát các tệp âm thanh thông qua hỗ trợ âm thanh tích hợp</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
-      <translation type="unfinished">Use internal player:</translation>
+      <translation>Sử dụng trình phát nội bộ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
-      <translation type="unfinished">Choose audio back end</translation>
+      <translation>Chọn đầu cuối âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
-      <translation type="unfinished">Enter audio player command line</translation>
+      <translation>Nhập dòng lệnh trình phát âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3978,533 +3948,575 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 đ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>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 các quảng cáo)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>Phát âm</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>Phát lại</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>Sử dụng chương trình ngoài:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>Nhấp đúp chuột sẽ dịch từ được chọn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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 âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <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>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>Nhấn phím ESC để ẩn cửa sổ chính</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>Ẩn thẻ trên thanh thẻ chính nếu chỉ duy nhất một thẻ được mở.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>Ẩn thẻ đơn nhất</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>Điều chỉnh giá trị này để tránh các trình đơn ngữ cảnh dài.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>Trình đơn ngữ cảnh các từ điển giới hạn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>Hiện từ đã dịch trên cửa sổ chính thay vì cửa sổ popup</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>Hiện từ đã dịch trên cửa sổ chính</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
-      <translation type="unfinished">Show a flag window before showing popup window, click the flag to show popup window. </translation>
+      <translation>Hiển thị cửa sổ cờ trước khi hiển thị cửa sổ bật lên, nhấp vào cờ để hiển thị cửa sổ bật lên. </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
 however, the article from the topmost dictionary is shown.</source>
-      <translation type="unfinished">Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</translation>
+      <translation>Thông thường, nhấp vào một liên kết, nhấp đúp vào một từ hoặc tra cứu
+lựa chọn trong một bài viết sẽ tải bản dịch và gần như ngay lập tức
+cuộn đến bài viết từ cùng một từ điển. Tuy nhiên, khi tắt tùy chọn này,
+bài viết từ từ điển trên cùng sẽ được hiển thị.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
-      <translation type="unfinished">Automatically scroll to target article</translation>
+      <translation>Tự động cuộn đến bài viết mục tiêu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation type="unfinished">Dictionary Font: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation type="unfinished">set the fallback font family for dictionary</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
-      <translation type="unfinished">Article Display style:</translation>
+      <translation>Kiểu hiển thị bài viết:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
-      <translation type="unfinished">Turn the UI to dark.</translation>
+      <translation>Chuyển giao diện người dùng sang màu tối.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
-      <translation type="unfinished">Dark Mode</translation>
+      <translation>Chế độ tối</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
-      <translation type="unfinished">Turn the article display style to dark.</translation>
+      <translation>Chuyển kiểu hiển thị bài viết thành tối.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
-      <translation type="unfinished">Dark Reader Mode</translation>
+      <translation>Chế độ đầu đọc tối</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
-      <translation type="unfinished">MRU order: Most recently used order.</translation>
+      <translation>Thứ tự MRU: Thứ tự được sử dụng gần đây nhất.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
-      <translation type="unfinished">Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</translation>
+      <translation>Theo dõi các thay đổi trong khay nhớ tạm khi tính năng Quét được bật. Để ý! Bạn phải luôn kích hoạt tính năng này trừ khi bạn đang sử dụng Linux.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
-      <translation type="unfinished">Track Clipboard change</translation>
+      <translation>Theo dõi thay đổi Clipboard</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
-      <translation type="unfinished">Track Selection change</translation>
+      <translation>Theo dõi thay đổi lựa chọn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
-      <translation type="unfinished">Only tack selection when all selected keys are kept pressed:</translation>
+      <translation>Chỉ giải quyết lựa chọn khi tất cả các phím đã chọn được nhấn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
-      <translation type="unfinished">Show scan flag when word is selected</translation>
+      <translation>Hiển thị cờ quét khi từ được chọn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>Thời gian trì hoãn</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation> ms</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>Proxy của hệ thống</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>Proxy tuỳ chỉnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>Thiết lập tuỳ chỉnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
-      <translation type="unfinished">Anki Connect</translation>
+      <translation>Kết nối anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation type="unfinished">http://</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
-      <translation type="unfinished">Deck:</translation>
+      <translation>Bộ bài:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
-      <translation type="unfinished">Model:</translation>
+      <translation>Người mẫu:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
-      <translation type="unfinished">Word</translation>
+      <translation>Từ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
-      <translation type="unfinished">Vocabulary field...</translation>
+      <translation>Trường từ vựng...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
-      <translation type="unfinished">Text</translation>
+      <translation>Chữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
-      <translation type="unfinished">Definition field...</translation>
+      <translation>Trường định nghĩa...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
-      <translation type="unfinished">Sentence</translation>
+      <translation>Câu</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
-      <translation type="unfinished">Sentence field (can be empty)...</translation>
+      <translation>Trường câu (có thể để trống)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Some sites detect GoldenDict via HTTP headers and block the requests.
 Enable this option to workaround the problem.</source>
       <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>
-      <location filename="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>Không định danh Từ điển Vàng trong phần đầu giao thức HTTP</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
-      <translation type="unfinished">Maximum network cache size:</translation>
+      <translation>Kích thước bộ đệm mạng tối đa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
-      <translation type="unfinished">Maximum disk space occupied by GoldenDict&apos;s network cache in
+      <translation>Dung lượng ổ đĩa tối đa do bộ đệm mạng của GoldenDict chiếm trong
 %1
-If set to 0 the network disk cache will be disabled.</translation>
+Nếu được đặt thành 0, bộ đệm đĩa mạng sẽ bị tắt.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
-      <translation type="unfinished"> MiB</translation>
+      <translation> MiB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
-      <translation type="unfinished">When this option is enabled, GoldenDict
-clears its network cache from disk during exit.</translation>
+      <translation>Khi tùy chọn này được bật, GoldenDict
+sẽ xóa bộ đệm mạng của nó khỏi đĩa trong khi thoát.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
-      <translation type="unfinished">Clear network cache on exit</translation>
+      <translation>Xóa bộ đệm mạng khi thoát</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>Tìm toàn văn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>Các dạng cho phép tìm toàn văn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>bài viết (0 - không giới hạn)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>&amp;Nâng cao</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
-      <translation type="unfinished">During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</translation>
+      <translation>Trong các lần tìm kiếm liên tiếp, nếu một từ điển được thu gọn bằng cách thủ công, nó sẽ vẫn được thu gọn trong lần tìm kiếm tiếp theo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
-      <translation type="unfinished">Session collapse</translation>
+      <translation>Thu gọn phiên</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
-      <translation type="unfinished">When using clipboard,strip everything after newline</translation>
+      <translation>Khi sử dụng khay nhớ tạm, hãy loại bỏ mọi thứ sau dòng mới</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
-      <translation type="unfinished">On a new search, focus the main or popup window even if it&apos;s visible</translation>
+      <translation>Trên một tìm kiếm mới, tập trung vào cửa sổ chính hoặc cửa sổ bật lên ngay cả khi nó hiển thị</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
-      <translation type="unfinished">Favorites</translation>
+      <translation>yêu thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
-      <translation type="unfinished">Favorites saving interval. If set to 0 Favorites will be saved only during exit.</translation>
+      <translation>Khoảng thời gian lưu yêu thích. Nếu được đặt thành 0 Mục ưa thích sẽ chỉ được lưu trong khi thoát.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
-      <translation type="unfinished">Turn this option on to confirm every operation of items deletion</translation>
+      <translation>Bật tùy chọn này để xác nhận mọi thao tác xóa mục</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
-      <translation type="unfinished">Confirmation for items deletion</translation>
+      <translation>Xác nhận xóa mục</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
-      <translation type="unfinished">Turn this option on to ignore unreasonably long input text
-from mouse-over, selection, clipboard or command line</translation>
+      <translation>Bật tùy chọn này để bỏ qua văn bản đầu vào dài bất hợp lý
+khi di chuột qua, lựa chọn, khay nhớ tạm hoặc dòng lệnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
-      <translation type="unfinished">Ignore input phrases longer than</translation>
+      <translation>Bỏ qua các cụm từ đầu vào dài hơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
-      <translation type="unfinished">Input phrases longer than this size will be ignored</translation>
+      <translation>Các cụm từ nhập dài hơn kích thước này sẽ bị bỏ qua</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
-      <translation type="unfinished">Turn this option on to ignore diacritics while searching articles</translation>
+      <translation>Bật tùy chọn này để bỏ qua dấu phụ khi tìm kiếm bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
-      <translation type="unfinished">Ignore diacritics while searching</translation>
+      <translation>Bỏ qua dấu phụ khi tìm kiếm</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>Luôn mở rộng phần tuỳ chọn của bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>Mở rộng phần tuỳ &amp;chọn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>Tự động thu gọn các bài viết dài</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>Thu gọn bài viết dài hơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>Bài viết dài hơn cỡ này sẽ được thu gọn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
-      <translation type="unfinished">Ignore punctuation while searching</translation>
+      <translation>Bỏ qua dấu câu khi tìm kiếm</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
-      <translation type="unfinished">Turn this option on to enable extra articles search via synonym lists
-from Stardict, Babylon and GLS dictionaries</translation>
+      <translation>Bật tùy chọn này để cho phép tìm kiếm bài viết bổ sung thông qua danh sách từ đồng nghĩa
+từ các từ điển Stardict, Babylon và GLS</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
-      <translation type="unfinished">Extra search via synonyms</translation>
+      <translation>Tìm kiếm bổ sung thông qua các từ đồng nghĩa</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>ký tự</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab điều hướng các thẻ theo trình tự MRU</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
-      <translation type="unfinished">Babylon</translation>
+      <translation>Ba-by-lôn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>Lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>Lưu lược sử các từ đã tra</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>Lưu &amp;Lược sử</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>Bài viết</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>Chọn từ bằng cách nhấp chuột đơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>Chọn từ với nhấp chuột đơn</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>Kiểu bổ sung:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>Xác định tối đa số mục lưu trong lược sử.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>Số lược sử tối đa:</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <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>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>Lưu mỗi</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>phút</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
-      <translation type="unfinished">Classic</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
-      <source>Modern</source>
-      <translation type="unfinished">Modern</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
-      <source>Lingoes</source>
-      <translation type="unfinished">Lingoes</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
-      <source>Lingoes-Blue</source>
-      <translation type="unfinished">Lingoes-Blue</translation>
+      <translation>Cổ điển</translation>
     </message>
     <message>
       <location filename="../src/ui/preferences.cc" line="132"/>
+      <source>Modern</source>
+      <translation>Hiện đại</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="135"/>
+      <source>Lingoes</source>
+      <translation>tiếng lóng</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="136"/>
+      <source>Lingoes-Blue</source>
+      <translation>Lingoes-Xanh</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
-      <translation type="unfinished"> MB</translation>
+      <translation> MB</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>Cần có thông tin vị trí để sử dụng tìm kiếm theo cụm từ của Xapian và toán tử NEAR, nhưng kích thước cơ sở dữ liệu sẽ lớn hơn nhiều. Chỉ áp dụng cho các từ điển mới đến.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>Bật chỉ mục với thông tin vị trí</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>Phông chữ chuẩn</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>Phông chữ đơn cách</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>Phông chữ có chân</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>Phông chữ Sans-serif</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>Vẻ bề ngoài</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>Các phông chữ này sẽ được áp dụng khi không tìm thấy phông chữ được chỉ định bởi từ điển.</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>Phông chữ dự phòng</translation>
     </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>Âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>Văn bản thuần</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
-      <translation type="unfinished">Html</translation>
+      <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>Khớp Tiền tố</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>Không biết</translation>
     </message>
@@ -4512,17 +4524,17 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>Không tên chương trình nào được gán.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>Chương trình đã bị hỏng.</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>Chương trình trả về mã thoát %1.</translation>
     </message>
@@ -4530,27 +4542,27 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>Bật</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>Loại</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>Dòng lệnh</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>Biểu tượng</translation>
     </message>
@@ -4558,99 +4570,114 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>Lỗi nạp bài viết</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>Lỗi giải mã bài viết</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
-      <translation type="unfinished">Copyright: %1%2</translation>
+      <translation>Bản quyền: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
-      <translation type="unfinished">Version: %1%2</translation>
+      <translation>Phiên bản: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
-      <translation type="unfinished">Author: %1%2</translation>
+      <translation>Tác giả: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
-      <translation type="unfinished">E-mail: %1%2</translation>
+      <translation>E-mail: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
-      <translation type="unfinished">Title: %1%2</translation>
+      <translation>Tiêu đề: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
-      <translation type="unfinished">Website: %1%2</translation>
+      <translation>Trang web: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
-      <translation type="unfinished">Date: %1%2</translation>
+      <translation>Ngày: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
-      <translation type="unfinished">A dictionary lookup program.</translation>
+      <translation>Một chương trình tra cứu từ điển.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
-      <translation type="unfinished">Word or sentence to query.</translation>
+      <translation>Từ hoặc câu để truy vấn.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
-      <translation type="unfinished">Save debug messages to gd_log.txt in the config folder.</translation>
+      <translation>Lưu thông báo gỡ lỗi vào gd_log.txt trong thư mục cấu hình.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>Đặt lại trạng thái cửa sổ.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>Vô hiệu hóa tts.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
-      <translation type="unfinished">Change the group of main window.</translation>
+      <translation>Thay đổi nhóm cửa sổ chính.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
-      <translation type="unfinished">Change the group of popup.</translation>
+      <translation>Thay đổi nhóm cửa sổ bật lên.</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
-      <translation type="unfinished">Toggle scan popup.</translation>
+      <translation>Chuyển đổi cửa sổ bật lên quét.</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>Phiên bản in và thông tin chẩn đoán.</translation>
     </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>Tìm/lọc từ điển (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>Xoá ô Tìm kiếm</translation>
     </message>
@@ -4658,22 +4685,22 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>LỖI: %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>Nguồn lưu lỗi: </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>Nguồn tham chiếu lỗi tải xuống.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>CẢNH BÁO: %1</translation>
     </message>
@@ -4702,67 +4729,72 @@ from Stardict, Babylon and GLS dictionaries</translation>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
-      <translation type="unfinished">Alt+S</translation>
+      <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>Hộp thoại</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>Phát âm (Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
-      <translation type="unfinished">Add word to Favorites (Ctrl+E)</translation>
+      <translation>Thêm từ vào Mục ưa thích (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>Ẩn/Hiện thanh Từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
-      <translation type="unfinished">Always stay on top of all other windows</translation>
+      <translation>Luôn ở trên cùng của tất cả các cửa sổ khác</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Use this to pin down the window so it would stay on screen,
 could be resized or managed in other ways.</source>
       <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>
-      <location filename="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>Hiện từ đã tra trên cửa sổ chính (Atl+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Atl+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>Trở lại</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>Tiếp tục</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
-      <translation type="unfinished">%1 - %2</translation>
+      <translation>%1 - %2</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>CẢNH BÁO: %1</translation>
     </message>
   </context>
   <context>
@@ -4770,53 +4802,53 @@ quản lý theo nhiều cách khác.</translation>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="14"/>
       <source>&amp;Previous</source>
-      <translation type="unfinished">&amp;Previous</translation>
+      <translation>&amp;Trước</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="15"/>
       <source>Ctrl+Shift+G</source>
-      <translation type="unfinished">Ctrl+Shift+G</translation>
+      <translation>Ctrl+Shift+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="19"/>
       <source>&amp;Next</source>
-      <translation type="unfinished">&amp;Next</translation>
+      <translation>&amp;Kế tiếp</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="20"/>
       <source>Ctrl+G</source>
-      <translation type="unfinished">Ctrl+G</translation>
+      <translation>Ctrl+G</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="24"/>
       <source>Highlight &amp;all</source>
-      <translation type="unfinished">Highlight &amp;all</translation>
+      <translation>Đánh dấu &amp;tất cả</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="28"/>
       <source>&amp;Case Sensitive</source>
-      <translation type="unfinished">&amp;Case Sensitive</translation>
+      <translation>&amp;Trường hợp nhạy cảm</translation>
     </message>
     <message>
       <location filename="../src/ui/searchpanel.cc" line="30"/>
       <source>Find:</source>
-      <translation type="unfinished">Find:</translation>
+      <translation>Tìm thấy:</translation>
     </message>
   </context>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>Đường dẫn</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>Biểu tượng</translation>
     </message>
@@ -4824,60 +4856,60 @@ quản lý theo nhiều cách khác.</translation>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>Tệp</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
-      <translation type="unfinished">Hiragana</translation>
+      <translation>Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>Hệ:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
-      <translation type="unfinished">Nihon-shiki</translation>
+      <translation>Nihon-shiki</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <source>Remove site &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Xóa bỏ trang &lt;b&gt;%1&lt;/b&gt; khỏi danh sách?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
-      <translation type="unfinished">Wikipedia</translation>
+      <translation>Wikipedia</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>Bảng chữ cái tiếng Nhật Katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>Thêm đường dẫn chứa các tệp âm thanh để tạo từ điển âm thanh:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <source>Remove directory &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Xóa bỏ thư mục &lt;b&gt;%1&lt;/b&gt; khỏi danh sách?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>Phiên âm Latinh tiếng Nhật</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4888,84 +4920,84 @@ Tiêu chuẩn ISO 3602
 Chưa được bổ sung trong Từ điển Vàng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>Trang Wikipedia (MediaWiki):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>Thư mục âm thanh</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
-      <translation type="unfinished">Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</translation>
+      <translation>Bất kỳ chương trình bên ngoài. Một chuỗi %GDWORD% sẽ được thay thế bằng từ truy vấn. Chuỗi %GDSEARCH% sẽ được thay thế bằng văn bản trong thanh tìm kiếm. Nếu cả hai tham số không được cung cấp, thì từ tiêu đề sẽ được đưa vào đầu vào tiêu chuẩn.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
-      <translation type="unfinished">Lingua Libre</translation>
+      <translation>ngôn ngữ tự do</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations được cung cấp bởi &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, một thư viện phương tiện ngôn ngữ cộng tác của Wikimedia Pháp. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
-      <translation type="unfinished">Enable Lingua Libre</translation>
+      <translation>Kích hoạt Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
-      <translation type="unfinished">ISO 639-3 language code</translation>
+      <translation>Mã ngôn ngữ ISO 639-3</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Việc sử dụng Forvo hiện yêu cầu khóa API, hãy đăng ký trên trang web để nhận khóa của riêng bạn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nhận chìa khóa của riêng bạn &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;tại đây&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>Phương pháp được sử dụng rộng rãi nhất để phiên âm tiếng
 Nhật, dựa trên hệ thống âm vị Anh ngữ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>Bảng chữ cái tiếng Nhật Hiragana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
-      <translation type="unfinished">Custom transliteration</translation>
+      <translation>Chuyển ngữ tùy chỉnh</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
-      <translation type="unfinished">This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</translation>
+      <translation>Điều này chỉ áp dụng trong cụm từ tìm kiếm, với mỗi dòng đại diện cho một phiên âm, được phân tách bằng dấu chấm phẩy. Ví dụ: ae;æ,người dùng có thể nhập ae để biểu thị æ trong từ mục tiêu.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
-      <translation type="unfinished">ae;æ #this is an example</translation>
+      <translation>ae;æ #đây là một ví dụ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>Chuyển tự</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4975,118 +5007,108 @@ Not implemented yet in GoldenDict.</source>
 Chưa được bổ sung trong Từ điển Vàng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>Chuyển tự sang chữ Nga</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>Hình thái học</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>&amp;Thay đổi...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
-      <translation type="unfinished">Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
+      <translation>Ví dụ:  &amp;quot;eng&amp;quot; cho tiếng Anh, &amp;quot;fra&amp;quot; cho tiếng Pháp &lt;br&gt;
 
-Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</translation>
+Có thể tìm thấy danh sách đầy đủ các ngôn ngữ khả dụng &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; tại đây &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
-      <translation type="unfinished">Katakana</translation>
+      <translation>chữ katakana</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>&amp;Quét lại</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>Chuyển tự sang chữ Đức</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <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>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>T&amp;hêm...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>Chọn một thư mục</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>Xóa &amp;bỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>Trang mạng</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>Đường dẫn chứa tệp từ điển:</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>Xác nhận xóa bỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>Bảng chữ cái:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>Các từ điển hình thái học sẵn sàng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>Bật để sử dụng bảng chữ cái La-Tinh để viết tiếng Nhật</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5100,96 +5122,96 @@ Thêm các từ điển phù hợp vào cuối những nhóm
 phù hợp để sử dụng chúng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
-      <translation type="unfinished">Hepburn</translation>
+      <translation>Hepburn</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
-      <translation type="unfinished">Kunrei-shiki</translation>
+      <translation>Kunrei-shiki</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
-      <translation type="unfinished">Forvo</translation>
+      <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>Máy chủ DICT</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>Máy chủ DICT:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Phát âm trực tuyến qua &lt;a href=&quot;http://www.forvo.com/&quot;&gt;forvo.com&lt;/a&gt;. Trang này cho phép mọi người ghi lại và chia sẻ phát âm của các từ. Bạn có thể nghe chúng qua Từ điển Vàng.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>Bật phát âm từ Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>Khóa API:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>Mã ngôn ngữ (phân cách bởi dấu phẩy):</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>List of language codes you would like to have. Example: &quot;en, ru&quot;.</source>
       <translation>Danh sách mã ngôn ngữ mà bạn muốn có. Ví dụ: &quot;en, ru&quot;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>Danh sách toàn bộ mã ngôn ngữ có tại &lt;a href=&quot;http://www.forvo.com/languages-codes/&quot;&gt;đây&lt;/a&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>Chuyển tự sang chữ Hy Lạp</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(không có trong phiên bản di động - portable)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>Chương trình</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <source>Remove program &lt;b&gt;%1&lt;/b&gt; from the list?</source>
       <translation>Xoá chương trình &lt;b&gt;%1&lt;/b&gt; khỏi danh sách?</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>Chuyển tự sang tiếng Belarus</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>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>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
-      <translation type="unfinished">Text to Speech</translation>
+      <translation>chuyển văn bản thành giọng nói</translation>
     </message>
   </context>
   <context>
@@ -5203,42 +5225,42 @@ phù hợp để sử dụng chúng.</translation>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>Thêm vào phương tiện giọng nói đã chọn:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>&amp;Thêm</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>Xóa &amp;bỏ</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>Xem trước</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>Các phương tiện giọng nói có thể:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>Xem trước văn bản:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>Nhập văn bản ở đây.</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>&amp;Xem trước</translation>
     </message>
@@ -5263,17 +5285,17 @@ phù hợp để sử dụng chúng.</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>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>Tùy thích</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>Âm lượng:</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>Tốc độ:</translation>
     </message>
@@ -5281,12 +5303,12 @@ phù hợp để sử dụng chúng.</translation>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>Nhập một từ hoặc cụm từ để tra từ điển</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>Nút xổ</translation>
     </message>
@@ -5306,7 +5328,7 @@ phù hợp để sử dụng chúng.</translation>
     <message>
       <location filename="../src/texttospeechsource.cc" line="284"/>
       <source>Id</source>
-      <translation type="unfinished">Id</translation>
+      <translation>Nhận dạng</translation>
     </message>
     <message>
       <location filename="../src/texttospeechsource.cc" line="286"/>
@@ -5317,33 +5339,33 @@ phù hợp để sử dụng chúng.</translation>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>Tên</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>Địa chỉ</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>Bật</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
-      <translation type="unfinished">Insert article as link inside &lt;iframe&gt; tag</translation>
+      <translation>Chèn bài viết dưới dạng liên kết bên trong thẻ &lt;iframe&gt;</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
-      <translation type="unfinished">As link</translation>
+      <translation>dưới dạng liên kết</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>Biểu tượng</translation>
     </message>
@@ -5351,17 +5373,9 @@ phù hợp để sử dụng chúng.</translation>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>Lỗi truy vấn một vài từ điểni.</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>CẢNH BÁO: %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/zh_CN.ts b/locale/zh_CN.ts
index 4fa718c0..ff891605 100644
--- a/locale/zh_CN.ts
+++ b/locale/zh_CN.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>关于</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng 电子词典程序，版本 </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>授权基于 GNU 公共授权 GPLv3 或更高版本</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>复制版本信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>复制词典列表</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>致谢名单：</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[未知]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>基于 Qt %1 (%2, %3 位)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>基于 Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>展开文章</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>收起文章</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>使用屏幕取词功能</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>（未命名）</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>欢迎使用！</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; 的翻译。</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;a href=&quot;使用屏幕取词功能&quot;&gt;直接从其它程序中抓词查询&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要改变设置，可以在&lt;b&gt;编辑 | 首选项&lt;/b&gt;菜单中查看一下可用的系统设置。所有的设置都有鼠标指针提示信息，如果有不明之处，请仔细阅读提示信息。如果你需要更多帮助，有任何疑问、建议，或者仅仅想了解其他人的想法，欢迎访问此程序的&lt;a href=&quot;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;官方论坛&lt;/a&gt;。访问此程序的&lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>（图片）</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>展开文章</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>来自</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>收起文章</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>创建新的 Anki 笔记</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>查询错误：%1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>相近词条：</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>复合短语：</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>单个词汇：</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>创建临时文件失败。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>查找 &quot;%1&quot;(&amp;L)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>在新标签页中查找 &quot;%1&quot;(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>所引用的资源不存在。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>自动打开资源文件时失败，请尝试手动打开：%1.</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>在 %2 中查找 &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>选择当前文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>复制为文本</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>审查元素</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>在新标签页中打开链接(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>在外部浏览器中打开链接(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>资源</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>音频</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>TTS 音频</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>图片</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>视频</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>视频：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>定义：&quot;%1&quot;: %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>定义：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>引用的音频播放程序不存在。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>打开链接(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>保存为书签（&amp;S）“%1...”</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>警告：音频播放器：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>错误： %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>保存音频文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>保存图片</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>图片文件 (*.bmp *.jpg *.png *.tif);;所有文件 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>保存图片(&amp;I)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>没找到词组</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>匹配（%1/%2）</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>保存音频文件(&amp;O)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>将 &quot;%1&quot; 发送到输入框</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>将 &quot;%1&quot; 添加到历史(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>发送当前文章到 Anki(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>发送选中文本到 Anki(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>声音文件 (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;所有文件 (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>声音文件 (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;所有文件 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>播放音频文件失败：%1</translation>
     </message>
@@ -413,62 +408,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>中文转换</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>启用简体中文与繁体/正体中文字符之间的转换</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>中文转换(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>启用从简体中文字符转换为正体中文（台湾）字符</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>简体转正体（台湾）</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>启用从简体中文字符转换为繁体中文（香港）字符</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>简体转繁体（香港）</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>启用从繁体中文字符转换为简体中文字符</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>繁体转简体</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>简体中文至正体中文（台湾）转换</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>简体中文至繁体中文（香港）转换</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>繁体中文至简体中文转换</translation>
     </message>
@@ -476,7 +471,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation>自定义转写</translation>
     </message>
@@ -484,22 +479,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>代理服务器要求身份验证</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>您需要提供代理服务器的用户名和密码</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>用户名：</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>密码：</translation>
     </message>
@@ -507,22 +502,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>表单</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>群组图标：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>快捷键：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>收藏文件夹：</translation>
     </message>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>图像</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>所有文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>错误</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>无法读取指定的图像文件。</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>确定</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>你确定要产生基于语言配对的群组吗？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation>您确定需要基于metadata.toml生成分组吗？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>根据源语言合并群组&quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>根据目标语言合并群组&quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>根据文件分组失败</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation>无法访问 %1 的父目录。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>您确定根据文件夹结构生成词组吗？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>建立双向群组&quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>与群组&quot;%1&quot;合并</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>词典：</translation>
     </message>
@@ -634,133 +629,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>搜索模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>在这里可以选择过滤器字符串的执行方式</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>若勾选则大小写不同的词条均计入总数</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>区分大小写</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>将词条导出至文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>导出</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>帮助</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>确定</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>点击此按钮启用词条列表过滤器</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>过滤</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>若勾选则词条列表过滤器的修改即时生效</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>自动过滤</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>过滤器：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>过滤器字符串（可以是固定的字符串、通配符或者正则表达式）</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>纯文本</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>通配符</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>正则表达式</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation>正在加载词条...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>总共有%1个不同的词条，已过滤%2个</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>保存词条至文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>无法打开导出的文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>导出词条...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>导出过程被中断</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>导出完成</translation>
     </message>
@@ -768,66 +763,76 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>文章总数：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>词条语言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>词条总数：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>释义语言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>打开文件夹</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>编辑词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>此词典包含的文件：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>描述：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>显示所有不同的词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>编辑词典信息的命令行：%1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>索引文件名：</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>打开索引文件夹</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 条记录</translation>
     </message>
@@ -858,44 +863,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>已启用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>地址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>数据库</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>策略</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>图标</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>逗号分隔的数据库列表
 （使用空字符串或者“*”可以匹配所有数据库）</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>逗号分隔的搜索策略列表
@@ -905,37 +910,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>展开菜单以包含所有词典……</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>编辑此群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>词典词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>打开词典文件夹</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>编辑词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>词典栏(&amp;D)</translation>
     </message>
@@ -944,27 +949,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>词典(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>词典</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>接受</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>词典文件所在目录已变更</translation>
     </message>
@@ -975,12 +980,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>群组(&amp;G)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>某些词典文件的所在目录已变更，是否接受变更？</translation>
     </message>
@@ -1009,75 +1014,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>全文搜索</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>全字匹配</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>纯文本</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>通配符</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>正则表达式</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>查询词不能为空。</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>支持 xapian 搜索语法，例如 AND OR +/- 等</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>最大词间距 (%1-%2)：</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>默认</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>每个词典最大词条数 (%1-%2)：</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>搜索到的词条：</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>正在索引：</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>无</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>搜索关键词至少包含</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>个或更多字符</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>没有可供全文搜索的词典</translation>
     </message>
@@ -1085,7 +1070,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>收藏文件中存在错误</translation>
     </message>
@@ -1151,7 +1136,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>来自</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
     </message>
@@ -1172,68 +1157,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>区分大小写</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>模式：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>忽略单词顺序</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>忽略变音符号</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>搜索到的词条：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>群组中的可用词典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>等候索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>帮助</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>总计：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>已索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>正在索引：无</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
@@ -1265,27 +1234,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>标签页 2</translation>
     </message>
@@ -1325,12 +1294,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>为群组起一个新名字：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>可用词典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>添加群组(&amp;A)</translation>
     </message>
@@ -1340,42 +1309,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>添加群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>创建新的词典群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation>按语言分组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation>创建基于文件夹的群组。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation>按文件夹分组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation>按元数据分组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <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>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>重命名当前词典群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>移除词典群组</translation>
     </message>
@@ -1385,43 +1354,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>为新群组命名：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>移除全部群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>将所选词典从群组中移除(Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>将所选词典添加进群组(Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>移除群组(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>群组：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>重命名群组(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>移除全部词典群组</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>创建基于语言的群组</translation>
     </message>
@@ -1444,12 +1413,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>历史：</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
       <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>历史条数：%1/%2</translation>
     </message>
@@ -1457,12 +1426,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>拼写建议：</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 构词法</translation>
     </message>
@@ -1470,12 +1439,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>已启用</translation>
     </message>
@@ -1483,1031 +1452,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>索引： </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>词典名称</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>初始化 GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>正在索引词典，请稍候</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>请稍候...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>索引...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>埃维语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>伊多语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>老挝语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>维特语（加纳）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>阿法尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>阿肯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>克里语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>伊博语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>科米语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>曼岛语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>巴利语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>泰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>乌尔都语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>祖鲁语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>捷克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>荷兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>卢甘达语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>富拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>希腊语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>豪萨语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>印地语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>爱尔兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>高棉语（柬埔寨语）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>刚果语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>拉丁语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>马来语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>毛利语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>瑙鲁语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>奥里亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>奥洛莫语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>桑戈语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>绍纳语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>塔吉克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>泰米尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>鞑靼语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>斯瓦特语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>东加语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>伊努庇克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>文达语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>乌兹别克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>威尔士语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>沃洛夫语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>科萨语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>意大利语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>罗曼斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>宗喀语（不丹语）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>卡纳达语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>北恩德贝勒语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>阿布哈西亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>吉尔吉斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>科隆地语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>苏格兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>阿尔巴尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>拉脱维亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>马拉雅拉姆语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>库尔德语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>保加利亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>林加拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>马耳他语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>马拉地语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>阿拉伯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>巴斯克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>阿瓦尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>比哈尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>艾马拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>布列塔尼语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>巽他语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>丹麦语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>迪维希语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>卢巴卡丹加语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>斐济语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>匈牙利语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>法语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>德语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>蒙古语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>希伯来语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>赫雷罗语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>卢森堡语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>卡努里语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>哈萨克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>基库尤语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>韩语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>纳瓦霍语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>恩敦加语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>尼泊尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>奥吉布瓦语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>普什图语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>波兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>萨摩亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>奥西坦语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>信德语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>斯洛伐克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>索马里语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>泰卢固语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>颂加语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>茨瓦纳语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>维吾尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>塞尔维亚-克罗地亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>约鲁巴语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>壮语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>罗马尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>印度尼西亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>旁遮普语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>梭托语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>科西嘉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>世界语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>波斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>斯洛文尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>西弗里西语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>阿拉贡语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>塔希提语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>马达加斯加语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>加利西亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>阿塞拜疆语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>阿姆哈拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>梵语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>日语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>乌克兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>班巴拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>格陵兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>巴什基尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>白俄罗斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>克什米尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>撒丁语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>希里莫图语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>科察语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>孟加拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>爪哇语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>阿维斯陀语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>卢旺达语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>南非语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>比斯拉马语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>亚美尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>波克默尔语（挪威）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>克罗地亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>波斯尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>国际语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>西方国际语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>加泰罗尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>塞尔维亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>缅甸语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>俄语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>林堡语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>挪威语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>车臣语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>汉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>楚瓦什语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>僧加罗语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>西班牙语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>凯尔特语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>他加禄语（菲律宾）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>阿萨姆语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>奥塞梯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>爱沙尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>斯瓦希里语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>瑞典语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>西藏语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>越南语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>马其顿语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>葡萄牙语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>土耳其语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>土库曼语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>古吉拉特语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>冰岛语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>因纽特语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>英语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>格鲁吉亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>教会斯拉夫语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>法罗语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>芬兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>沃拉普克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>华隆语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>宽亚玛语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>马绍尔语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>北萨莫斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>海地语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>查莫罗语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>尼诺斯克语（挪威）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>瓜拉尼语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>南恩德贝勒语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>奇契瓦语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>立陶宛语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>四川彝语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>提格里尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>意第绪语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>繁体中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>简体中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>其它</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>简体中文其它方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>繁体中文其它方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>东欧其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>西欧其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>俄罗斯其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>日本其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>波罗地海其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>希腊其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>其他韩国方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>土尔其其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>泰国其它语言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>塔马塞特语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>逻辑语</translation>
     </message>
@@ -2515,207 +2488,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>法语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>西班牙语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>白俄罗斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>保加利亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>捷克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>德语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>希腊语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>芬兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>意大利语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>日语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>韩语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>立陶宛语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>马其顿语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>荷兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>波兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>葡萄牙语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>俄语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>斯洛伐克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>阿尔巴尼亚语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>塞尔维亚语（西里尔文）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>瑞典语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>土耳其语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>乌克兰语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>中文（简体）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>中文（繁体）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>越南语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>葡萄牙语（巴西）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>波斯语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>西班牙语（阿根廷）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>印地语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>世界语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>德语（瑞士）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>西班牙语（玻利维亚）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>塔吉克语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>科察语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>艾马拉语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>阿拉伯语（沙特阿拉伯）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>土库曼语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>国际语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>逻辑语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>英语</translation>
     </message>
@@ -2723,7 +2696,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>读取词典出错</translation>
     </message>
@@ -2731,7 +2704,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>配置文件错误，使用默认配置并继续？</translation>
     </message>
@@ -2739,703 +2712,703 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>收藏(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>全部</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>回退</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>词典数：%1，文章数：%2，词条数：%3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>编辑(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>文件(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>帮助(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>退出(&amp;Q)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>错误</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>退出程序</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>关闭至系统托盘(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>无法保存文章：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>放大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>词典(&amp;D)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>关于(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>论坛(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>打印(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>保存文章(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>文章另存为</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>最小化窗口至系统托盘</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>页面设置(&amp;U)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>主页(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>有新版本可用</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>查找：</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>缩小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>显示主窗口(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>关于 GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>下载</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>页面设置</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>查找于：</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>正常大小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>加载中……</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>（未命名）</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>首选项(&amp;P)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>欢迎使用！</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>保存文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>忽略此次升级</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>前进</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>打印文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>找不到可用的打印机，请先安装一个打印机。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>查看(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>历史(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>清除(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>缩放(&amp;Z)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>单词列表 - 放大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>单词列表 - 缩小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>单词列表 - 正常大小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>关闭当前标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>关闭所有标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>关闭其它标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>已打开的标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>新建标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>配置文件夹(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>菜单栏(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>在以下词典中找到：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>将全部标签页添加至收藏</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>警告： %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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>词典搜索中的字符串：可以使用通配符“*”、“?”和符号分组“[...]”。
 如需查找“*”、“?”、“[”和“]”字符，请对应使用“\*”、“\?”、“\[”和“\]”</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>打开标签页列表</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>从收藏中删除当前标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>你选择了隐藏菜单栏，使用 %1 再次显示。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>显示(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>导出(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>隐藏(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>导出历史记录到文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>文本文件 (*.txt);;所有文件 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>历史记录导出完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>导出错误：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+H</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>导入(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>导入历史文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>导入失败：无效数据</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>历史导入成功</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>导入错误：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>导出收藏记录到文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML 文件 (*.xml);;所有文件 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>收藏导出完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>以纯列表形式导出收藏列表到文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>导入收藏文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
-      <translation>XML文件(*.xml);;文本文件(*.txt);;所有文件(*.*)</translation>
+      <translation>XML 文件(*.xml);;文本文件(*.txt);;所有文件(*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>收藏导入完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>数据解析错误</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>词典词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>打开词典文件夹</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>编辑词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>正在为全文搜索进行索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>从收藏中删除标题字“%1”？</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>查询面板(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>查询结果导航面板(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>收藏面板(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>打印预览(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>重新扫描文件(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>新建标签页(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>总在最前(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>总在最前</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl+O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>菜单按钮</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>页内搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>全文搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-ng 帮助</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>显示</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>导出</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>导入</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>添加</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>将当前标签页添加至收藏</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>导出至列表</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>在词典栏中显示词典名称(&amp;B)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>在工具栏上显示小图标(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>导航栏(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>取词弹窗</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>文章, 完整 (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>文章, 仅 HTML (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>文章保存中……</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation>文章保存完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>主窗口已设置为总在最前。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>历史面板(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>无障碍API未启用</translation>
     </message>
@@ -3443,12 +3416,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>词典文件被修改或已损坏</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>从 %1 加载文章失败：%2</translation>
     </message>
@@ -3456,7 +3429,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML 解析失败：%1 于 %2, %3</translation>
     </message>
@@ -3472,22 +3445,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>地址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>已启用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>图标</translation>
     </message>
@@ -3503,82 +3476,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>表单</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>未启用（已禁用）的词典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>名称：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>文章总数：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>词条语言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>释义语言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>词条总数：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>词典排序：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>此词典包含的文件：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>词典信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>描述：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>按名称排序</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>按语言排序</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>词典词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>激活的词典：%1，未激活的词典：%2</translation>
     </message>
@@ -3586,12 +3559,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>路径</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>递归搜索</translation>
     </message>
@@ -3599,69 +3572,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>启动至系统托盘</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>仅限左 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>启用系统托盘图标</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>主机：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>端口：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>类型：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>用户名：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>屏幕取词(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3669,137 +3640,137 @@ switching to them.</source>
 启用此选项将会在打开新标签页时不自动选定。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>使用代理服务器</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>使用下列热键翻译剪贴板中的单词：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows 键或 Meta 键</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>自动朗读主窗口中的词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>随系统启动</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>仅限左 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>标签页浏览</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>仅限右 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>音频(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable if you wish to use a proxy server
 for all program&apos;s network requests.</source>
       <translation>如果你希望通过代理服务器执行程序的网络查
 询功能，启用此选项。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>界面语言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>仅限左 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>在后台打开新标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>网络(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>仅限右 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>右 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>左 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>自动朗读屏幕取词弹出窗口中的词条</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>在当前页之后打开新标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>变更界面语言需要重新启动程序才能生效。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt 键</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>定期检查可用版本</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3807,24 +3778,23 @@ be the last ones.</source>
 打开此选项，新标签页将会自动添加到末尾。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>关闭至系统托盘</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>系统默认</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>启用此选项，将会启用系统托盘图标。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3835,139 +3805,139 @@ download page.</source>
 页面。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>开机自动启动</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>密码：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>默认</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>界面(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>变更界面语言</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctr l键</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>使用下列热键显示或隐藏主窗口：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>左 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>仅限右 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>首选项</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>左 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>右 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>右 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>热键</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>启动程序时同时启动屏幕取词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>启用此选项，程序启动时将直接最小化至系统托盘。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift 键</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>开机自动启动 GoldenDict.</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>在 GoldenDict 自身窗口口内选择或进行剪贴板操作时不要弹出窗口</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>忽略 GoldenDict 自身的选择和剪贴板变更</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>使用内建音频支持播放音频文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>使用内部播放器：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>选择音频后端</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>输入音频播放器命令行</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3976,83 +3946,83 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 用此选项。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>禁止载入来自其它站点的内容（封杀广告）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>朗读</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>播放</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>使用外部程序播放：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>双击翻译词条（在主界面中）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>使用外部程序播放音频文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>ESC 键隐藏主窗口</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>隐藏单标签页</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>避免右键菜单出现过多词典条目。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>右键菜单词典数目限制：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>将翻译词条发送至主窗口，而非在取词窗口中显示</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>发送翻译词条到主窗口</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>显示弹出窗口之前先显示一个旗标窗口，点击旗标以显示弹出窗口。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4060,158 +4030,158 @@ however, the article from the topmost dictionary is shown.</source>
       <translation>单击link或双击翻译的时候是否自动定位到当前正在浏览的词典。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>自动定位到当前词典</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>词典字体：</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>设置词典的备用字体</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>文章显示风格</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>启用暗色界面</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>深色模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>将文章以暗色风格显示</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>深色阅读模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>排序：最近使用优先</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>剪贴板取词。注意！非Linux系统，这个选项必须打开</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>剪贴板取词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>选择文本取词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>仅当指定按钮被按时，文本取词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>单词被选中时显示扫描旗标</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>延迟时间</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation>毫秒</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>系统代理</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>自定义代理</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>自定义设置</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki连接</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
-      <translation>http:///</translation>
+      <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>牌组：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>模板：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>单词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>对应anki里面的变量名，如设置word，则用{{Word}}引用</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>释义</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>释义的变量字段</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>句子</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>句子的变量（可选）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>不使用 GoldenDict 浏览器标识（UA）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>允许的最大网络缓存：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4219,282 +4189,324 @@ If set to 0 the network disk cache will be disabled.</source>
 如果设置为0，磁盘缓存会被禁用。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>GoldenDict退出时清空网络缓存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>退出时清空网络缓存</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>全文搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>允许对以下格式词典进行全文搜索：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>不要在词条数多于</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>个 (0 - 无限制) 的词典中进行搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>高级(&amp;v)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>如果用户折叠了词典，下次搜索的时候，保持折叠状态。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>搜索期间保持折叠</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>当使用剪贴板时，忽略剪贴板中换行之后的内容</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>查询时，窗口获取焦点</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>收藏</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>收藏内容保存周期。若为 0 则只在程序退出时保存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>开启此选项以在每次进行删除操作时进行确认</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>删除条目时确认</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>启用后，避免过长的输入（来自鼠标选择，剪贴板或命令行）</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>忽略大于</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>忽略超过设置长度的字符</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>启用该选项以在搜索文章时忽略变音符号</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>搜索时忽略变音符号</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>开启此选项以自动展开文章的可选部分</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>展开可选部分(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>开启此选项以自动收起过长的文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>收起大于</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>大于此大小的文章将被收起</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>搜索时忽略标点符号</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>启用该选项可以激活基于同义词列表的额外搜索功能
 列表可以来源于星际翻王、Babylon 和 GLS 的词典</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>基于同义词的额外搜索</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>字符的文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>用 Ctrl-tab 浏览标签页时，以“最近使用”为序</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>巴比伦文</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>历史</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>开启此选项以保存查询历史</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>保存历史(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>开启此选项以启用单击选择单词功能</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>单击选择单词</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>附加样式：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>指定历史最大条数。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>最大历史条数：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>历史保存周期。若为 0 则只在程序退出时保存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>保存周期：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>分钟</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>经典</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>现代</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>灵格斯</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>灵格斯-蓝色调</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>使用Xapian的短语搜索和NEAR运算符需要位置信息，但数据库大小会更大。 仅适用于新传入的词典。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>启用带有位置信息的索引</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>标准字体</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>等宽字体</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>衬线字体</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>无衬线字体</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>外貌</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>当未找到字典指定的字体时，将应用这些字体。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>后备字体</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>音频</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>纯文本</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>匹配前缀</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>未知</translation>
     </message>
@@ -4502,17 +4514,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>未指定程序名。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>程序已崩溃。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>程序返回，退出代码为 %1.</translation>
     </message>
@@ -4520,27 +4532,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>已启用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>类型</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>命令行</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>图标</translation>
     </message>
@@ -4548,99 +4560,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>文章加载错误</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>文章解码错误</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>版权：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>版本：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>作者：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>电子邮件：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>标题：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>网站：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>日期：%1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>一款电子词典程序。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>单词或句子查询。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>在配置文件夹中将调试消息保存到 gd_log.txt。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>重置窗口状态。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>禁用 tts。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>更改主窗口组。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>更改弹出窗口组。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>切换扫描弹出窗口。</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>打印版本和诊断信息。</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>词典查询/过滤 (Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>清除查询结果</translation>
     </message>
@@ -4648,22 +4675,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>错误： %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>资源保存失败：</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>所引用的资源下载失败。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>警告： %1</translation>
     </message>
@@ -4692,67 +4719,72 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>对话框</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>朗读词条(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>将词条添加至收藏 (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>显示或隐藏词典栏</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>总是位于其它窗口上方</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>将词条发送到主窗口 (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>回退</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>前进</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>警告： %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4795,17 +4827,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>路径</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>图标</translation>
     </message>
@@ -4813,60 +4845,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>文件</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>平假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>方案：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>日本式</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>维基百科</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>日语的片假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>如果要批量添加音频文件，请把路径添加在这里：</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>日文罗马字</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4877,83 +4909,83 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支持此方案。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>维基百科（MediaWik）站点：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>音频文件目录</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>任何外部程序。一个字符串 %GDWORD% 将被替换为查询单词。 一个字符串 %GDSEARCH% 将被搜索栏中的文本替换。 如果不提供这两项参数，将把标题输入标准输入。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;由 &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;法国维基百科合作语言媒体图书馆 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>启用 Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 语言代码</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>使用 Forvo 需要一个 API key，请在该网站注册以获取你自己的 key.</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>从&lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;这里&lt;/a&gt;获取自己的API Key。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>以英文语音学为基础建立的，最常用的日文转写方案</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>日语的平假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation>自定义转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation>这只适用于搜索的时候，每行代表一个音译转写，分号分隔。 例如，ae;æ，用户可以在目标单词中输入ae代替实际要输入的æ。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation>ae;æ #这是一个例子</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4964,22 +4996,22 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支持此方案。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>俄文转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>构词法规则库</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>变更(&amp;C)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -4988,94 +5020,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 可用语言的完整列表可在这里查找 &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; &lt;/a&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>片假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>储存 Hunspell/Myspell 拼写检查词库文件的路径：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>重新扫描(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>德文转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>任意网站。%GDWORD% 字符串将会被搜索关键词替换：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>添加(&amp;A)...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>选择目录</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>移除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>网站</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>词典文件所在目录：</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>确认移除</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>音节：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>可用的构词法规则库：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>启用日文罗马字转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5088,94 +5110,94 @@ of the appropriate groups to use them.</source>
 最下面。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>黑本式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>训令式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>词典服务器</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>词典服务器：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>启用来自 Forvo 的发音功能</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API 密钥：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>语言代码（用逗号分隔）：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>希腊文转写</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>（便携版中不可用）</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>程序</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>白俄罗斯语转写</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>语音合成</translation>
     </message>
@@ -5191,42 +5213,42 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>语音引擎列表：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>添加(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>移除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>预览</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>可用语音引擎：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>预览以下文本：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>在这里输入要预览的文本。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>预览(&amp;P)</translation>
     </message>
@@ -5251,17 +5273,17 @@ of the appropriate groups to use them.</source>
       <translation>无可用 TTS 引擎。&lt;br&gt;请确保 TTS 引擎已正确安装在计算机上。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>选项</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>音量：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>频率：</translation>
     </message>
@@ -5269,12 +5291,12 @@ of the appropriate groups to use them.</source>
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>输入单词或短语以搜索字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>下拉菜单</translation>
     </message>
@@ -5305,33 +5327,33 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>名称</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>地址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>已启用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>将文章在 &lt;iframe&gt; 标签中作为链接插入</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>作为链接</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>图标</translation>
     </message>
@@ -5339,17 +5361,9 @@ of the appropriate groups to use them.</source>
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>在某些词典中进行查询时失败。</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>警告： %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/locale/zh_TW.ts b/locale/zh_TW.ts
index f4fa7296..3a58c27e 100644
--- a/locale/zh_TW.ts
+++ b/locale/zh_TW.ts
@@ -4,50 +4,45 @@
   <context>
     <name>About</name>
     <message>
-      <location filename="../src/ui/about.ui" line="17"/>
+      <location filename="../src/ui/about.ui"/>
       <source>About</source>
       <translation>關於</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="66"/>
+      <location filename="../src/ui/about.ui"/>
       <source>GoldenDict-ng dictionary lookup program, version </source>
       <translation>GoldenDict-ng 字典查詢程式，版本 </translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="101"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Licensed under GNU GPLv3 or later</source>
       <translation>授權基於 GNU 公共授權 GPLv3 或更高版本</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="129"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy version info</source>
       <translation>複製版本信息</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="142"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Copy dictionaries list</source>
       <translation>複製詞典列表</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.ui" line="168"/>
+      <location filename="../src/ui/about.ui"/>
       <source>Credits:</source>
       <translation>致謝名單：</translation>
     </message>
     <message>
-      <location filename="../src/ui/about.cc" line="20"/>
-      <source>[Unknown]</source>
-      <translation>[未知]</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.cc" line="35"/>
-      <source>Based on Qt %1 (%2, %3 bit)</source>
-      <translation>基於 QT %1 (%2, %3 bit)</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/about.ui" line="91"/>
+      <location filename="../src/ui/about.ui"/>
       <source>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</source>
       <translation>(c) 2008-2013 Konstantin Isakov (ikm@goldendict.org)</translation>
     </message>
+    <message>
+      <location filename="../src/ui/about.cc" line="19"/>
+      <source>Based on Qt %1 (%2, %3)</source>
+      <translation>基於Qt %1 (%2, %3)</translation>
+    </message>
   </context>
   <context>
     <name>AnkiConnector</name>
@@ -85,62 +80,62 @@
   <context>
     <name>ArticleMaker</name>
     <message>
-      <location filename="../src/article_maker.cc" line="311"/>
+      <location filename="../src/article_maker.cc" line="318"/>
       <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="../src/article_maker.cc" line="304"/>
+      <location filename="../src/article_maker.cc" line="311"/>
       <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="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Expand article</source>
       <translation>展開條目</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="138"/>
+      <location filename="../src/article_maker.cc" line="143"/>
       <source>Collapse article</source>
       <translation>摺疊條目</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="232"/>
-      <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="../src/article_maker.cc" line="302"/>
+      <location filename="../src/article_maker.cc" line="309"/>
       <source>Working with popup</source>
       <translation>使用螢幕取詞功能</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="392"/>
+      <location filename="../src/article_maker.cc" line="399"/>
       <source>(untitled)</source>
       <translation>(未命名)</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="284"/>
+      <location filename="../src/article_maker.cc" line="291"/>
       <source>Welcome!</source>
       <translation>歡迎使用！</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="314"/>
+      <location filename="../src/article_maker.cc" line="321"/>
       <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="../src/article_maker.cc" line="236"/>
+      <location filename="../src/article_maker.cc" line="243"/>
       <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="../src/article_maker.cc" line="286"/>
+      <location filename="../src/article_maker.cc" line="236"/>
+      <source>No translation for &lt;b dir=&quot;%3&quot;&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 dir=&quot;%3&quot;&gt;%1&lt;/b&gt; 的翻譯。</translation>
+    </message>
+    <message>
+      <location filename="../src/article_maker.cc" line="293"/>
       <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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;forum&lt;/a&gt;.&lt;p&gt;Check program&apos;s &lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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;https://github.com/xiaoyifang/goldendict/discussions&quot;&gt;官方論壇&lt;/a&gt;。&lt;p style=&quot;text-indent:2em&quot;&gt;如需要取得程式更新，歡迎拜訪此程式的&lt;a href=&quot;https://github.com/xiaoyifang/goldendict&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="../src/article_maker.cc" line="404"/>
+      <location filename="../src/article_maker.cc" line="411"/>
       <source>(picture)</source>
       <translation>(圖片)</translation>
     </message>
@@ -148,42 +143,42 @@
   <context>
     <name>ArticleRequest</name>
     <message>
-      <location filename="../src/article_maker.cc" line="672"/>
+      <location filename="../src/article_maker.cc" line="678"/>
       <source>Expand article</source>
       <translation>展開條目</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="673"/>
+      <location filename="../src/article_maker.cc" line="679"/>
       <source>From </source>
       <translation>來自</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="676"/>
+      <location filename="../src/article_maker.cc" line="682"/>
       <source>Collapse article</source>
       <translation>摺疊條目</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="691"/>
+      <location filename="../src/article_maker.cc" line="694"/>
       <source>Make a new Anki note</source>
       <translation>製作一個新的anki note</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="704"/>
+      <location filename="../src/article_maker.cc" line="708"/>
       <source>Query error: %1</source>
       <translation>查詢錯誤：%1</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="832"/>
+      <location filename="../src/article_maker.cc" line="836"/>
       <source>Close words: </source>
       <translation>近似字詞：</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="899"/>
+      <location filename="../src/article_maker.cc" line="903"/>
       <source>Compound expressions: </source>
       <translation>複合片語：</translation>
     </message>
     <message>
-      <location filename="../src/article_maker.cc" line="927"/>
+      <location filename="../src/article_maker.cc" line="931"/>
       <source>Individual words: </source>
       <translation>單個詞彙：</translation>
     </message>
@@ -191,197 +186,197 @@
   <context>
     <name>ArticleView</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2087"/>
+      <location filename="../src/ui/articleview.cc" line="1929"/>
       <source>Failed to create temporary file.</source>
       <translation>建立暫存檔失敗。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1798"/>
+      <location filename="../src/ui/articleview.cc" line="1640"/>
       <source>&amp;Look up &quot;%1&quot;</source>
       <translation>查詢 &quot;%1&quot;(&amp;L)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1806"/>
+      <location filename="../src/ui/articleview.cc" line="1648"/>
       <source>Look up &quot;%1&quot; in &amp;New Tab</source>
       <translation>在新分頁中查詢 &quot;%1&quot;(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1358"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1215"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>The referenced resource doesn&apos;t exist.</source>
       <translation>所引用的資源不存在。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2098"/>
+      <location filename="../src/ui/articleview.cc" line="1940"/>
       <source>Failed to auto-open resource file, try opening manually: %1.</source>
       <translation>自動開啟資源檔時失敗，請嘗試手動開啟：%1。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1832"/>
+      <location filename="../src/ui/articleview.cc" line="1674"/>
       <source>Look up &quot;%1&quot; in %2</source>
       <translation>在 %2 中查詢 &quot;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="321"/>
+      <location filename="../src/ui/articleview.cc" line="199"/>
       <source>Select Current Article</source>
       <translation>選擇目前條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="326"/>
+      <location filename="../src/ui/articleview.cc" line="204"/>
       <source>Copy as text</source>
       <translation>以純文字複製</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="331"/>
+      <location filename="../src/ui/articleview.cc" line="209"/>
       <source>Inspect</source>
       <translation>檢查原始碼</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1840"/>
+      <location filename="../src/ui/articleview.cc" line="1682"/>
       <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="../src/ui/articleview.cc" line="1750"/>
+      <location filename="../src/ui/articleview.cc" line="1598"/>
       <source>Open Link in New &amp;Tab</source>
       <translation>在新分頁中開啟連結(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1757"/>
+      <location filename="../src/ui/articleview.cc" line="1605"/>
       <source>Open Link in &amp;External Browser</source>
       <translation>在外部瀏覽器中開啟連結(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="995"/>
+      <location filename="../src/ui/articleview.cc" line="855"/>
       <source>Resource</source>
       <translation>資源</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1000"/>
+      <location filename="../src/ui/articleview.cc" line="860"/>
       <source>Audio</source>
       <translation>音訊</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1005"/>
+      <location filename="../src/ui/articleview.cc" line="865"/>
       <source>TTS Voice</source>
       <translation>文字轉語音聲音</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1010"/>
+      <location filename="../src/ui/articleview.cc" line="870"/>
       <source>Picture</source>
       <translation>圖片</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1017"/>
+      <location filename="../src/ui/articleview.cc" line="877"/>
       <source>Video</source>
       <translatorcomment>视频: %1</translatorcomment>
       <translation>影像</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1026"/>
+      <location filename="../src/ui/articleview.cc" line="886"/>
       <source>Video: %1</source>
       <translation>影像： %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1043"/>
+      <location filename="../src/ui/articleview.cc" line="903"/>
       <source>Definition from dictionary &quot;%1&quot;: %2</source>
       <translation>字典 &quot;%1&quot; 的定義： %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1051"/>
+      <location filename="../src/ui/articleview.cc" line="911"/>
       <source>Definition: %1</source>
       <translation>查詢釋義：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1397"/>
+      <location filename="../src/ui/articleview.cc" line="1250"/>
       <source>The referenced audio program doesn&apos;t exist.</source>
       <translation>引用的音訊程式不存在。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1744"/>
+      <location filename="../src/ui/articleview.cc" line="1592"/>
       <source>Op&amp;en Link</source>
       <translation>開啟連結(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1851"/>
+      <location filename="../src/ui/articleview.cc" line="1693"/>
       <source>Save &amp;Bookmark &quot;%1...&quot;</source>
       <translation>儲存書籤(&amp;B)&quot;%1...&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2128"/>
+      <location filename="../src/ui/articleview.cc" line="1970"/>
       <source>WARNING: Audio Player: %1</source>
       <translation>警告： 音訊播放程式： %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1283"/>
-      <location filename="../src/ui/articleview.cc" line="1318"/>
-      <location filename="../src/ui/articleview.cc" line="1542"/>
+      <location filename="../src/ui/articleview.cc" line="1140"/>
+      <location filename="../src/ui/articleview.cc" line="1175"/>
+      <location filename="../src/ui/articleview.cc" line="1392"/>
       <source>ERROR: %1</source>
       <translation>錯誤：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2000"/>
+      <location filename="../src/ui/articleview.cc" line="1842"/>
       <source>Save sound</source>
       <translation>儲存音訊</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2015"/>
+      <location filename="../src/ui/articleview.cc" line="1857"/>
       <source>Save image</source>
       <translation>儲存圖片</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2017"/>
+      <location filename="../src/ui/articleview.cc" line="1859"/>
       <source>Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)</source>
       <translation>圖片檔(*.bmp *.jpg *.png *.tif);;所有檔案 (*.*) </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1773"/>
+      <location filename="../src/ui/articleview.cc" line="1621"/>
       <source>Save &amp;image...</source>
       <translation>儲存圖片(&amp;I)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="192"/>
+      <location filename="../src/ui/articleview.cc" line="70"/>
       <source>Phrase not found</source>
       <translation>找不到該片語。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="200"/>
+      <location filename="../src/ui/articleview.cc" line="78"/>
       <source>%1 of %2 matches</source>
       <translation>%1/%2 個匹配</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1780"/>
+      <location filename="../src/ui/articleview.cc" line="1628"/>
       <source>Save s&amp;ound...</source>
       <translation>儲存音訊(&amp;O)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1811"/>
+      <location filename="../src/ui/articleview.cc" line="1653"/>
       <source>Send &quot;%1&quot; to input line</source>
       <translation>把 &quot;%1&quot; 傳送到輸入列</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1817"/>
-      <location filename="../src/ui/articleview.cc" line="1869"/>
+      <location filename="../src/ui/articleview.cc" line="1659"/>
+      <location filename="../src/ui/articleview.cc" line="1711"/>
       <source>&amp;Add &quot;%1&quot; to history</source>
       <translation>將 &quot;%1&quot; 新增至歷史記錄(&amp;A) </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1859"/>
+      <location filename="../src/ui/articleview.cc" line="1701"/>
       <source>&amp;Send Current Article to Anki</source>
       <translation>將當前內容傳送到anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="1860"/>
+      <location filename="../src/ui/articleview.cc" line="1702"/>
       <source>&amp;Send selected text to Anki</source>
       <translation>將選擇的文字傳送到anki</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2002"/>
-      <source>Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
-      <translation>聲音檔案 (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
+      <location filename="../src/ui/articleview.cc" line="1844"/>
+      <source>Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</source>
+      <translation>聲音檔案 (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2072"/>
+      <location filename="../src/ui/articleview.cc" line="1914"/>
       <source>Failed to play sound file: %1</source>
       <translation>播放音訊檔案失敗：%1</translation>
     </message>
@@ -413,62 +408,62 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>ChineseConversion</name>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="20"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Conversion</source>
       <translation>中文轉換</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="23"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion between simplified and traditional Chinese characters</source>
       <translation>啟用簡繁轉換</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="26"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Chinese Con&amp;version</source>
       <translation>中文轉換(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="35"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Taiwan variant) characters</source>
       <translation>啟用簡體字轉換為台灣繁體字</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="38"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Taiwan variant)</source>
       <translation>簡體轉為台灣繁體</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="45"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from simplified characters to traditional (Hong Kong variant) characters</source>
       <translation>啟用簡體字轉換為香港繁體字</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="48"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>SC to TC (Hong Kong variant)</source>
       <translation>簡體轉為香港繁體</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="55"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>Enable conversion from traditional characters to simplified characters</source>
       <translation>啟用繁體字轉換為簡體字</translation>
     </message>
     <message>
-      <location filename="../src/ui/chineseconversion.ui" line="58"/>
+      <location filename="../src/ui/chineseconversion.ui"/>
       <source>TC to SC</source>
       <translation>繁體轉為簡體</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="129"/>
+      <location filename="../src/dict/chinese.cc" line="128"/>
       <source>Simplified to traditional Chinese (Taiwan variant) conversion</source>
       <translation>簡體字轉換為台灣繁體字</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="136"/>
+      <location filename="../src/dict/chinese.cc" line="135"/>
       <source>Simplified to traditional Chinese (Hong Kong variant) conversion</source>
       <translation>簡體字轉換為香港繁體字</translation>
     </message>
     <message>
-      <location filename="../src/dict/chinese.cc" line="143"/>
+      <location filename="../src/dict/chinese.cc" line="142"/>
       <source>Traditional to simplified Chinese conversion</source>
       <translation>繁體字轉換為簡體字</translation>
     </message>
@@ -476,7 +471,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>CustomTranslit</name>
     <message>
-      <location filename="../src/dict/customtransliteration.cpp" line="51"/>
+      <location filename="../src/dict/customtransliteration.cc" line="52"/>
       <source>custom transliteration</source>
       <translation>自定義音譯</translation>
     </message>
@@ -484,22 +479,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Dialog</name>
     <message>
-      <location filename="../src/ui/authentication.ui" line="14"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Proxy authentication required</source>
       <translation>必須提供代理伺服器的驗證</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="20"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>You need to supply a Username and a Password to access via proxy</source>
       <translation>如果您要透過代理伺服器來存取，需要提供使用者名稱和密碼</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="30"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Username:</source>
       <translation>使用者名稱：</translation>
     </message>
     <message>
-      <location filename="../src/ui/authentication.ui" line="40"/>
+      <location filename="../src/ui/authentication.ui"/>
       <source>Password:</source>
       <translation>密碼：</translation>
     </message>
@@ -507,22 +502,22 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupWidget</name>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="14"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Form</source>
       <translation>表單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="28"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Group icon:</source>
       <translation>群組圖示：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="76"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Shortcut:</source>
       <translation>快速鍵：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictgroupwidget.ui" line="120"/>
+      <location filename="../src/ui/dictgroupwidget.ui"/>
       <source>Favorites folder:</source>
       <translation>我的最愛資料夾：</translation>
     </message>
@@ -547,17 +542,17 @@ between classic and school orthography in cyrillic)</source>
       <translation>影像</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="99"/>
+      <location filename="../src/ui/groups_widgets.cc" line="98"/>
       <source>All files</source>
       <translation>所有檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Error</source>
       <translation>錯誤</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="106"/>
+      <location filename="../src/ui/groups_widgets.cc" line="104"/>
       <source>Can&apos;t read the specified image file.</source>
       <translation>無法讀取指定的影像檔案。</translation>
     </message>
@@ -565,63 +560,63 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictGroupsWidget</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="691"/>
-      <location filename="../src/ui/groups_widgets.cc" line="789"/>
-      <location filename="../src/ui/groups_widgets.cc" line="890"/>
+      <location filename="../src/ui/groups_widgets.cc" line="695"/>
+      <location filename="../src/ui/groups_widgets.cc" line="781"/>
+      <location filename="../src/ui/groups_widgets.cc" line="881"/>
       <source>Confirmation</source>
       <translation>確定</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="692"/>
+      <location filename="../src/ui/groups_widgets.cc" line="696"/>
       <source>Are you sure you want to generate a set of groups based on language pairs?</source>
       <translation>您確定要依據語言別來產生群組嗎？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="891"/>
+      <location filename="../src/ui/groups_widgets.cc" line="882"/>
       <source>Are you sure you want to generate a set of groups based on metadata.toml?</source>
       <translation>您確定要依據metadata.toml產生群組嗎？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1001"/>
+      <location filename="../src/ui/groups_widgets.cc" line="990"/>
       <source>Combine groups by source language to &quot;%1-&gt;&quot;</source>
       <translation>依來源語言合併分組至 &quot;%1-&gt;&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1018"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1007"/>
       <source>Combine groups by target language to &quot;-&gt;%1&quot;</source>
       <translation>依目標語言合併分組至 &quot;-&gt;%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="784"/>
+      <location filename="../src/ui/groups_widgets.cc" line="776"/>
       <source>Auto group by folder failed.</source>
       <translation>依文件夾自動分組失敗</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="785"/>
+      <location filename="../src/ui/groups_widgets.cc" line="777"/>
       <source>The parent directory of %1 can not be reached.</source>
       <translation>無法訪問 %1 的父目錄。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="790"/>
+      <location filename="../src/ui/groups_widgets.cc" line="782"/>
       <source>Are you sure you want to generate a set of groups based on containing folders?</source>
       <translation>您確定要依據語言來產生群組嗎？</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1036"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1025"/>
       <source>Make two-side translate group &quot;%1-%2-%1&quot;</source>
       <translation>製作雙向翻譯組 &quot;%1-%2-%1&quot;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1054"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1073"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1042"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1060"/>
       <source>Combine groups with &quot;%1&quot;</source>
       <translation>與 &quot;%1&quot; 合併分組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="592"/>
-      <location filename="../src/ui/groups_widgets.cc" line="666"/>
-      <location filename="../src/ui/groups_widgets.cc" line="985"/>
-      <location filename="../src/ui/groups_widgets.cc" line="1160"/>
+      <location filename="../src/ui/groups_widgets.cc" line="579"/>
+      <location filename="../src/ui/groups_widgets.cc" line="675"/>
+      <location filename="../src/ui/groups_widgets.cc" line="973"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1134"/>
       <source>Dictionaries: </source>
       <translation>字典數：</translation>
     </message>
@@ -634,133 +629,133 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictHeadwords</name>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="67"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Search mode</source>
       <translation>搜尋模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="73"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>This element determines how filter string will be interpreted</source>
       <translation>此部份決定程式如何解析欲篩選的字串</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="80"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked on the symbols case will be take in account when filtering</source>
       <translation>勾選後，大小寫就會視為不同</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="83"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Match case</source>
       <translation>符合大小寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="93"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Exports headwords to file</source>
       <translation>將詞條清單匯出至檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="96"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Export</source>
       <translation>匯出</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="119"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Help</source>
       <translation>說明</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="129"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>OK</source>
       <translation>確定</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="35"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Press this button to apply filter to headwords list</source>
       <translation>按下此按鈕，讓篩選器套用至詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="38"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Apply</source>
       <translation>套用</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="22"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>If checked any filter changes will we immediately applied to headwords list</source>
       <translation>假如勾選的話，如果篩選器有任何變更，都會立即套用至詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="25"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Auto apply</source>
       <translation>自動套用</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="58"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter:</source>
       <translation>篩選器：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.ui" line="51"/>
+      <location filename="../src/ui/dictheadwords.ui"/>
       <source>Filter string (fixed string, wildcards or regular expression)</source>
       <translation>篩選字串 (固定字串、萬用字元或正規表達式)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="42"/>
+      <location filename="../src/ui/dictheadwords.cc" line="44"/>
       <source>Text</source>
       <translation>文字</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="43"/>
+      <location filename="../src/ui/dictheadwords.cc" line="45"/>
       <source>Wildcards</source>
       <translation>萬用字元</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="44"/>
+      <location filename="../src/ui/dictheadwords.cc" line="46"/>
       <source>RegExp</source>
       <translation>正規表達式</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
       <source>Loading headwords...</source>
       <translation>加載詞條...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="281"/>
+      <location filename="../src/ui/dictheadwords.cc" line="285"/>
       <source>Unique headwords total: %1, filtered: %2</source>
       <translation>詞條總數：%1，已篩選出：%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="338"/>
+      <location filename="../src/ui/dictheadwords.cc" line="342"/>
       <source>Save headwords to file</source>
       <translation>將詞條清單儲存成檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="340"/>
+      <location filename="../src/ui/dictheadwords.cc" line="344"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>文字檔 (*.txt);;所有檔案 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="348"/>
+      <location filename="../src/ui/dictheadwords.cc" line="352"/>
       <source>Can not open exported file</source>
       <translation>無法開啟要存檔的檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Export headwords...</source>
       <translation>匯出詞條清單...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="246"/>
-      <location filename="../src/ui/dictheadwords.cc" line="357"/>
+      <location filename="../src/ui/dictheadwords.cc" line="250"/>
+      <location filename="../src/ui/dictheadwords.cc" line="361"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="400"/>
+      <location filename="../src/ui/dictheadwords.cc" line="404"/>
       <source>Export process is interrupted</source>
       <translation>匯出的活動被中止</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictheadwords.cc" line="408"/>
+      <location filename="../src/ui/dictheadwords.cc" line="412"/>
       <source>Export finished</source>
       <translation>匯出完成</translation>
     </message>
@@ -768,67 +763,77 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictInfo</name>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="83"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total articles:</source>
       <translation>條目總數：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="52"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates from:</source>
       <translation>詞條語言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="59"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Total words:</source>
       <translation>詞條總數：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="66"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Translates to:</source>
       <translation>釋義語言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="36"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Open folder</source>
       <translation>開啟資料夾</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="76"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Edit dictionary</source>
       <translation>編輯字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="130"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>此字典包含的檔案：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="174"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Description:</source>
       <translation>描述：</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="196"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Show all unique dictionary headwords</source>
       <translation>顯示所有的詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.ui" line="199"/>
+      <location filename="../src/ui/dictinfo.ui"/>
       <source>Headwords</source>
       <translation>詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictinfo.cc" line="30"/>
+      <location filename="../src/ui/dictinfo.cc" line="31"/>
       <source>Edit the dictionary via command:
 %1</source>
       <translation>以指令編輯字典：
 %1</translation>
     </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Index filename:</source>
+      <translation>索引文件名：</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/dictinfo.ui"/>
+      <source>Open index folder</source>
+      <translation>打開索引文件夾</translation>
+    </message>
   </context>
   <context>
     <name>DictListModel</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="243"/>
+      <location filename="../src/ui/groups_widgets.cc" line="238"/>
       <source>%1 entries</source>
       <translation>%1 詞條</translation>
     </message>
@@ -859,44 +864,44 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictServersModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="823"/>
+      <location filename="../src/dict/sources.cc" line="824"/>
       <source>Enabled</source>
       <translation>啟用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="825"/>
+      <location filename="../src/dict/sources.cc" line="826"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="827"/>
+      <location filename="../src/dict/sources.cc" line="828"/>
       <source>Address</source>
       <translation>位址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="829"/>
+      <location filename="../src/dict/sources.cc" line="830"/>
       <source>Databases</source>
       <translation>資料庫</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="831"/>
+      <location filename="../src/dict/sources.cc" line="832"/>
       <source>Strategies</source>
       <translation>策略</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="833"/>
+      <location filename="../src/dict/sources.cc" line="834"/>
       <source>Icon</source>
       <translation>圖示</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="866"/>
+      <location filename="../src/dict/sources.cc" line="867"/>
       <source>Comma-delimited list of databases
 (empty string or &quot;*&quot; matches all databases)</source>
       <translation>資料庫的逗號分隔清單
 (空字串或&quot;*&quot;複合所有的資料庫)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="869"/>
+      <location filename="../src/dict/sources.cc" line="870"/>
       <source>Comma-delimited list of search strategies
 (empty string mean &quot;prefix&quot; strategy)</source>
       <translation>搜尋策略的的逗號分隔清單
@@ -906,37 +911,37 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>DictionaryBar</name>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="22"/>
+      <location filename="../src/ui/dictionarybar.cc" line="21"/>
       <source>Extended menu with all dictionaries...</source>
       <translation>展開所有字典的選單...</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="96"/>
+      <location filename="../src/ui/dictionarybar.cc" line="95"/>
       <source>Edit this group</source>
       <translation>編輯此群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="120"/>
+      <location filename="../src/ui/dictionarybar.cc" line="119"/>
       <source>Dictionary info</source>
       <translation>字典資訊</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="125"/>
+      <location filename="../src/ui/dictionarybar.cc" line="124"/>
       <source>Dictionary headwords</source>
       <translation>詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="127"/>
+      <location filename="../src/ui/dictionarybar.cc" line="126"/>
       <source>Open dictionary folder</source>
       <translation>開啟字典資料夾</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="134"/>
+      <location filename="../src/ui/dictionarybar.cc" line="133"/>
       <source>Edit dictionary</source>
       <translation>編輯字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/dictionarybar.cc" line="14"/>
+      <location filename="../src/ui/dictionarybar.cc" line="13"/>
       <source>&amp;Dictionary Bar</source>
       <translation>字典列(&amp;D)</translation>
     </message>
@@ -945,27 +950,27 @@ between classic and school orthography in cyrillic)</source>
     <name>EditDictionaries</name>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="45"/>
-      <location filename="../src/ui/editdictionaries.cc" line="251"/>
+      <location filename="../src/ui/editdictionaries.cc" line="243"/>
       <source>&amp;Dictionaries</source>
       <translation>字典(&amp;D)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.ui" line="14"/>
+      <location filename="../src/ui/editdictionaries.ui"/>
       <source>Dictionaries</source>
       <translation>字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="134"/>
+      <location filename="../src/ui/editdictionaries.cc" line="129"/>
       <source>Accept</source>
       <translation>接受</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="136"/>
+      <location filename="../src/ui/editdictionaries.cc" line="131"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="130"/>
+      <location filename="../src/ui/editdictionaries.cc" line="124"/>
       <source>Sources changed</source>
       <translation>字典檔案所在資料夾已變更</translation>
     </message>
@@ -976,12 +981,12 @@ between classic and school orthography in cyrillic)</source>
     </message>
     <message>
       <location filename="../src/ui/editdictionaries.cc" line="46"/>
-      <location filename="../src/ui/editdictionaries.cc" line="253"/>
+      <location filename="../src/ui/editdictionaries.cc" line="244"/>
       <source>&amp;Groups</source>
       <translation>群組(&amp;G)</translation>
     </message>
     <message>
-      <location filename="../src/ui/editdictionaries.cc" line="131"/>
+      <location filename="../src/ui/editdictionaries.cc" line="125"/>
       <source>Some sources were changed. Would you like to accept the changes?</source>
       <translation>某些字典檔案的所在資料夾已變更，您是否接受變更？</translation>
     </message>
@@ -1010,75 +1015,55 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FTS::FullTextSearchDialog</name>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="232"/>
+      <location filename="../src/fulltextsearch.cc" line="217"/>
       <source>Full-text search</source>
       <translation>全文搜尋</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="241"/>
-      <source>Whole words</source>
-      <translation>整個字(Whole words)</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="242"/>
+      <location filename="../src/fulltextsearch.cc" line="231"/>
       <source>Plain text</source>
       <translation>純文字</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="232"/>
       <source>Wildcards</source>
       <translation>萬用字元</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="245"/>
-      <source>RegExp</source>
-      <translation>正規表達式</translation>
+      <location filename="../src/fulltextsearch.cc" line="339"/>
+      <source>The querying word can not be empty.</source>
+      <translation>查詢詞不能為空。</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="255"/>
+      <location filename="../src/fulltextsearch.cc" line="234"/>
       <source>support xapian search syntax,such as AND OR +/- etc</source>
       <translation>支援xapian如下的搜尋語法 AND OR +/- 等</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="261"/>
-      <source>Max distance between words (%1-%2):</source>
-      <translation>文字間最大距離 (%1-%2)</translation>
+      <location filename="../src/fulltextsearch.cc" line="230"/>
+      <source>Default</source>
+      <translation>默認</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="270"/>
-      <source>Max articles per dictionary (%1-%2):</source>
-      <translation>每個字典的條目上限 (%1-%2)：</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="309"/>
-      <location filename="../src/fulltextsearch.cc" line="443"/>
-      <location filename="../src/fulltextsearch.cc" line="564"/>
-      <location filename="../src/fulltextsearch.cc" line="577"/>
+      <location filename="../src/fulltextsearch.cc" line="243"/>
+      <location filename="../src/fulltextsearch.cc" line="334"/>
+      <location filename="../src/fulltextsearch.cc" line="439"/>
+      <location filename="../src/fulltextsearch.cc" line="452"/>
       <source>Articles found: </source>
       <translation>找到的條目：</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="396"/>
+      <location filename="../src/fulltextsearch.cc" line="323"/>
       <source>Now indexing: </source>
       <translation>建立索引中：</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="397"/>
+      <location filename="../src/fulltextsearch.cc" line="324"/>
       <source>None</source>
       <translation>無</translation>
     </message>
     <message>
-      <location filename="../src/fulltextsearch.cc" line="454"/>
-      <source>The search line must contains at least one word containing </source>
-      <translation>搜尋列至少必須包括</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="455"/>
-      <source> or more symbols</source>
-      <translation>或更多文字</translation>
-    </message>
-    <message>
-      <location filename="../src/fulltextsearch.cc" line="466"/>
+      <location filename="../src/fulltextsearch.cc" line="350"/>
       <source>No dictionaries for full-text search</source>
       <translation>沒有可用於全文搜尋的字典</translation>
     </message>
@@ -1086,7 +1071,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FavoritesModel</name>
     <message>
-      <location filename="../src/ui/favoritespanewidget.cc" line="648"/>
+      <location filename="../src/ui/favoritespanewidget.cc" line="650"/>
       <source>Error in favorities file</source>
       <translation>我的最愛檔案發生錯誤</translation>
     </message>
@@ -1152,7 +1137,7 @@ between classic and school orthography in cyrillic)</source>
       <translation>來自</translation>
     </message>
     <message>
-      <location filename="../src/dict/forvo.cc" line="309"/>
+      <location filename="../src/dict/forvo.cc" line="303"/>
       <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>
     </message>
@@ -1173,68 +1158,52 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>FullTextSearchDialog</name>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="26"/>
-      <location filename="../src/ui/fulltextsearch.ui" line="206"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Search</source>
       <translation>搜尋</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="60"/>
-      <source>Match case</source>
-      <translation>符合大小寫</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="37"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Mode:</source>
       <translation>模式：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="81"/>
-      <source>Ignore words order</source>
-      <translation>忽略單字排序</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="88"/>
-      <source>Ignore diacritics</source>
-      <translation>忽略變音符號</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="111"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Articles found:</source>
       <translation>找到條目：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="133"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Available dictionaries in group:</source>
       <translation>群組中可用的字典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="139"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Wait for indexing:</source>
       <translation>等候建立索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="252"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Help</source>
       <translation>說明</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="160"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Total:</source>
       <translation>總共：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="167"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Indexed:</source>
       <translation>已建立索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="184"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Now indexing: None</source>
       <translation>正在建立索引：無</translation>
     </message>
     <message>
-      <location filename="../src/ui/fulltextsearch.ui" line="232"/>
+      <location filename="../src/ui/fulltextsearch.ui"/>
       <source>Cancel</source>
       <translation>取消</translation>
     </message>
@@ -1266,27 +1235,27 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Groups</name>
     <message>
-      <location filename="../src/ui/groups.ui" line="92"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&lt;</source>
       <translation>&lt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="67"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&gt;</source>
       <translation>&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="95"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Del</source>
       <translation>Del</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="70"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Ins</source>
       <translation>Ins</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="133"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Tab 2</source>
       <translation>分頁 2</translation>
     </message>
@@ -1326,12 +1295,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>為群組取一個新名字：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="22"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Dictionaries available:</source>
       <translation>可用的字典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="146"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Add group</source>
       <translation>新增群組(&amp;A)</translation>
     </message>
@@ -1341,42 +1310,42 @@ between classic and school orthography in cyrillic)</source>
       <translation>新增群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="143"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create new dictionary group</source>
       <translation>建立新的字典群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="203"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Languages</source>
       <translation>按語言分組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="210"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create folder-based groups.</source>
       <translation>創建基於文件夾的群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="213"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Folders</source>
       <translation>按文件夾分組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="220"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Group by Metadata</source>
       <translation>按元數據分組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="244"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Drag&amp;drop dictionaries to and from the groups, move them inside the groups, reorder the groups using your mouse.</source>
       <translation>使用您的滑鼠將字典拖曳到群組，或是拖曳群組來改變其排序。</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="153"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Rename current dictionary group</source>
       <translation>重新命名目前的字典群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="163"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove current dictionary group</source>
       <translation>移除目前的字典群組</translation>
     </message>
@@ -1386,43 +1355,43 @@ between classic and school orthography in cyrillic)</source>
       <translation>為新群組命名：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="176"/>
+      <location filename="../src/ui/groups.ui"/>
       <location filename="../src/ui/groups.cc" line="173"/>
       <source>Remove all groups</source>
       <translation>移除全部群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="89"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove selected dictionaries from group (Del)</source>
       <translation>將所選字典從群組中移除(Del)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="64"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Add selected dictionaries to group (Ins)</source>
       <translation>將所選字典新增至群組(Ins)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="166"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>&amp;Remove group</source>
       <translation>移除群組(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="119"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Groups:</source>
       <translation>群組：</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="156"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Re&amp;name group</source>
       <translation>重新命名群組(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="173"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Remove all dictionary groups</source>
       <translation>移除全部字典群組</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups.ui" line="200"/>
+      <location filename="../src/ui/groups.ui"/>
       <source>Create language-based groups</source>
       <translation>依語言來建立群組</translation>
     </message>
@@ -1445,12 +1414,12 @@ between classic and school orthography in cyrillic)</source>
       <translation>歷史記錄：</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="215"/>
+      <location filename="../src/ui/historypanewidget.cc" line="217"/>
       <source>%1/%2</source>
-      <translation>第%1/%2輪</translation>
+      <translation>%1/%2</translation>
     </message>
     <message>
-      <location filename="../src/ui/historypanewidget.cc" line="219"/>
+      <location filename="../src/ui/historypanewidget.cc" line="221"/>
       <source>History size: %1 entries out of maximum %2</source>
       <translation>歷史記錄的大小： %1 個詞條，最多 %2 個</translation>
     </message>
@@ -1458,12 +1427,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Hunspell</name>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="259"/>
+      <location filename="../src/dict/hunspell.cc" line="256"/>
       <source>Spelling suggestions: </source>
       <translation>拼字建議：</translation>
     </message>
     <message>
-      <location filename="../src/dict/hunspell.cc" line="780"/>
+      <location filename="../src/dict/hunspell.cc" line="768"/>
       <source>%1 Morphology</source>
       <translation>%1 構詞法</translation>
     </message>
@@ -1471,12 +1440,12 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>HunspellDictsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1404"/>
+      <location filename="../src/dict/sources.cc" line="1405"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1402"/>
+      <location filename="../src/dict/sources.cc" line="1403"/>
       <source>Enabled</source>
       <translation>啟用</translation>
     </message>
@@ -1484,1031 +1453,1035 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Initializing</name>
     <message>
-      <location filename="../src/ui/initializing.ui" line="44"/>
+      <location filename="../src/ui/initializing.ui"/>
+      <source>Indexing: </source>
+      <translation>索引： </translation>
+    </message>
+    <message>
+      <location filename="../src/ui/initializing.ui"/>
       <source>Dictionary Name</source>
       <translation>字典名稱</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="22"/>
+      <location filename="../src/ui/initializing.ui"/>
       <source>GoldenDict-ng - Initializing</source>
       <translation>初始化 GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/initializing.ui" line="28"/>
-      <location filename="../src/initializing.cc" line="31"/>
-      <source>Please wait while indexing dictionary</source>
-      <translation>正在建立字典索引，請稍候</translation>
-    </message>
-    <message>
-      <location filename="../src/initializing.cc" line="22"/>
+      <location filename="../src/initializing.cc" line="18"/>
       <source>Please wait...</source>
       <translation>請稍候...</translation>
     </message>
+    <message>
+      <location filename="../src/initializing.cc" line="27"/>
+      <source>Indexing...</source>
+      <translation>索引...</translation>
+    </message>
   </context>
   <context>
     <name>Language</name>
     <message>
-      <location filename="../src/language.cc" line="153"/>
+      <location filename="../src/language.cc" line="151"/>
       <source>Ewe</source>
       <translation>埃維語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="188"/>
+      <location filename="../src/language.cc" line="186"/>
       <source>Ido</source>
       <translation>伊多語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="214"/>
+      <location filename="../src/language.cc" line="212"/>
       <source>Lao</source>
       <translation>寮國語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="286"/>
+      <location filename="../src/language.cc" line="284"/>
       <source>Twi</source>
       <translation>維特語(迦納)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="118"/>
+      <location filename="../src/language.cc" line="116"/>
       <source>Afar</source>
       <translation>阿法爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="122"/>
+      <location filename="../src/language.cc" line="120"/>
       <source>Akan</source>
       <translation>阿肯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="144"/>
+      <location filename="../src/language.cc" line="142"/>
       <source>Cree</source>
       <translation>克里語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="185"/>
+      <location filename="../src/language.cc" line="183"/>
       <source>Igbo</source>
       <translation>伊博語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="206"/>
+      <location filename="../src/language.cc" line="204"/>
       <source>Komi</source>
       <translation>科米語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="172"/>
+      <location filename="../src/language.cc" line="170"/>
       <source>Manx</source>
       <translation>曼島語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="245"/>
+      <location filename="../src/language.cc" line="243"/>
       <source>Pali</source>
       <translation>巴利語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="277"/>
+      <location filename="../src/language.cc" line="275"/>
       <source>Thai</source>
       <translation>泰文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="290"/>
+      <location filename="../src/language.cc" line="288"/>
       <source>Urdu</source>
       <translation>烏爾都語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="302"/>
+      <location filename="../src/language.cc" line="300"/>
       <source>Zulu</source>
       <translation>祖魯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="145"/>
+      <location filename="../src/language.cc" line="143"/>
       <source>Czech</source>
       <translation>捷克文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="233"/>
+      <location filename="../src/language.cc" line="231"/>
       <source>Dutch</source>
       <translation>荷蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="211"/>
+      <location filename="../src/language.cc" line="209"/>
       <source>Ganda</source>
       <translation>盧甘達語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="161"/>
+      <location filename="../src/language.cc" line="159"/>
       <source>Fulah</source>
       <translation>富拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="154"/>
+      <location filename="../src/language.cc" line="152"/>
       <source>Greek</source>
       <translation>希臘文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="173"/>
+      <location filename="../src/language.cc" line="171"/>
       <source>Hausa</source>
       <translation>豪薩語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="175"/>
+      <location filename="../src/language.cc" line="173"/>
       <source>Hindi</source>
       <translation>印地語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="167"/>
+      <location filename="../src/language.cc" line="165"/>
       <source>Irish</source>
       <translation>愛爾蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="200"/>
+      <location filename="../src/language.cc" line="198"/>
       <source>Khmer</source>
       <translation>高棉語(柬埔寨語)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="195"/>
+      <location filename="../src/language.cc" line="193"/>
       <source>Kongo</source>
       <translation>剛果語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="209"/>
+      <location filename="../src/language.cc" line="207"/>
       <source>Latin</source>
       <translation>拉丁文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="225"/>
+      <location filename="../src/language.cc" line="223"/>
       <source>Malay</source>
       <translation>馬來文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="220"/>
+      <location filename="../src/language.cc" line="218"/>
       <source>Maori</source>
       <translation>毛利語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="228"/>
+      <location filename="../src/language.cc" line="226"/>
       <source>Nauru</source>
       <translation>諾魯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="242"/>
+      <location filename="../src/language.cc" line="240"/>
       <source>Oriya</source>
       <translation>奧裡亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="241"/>
+      <location filename="../src/language.cc" line="239"/>
       <source>Oromo</source>
       <translation>奧洛莫語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="259"/>
+      <location filename="../src/language.cc" line="257"/>
       <source>Sango</source>
       <translation>桑戈語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="265"/>
+      <location filename="../src/language.cc" line="263"/>
       <source>Shona</source>
       <translation>紹納語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="276"/>
+      <location filename="../src/language.cc" line="274"/>
       <source>Tajik</source>
       <translation>塔吉克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="274"/>
+      <location filename="../src/language.cc" line="272"/>
       <source>Tamil</source>
       <translation>泰米爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="285"/>
+      <location filename="../src/language.cc" line="283"/>
       <source>Tatar</source>
       <translation>韃靼文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="269"/>
+      <location filename="../src/language.cc" line="267"/>
       <source>Swati</source>
       <translation>斯瓦特語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="282"/>
+      <location filename="../src/language.cc" line="280"/>
       <source>Tonga</source>
       <translation>東加語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="187"/>
+      <location filename="../src/language.cc" line="185"/>
       <source>Inupiaq</source>
       <translation>伊努庇克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="292"/>
+      <location filename="../src/language.cc" line="290"/>
       <source>Venda</source>
       <translation>文達語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="291"/>
+      <location filename="../src/language.cc" line="289"/>
       <source>Uzbek</source>
       <translation>烏茲別克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="148"/>
+      <location filename="../src/language.cc" line="146"/>
       <source>Welsh</source>
       <translation>威爾士語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="296"/>
+      <location filename="../src/language.cc" line="294"/>
       <source>Wolof</source>
       <translation>沃洛夫語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="297"/>
+      <location filename="../src/language.cc" line="295"/>
       <source>Xhosa</source>
       <translation>科薩語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="190"/>
+      <location filename="../src/language.cc" line="188"/>
       <source>Italian</source>
       <translation>義大利文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="250"/>
+      <location filename="../src/language.cc" line="248"/>
       <source>Raeto-Romance</source>
       <translation>羅曼斯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="152"/>
+      <location filename="../src/language.cc" line="150"/>
       <source>Dzongkha</source>
       <translation>宗喀語(不丹文)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="201"/>
+      <location filename="../src/language.cc" line="199"/>
       <source>Kannada</source>
       <translation>卡納達語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="230"/>
+      <location filename="../src/language.cc" line="228"/>
       <source>North Ndebele</source>
       <translation>北恩德貝勒語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="119"/>
+      <location filename="../src/language.cc" line="117"/>
       <source>Abkhazian</source>
       <translation>阿布哈西亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="208"/>
+      <location filename="../src/language.cc" line="206"/>
       <source>Kirghiz</source>
       <translation>吉爾吉斯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="251"/>
+      <location filename="../src/language.cc" line="249"/>
       <source>Kirundi</source>
       <translation>科隆地語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="168"/>
+      <location filename="../src/language.cc" line="166"/>
       <source>Scottish Gaelic</source>
       <translation>蘇格蘭語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="267"/>
+      <location filename="../src/language.cc" line="265"/>
       <source>Albanian</source>
       <translation>阿爾巴尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="217"/>
+      <location filename="../src/language.cc" line="215"/>
       <source>Latvian</source>
       <translation>拉脫維亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="222"/>
+      <location filename="../src/language.cc" line="220"/>
       <source>Malayalam</source>
       <translation>馬拉雅拉姆語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="205"/>
+      <location filename="../src/language.cc" line="203"/>
       <source>Kurdish</source>
       <translation>庫爾德文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="132"/>
+      <location filename="../src/language.cc" line="130"/>
       <source>Bulgarian</source>
       <translation>保加利亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="213"/>
+      <location filename="../src/language.cc" line="211"/>
       <source>Lingala</source>
       <translation>林加拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="226"/>
+      <location filename="../src/language.cc" line="224"/>
       <source>Maltese</source>
       <translation>馬爾他語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="224"/>
+      <location filename="../src/language.cc" line="222"/>
       <source>Marathi</source>
       <translation>馬拉地語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="125"/>
+      <location filename="../src/language.cc" line="123"/>
       <source>Arabic</source>
       <translation>阿拉伯文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="159"/>
+      <location filename="../src/language.cc" line="157"/>
       <source>Basque</source>
       <translation>巴斯克文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="127"/>
+      <location filename="../src/language.cc" line="125"/>
       <source>Avaric</source>
       <translation>阿瓦爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="133"/>
+      <location filename="../src/language.cc" line="131"/>
       <source>Bihari</source>
       <translation>比哈爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="128"/>
+      <location filename="../src/language.cc" line="126"/>
       <source>Aymara</source>
       <translation>艾馬拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="138"/>
+      <location filename="../src/language.cc" line="136"/>
       <source>Breton</source>
       <translation>布列塔尼語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="271"/>
+      <location filename="../src/language.cc" line="269"/>
       <source>Sundanese</source>
       <translation>巽他語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="149"/>
+      <location filename="../src/language.cc" line="147"/>
       <source>Danish</source>
       <translation>丹麥文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="151"/>
+      <location filename="../src/language.cc" line="149"/>
       <source>Divehi</source>
       <translation>迪維希語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="216"/>
+      <location filename="../src/language.cc" line="214"/>
       <source>Luba-Katanga</source>
       <translation>盧巴卡丹加語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="163"/>
+      <location filename="../src/language.cc" line="161"/>
       <source>Fijian</source>
       <translation>斐濟語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="179"/>
+      <location filename="../src/language.cc" line="177"/>
       <source>Hungarian</source>
       <translation>匈牙利文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="165"/>
+      <location filename="../src/language.cc" line="163"/>
       <source>French</source>
       <translation>法文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="150"/>
+      <location filename="../src/language.cc" line="148"/>
       <source>German</source>
       <translation>德文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="223"/>
+      <location filename="../src/language.cc" line="221"/>
       <source>Mongolian</source>
       <translation>蒙古文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="174"/>
+      <location filename="../src/language.cc" line="172"/>
       <source>Hebrew</source>
       <translation>希伯來文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="181"/>
+      <location filename="../src/language.cc" line="179"/>
       <source>Herero</source>
       <translation>赫雷羅語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="210"/>
+      <location filename="../src/language.cc" line="208"/>
       <source>Luxembourgish</source>
       <translation>盧森堡語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="203"/>
+      <location filename="../src/language.cc" line="201"/>
       <source>Kanuri</source>
       <translation>卡努裡語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="198"/>
+      <location filename="../src/language.cc" line="196"/>
       <source>Kazakh</source>
       <translation>哈薩克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="196"/>
+      <location filename="../src/language.cc" line="194"/>
       <source>Kikuyu</source>
       <translation>基庫尤語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="202"/>
+      <location filename="../src/language.cc" line="200"/>
       <source>Korean</source>
       <translation>韓語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="237"/>
+      <location filename="../src/language.cc" line="235"/>
       <source>Navajo</source>
       <translation>納瓦霍語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="232"/>
+      <location filename="../src/language.cc" line="230"/>
       <source>Ndonga</source>
       <translation>恩敦加語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="231"/>
+      <location filename="../src/language.cc" line="229"/>
       <source>Nepali</source>
       <translation>尼泊爾文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="240"/>
+      <location filename="../src/language.cc" line="238"/>
       <source>Ojibwa</source>
       <translation>奧吉布瓦語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="247"/>
+      <location filename="../src/language.cc" line="245"/>
       <source>Pashto</source>
       <translation>普什圖語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="246"/>
+      <location filename="../src/language.cc" line="244"/>
       <source>Polish</source>
       <translation>波蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="264"/>
+      <location filename="../src/language.cc" line="262"/>
       <source>Samoan</source>
       <translation>薩摩亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="239"/>
+      <location filename="../src/language.cc" line="237"/>
       <source>Occitan</source>
       <translation>奧西坦語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="257"/>
+      <location filename="../src/language.cc" line="255"/>
       <source>Sindhi</source>
       <translation>信德文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="262"/>
+      <location filename="../src/language.cc" line="260"/>
       <source>Slovak</source>
       <translation>斯洛伐克文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="266"/>
+      <location filename="../src/language.cc" line="264"/>
       <source>Somali</source>
       <translation>索馬利亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="275"/>
+      <location filename="../src/language.cc" line="273"/>
       <source>Telugu</source>
       <translation>泰盧固語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="284"/>
+      <location filename="../src/language.cc" line="282"/>
       <source>Tsonga</source>
       <translation>頌加語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="281"/>
+      <location filename="../src/language.cc" line="279"/>
       <source>Tswana</source>
       <translation>茨瓦納語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="288"/>
+      <location filename="../src/language.cc" line="286"/>
       <source>Uighur</source>
       <translation>維吾爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="260"/>
+      <location filename="../src/language.cc" line="258"/>
       <source>Serbo-Croatian</source>
       <translation>塞爾維亞-克羅埃西亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="299"/>
+      <location filename="../src/language.cc" line="297"/>
       <source>Yoruba</source>
       <translation>約魯巴語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="300"/>
+      <location filename="../src/language.cc" line="298"/>
       <source>Zhuang</source>
       <translation>壯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="252"/>
+      <location filename="../src/language.cc" line="250"/>
       <source>Romanian</source>
       <translation>羅馬尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="183"/>
+      <location filename="../src/language.cc" line="181"/>
       <source>Indonesian</source>
       <translation>印度尼西亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="244"/>
+      <location filename="../src/language.cc" line="242"/>
       <source>Panjabi</source>
       <translation>旁遮普語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="270"/>
+      <location filename="../src/language.cc" line="268"/>
       <source>Southern Sotho</source>
       <translation>梭托語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="143"/>
+      <location filename="../src/language.cc" line="141"/>
       <source>Corsican</source>
       <translation>科西嘉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="156"/>
+      <location filename="../src/language.cc" line="154"/>
       <source>Esperanto</source>
       <translation>世界語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="160"/>
+      <location filename="../src/language.cc" line="158"/>
       <source>Persian</source>
       <translation>波斯文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="263"/>
+      <location filename="../src/language.cc" line="261"/>
       <source>Slovenian</source>
       <translation>斯洛維尼亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="166"/>
+      <location filename="../src/language.cc" line="164"/>
       <source>Western Frisian</source>
       <translation>西弗裡西語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="124"/>
+      <location filename="../src/language.cc" line="122"/>
       <source>Aragonese</source>
       <translation>阿拉貢語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="287"/>
+      <location filename="../src/language.cc" line="285"/>
       <source>Tahitian</source>
       <translation>塔希提語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="218"/>
+      <location filename="../src/language.cc" line="216"/>
       <source>Malagasy</source>
       <translation>馬達加斯加語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="169"/>
+      <location filename="../src/language.cc" line="167"/>
       <source>Galician</source>
       <translation>加利西亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="129"/>
+      <location filename="../src/language.cc" line="127"/>
       <source>Azerbaijani</source>
       <translation>亞塞拜然語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="123"/>
+      <location filename="../src/language.cc" line="121"/>
       <source>Amharic</source>
       <translation>阿姆哈拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="255"/>
+      <location filename="../src/language.cc" line="253"/>
       <source>Sanskrit</source>
       <translation>梵語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="192"/>
+      <location filename="../src/language.cc" line="190"/>
       <source>Japanese</source>
       <translation>日文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="289"/>
+      <location filename="../src/language.cc" line="287"/>
       <source>Ukrainian</source>
       <translation>烏克蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="135"/>
+      <location filename="../src/language.cc" line="133"/>
       <source>Bambara</source>
       <translation>班巴拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="199"/>
+      <location filename="../src/language.cc" line="197"/>
       <source>Kalaallisut</source>
       <translation>格陵蘭語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="130"/>
+      <location filename="../src/language.cc" line="128"/>
       <source>Bashkir</source>
       <translation>巴什基爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="131"/>
+      <location filename="../src/language.cc" line="129"/>
       <source>Belarusian</source>
       <translation>白俄羅斯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="204"/>
+      <location filename="../src/language.cc" line="202"/>
       <source>Kashmiri</source>
       <translation>克什米爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="256"/>
+      <location filename="../src/language.cc" line="254"/>
       <source>Sardinian</source>
       <translation>撒丁語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="176"/>
+      <location filename="../src/language.cc" line="174"/>
       <source>Hiri Motu</source>
       <translation>希里莫圖語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="249"/>
+      <location filename="../src/language.cc" line="247"/>
       <source>Quechua</source>
       <translation>科察語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="136"/>
+      <location filename="../src/language.cc" line="134"/>
       <source>Bengali</source>
       <translation>孟加拉文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="193"/>
+      <location filename="../src/language.cc" line="191"/>
       <source>Javanese</source>
       <translation>爪哇語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="120"/>
+      <location filename="../src/language.cc" line="118"/>
       <source>Avestan</source>
       <translation>阿維斯陀語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="254"/>
+      <location filename="../src/language.cc" line="252"/>
       <source>Kinyarwanda</source>
       <translation>盧安達語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="121"/>
+      <location filename="../src/language.cc" line="119"/>
       <source>Afrikaans</source>
       <translation>南非語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="134"/>
+      <location filename="../src/language.cc" line="132"/>
       <source>Bislama</source>
       <translation>比斯拉馬語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="180"/>
+      <location filename="../src/language.cc" line="178"/>
       <source>Armenian</source>
       <translation>亞美尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="229"/>
+      <location filename="../src/language.cc" line="227"/>
       <source>Norwegian Bokmal</source>
       <translation>波克默爾語(挪威)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="177"/>
+      <location filename="../src/language.cc" line="175"/>
       <source>Croatian</source>
       <translation>克羅埃西亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="139"/>
+      <location filename="../src/language.cc" line="137"/>
       <source>Bosnian</source>
       <translation>波士尼亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="182"/>
+      <location filename="../src/language.cc" line="180"/>
       <source>Interlingua</source>
       <translation>國際語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="184"/>
+      <location filename="../src/language.cc" line="182"/>
       <source>Interlingue</source>
       <translation>西方國際語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="140"/>
+      <location filename="../src/language.cc" line="138"/>
       <source>Catalan</source>
       <translation>加泰羅尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="268"/>
+      <location filename="../src/language.cc" line="266"/>
       <source>Serbian</source>
       <translation>塞爾維亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="227"/>
+      <location filename="../src/language.cc" line="225"/>
       <source>Burmese</source>
       <translation>緬甸文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="253"/>
+      <location filename="../src/language.cc" line="251"/>
       <source>Russian</source>
       <translation>俄文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="212"/>
+      <location filename="../src/language.cc" line="210"/>
       <source>Limburgish</source>
       <translation>林堡語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="235"/>
+      <location filename="../src/language.cc" line="233"/>
       <source>Norwegian</source>
       <translation>挪威文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="141"/>
+      <location filename="../src/language.cc" line="139"/>
       <source>Chechen</source>
       <translation>車臣語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="301"/>
+      <location filename="../src/language.cc" line="299"/>
       <source>Chinese</source>
       <translation>中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="147"/>
+      <location filename="../src/language.cc" line="145"/>
       <source>Chuvash</source>
       <translation>楚瓦什語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="261"/>
+      <location filename="../src/language.cc" line="259"/>
       <source>Sinhala</source>
       <translation>僧加羅語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="157"/>
+      <location filename="../src/language.cc" line="155"/>
       <source>Spanish</source>
       <translation>西班牙文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="207"/>
+      <location filename="../src/language.cc" line="205"/>
       <source>Cornish</source>
       <translation>凱爾特語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="280"/>
+      <location filename="../src/language.cc" line="278"/>
       <source>Tagalog</source>
       <translation>他加祿語(菲律賓)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="126"/>
+      <location filename="../src/language.cc" line="124"/>
       <source>Assamese</source>
       <translation>阿薩姆語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="243"/>
+      <location filename="../src/language.cc" line="241"/>
       <source>Ossetian</source>
       <translation>奧塞梯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="158"/>
+      <location filename="../src/language.cc" line="156"/>
       <source>Estonian</source>
       <translation>愛沙尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="273"/>
+      <location filename="../src/language.cc" line="271"/>
       <source>Swahili</source>
       <translation>斯瓦希里語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="272"/>
+      <location filename="../src/language.cc" line="270"/>
       <source>Swedish</source>
       <translation>瑞典文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="137"/>
+      <location filename="../src/language.cc" line="135"/>
       <source>Tibetan</source>
       <translation>西藏語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="293"/>
+      <location filename="../src/language.cc" line="291"/>
       <source>Vietnamese</source>
       <translation>越南文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="221"/>
+      <location filename="../src/language.cc" line="219"/>
       <source>Macedonian</source>
       <translation>馬其頓文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="248"/>
+      <location filename="../src/language.cc" line="246"/>
       <source>Portuguese</source>
       <translation>葡萄牙文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="283"/>
+      <location filename="../src/language.cc" line="281"/>
       <source>Turkish</source>
       <translation>土耳其文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="279"/>
+      <location filename="../src/language.cc" line="277"/>
       <source>Turkmen</source>
       <translation>土庫曼語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="171"/>
+      <location filename="../src/language.cc" line="169"/>
       <source>Gujarati</source>
       <translation>古吉拉特語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="189"/>
+      <location filename="../src/language.cc" line="187"/>
       <source>Icelandic</source>
       <translation>冰島文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="191"/>
+      <location filename="../src/language.cc" line="189"/>
       <source>Inuktitut</source>
       <translation>因紐特語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="155"/>
+      <location filename="../src/language.cc" line="153"/>
       <source>English</source>
       <translation>英文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="194"/>
+      <location filename="../src/language.cc" line="192"/>
       <source>Georgian</source>
       <translation>喬治亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="146"/>
+      <location filename="../src/language.cc" line="144"/>
       <source>Church Slavic</source>
       <translation>教會斯拉夫語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="164"/>
+      <location filename="../src/language.cc" line="162"/>
       <source>Faroese</source>
       <translation>法羅語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="162"/>
+      <location filename="../src/language.cc" line="160"/>
       <source>Finnish</source>
       <translation>芬蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="294"/>
+      <location filename="../src/language.cc" line="292"/>
       <source>Volapuk</source>
       <translation>沃拉普克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="295"/>
+      <location filename="../src/language.cc" line="293"/>
       <source>Walloon</source>
       <translation>華隆語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="197"/>
+      <location filename="../src/language.cc" line="195"/>
       <source>Kwanyama</source>
       <translation>寬亞瑪語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="219"/>
+      <location filename="../src/language.cc" line="217"/>
       <source>Marshallese</source>
       <translation>馬紹爾語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="258"/>
+      <location filename="../src/language.cc" line="256"/>
       <source>Northern Sami</source>
       <translation>北薩莫斯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="178"/>
+      <location filename="../src/language.cc" line="176"/>
       <source>Haitian</source>
       <translation>海地語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="142"/>
+      <location filename="../src/language.cc" line="140"/>
       <source>Chamorro</source>
       <translation>查莫羅語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="234"/>
+      <location filename="../src/language.cc" line="232"/>
       <source>Norwegian Nynorsk</source>
       <translation>尼諾斯克語(挪威)</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="170"/>
+      <location filename="../src/language.cc" line="168"/>
       <source>Guarani</source>
       <translation>瓜拉尼語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="236"/>
+      <location filename="../src/language.cc" line="234"/>
       <source>South Ndebele</source>
       <translation>南恩德貝勒語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="238"/>
+      <location filename="../src/language.cc" line="236"/>
       <source>Chichewa</source>
       <translation>奇契瓦語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="215"/>
+      <location filename="../src/language.cc" line="213"/>
       <source>Lithuanian</source>
       <translation>立陶宛文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="186"/>
+      <location filename="../src/language.cc" line="184"/>
       <source>Sichuan Yi</source>
       <translation>四川彝語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="278"/>
+      <location filename="../src/language.cc" line="276"/>
       <source>Tigrinya</source>
       <translation>提格里尼亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="298"/>
+      <location filename="../src/language.cc" line="296"/>
       <source>Yiddish</source>
       <translation>意第緒語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="439"/>
+      <location filename="../src/language.cc" line="437"/>
       <source>Traditional Chinese</source>
       <translation>繁體中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="440"/>
+      <location filename="../src/language.cc" line="438"/>
       <source>Simplified Chinese</source>
       <translation>簡體中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="441"/>
+      <location filename="../src/language.cc" line="439"/>
       <source>Other</source>
       <translation>其他</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="442"/>
+      <location filename="../src/language.cc" line="440"/>
       <source>Other Simplified Chinese dialects</source>
       <translation>其他簡體中文方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="443"/>
+      <location filename="../src/language.cc" line="441"/>
       <source>Other Traditional Chinese dialects</source>
       <translation>其他繁體中文方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="444"/>
+      <location filename="../src/language.cc" line="442"/>
       <source>Other Eastern-European languages</source>
       <translation>其他東歐語言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="445"/>
+      <location filename="../src/language.cc" line="443"/>
       <source>Other Western-European languages</source>
       <translation>其他西歐語言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="446"/>
+      <location filename="../src/language.cc" line="444"/>
       <source>Other Russian languages</source>
       <translation>其他俄羅斯文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="447"/>
+      <location filename="../src/language.cc" line="445"/>
       <source>Other Japanese languages</source>
       <translation>其他日文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="448"/>
+      <location filename="../src/language.cc" line="446"/>
       <source>Other Baltic languages</source>
       <translation>其他波羅的海語言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="449"/>
+      <location filename="../src/language.cc" line="447"/>
       <source>Other Greek languages</source>
       <translation>其他希臘文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="450"/>
+      <location filename="../src/language.cc" line="448"/>
       <source>Other Korean dialects</source>
       <translation>其他韓文方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="451"/>
+      <location filename="../src/language.cc" line="449"/>
       <source>Other Turkish dialects</source>
       <translation>其他土耳其方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="452"/>
+      <location filename="../src/language.cc" line="450"/>
       <source>Other Thai dialects</source>
       <translation>其他泰文方言</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="453"/>
+      <location filename="../src/language.cc" line="451"/>
       <source>Tamazight</source>
       <translation>塔馬齊格特語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="303"/>
+      <location filename="../src/language.cc" line="301"/>
       <source>Lojban</source>
       <translation>邏輯語</translation>
     </message>
@@ -2516,207 +2489,207 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Language::Db</name>
     <message>
-      <location filename="../src/language.cc" line="41"/>
+      <location filename="../src/language.cc" line="39"/>
       <source>French</source>
       <translation>法語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="42"/>
+      <location filename="../src/language.cc" line="40"/>
       <source>Spanish</source>
       <translation>西班牙語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="43"/>
+      <location filename="../src/language.cc" line="41"/>
       <source>Belarusian</source>
       <translation>白俄羅斯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="44"/>
+      <location filename="../src/language.cc" line="42"/>
       <source>Bulgarian</source>
       <translation>保加利亞語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="45"/>
+      <location filename="../src/language.cc" line="43"/>
       <source>Czech</source>
       <translation>捷克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="46"/>
+      <location filename="../src/language.cc" line="44"/>
       <source>German</source>
       <translation>德語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="47"/>
+      <location filename="../src/language.cc" line="45"/>
       <source>Greek</source>
       <translation>希臘文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="48"/>
+      <location filename="../src/language.cc" line="46"/>
       <source>Finnish</source>
       <translation>芬蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="49"/>
+      <location filename="../src/language.cc" line="47"/>
       <source>Italian</source>
       <translation>義大利文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="50"/>
+      <location filename="../src/language.cc" line="48"/>
       <source>Japanese</source>
       <translation>日语</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="51"/>
+      <location filename="../src/language.cc" line="49"/>
       <source>Korean</source>
       <translation>韓語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="52"/>
+      <location filename="../src/language.cc" line="50"/>
       <source>Lithuanian</source>
       <translation>立陶宛文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="53"/>
+      <location filename="../src/language.cc" line="51"/>
       <source>Macedonian</source>
       <translation>馬其頓文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="54"/>
+      <location filename="../src/language.cc" line="52"/>
       <source>Dutch</source>
       <translation>荷蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="55"/>
+      <location filename="../src/language.cc" line="53"/>
       <source>Polish</source>
       <translation>波蘭文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="56"/>
+      <location filename="../src/language.cc" line="54"/>
       <source>Portuguese</source>
       <translation>葡萄牙文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="57"/>
+      <location filename="../src/language.cc" line="55"/>
       <source>Russian</source>
       <translation>俄語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="58"/>
+      <location filename="../src/language.cc" line="56"/>
       <source>Slovak</source>
       <translation>斯洛伐克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="59"/>
+      <location filename="../src/language.cc" line="57"/>
       <source>Albanian</source>
       <translation>阿爾巴尼亞文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="60"/>
+      <location filename="../src/language.cc" line="58"/>
       <source>Serbian (Cyrillic)</source>
       <translation>塞爾維亞語（西里爾語）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="61"/>
+      <location filename="../src/language.cc" line="59"/>
       <source>Swedish</source>
       <translation>瑞典語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="62"/>
+      <location filename="../src/language.cc" line="60"/>
       <source>Turkish</source>
       <translation>土耳其語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="63"/>
+      <location filename="../src/language.cc" line="61"/>
       <source>Ukrainian</source>
       <translation>烏克蘭語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="64"/>
+      <location filename="../src/language.cc" line="62"/>
       <source>Chinese Simplified</source>
       <translation>簡體中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="65"/>
+      <location filename="../src/language.cc" line="63"/>
       <source>Chinese Traditional</source>
       <translation>繁體中文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="66"/>
+      <location filename="../src/language.cc" line="64"/>
       <source>Vietnamese</source>
       <translation>越南文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="67"/>
+      <location filename="../src/language.cc" line="65"/>
       <source>Portuguese, Brazilian</source>
       <translation>葡萄牙文（巴西）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="68"/>
+      <location filename="../src/language.cc" line="66"/>
       <source>Persian</source>
       <translation>波斯文</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="69"/>
+      <location filename="../src/language.cc" line="67"/>
       <source>Spanish, Argentina</source>
       <translation>西班牙文（阿根廷）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="70"/>
+      <location filename="../src/language.cc" line="68"/>
       <source>Hindi</source>
       <translation>印地語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="71"/>
+      <location filename="../src/language.cc" line="69"/>
       <source>Esperanto</source>
       <translation>世界語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="72"/>
+      <location filename="../src/language.cc" line="70"/>
       <source>German, Switzerland</source>
       <translation>德語（瑞士）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="73"/>
+      <location filename="../src/language.cc" line="71"/>
       <source>Spanish, Bolivia</source>
       <translation>西班牙語（玻利維亞）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="74"/>
+      <location filename="../src/language.cc" line="72"/>
       <source>Tajik</source>
       <translation>塔吉克語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="75"/>
+      <location filename="../src/language.cc" line="73"/>
       <source>Quechua</source>
       <translation>科察語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="76"/>
+      <location filename="../src/language.cc" line="74"/>
       <source>Aymara</source>
       <translation>艾馬拉語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="77"/>
+      <location filename="../src/language.cc" line="75"/>
       <source>Arabic, Saudi Arabia</source>
       <translation>阿拉伯文（沙烏地阿拉伯）</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="78"/>
+      <location filename="../src/language.cc" line="76"/>
       <source>Turkmen</source>
       <translation>土庫曼語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="79"/>
+      <location filename="../src/language.cc" line="77"/>
       <source>Interlingue</source>
       <translation>國際語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="80"/>
+      <location filename="../src/language.cc" line="78"/>
       <source>Lojban</source>
       <translation>邏輯語</translation>
     </message>
     <message>
-      <location filename="../src/language.cc" line="81"/>
+      <location filename="../src/language.cc" line="79"/>
       <source>English</source>
       <translation>英文</translation>
     </message>
@@ -2724,7 +2697,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>LoadDictionaries</name>
     <message>
-      <location filename="../src/dict/loaddictionaries.cc" line="195"/>
+      <location filename="../src/dict/loaddictionaries.cc" line="210"/>
       <source>Error loading dictionaries</source>
       <translation>讀取字典時發生錯誤</translation>
     </message>
@@ -2732,7 +2705,7 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>Main</name>
     <message>
-      <location filename="../src/main.cc" line="368"/>
+      <location filename="../src/main.cc" line="443"/>
       <source>Error in configuration file. Continue with default settings?</source>
       <translation>設定檔有問題，要使用預設的設定嗎？</translation>
     </message>
@@ -2740,705 +2713,705 @@ between classic and school orthography in cyrillic)</source>
   <context>
     <name>MainWindow</name>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="553"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F1</source>
       <translation>F1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="388"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F2</source>
       <translation>F2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="143"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favo&amp;rites</source>
       <translation>我的最愛(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="299"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F3</source>
       <translation>F3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="314"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>F4</source>
       <translation>F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1495"/>
+      <location filename="../src/ui/mainwindow.cc" line="1560"/>
       <source>All</source>
       <translation>全部</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="198"/>
+      <location filename="../src/ui/mainwindow.cc" line="224"/>
       <source>Back</source>
       <translation>上一頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1466"/>
+      <location filename="../src/ui/mainwindow.cc" line="1533"/>
       <source>%1 dictionaries, %2 articles, %3 words</source>
       <translation>字典數：%1，條目數：%2，單字數：%3</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="95"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Edit</source>
       <translation>編輯(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="78"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;File</source>
       <translation>檔案(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="102"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Help</source>
       <translation>說明(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="136"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search</source>
       <translation>搜尋</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="341"/>
-      <location filename="../src/ui/mainwindow.cc" line="389"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="407"/>
       <source>&amp;Quit</source>
       <translation>結束(&amp;Q)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Error</source>
       <translation>錯誤</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="344"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Quit from application</source>
       <translation>結束程式</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="363"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Close To Tray</source>
       <translation>關閉至系統匣(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3371"/>
+      <location filename="../src/ui/mainwindow.cc" line="3305"/>
       <source>Can&apos;t save article: %1</source>
       <translation>無法儲存條目：%1</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="244"/>
+      <location filename="../src/ui/mainwindow.cc" line="270"/>
       <source>Zoom In</source>
       <translation>放大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="296"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Dictionaries...</source>
       <translation>字典(&amp;D)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="330"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;About</source>
       <translation>關於(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="355"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Forum</source>
       <translation>論壇(&amp;F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="400"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Print</source>
       <translation>列印(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="382"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Save Article</source>
       <translation>儲存條目(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3353"/>
+      <location filename="../src/ui/mainwindow.cc" line="3288"/>
       <source>Save Article As</source>
       <translation>條目另存新檔</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="403"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+P</source>
       <translation>Ctrl+P</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="347"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Q</source>
       <translation>Ctrl+Q</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="366"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Minimizes the window to tray</source>
       <translation>最小化視窗至系統匣</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="411"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Page Set&amp;up</source>
       <translation>頁面設定(&amp;U)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="322"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Homepage</source>
       <translation>首頁(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3039"/>
+      <location filename="../src/ui/mainwindow.cc" line="2987"/>
       <source>New Release Available</source>
       <translation>有新版本可用</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up:</source>
-      <translation>查詢：</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="250"/>
+      <location filename="../src/ui/mainwindow.cc" line="274"/>
       <source>Zoom Out</source>
       <translation>縮小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="382"/>
+      <location filename="../src/ui/mainwindow.cc" line="400"/>
       <source>Show &amp;Main Window</source>
       <translation>顯示主視窗(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="333"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>About GoldenDict-ng</source>
       <translation>關於 GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3045"/>
+      <location filename="../src/ui/mainwindow.cc" line="2994"/>
       <source>Download</source>
       <translation>下載</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3250"/>
+      <location filename="../src/ui/mainwindow.cc" line="3183"/>
       <source>Page Setup</source>
       <translation>頁面設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="306"/>
-      <location filename="../src/ui/mainwindow.cc" line="1477"/>
-      <source>Look up in:</source>
-      <translation>查詢範圍：</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/mainwindow.cc" line="254"/>
+      <location filename="../src/ui/mainwindow.cc" line="278"/>
       <source>Normal Size</source>
       <translation>正常大小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="2888"/>
+      <location filename="../src/ui/mainwindow.cc" line="2837"/>
       <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="../src/ui/mainwindow.cc" line="3040"/>
+      <location filename="../src/ui/mainwindow.cc" line="2988"/>
       <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="../src/ui/mainwindow.ui" line="369"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F4</source>
       <translation>Ctrl+F4</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="430"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F5</source>
       <translation>Ctrl+F5</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="581"/>
+      <location filename="../src/ui/mainwindow.cc" line="607"/>
       <source>Loading...</source>
       <translation>載入中
 
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1666"/>
+      <location filename="../src/ui/mainwindow.cc" line="1719"/>
       <source>(untitled)</source>
       <translation>(未命名)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="311"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Preferences...</source>
       <translation>偏好設定(&amp;P)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="46"/>
-      <location filename="../src/ui/mainwindow.cc" line="732"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="757"/>
       <source>Welcome!</source>
       <translation>歡迎使用！</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="231"/>
+      <location filename="../src/ui/mainwindow.cc" line="257"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>朗讀詞條(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="385"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Save Article</source>
       <translation>儲存條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3046"/>
+      <location filename="../src/ui/mainwindow.cc" line="2995"/>
       <source>Skip This Release</source>
       <translation>略過此次升級</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="200"/>
+      <location filename="../src/ui/mainwindow.cc" line="226"/>
       <source>Forward</source>
       <translation>下一頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3272"/>
+      <location filename="../src/ui/mainwindow.cc" line="3205"/>
       <source>Print Article</source>
       <translation>列印條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3251"/>
+      <location filename="../src/ui/mainwindow.cc" line="3184"/>
       <source>No printer is available. Please install one first.</source>
       <translation>找不到可用的印表機，請先安裝一個印表機。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="115"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;View</source>
       <translation>檢視(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="126"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>H&amp;istory</source>
       <translation>歷史(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="438"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Clear</source>
       <translation>清除(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="119"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Zoom</source>
       <translation>縮放(&amp;Z)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="368"/>
+      <location filename="../src/ui/mainwindow.cc" line="388"/>
       <source>Words Zoom In</source>
       <translation>單字清單 - 放大</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="372"/>
+      <location filename="../src/ui/mainwindow.cc" line="390"/>
       <source>Words Zoom Out</source>
       <translation>單字清單 - 縮小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="374"/>
+      <location filename="../src/ui/mainwindow.cc" line="392"/>
       <source>Words Normal Size</source>
       <translation>單字清單 - 正常大小</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="421"/>
+      <location filename="../src/ui/mainwindow.cc" line="449"/>
       <source>Close current tab</source>
       <translation>關閉目前分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="429"/>
+      <location filename="../src/ui/mainwindow.cc" line="457"/>
       <source>Close all tabs</source>
       <translation>關閉所有分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="436"/>
+      <location filename="../src/ui/mainwindow.cc" line="464"/>
       <source>Close all tabs except current</source>
       <translation>關閉其它分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="411"/>
+      <location filename="../src/ui/mainwindow.cc" line="439"/>
       <source>Opened tabs</source>
       <translation>已開啟的分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="590"/>
+      <location filename="../src/ui/mainwindow.cc" line="616"/>
       <source>New Tab</source>
       <translation>新增分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="453"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+T</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="464"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Configuration Folder</source>
       <translation>設定檔資料夾(&amp;C)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="121"/>
+      <location filename="../src/ui/mainwindow.cc" line="147"/>
       <source>&amp;Menubar</source>
       <translation>選單列(&amp;M)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="344"/>
+      <location filename="../src/ui/mainwindow.cc" line="364"/>
       <source>Found in Dictionaries:</source>
       <translation>在下列字典中找到：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="456"/>
+      <location filename="../src/ui/mainwindow.cc" line="484"/>
       <source>Add all tabs to Favorites</source>
       <translation>將所有分頁新增到我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1011"/>
+      <location filename="../src/ui/mainwindow.cc" line="971"/>
+      <source>WARNING: %1</source>
+      <translation>警告： %1</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/mainwindow.cc" line="1101"/>
       <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="../src/ui/mainwindow.cc" line="1609"/>
+      <location filename="../src/ui/mainwindow.cc" line="1668"/>
       <source>Open Tabs List</source>
       <translation>開啟分頁清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1866"/>
-      <location filename="../src/ui/mainwindow.cc" line="1944"/>
-      <location filename="../src/ui/mainwindow.cc" line="4457"/>
-      <location filename="../src/ui/mainwindow.cc" line="4485"/>
-      <location filename="../src/ui/mainwindow.cc" line="4524"/>
+      <location filename="../src/ui/mainwindow.cc" line="1915"/>
+      <location filename="../src/ui/mainwindow.cc" line="1979"/>
+      <location filename="../src/ui/mainwindow.cc" line="4344"/>
+      <location filename="../src/ui/mainwindow.cc" line="4372"/>
+      <location filename="../src/ui/mainwindow.cc" line="4411"/>
       <source>Remove current tab from Favorites</source>
       <translation>將目前分頁從我的最愛中移除</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="1897"/>
+      <location filename="../src/ui/mainwindow.cc" line="1939"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3150"/>
+      <location filename="../src/ui/mainwindow.cc" line="3089"/>
       <source>You have chosen to hide a menubar. Use %1 to show it back.</source>
       <translation>您已隱藏選單列，可使用 %1 來顯示選單列。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3151"/>
+      <location filename="../src/ui/mainwindow.cc" line="3091"/>
       <source>Ctrl+M</source>
       <translation>Ctrl+M</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="472"/>
-      <location filename="../src/ui/mainwindow.cc" line="3744"/>
-      <location filename="../src/ui/mainwindow.cc" line="3756"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="3651"/>
+      <location filename="../src/ui/mainwindow.cc" line="3661"/>
       <source>&amp;Show</source>
       <translation>顯示(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="483"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Export</source>
       <translation>匯出(&amp;E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3740"/>
-      <location filename="../src/ui/mainwindow.cc" line="3752"/>
+      <location filename="../src/ui/mainwindow.cc" line="3647"/>
+      <location filename="../src/ui/mainwindow.cc" line="3658"/>
       <source>&amp;Hide</source>
       <translation>隱藏(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3798"/>
+      <location filename="../src/ui/mainwindow.cc" line="3699"/>
       <source>Export history to file</source>
       <translation>匯出歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3800"/>
-      <location filename="../src/ui/mainwindow.cc" line="3862"/>
-      <location filename="../src/ui/mainwindow.cc" line="3976"/>
+      <location filename="../src/ui/mainwindow.cc" line="3701"/>
+      <location filename="../src/ui/mainwindow.cc" line="3762"/>
+      <location filename="../src/ui/mainwindow.cc" line="3877"/>
       <source>Text files (*.txt);;All files (*.*)</source>
       <translation>文字檔 (*.txt);;所有檔案 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3839"/>
+      <location filename="../src/ui/mainwindow.cc" line="3745"/>
       <source>History export complete</source>
       <translation>成功匯出歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3842"/>
-      <location filename="../src/ui/mainwindow.cc" line="3957"/>
-      <location filename="../src/ui/mainwindow.cc" line="4006"/>
+      <location filename="../src/ui/mainwindow.cc" line="3710"/>
+      <location filename="../src/ui/mainwindow.cc" line="3723"/>
+      <location filename="../src/ui/mainwindow.cc" line="3740"/>
+      <location filename="../src/ui/mainwindow.cc" line="3846"/>
+      <location filename="../src/ui/mainwindow.cc" line="3854"/>
+      <location filename="../src/ui/mainwindow.cc" line="3885"/>
+      <location filename="../src/ui/mainwindow.cc" line="3893"/>
+      <location filename="../src/ui/mainwindow.cc" line="3903"/>
       <source>Export error: </source>
       <translation>匯出失敗： </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="475"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+H</source>
       <translation>Ctrl+T</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="491"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Import</source>
       <translation>匯入(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3860"/>
+      <location filename="../src/ui/mainwindow.cc" line="3760"/>
       <source>Import history from file</source>
       <translation>匯入歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3909"/>
+      <location filename="../src/ui/mainwindow.cc" line="3809"/>
       <source>Import error: invalid data in file</source>
       <translation>匯入失敗： 檔案中無效的日期</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3913"/>
+      <location filename="../src/ui/mainwindow.cc" line="3815"/>
       <source>History import complete</source>
       <translation>成功匯入歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3916"/>
-      <location filename="../src/ui/mainwindow.cc" line="4058"/>
+      <location filename="../src/ui/mainwindow.cc" line="3772"/>
+      <location filename="../src/ui/mainwindow.cc" line="3803"/>
+      <location filename="../src/ui/mainwindow.cc" line="3935"/>
       <source>Import error: </source>
       <translation>匯入失敗： </translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3933"/>
+      <location filename="../src/ui/mainwindow.cc" line="3835"/>
       <source>Export Favorites to file</source>
       <translation>匯出我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3935"/>
+      <location filename="../src/ui/mainwindow.cc" line="3837"/>
       <source>XML files (*.xml);;All files (*.*)</source>
       <translation>XML 檔案 (*.xml);;所有檔案 (*.*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3954"/>
-      <location filename="../src/ui/mainwindow.cc" line="4003"/>
+      <location filename="../src/ui/mainwindow.cc" line="3859"/>
+      <location filename="../src/ui/mainwindow.cc" line="3908"/>
       <source>Favorites export complete</source>
       <translation>我的最愛匯出完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3974"/>
+      <location filename="../src/ui/mainwindow.cc" line="3875"/>
       <source>Export Favorites to file as plain list</source>
       <translation>以純文字清單方式匯出我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4023"/>
+      <location filename="../src/ui/mainwindow.cc" line="3923"/>
       <source>Import Favorites from file</source>
       <translation>從檔案匯入我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4025"/>
+      <location filename="../src/ui/mainwindow.cc" line="3925"/>
       <source>XML files (*.xml);;Txt files (*.txt);;All files (*.*)</source>
       <translation>XML 檔案 (*.csv);;文字檔案 (*.txt);;所有檔案 (*)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4054"/>
+      <location filename="../src/ui/mainwindow.cc" line="3955"/>
       <source>Favorites import complete</source>
       <translation>我的最愛匯入完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4060"/>
+      <location filename="../src/ui/mainwindow.cc" line="3943"/>
+      <location filename="../src/ui/mainwindow.cc" line="3949"/>
       <source>Data parsing error</source>
       <translation>資料解析錯誤</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4270"/>
+      <location filename="../src/ui/mainwindow.cc" line="4162"/>
       <source>Dictionary info</source>
       <translation>字典資訊</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4274"/>
+      <location filename="../src/ui/mainwindow.cc" line="4166"/>
       <source>Dictionary headwords</source>
       <translation>詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4276"/>
+      <location filename="../src/ui/mainwindow.cc" line="4168"/>
       <source>Open dictionary folder</source>
       <translation>開啟字典資料夾</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4282"/>
+      <location filename="../src/ui/mainwindow.cc" line="4174"/>
       <source>Edit dictionary</source>
       <translation>編輯字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4428"/>
+      <location filename="../src/ui/mainwindow.cc" line="4319"/>
       <source>Now indexing for full-text search: </source>
       <translation>正在建立全文搜尋用的索引：</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="4470"/>
+      <location filename="../src/ui/mainwindow.cc" line="4357"/>
       <source>Remove headword &quot;%1&quot; from Favorites?</source>
       <translation>確定要將詞條 &quot;%1&quot; 從我的最愛中移除嗎？</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="162"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Search Pane</source>
       <translation>查詢窗格(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="208"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Results Navigation Pane</source>
       <translation>結果導航窗格(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="235"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Favor&amp;ites Pane</source>
       <translation>我的最愛窗格(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="419"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Print Pre&amp;view</source>
       <translation>預覽列印(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="427"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Rescan Files</source>
       <translation>重新掃描檔案(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="450"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;New Tab</source>
       <translation>新增分頁(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="502"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;Always on Top</source>
       <translation>最上層顯示(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="505"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Always on Top</source>
       <translation>最上層顯示</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="508"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+O</source>
       <translation>Ctrl + O</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="517"/>
-      <location filename="../src/ui/mainwindow.ui" line="520"/>
-      <location filename="../src/ui/mainwindow.cc" line="298"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="322"/>
       <source>Menu Button</source>
       <translation>選單按鈕</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="525"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Search in page</source>
       <translation>在頁面中尋找</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="528"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+F</source>
       <translation>Ctrl+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="536"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Full-text search</source>
       <translation>全文搜尋</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="539"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+Shift+F</source>
       <translation>Ctrl+Shift+F</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="550"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>GoldenDict reference</source>
       <translation>GoldenDict-ng 參考資料</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="558"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Show</source>
       <translation>顯示</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="566"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export</source>
       <translation>匯出</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="571"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Import</source>
       <translation>匯入</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="576"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Add</source>
       <translation>新增</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="579"/>
-      <location filename="../src/ui/mainwindow.cc" line="269"/>
-      <location filename="../src/ui/mainwindow.cc" line="1871"/>
-      <location filename="../src/ui/mainwindow.cc" line="1949"/>
-      <location filename="../src/ui/mainwindow.cc" line="4477"/>
+      <location filename="../src/ui/mainwindow.ui"/>
+      <location filename="../src/ui/mainwindow.cc" line="293"/>
+      <location filename="../src/ui/mainwindow.cc" line="1919"/>
+      <location filename="../src/ui/mainwindow.cc" line="1983"/>
+      <location filename="../src/ui/mainwindow.cc" line="4364"/>
       <source>Add current tab to Favorites</source>
       <translation>將目前分頁新增到我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="582"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Ctrl+E</source>
       <translation>Ctrl+E</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="587"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>Export to list</source>
       <translation>匯出到清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="119"/>
+      <location filename="../src/ui/mainwindow.cc" line="145"/>
       <source>Show Names in Dictionary &amp;Bar</source>
       <translation>在字典列中顯示字典名稱(&amp;B)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="120"/>
+      <location filename="../src/ui/mainwindow.cc" line="146"/>
       <source>Show Small Icons in &amp;Toolbars</source>
       <translation>在工具列中顯示小型圖示(&amp;T)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="195"/>
+      <location filename="../src/ui/mainwindow.cc" line="221"/>
       <source>&amp;Navigation</source>
       <translation>導航列(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="223"/>
+      <location filename="../src/ui/mainwindow.cc" line="249"/>
       <source>Enable Scanning</source>
       <translation>啟用掃描</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3348"/>
+      <location filename="../src/ui/mainwindow.cc" line="3283"/>
       <source>Article, Complete (*.html)</source>
       <translation>條目，完整 (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3349"/>
+      <location filename="../src/ui/mainwindow.cc" line="3284"/>
       <source>Article, HTML Only (*.html)</source>
       <translation>條目，僅HTML部分 (*.html)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3435"/>
+      <location filename="../src/ui/mainwindow.cc" line="3363"/>
       <source>Saving article...</source>
       <translation>儲存條目...</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3448"/>
+      <location filename="../src/ui/mainwindow.cc" line="3376"/>
       <source>Save article complete</source>
       <translation>保存文章完成</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="3499"/>
+      <location filename="../src/ui/mainwindow.cc" line="3424"/>
       <source>The main window is set to be always on top.</source>
       <translation>主視窗設定為最上層顯示。</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.ui" line="262"/>
+      <location filename="../src/ui/mainwindow.ui"/>
       <source>&amp;History Pane</source>
       <translation>歷史記錄窗格(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/mainwindow.cc" line="780"/>
-      <location filename="../src/ui/mainwindow.cc" line="863"/>
+      <location filename="../src/ui/mainwindow.cc" line="799"/>
+      <location filename="../src/ui/mainwindow.cc" line="878"/>
       <source>Accessibility API is not enabled</source>
       <translation>未啟用協助存取 API</translation>
     </message>
@@ -3446,12 +3419,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Mdx::MdxArticleRequest</name>
     <message>
-      <location filename="../src/dict/mdx.cc" line="625"/>
+      <location filename="../src/dict/mdx.cc" line="618"/>
       <source>Dictionary file was tampered or corrupted</source>
       <translation>字典檔案已遭竄改或已損壞</translation>
     </message>
     <message>
-      <location filename="../src/dict/mdx.cc" line="636"/>
+      <location filename="../src/dict/mdx.cc" line="629"/>
       <source>Failed loading article from %1, reason: %2</source>
       <translation>從 %1 讀取條目時失敗，原因是： %2</translation>
     </message>
@@ -3459,7 +3432,7 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWiki::MediaWikiArticleRequest</name>
     <message>
-      <location filename="../src/dict/mediawiki.cc" line="485"/>
+      <location filename="../src/dict/mediawiki.cc" line="486"/>
       <source>XML parse error: %1 at %2,%3</source>
       <translation>XML 語法錯誤：%1 於 %2, %3</translation>
     </message>
@@ -3475,22 +3448,22 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>MediaWikisModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="481"/>
+      <location filename="../src/dict/sources.cc" line="482"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="483"/>
+      <location filename="../src/dict/sources.cc" line="484"/>
       <source>Address</source>
       <translation>網址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="479"/>
+      <location filename="../src/dict/sources.cc" line="480"/>
       <source>Enabled</source>
       <translation>啟用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="485"/>
+      <location filename="../src/dict/sources.cc" line="486"/>
       <source>Icon</source>
       <translation>圖示</translation>
     </message>
@@ -3506,82 +3479,82 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>OrderAndProps</name>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="14"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Form</source>
       <translation>表單</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="53"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Inactive (disabled) dictionaries:</source>
       <translation>未啟用 (已停用) 的字典：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="75"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Name:</source>
       <translation>名稱：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="105"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total articles:</source>
       <translation>條目總數：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="129"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates from:</source>
       <translation>詞條語言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="136"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Translates to:</source>
       <translation>釋義語言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="112"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Total words:</source>
       <translation>詞條總數：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="251"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <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="../src/ui/orderandprops.ui" line="37"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary order:</source>
       <translation>字典排序：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="208"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Files comprising this dictionary:</source>
       <translation>此字典包含的檔案：</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="67"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Dictionary information</source>
       <translation>字典資訊</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.ui" line="165"/>
+      <location filename="../src/ui/orderandprops.ui"/>
       <source>Description:</source>
       <translation>描述</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="263"/>
+      <location filename="../src/ui/orderandprops.cc" line="267"/>
       <source>Sort by name</source>
       <translation>依名稱排序</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="265"/>
+      <location filename="../src/ui/orderandprops.cc" line="269"/>
       <source>Sort by languages</source>
       <translation>依語言排序</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="259"/>
+      <location filename="../src/ui/orderandprops.cc" line="263"/>
       <source>Dictionary headwords</source>
       <translation>詞條清單</translation>
     </message>
     <message>
-      <location filename="../src/ui/orderandprops.cc" line="288"/>
+      <location filename="../src/ui/orderandprops.cc" line="292"/>
       <source>Dictionaries active: %1, inactive: %2</source>
       <translation>字典已啟用：%1，未啟用：%2</translation>
     </message>
@@ -3589,12 +3562,12 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>PathsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1183"/>
+      <location filename="../src/dict/sources.cc" line="1184"/>
       <source>Path</source>
       <translation>路徑</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1185"/>
+      <location filename="../src/dict/sources.cc" line="1186"/>
       <source>Recursive</source>
       <translation>搜尋子資料夾(遞迴搜尋)</translation>
     </message>
@@ -3602,69 +3575,67 @@ To find &apos;*&apos;, &apos;?&apos;, &apos;[&apos;, &apos;]&apos; symbols use &
   <context>
     <name>Preferences</name>
     <message>
-      <location filename="../src/ui/preferences.ui" line="495"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt</source>
       <translation>Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="85"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start to system tray</source>
       <translation>啟動至系統匣</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="552"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift only</source>
       <translation>僅限左 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="505"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl</source>
       <translation>Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="565"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Win/Meta</source>
       <translation>Win/Meta</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="63"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enable system tray icon</source>
       <translation>啟用系統匣圖示</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="904"/>
-      <location filename="../src/ui/preferences.ui" line="984"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Host:</source>
       <translation>主機：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="914"/>
-      <location filename="../src/ui/preferences.ui" line="1001"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Port:</source>
       <translation>連接埠：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="525"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift</source>
       <translation>Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="891"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Type:</source>
       <translation>類型：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="935"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>User:</source>
       <translation>使用者名稱：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="371"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Scan Popup</source>
       <translation>螢幕取詞(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="295"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, opening a new tab switches to it immediately.
 With this on however, new tabs will be opened without
 switching to them.</source>
@@ -3672,137 +3643,137 @@ switching to them.</source>
 啟用此選項後，不會自動跳至開啟的新分頁。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="854"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use proxy server</source>
       <translation>使用Proxy伺服器</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="680"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to translate a word from clipboard:</source>
       <translation>使用下列快速鍵翻譯剪貼簿中的單字：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="562"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Windows key or Meta key</source>
       <translation>Windows 鍵或 Meta 鍵</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="763"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in main window</source>
       <translation>自動朗讀主視窗中的單字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="191"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with system</source>
       <translation>隨系統啟動</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="512"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt only</source>
       <translation>僅限左 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="289"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Tabbed browsing</source>
       <translation>分頁瀏覽</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="482"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift only</source>
       <translation>僅限右 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="92"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="751"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Audio</source>
       <translation>音訊(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="850"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="201"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Interface language:</source>
       <translation>介面語言：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="472"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl only</source>
       <translation>僅限左 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="300"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs in background</source>
       <translation>在背景開啟新分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="844"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Network</source>
       <translation>網路(&amp;N)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="542"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl only</source>
       <translation>僅限右 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="118"/>
+      <location filename="../src/ui/preferences.cc" line="133"/>
       <source>Lingvo</source>
       <translation>Lingvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="485"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Shift</source>
       <translation>右 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="555"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Shift</source>
       <translation>左 Shift</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="420"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="770"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Auto-pronounce words in scan popup</source>
       <translation>自動朗讀螢幕取詞彈出視窗中的單字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="312"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Open new tabs after the current one</source>
       <translation>在目前分頁之後開啟新分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="624"/>
+      <location filename="../src/ui/preferences.cc" line="585"/>
       <source>Restart the program to apply the language change.</source>
       <translation>變更介面語言需要重新啟動程式才能生效。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="492"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Alt key</source>
       <translation>Alt 鍵</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1202"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Check for new program releases periodically</source>
       <translation>定期檢查更新的版本</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="307"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, new tabs are opened just after the
 current, active one. Otherwise they are added to
 be the last ones.</source>
@@ -3810,25 +3781,24 @@ be the last ones.</source>
 不啟用此選項，新分頁將會自動新增到最後面。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="96"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Close to system tray</source>
       <translation>關閉至系統匣</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="59"/>
-      <location filename="../src/ui/preferences.cc" line="60"/>
+      <location filename="../src/ui/preferences.cc" line="61"/>
       <source>System default</source>
       <translation>系統預設</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="59"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When enabled, an icon appears in the system tray area which can be used
 to open main window and perform other tasks.</source>
       <translation>啟用此選項，將會啟用系統匣圖示。
 可用來顯示主視窗以及執行其他工作。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1195"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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
@@ -3839,139 +3809,139 @@ download page.</source>
 </translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="182"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Startup</source>
       <translation>開機自動啟動</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="945"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Password:</source>
       <translation>密碼：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="115"/>
+      <location filename="../src/ui/preferences.cc" line="130"/>
       <source>Default</source>
       <translation>預設</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="50"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>&amp;Interface</source>
       <translation>介面(&amp;I)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="623"/>
+      <location filename="../src/ui/preferences.cc" line="584"/>
       <source>Changing Language</source>
       <translation>變更介面語言</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="502"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl key</source>
       <translation>Ctr l鍵</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="653"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use the following hotkey to show or hide the main window:</source>
       <translation>使用下列快速鍵顯示或隱藏主視窗：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="515"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Alt</source>
       <translation>左 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="532"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt only</source>
       <translation>僅限右 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="14"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Preferences</source>
       <translation>偏好設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="475"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Left Ctrl</source>
       <translation>左 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="535"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Alt</source>
       <translation>右 Alt</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="723"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="545"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Right Ctrl</source>
       <translation>右 Ctrl</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="647"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hotkeys</source>
       <translation>快速鍵</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="381"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Start with scan popup turned on</source>
       <translation>啟動程式時同時啟動螢幕取詞</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="81"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>With this on, the application starts directly to system tray without showing
 its main window.</source>
       <translation>啟用此選項，程式啟動時將直接最小化至系統匣。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="522"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Shift key</source>
       <translation>Shift 鍵</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="188"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically starts GoldenDict after operation system bootup.</source>
       <translation>開機自動啟動 GoldenDict。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="377"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="616"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not show popup when selection or clipboard in one of GoldenDict&apos;s own windows changes</source>
       <translation>當 GoldenDict 自己的窗口之一中的選擇或剪貼板發生變化時不顯示彈出窗口</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="619"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore GoldenDict&apos;s own selection and clipboard changes</source>
       <translation>忽略GoldenDict自身的選擇和剪貼板變化</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="786"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Play audio files via built-in audio support</source>
       <translation>使用內建音訊支援播放音訊檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="789"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use internal player:</source>
       <translation>使用內部播放器：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="796"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Choose audio back end</source>
       <translation>選擇音訊後端</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="816"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Enter audio player command line</source>
       <translation>輸入音訊播放器命令列</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1119"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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>
@@ -3980,84 +3950,84 @@ you are browsing. If some site breaks because of this, try disabling this.</sour
 試著停用此選項。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1124"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Disallow loading content from other sites (hides most advertisements)</source>
       <translation>禁止載入來自其它網站的內容 (隱藏大多數廣告)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="757"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Pronunciation</source>
       <translation>朗讀</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="780"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Playback</source>
       <translation>播放</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="806"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use external program:</source>
       <translation>使用外部程式播放：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="282"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Double-click translates the word clicked</source>
       <translation>按兩下翻譯字詞(在主介面中)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="803"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Use any external program to play audio files</source>
       <translation>使用外部程式播放音訊檔案。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="106"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, pressing ESC key moves focus to the translation line.
 With this on however, it will hide the main window.</source>
       <translation>一般而言，按下 ESC 鍵會將游標移至翻譯列。
 啟用此選項後，按下 ESC 鍵會隱藏主視窗。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="110"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>ESC key hides main window</source>
       <translation>使用 ESC 鍵隱藏主視窗</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="319"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="322"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Hide single tab</source>
       <translation>隱藏單一分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="141"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Adjust this value to avoid huge context menus.</source>
       <translation>調整此數值以避免過長的字典快顯功能表。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Context menu dictionaries limit:</source>
       <translation>快顯功能表的字典上限：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="388"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window instead of to show it in popup window</source>
       <translation>將翻譯的文字傳送至主視窗，而非顯示在彈出式視窗中</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Send translated word to main window</source>
       <translation>將翻譯傳送至主視窗</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="606"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show a flag window before showing popup window, click the flag to show popup window. </source>
       <translation>顯示彈出視窗之前先顯示一個旗標視窗，點選旗標以顯示彈出視窗。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="117"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Normally, clicking on a link, double-clicking on a word or looking up
 selection in an article loads the translation and almost immediately
 scrolls to the article from the same dictionary. With this option off,
@@ -4065,159 +4035,159 @@ however, the article from the topmost dictionary is shown.</source>
       <translation>在正常情況下，單擊鏈接、雙擊單詞或查找文章中的選錄部分會載入翻譯功能並即時滾動到同一詞字典中的條目。然而，若將此選項關掉，則會顯示該字典最頂層的條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="123"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Automatically scroll to target article</source>
       <translation>自動滾動到目標文章</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="208"/>
-      <source>Dictionary Font: </source>
-      <translation>字典名稱: </translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="275"/>
-      <source>set the fallback font family for dictionary</source>
-      <translation>為字典設置後備字體系列</translation>
-    </message>
-    <message>
-      <location filename="../src/ui/preferences.ui" line="344"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Article Display style:</source>
       <translation>文章顯示樣式：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="230"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the UI to dark.</source>
       <translation>將UI頁面調為深色</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Mode</source>
       <translation>暗黑模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="240"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn the article display style to dark.</source>
       <translation>將文章顯示樣式調為深色。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="243"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Dark Reader Mode</source>
       <translation>深色瀏覽模式</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="329"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>MRU order: Most recently used order.</source>
       <translation>MRU 順序：最近使用的順序。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="398"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track clipboard changes when Scanning is enabled. Notice! You should always enable this unless you are on Linux.</source>
       <translation>當掃描啟動時會記錄剪貼簿變更。注意！除非您正在使用Linux，否則您應該一直啟用此功能。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="401"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Clipboard change</source>
       <translation>跟踪剪貼板更改</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Track Selection change</source>
       <translation>跟踪選擇變化</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="424"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Only tack selection when all selected keys are kept pressed:</source>
       <translation>僅在按住下列特定的按鍵時螢幕取詞才會啟動：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="609"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Show scan flag when word is selected</source>
       <translation>單字被選取時顯示掃描旗標</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="866"/>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Delay time</source>
+      <translation>延遲時間</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source> ms</source>
+      <translation>毫秒</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
       <source>System proxy</source>
       <translation>系統的代理伺服器</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="873"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom proxy</source>
       <translation>自訂代理伺服器</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="883"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Custom settings</source>
       <translation>自訂設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="970"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Anki Connect</source>
       <translation>Anki Connect</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="991"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>http://</source>
       <translation>http://</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1035"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Deck:</source>
       <translation>牌組：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1045"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Model:</source>
       <translation>模型：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1072"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Word</source>
       <translation>單字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1079"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Vocabulary field...</source>
       <translation>字彙輸入欄</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1086"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Text</source>
       <translation>文字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1093"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Definition field...</source>
       <translation>定義輸入欄</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1100"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence</source>
       <translation>語句</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1107"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Sentence field (can be empty)...</source>
       <translation>句子輸入欄(可為空)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1131"/>
+      <location filename="../src/ui/preferences.ui"/>
       <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="../src/ui/preferences.ui" line="1135"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Do not identify GoldenDict in HTTP headers</source>
       <translation>在 HTTP 標頭檔中不要顯示 GoldenDict-ng</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1144"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum network cache size:</source>
       <translation>最大網絡緩存大小：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1151"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum disk space occupied by GoldenDict&apos;s network cache in
 %1
 If set to 0 the network disk cache will be disabled.</source>
@@ -4225,284 +4195,326 @@ If set to 0 the network disk cache will be disabled.</source>
 如果設置為 0，網絡磁盤緩存將被禁用。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1156"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source> MiB</source>
       <translation> MB</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1169"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When this option is enabled, GoldenDict
 clears its network cache from disk during exit.</source>
       <translation>啟用此選項時，GoldenDict
 在退出期間從磁盤清除其網絡緩存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1173"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Clear network cache on exit</source>
       <translation>結束時清除快取</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1227"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Full-text search</source>
       <translation>全文搜尋</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1233"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Allow full-text search for:</source>
       <translation>允許下列的全文搜尋：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1331"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Don&apos;t search in dictionaries containing more than</source>
       <translation>不要在超過</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1348"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>articles (0 - unlimited)</source>
       <translation>條目的字典中尋找 (0 - 不限)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1391"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ad&amp;vanced</source>
       <translation>進階設定(&amp;V)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1717"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>During successive searches,if one dictionary is collapsed by manual, it will remain collapsed in the next search</source>
       <translation>在連續搜索過程中，如果一個字典被手動折疊，在下一次搜索時它將保持折疊狀態</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1720"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Session collapse</source>
       <translation>會話期間，詞典保持摺疊</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1741"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>When using clipboard,strip everything after newline</source>
       <translation>使用剪貼板時，刪除換行符後的所有內容</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1748"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>On a new search, focus the main or popup window even if it&apos;s visible</source>
       <translation>在新搜索中，聚焦主窗口或彈出窗口，即使它是可見的</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1511"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites</source>
       <translation>我的最愛</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1528"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Favorites saving interval. If set to 0 Favorites will be saved only during exit.</source>
       <translation>我的最愛內容儲存間隔。若設定為 0 則只在程式結束時儲存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1560"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to confirm every operation of items deletion</source>
       <translation>啟用此選項以在每次進行刪除操作時進行確認</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1563"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Confirmation for items deletion</source>
       <translation>刪除項目時進行確認</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1634"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore unreasonably long input text
 from mouse-over, selection, clipboard or command line</source>
       <translation>打開此選項以忽略不合理的長輸入文本
 從鼠標懸停、選擇、剪貼板或命令行</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1638"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore input phrases longer than</source>
       <translation>忽略長度超過</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1601"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Input phrases longer than this size will be ignored</source>
       <translation>長度超過此大小的輸入短語將被忽略</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1694"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to ignore diacritics while searching articles</source>
       <translation>打開此選項以在搜索文章時忽略變音符號</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1697"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore diacritics while searching</source>
       <translation>搜索時忽略變音符號</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1684"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to always expand optional parts of articles</source>
       <translation>啟用此選項以後會展開條目額外的部分</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1687"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Expand optional &amp;parts</source>
       <translation>展開額外的部分(&amp;P)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1624"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select this option to automatic collapse big articles</source>
       <translation>啟用此選項能自動摺疊較長的條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1627"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Collapse articles more than</source>
       <translation>摺疊超過</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1668"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles longer than this size will be collapsed</source>
       <translation>超過此大小的條目將被摺疊</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1594"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ignore punctuation while searching</source>
       <translation>搜索時忽略標點符號</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1730"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to enable extra articles search via synonym lists
 from Stardict, Babylon and GLS dictionaries</source>
       <translation>啟用此選項可以透過同義詞清單開啟額外搜尋功能，
 清單來自 Stardict、Babylon 和 GLS 的字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1734"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Extra search via synonyms</source>
       <translation>同義詞額外搜尋功能</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1617"/>
-      <location filename="../src/ui/preferences.ui" line="1661"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>symbols</source>
       <translation>個符號的條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="332"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Ctrl-Tab navigates tabs in MRU order</source>
       <translation>Ctrl-Tab 依照 MRU 順序瀏覽分頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="119"/>
+      <location filename="../src/ui/preferences.cc" line="134"/>
       <source>Babylon</source>
       <translation>巴比倫</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1399"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History</source>
       <translation>歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1405"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on to store history of the translated words</source>
       <translation>啟用此選項以儲存查詢單字的歷史記錄</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1408"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Store &amp;history</source>
       <translation>儲存歷史記錄(&amp;H)</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1588"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Articles</source>
       <translation>條目</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="252"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Turn this option on if you want to select words by single mouse click</source>
       <translation>啟用此選項後只要按一下滑鼠左鍵就可選擇單字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="255"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Select word by single click</source>
       <translation>按一下就選字</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="354"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Add-on style:</source>
       <translation>擴充風格：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1423"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Specify the maximum number of entries to keep in history.</source>
       <translation>設定歷史記錄最多儲存的詞條數量。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1426"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Maximum history size:</source>
       <translation>歷史記錄最大為：</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1463"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>History saving interval. If set to 0 history will be saved only during exit.</source>
       <translation>多久一次儲存歷史記錄。如果設定為 0 就代表只在離開時儲存。</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1469"/>
-      <location filename="../src/ui/preferences.ui" line="1531"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>Save every</source>
       <translation>每</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.ui" line="1486"/>
-      <location filename="../src/ui/preferences.ui" line="1551"/>
+      <location filename="../src/ui/preferences.ui"/>
       <source>minutes</source>
       <translation>分鐘儲存一次</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="116"/>
+      <location filename="../src/ui/preferences.cc" line="131"/>
       <source>Classic</source>
       <translation>經典式樣</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="117"/>
+      <location filename="../src/ui/preferences.cc" line="132"/>
       <source>Modern</source>
       <translation>現代</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="120"/>
+      <location filename="../src/ui/preferences.cc" line="135"/>
       <source>Lingoes</source>
       <translation>靈格斯</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="121"/>
+      <location filename="../src/ui/preferences.cc" line="136"/>
       <source>Lingoes-Blue</source>
       <translation>靈格斯-藍</translation>
     </message>
     <message>
-      <location filename="../src/ui/preferences.cc" line="132"/>
+      <location filename="../src/ui/preferences.cc" line="147"/>
       <source> MB</source>
       <translation> MB</translation>
     </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Positional information is required to use Xapian&apos;s phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</source>
+      <translation>使用Xapian的短語搜索和NEAR運算符需要位置信息，但數據庫大小會更大。 僅適用於新傳入的詞典。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Enable index with positional information</source>
+      <translation>啟用帶有位置信息的索引</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Standard Font</source>
+      <translation>標準字體</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Monospace Font</source>
+      <translation>等寬字體</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Serif Font</source>
+      <translation>襯線字體</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Sans-serif Font</source>
+      <translation>無襯線字體</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Appearance</source>
+      <translation>外貌</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>These fonts will be applied when the fonts specified by a dictionary are not found.</source>
+      <translation>當未找到字典指定的字體時，將應用這些字體。</translation>
+    </message>
+    <message>
+      <location filename="../src/ui/preferences.ui"/>
+      <source>Fallback Fonts</source>
+      <translation>後備字體</translation>
+    </message>
   </context>
   <context>
     <name>ProgramTypeEditor</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1091"/>
+      <location filename="../src/dict/sources.cc" line="1092"/>
       <source>Audio</source>
       <translation>音訊</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1093"/>
+      <location filename="../src/dict/sources.cc" line="1094"/>
       <source>Plain Text</source>
       <translation>純文字</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1095"/>
+      <location filename="../src/dict/sources.cc" line="1096"/>
       <source>Html</source>
       <translation>Html</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1097"/>
+      <location filename="../src/dict/sources.cc" line="1098"/>
       <source>Prefix Match</source>
       <translation>字首符合</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1099"/>
+      <location filename="../src/dict/sources.cc" line="1100"/>
       <source>Unknown</source>
       <translation>未知</translation>
     </message>
@@ -4510,17 +4522,17 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>Programs::RunInstance</name>
     <message>
-      <location filename="../src/dict/programs.cc" line="182"/>
+      <location filename="../src/dict/programs.cc" line="179"/>
       <source>No program name was given.</source>
       <translation>未提供程式名稱。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="198"/>
+      <location filename="../src/dict/programs.cc" line="195"/>
       <source>The program has crashed.</source>
       <translation>該程式已當掉。</translation>
     </message>
     <message>
-      <location filename="../src/dict/programs.cc" line="201"/>
+      <location filename="../src/dict/programs.cc" line="198"/>
       <source>The program has returned exit code %1.</source>
       <translation>該程式 returned exit code %1。</translation>
     </message>
@@ -4528,27 +4540,27 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ProgramsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="999"/>
+      <location filename="../src/dict/sources.cc" line="1000"/>
       <source>Enabled</source>
       <translation>啟用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1001"/>
+      <location filename="../src/dict/sources.cc" line="1002"/>
       <source>Type</source>
       <translation>類型</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1003"/>
+      <location filename="../src/dict/sources.cc" line="1004"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1005"/>
+      <location filename="../src/dict/sources.cc" line="1006"/>
       <source>Command Line</source>
       <translation>命令列</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1007"/>
+      <location filename="../src/dict/sources.cc" line="1008"/>
       <source>Icon</source>
       <translation>圖示</translation>
     </message>
@@ -4556,99 +4568,114 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>QObject</name>
     <message>
-      <location filename="../src/dict/aard.cc" line="430"/>
-      <location filename="../src/dict/dsl.cc" line="1691"/>
+      <location filename="../src/dict/aard.cc" line="419"/>
+      <location filename="../src/dict/dsl.cc" line="1671"/>
       <source>Article loading error</source>
       <translation>條目讀取失敗</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="522"/>
-      <location filename="../src/dict/slob.cc" line="801"/>
+      <location filename="../src/dict/aard.cc" line="511"/>
+      <location filename="../src/dict/slob.cc" line="800"/>
       <source>Article decoding error</source>
       <translation>條目解碼失敗</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="563"/>
-      <location filename="../src/dict/bgl.cc" line="394"/>
-      <location filename="../src/dict/sdict.cc" line="685"/>
-      <location filename="../src/dict/stardict.cc" line="1102"/>
+      <location filename="../src/dict/aard.cc" line="552"/>
+      <location filename="../src/dict/bgl.cc" line="381"/>
+      <location filename="../src/dict/sdict.cc" line="671"/>
+      <location filename="../src/dict/stardict.cc" line="1101"/>
       <source>Copyright: %1%2</source>
       <translation>版權所有: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/aard.cc" line="567"/>
-      <location filename="../src/dict/sdict.cc" line="701"/>
+      <location filename="../src/dict/aard.cc" line="556"/>
+      <location filename="../src/dict/sdict.cc" line="687"/>
       <source>Version: %1%2</source>
       <translation>版本: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="401"/>
-      <location filename="../src/dict/gls.cc" line="550"/>
-      <location filename="../src/dict/stardict.cc" line="1110"/>
+      <location filename="../src/dict/bgl.cc" line="388"/>
+      <location filename="../src/dict/gls.cc" line="543"/>
+      <location filename="../src/dict/stardict.cc" line="1109"/>
       <source>Author: %1%2</source>
       <translation>作者: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/bgl.cc" line="408"/>
-      <location filename="../src/dict/stardict.cc" line="1118"/>
+      <location filename="../src/dict/bgl.cc" line="395"/>
+      <location filename="../src/dict/stardict.cc" line="1117"/>
       <source>E-mail: %1%2</source>
       <translation>電子郵件: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/sdict.cc" line="653"/>
+      <location filename="../src/dict/sdict.cc" line="639"/>
       <source>Title: %1%2</source>
       <translation>標題: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1126"/>
+      <location filename="../src/dict/stardict.cc" line="1125"/>
       <source>Website: %1%2</source>
       <translation>網站: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/dict/stardict.cc" line="1134"/>
+      <location filename="../src/dict/stardict.cc" line="1133"/>
       <source>Date: %1%2</source>
       <translation>日期: %1%2</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="150"/>
+      <location filename="../src/main.cc" line="179"/>
       <source>A dictionary lookup program.</source>
       <translation>字典查找程序。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="153"/>
+      <location filename="../src/main.cc" line="182"/>
       <source>Word or sentence to query.</source>
       <translation>要查詢的單詞或句子。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="157"/>
+      <location filename="../src/main.cc" line="186"/>
       <source>Save debug messages to gd_log.txt in the config folder.</source>
       <translation>將調試消息保存到配置文件夾中的 gd_log.txt。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="161"/>
+      <location filename="../src/main.cc" line="190"/>
+      <source>Reset window state.</source>
+      <translation>重置窗口狀態。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="192"/>
+      <source>Disable tts.</source>
+      <translation>禁用 tts。</translation>
+    </message>
+    <message>
+      <location filename="../src/main.cc" line="196"/>
       <source>Change the group of main window.</source>
       <translation>更改主窗口組。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="165"/>
+      <location filename="../src/main.cc" line="200"/>
       <source>Change the group of popup.</source>
       <translation>更改彈出窗口的詞組。</translation>
     </message>
     <message>
-      <location filename="../src/main.cc" line="170"/>
+      <location filename="../src/main.cc" line="205"/>
       <source>Toggle scan popup.</source>
       <translation>切換彈出窗口。</translation>
     </message>
+    <message>
+      <location filename="../src/main.cc" line="209"/>
+      <source>Print version and diagnosis info.</source>
+      <translation>打印版本和診斷信息。</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1169"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1143"/>
       <source>Dictionary search/filter (Ctrl+F)</source>
       <translation>字典搜尋/篩選(Ctrl+F)</translation>
     </message>
     <message>
-      <location filename="../src/ui/groups_widgets.cc" line="1174"/>
+      <location filename="../src/ui/groups_widgets.cc" line="1148"/>
       <source>Clear Search</source>
       <translation>清除搜尋</translation>
     </message>
@@ -4656,22 +4683,22 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ResourceToSaveHandler</name>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>ERROR: %1</source>
       <translation>錯誤： %1</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2706"/>
+      <location filename="../src/ui/articleview.cc" line="2474"/>
       <source>Resource saving error: </source>
       <translation>資源儲存錯誤： </translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>The referenced resource failed to download.</source>
       <translation>所引用的資源下載失敗。</translation>
     </message>
     <message>
-      <location filename="../src/ui/articleview.cc" line="2732"/>
+      <location filename="../src/ui/articleview.cc" line="2500"/>
       <source>WARNING: %1</source>
       <translation>警告： %1</translation>
     </message>
@@ -4700,68 +4727,73 @@ from Stardict, Babylon and GLS dictionaries</source>
   <context>
     <name>ScanPopup</name>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="142"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+S</source>
       <translation>Alt+S</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="14"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Dialog</source>
       <translation>對話方塊</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="135"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Pronounce Word (Alt+S)</source>
       <translation>單字發音(Alt+S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="166"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Add word to Favorites (Ctrl+E)</source>
       <translation>新增單字到我的最愛 (Ctrl+E)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="193"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Shows or hides the dictionary bar</source>
       <translation>顯示或隱藏字典列</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="213"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Always stay on top of all other windows</source>
       <translation>最上層顯示在其他所有視窗</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="230"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <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="../src/ui/scanpopup.ui" line="152"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Send word to main window (Alt+W)</source>
       <translation>將單字傳送到主視窗 (Alt+W)</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="159"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Alt+W</source>
       <translation>Alt+W</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="113"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Back</source>
       <translation>上一頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.ui" line="124"/>
+      <location filename="../src/ui/scanpopup.ui"/>
       <source>Forward</source>
       <translation>下一頁</translation>
     </message>
     <message>
-      <location filename="../src/ui/scanpopup.cc" line="604"/>
-      <location filename="../src/ui/scanpopup.cc" line="1000"/>
+      <location filename="../src/ui/scanpopup.cc" line="587"/>
+      <location filename="../src/ui/scanpopup.cc" line="981"/>
       <source>%1 - %2</source>
       <translation>%1 - %2</translation>
     </message>
+    <message>
+      <location filename="../src/ui/scanpopup.cc" line="943"/>
+      <source>WARNING: %1</source>
+      <translation>警告： %1</translation>
+    </message>
   </context>
   <context>
     <name>SearchPanel</name>
@@ -4804,17 +4836,17 @@ could be resized or managed in other ways.</source>
   <context>
     <name>SoundDirsModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="1291"/>
+      <location filename="../src/dict/sources.cc" line="1292"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1289"/>
+      <location filename="../src/dict/sources.cc" line="1290"/>
       <source>Path</source>
       <translation>路徑</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="1293"/>
+      <location filename="../src/dict/sources.cc" line="1294"/>
       <source>Icon</source>
       <translation>圖示</translation>
     </message>
@@ -4822,60 +4854,60 @@ could be resized or managed in other ways.</source>
   <context>
     <name>Sources</name>
     <message>
-      <location filename="../src/ui/sources.ui" line="40"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Files</source>
       <translation>檔案</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="813"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana</source>
       <translation>平假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="753"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Systems:</source>
       <translation>方案：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="780"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Nihon-shiki</source>
       <translation>日本式</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="262"/>
-      <location filename="../src/dict/sources.cc" line="286"/>
-      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="263"/>
+      <location filename="../src/dict/sources.cc" line="287"/>
+      <location filename="../src/dict/sources.cc" line="311"/>
       <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="../src/ui/sources.ui" line="227"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia</source>
       <translation>維基百科</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="820"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana Japanese syllabary</source>
       <translation>日文的片假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="109"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Make dictionaries from bunches of audiofiles by adding paths here:</source>
       <translation>如果要批量新增音訊檔案，請把路徑新增在這裡：</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="195"/>
-      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="196"/>
+      <location filename="../src/dict/sources.cc" line="223"/>
       <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="../src/ui/sources.ui" line="741"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Japanese Romaji</source>
       <translation>日文羅馬字</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="790"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
 Standardized as ISO 3602
 
@@ -4886,83 +4918,83 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支援此方案。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="233"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Wikipedia (MediaWiki) sites:</source>
       <translation>維基百科 (MediaWik) 網站：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="103"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Sound Dirs</source>
       <translation>音訊檔資料夾</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="412"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any external programs. A string %GDWORD% will be replaced with the query word. A string %GDSEARCH% will be replaced with the text in the search bar. If both of the parameters are not provided, the headword will be fed into standard input.</source>
       <translation>任何外部程序。字符串 %GDWORD% 將替換為查詢詞。字符串 %GDSEARCH% 將替換為搜索欄中的文本。如果兩個參數都沒有提供，詞條將被輸入到標準輸入中。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="465"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="471"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;發音由 &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt; 提供，後者是法國維基媒體的協作語言媒體庫。 &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="481"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable Lingua Libre</source>
       <translation>啟用Lingua Libre</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="490"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ISO 639-3 language code</source>
       <translation>ISO 639-3 語言代碼</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="582"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Use of Forvo currently requires an API key, register on the site to get your own key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;使用 Forvo 目前需要一個 API 密鑰，在網站上註冊以獲取您自己的密鑰。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="605"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Get your own key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;here&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
       <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;得到你自己的Key &lt;a href=&quot;http://api.forvo.com/key/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;這裡&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="760"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most widely used method of transcription of Japanese,
 based on English phonology</source>
       <translation>以英文語音學為基礎所建立的最常用日文轉寫方案</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="810"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hiragana Japanese syllabary</source>
       <translation>日文的平假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="835"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Custom transliteration</source>
       <translation>自定義音譯</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="844"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>This only applied in search phrase, with each line represent a transliteration,semicolon seperated. For example, ae;æ,users can input ae to represent æ in the target word.</source>
       <translation>這只適用於搜索短語，每行代表一個音譯，以分號分隔。例如ae;æ，用戶可以輸入ae來表示目標詞中的æ。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="854"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>ae;æ #this is an example</source>
       <translation>ae;æ #這是一個例子</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="681"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Transliteration</source>
       <translation>轉寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="774"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>The most regular system, having a one-to-one relation to the
 kana writing systems. Standardized as ISO 3602
 
@@ -4973,22 +5005,22 @@ Not implemented yet in GoldenDict.</source>
 GoldenDict 尚不支援此方案。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="703"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Russian transliteration</source>
       <translation>俄文轉寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="159"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Morphology</source>
       <translation>構詞法規則庫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="181"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Change...</source>
       <translation>變更(&amp;C)...</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="500"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Examples:  &amp;quot;eng&amp;quot; for English, &amp;quot;fra&amp;quot; for French &lt;br&gt;
 
 Full list of availiable languages can be found &lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt; here &lt;/a&gt;</source>
@@ -4997,94 +5029,84 @@ Full list of availiable languages can be found &lt;a href=&quot;https://linguali
 可在&lt;a href=&quot;https://lingualibre.org/wiki/LinguaLibre:Stats/Languages&quot;&gt;此處&lt;/a&gt;找到可用語言的完整列表</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="823"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Katakana</source>
       <translation>片假名</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="165"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Path to a directory with Hunspell/Myspell dictionaries:</source>
       <translation>儲存 Hunspell/Myspell 拼字檢查詞庫檔案的路徑：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="87"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Re&amp;scan now</source>
       <translation>重新掃描(&amp;S)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="714"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>German transliteration</source>
       <translation>德文轉寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="292"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Any websites. A string %GDWORD% will be replaced with the query word:</source>
       <translation>任意網站。%GDWORD% 字串將會被搜尋關鍵詞取代：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="60"/>
-      <location filename="../src/ui/sources.ui" line="123"/>
-      <location filename="../src/ui/sources.ui" line="247"/>
-      <location filename="../src/ui/sources.ui" line="306"/>
-      <location filename="../src/ui/sources.ui" line="370"/>
-      <location filename="../src/ui/sources.ui" line="429"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Add...</source>
       <translation>新增(&amp;A)...</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="180"/>
-      <location filename="../src/dict/sources.cc" line="207"/>
-      <location filename="../src/dict/sources.cc" line="234"/>
+      <location filename="../src/dict/sources.cc" line="181"/>
+      <location filename="../src/dict/sources.cc" line="208"/>
+      <location filename="../src/dict/sources.cc" line="235"/>
       <source>Choose a directory</source>
       <translation>選擇資料夾</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="67"/>
-      <location filename="../src/ui/sources.ui" line="130"/>
-      <location filename="../src/ui/sources.ui" line="254"/>
-      <location filename="../src/ui/sources.ui" line="313"/>
-      <location filename="../src/ui/sources.ui" line="377"/>
-      <location filename="../src/ui/sources.ui" line="436"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>&amp;Remove</source>
       <translation>移除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="286"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Websites</source>
       <translation>網站</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="46"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Paths to search for the dictionary files:</source>
       <translation>字典檔案所在資料夾：</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="194"/>
-      <location filename="../src/dict/sources.cc" line="221"/>
-      <location filename="../src/dict/sources.cc" line="261"/>
-      <location filename="../src/dict/sources.cc" line="285"/>
-      <location filename="../src/dict/sources.cc" line="309"/>
-      <location filename="../src/dict/sources.cc" line="333"/>
+      <location filename="../src/dict/sources.cc" line="195"/>
+      <location filename="../src/dict/sources.cc" line="222"/>
+      <location filename="../src/dict/sources.cc" line="262"/>
+      <location filename="../src/dict/sources.cc" line="286"/>
+      <location filename="../src/dict/sources.cc" line="310"/>
+      <location filename="../src/dict/sources.cc" line="334"/>
       <source>Confirm removal</source>
       <translation>確認移除</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="803"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Syllabaries:</source>
       <translation>音節：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="190"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Available morphology dictionaries:</source>
       <translation>可用的構詞法規則庫：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="738"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enables to use the Latin alphabet to write the Japanese language</source>
       <translation>啟用日文羅馬字轉寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="202"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Each morphology dictionary appears as a
 separate auxiliary dictionary which
 provides stem words for searches and
@@ -5097,94 +5119,94 @@ of the appropriate groups to use them.</source>
 最下面。</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="764"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Hepburn</source>
       <translation>黑本式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="796"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Kunrei-shiki</source>
       <translation>訓令式</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="533"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Forvo</source>
       <translation>Forvo</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="350"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers</source>
       <translation>DICT 伺服器</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="356"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>DICT servers:</source>
       <translation>DICT 伺服器</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="545"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="558"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Enable pronunciations from Forvo</source>
       <translation>啟用來自 Forvo 的發音功能</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="575"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>API Key:</source>
       <translation>API Key:</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="618"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Language codes (comma-separated):</source>
       <translation>語言程式碼 (用逗號分隔)：</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="625"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="648"/>
+      <location filename="../src/ui/sources.ui"/>
       <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="../src/ui/sources.ui" line="692"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Greek transliteration</source>
       <translation>希臘文轉寫</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="143"/>
+      <location filename="../src/dict/sources.cc" line="144"/>
       <source>(not available in portable version)</source>
       <translation>(免安裝版中不可用)</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="406"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Programs</source>
       <translation>程式</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="334"/>
+      <location filename="../src/dict/sources.cc" line="335"/>
       <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="../src/ui/sources.ui" line="725"/>
+      <location filename="../src/ui/sources.ui"/>
       <source>Belarusian transliteration</source>
       <translation>白俄羅斯文轉寫</translation>
     </message>
     <message>
-      <location filename="../src/ui/sources.ui" line="337"/>
+      <location filename="../src/ui/sources.ui"/>
       <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>此外，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>
-      <location filename="../src/dict/sources.cc" line="128"/>
+      <location filename="../src/dict/sources.cc" line="129"/>
       <source>Text to Speech</source>
       <translation>文字轉語音</translation>
     </message>
@@ -5200,42 +5222,42 @@ Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用
   <context>
     <name>TextToSpeechSource</name>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="20"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Selected voice engines:</source>
       <translation>選擇語音引擎：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="40"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Add</source>
       <translation>新增(&amp;A)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="47"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Remove</source>
       <translation>移除(&amp;R)</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="147"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preview</source>
       <translation>預覽</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="161"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Available voice engines:</source>
       <translation>可用的語音引擎：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="179"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Text to be previewed:</source>
       <translation>預覽的文字：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="186"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Type text to be previewed here.</source>
       <translation>請在此輸入預覽的文字。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="220"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>&amp;Preview</source>
       <translation>預覽(&amp;P)</translation>
     </message>
@@ -5260,17 +5282,17 @@ Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用
       <translation>找不到可用的 TTS 文字轉語音引擎。&lt;br&gt;請檢查您的電腦是否已經安裝 TTS 文字轉語音引擎。</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="71"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Preferences</source>
       <translation>偏好設定</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="77"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Volume:</source>
       <translation>音量：</translation>
     </message>
     <message>
-      <location filename="../src/ui/texttospeechsource.ui" line="106"/>
+      <location filename="../src/ui/texttospeechsource.ui"/>
       <source>Rate:</source>
       <translation>速度：</translation>
     </message>
@@ -5278,12 +5300,12 @@ Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用
   <context>
     <name>TranslateBox</name>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="108"/>
+      <location filename="../src/ui/translatebox.cc" line="31"/>
       <source>Type a word or phrase to search dictionaries</source>
       <translation>輸入單字或片語來查字典</translation>
     </message>
     <message>
-      <location filename="../src/ui/translatebox.cc" line="120"/>
+      <location filename="../src/ui/translatebox.cc" line="38"/>
       <source>Drop-down</source>
       <translation>下拉</translation>
     </message>
@@ -5314,33 +5336,33 @@ Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用
   <context>
     <name>WebSitesModel</name>
     <message>
-      <location filename="../src/dict/sources.cc" line="650"/>
+      <location filename="../src/dict/sources.cc" line="651"/>
       <source>Name</source>
       <translation>名稱</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="652"/>
+      <location filename="../src/dict/sources.cc" line="653"/>
       <source>Address</source>
       <translation>網址</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="646"/>
+      <location filename="../src/dict/sources.cc" line="647"/>
       <source>Enabled</source>
       <translation>啟用</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="637"/>
-      <location filename="../src/dict/sources.cc" line="670"/>
+      <location filename="../src/dict/sources.cc" line="638"/>
+      <location filename="../src/dict/sources.cc" line="671"/>
       <source>Insert article as link inside &lt;iframe&gt; tag</source>
       <translation>在框架標籤內顯示條目(優先模式)</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="648"/>
+      <location filename="../src/dict/sources.cc" line="649"/>
       <source>As link</source>
       <translation>連結</translation>
     </message>
     <message>
-      <location filename="../src/dict/sources.cc" line="654"/>
+      <location filename="../src/dict/sources.cc" line="655"/>
       <source>Icon</source>
       <translation>圖示</translation>
     </message>
@@ -5348,17 +5370,9 @@ Big-5 使用%GDBIG5%，Big5-HKSCS 使用 %GDBIG5HKSCS% ，GBK 和 GB18030 使用
   <context>
     <name>WordFinder</name>
     <message>
-      <location filename="../src/wordfinder.cc" line="200"/>
+      <location filename="../src/wordfinder.cc" line="194"/>
       <source>Failed to query some dictionaries.</source>
       <translation>在某些字典中進行查詢時失敗。</translation>
     </message>
   </context>
-  <context>
-    <name>WordList</name>
-    <message>
-      <location filename="../src/wordlist.cc" line="82"/>
-      <source>WARNING: %1</source>
-      <translation>警告： %1</translation>
-    </message>
-  </context>
 </TS>
diff --git a/opencc/HKVariants.ocd2 b/opencc/HKVariants.ocd2
index d87866dd..fa2edde1 100644
Binary files a/opencc/HKVariants.ocd2 and b/opencc/HKVariants.ocd2 differ
diff --git a/opencc/HKVariantsRev.ocd2 b/opencc/HKVariantsRev.ocd2
index 25107df2..abc97a94 100644
Binary files a/opencc/HKVariantsRev.ocd2 and b/opencc/HKVariantsRev.ocd2 differ
diff --git a/opencc/HKVariantsRevPhrases.ocd2 b/opencc/HKVariantsRevPhrases.ocd2
index fe817dc6..84822772 100644
Binary files a/opencc/HKVariantsRevPhrases.ocd2 and b/opencc/HKVariantsRevPhrases.ocd2 differ
diff --git a/opencc/JPShinjitaiCharacters.ocd2 b/opencc/JPShinjitaiCharacters.ocd2
index 23e59125..d2780147 100644
Binary files a/opencc/JPShinjitaiCharacters.ocd2 and b/opencc/JPShinjitaiCharacters.ocd2 differ
diff --git a/opencc/JPVariants.ocd2 b/opencc/JPVariants.ocd2
index 68b9e5b1..18587b01 100644
Binary files a/opencc/JPVariants.ocd2 and b/opencc/JPVariants.ocd2 differ
diff --git a/opencc/JPVariantsRev.ocd2 b/opencc/JPVariantsRev.ocd2
index bcca7d36..8abee318 100644
Binary files a/opencc/JPVariantsRev.ocd2 and b/opencc/JPVariantsRev.ocd2 differ
diff --git a/opencc/STCharacters.ocd2 b/opencc/STCharacters.ocd2
index 7e917758..74f7fbe2 100644
Binary files a/opencc/STCharacters.ocd2 and b/opencc/STCharacters.ocd2 differ
diff --git a/opencc/STPhrases.ocd2 b/opencc/STPhrases.ocd2
index 9eace34a..13cd9be0 100644
Binary files a/opencc/STPhrases.ocd2 and b/opencc/STPhrases.ocd2 differ
diff --git a/opencc/TSCharacters.ocd2 b/opencc/TSCharacters.ocd2
index 79e3bdcf..3c0d60a9 100644
Binary files a/opencc/TSCharacters.ocd2 and b/opencc/TSCharacters.ocd2 differ
diff --git a/opencc/TSPhrases.ocd2 b/opencc/TSPhrases.ocd2
index dc1d1a97..dc8ef5d7 100644
Binary files a/opencc/TSPhrases.ocd2 and b/opencc/TSPhrases.ocd2 differ
diff --git a/opencc/TWPhrases.ocd2 b/opencc/TWPhrases.ocd2
index c3a02eff..9107d1ab 100644
Binary files a/opencc/TWPhrases.ocd2 and b/opencc/TWPhrases.ocd2 differ
diff --git a/opencc/TWPhrasesRev.ocd2 b/opencc/TWPhrasesRev.ocd2
index 447c8e6b..acc8662a 100644
Binary files a/opencc/TWPhrasesRev.ocd2 and b/opencc/TWPhrasesRev.ocd2 differ
diff --git a/opencc/TWVariants.ocd2 b/opencc/TWVariants.ocd2
index 80553c44..8d743955 100644
Binary files a/opencc/TWVariants.ocd2 and b/opencc/TWVariants.ocd2 differ
diff --git a/opencc/TWVariantsRev.ocd2 b/opencc/TWVariantsRev.ocd2
index 5f3e266f..2546811c 100644
Binary files a/opencc/TWVariantsRev.ocd2 and b/opencc/TWVariantsRev.ocd2 differ
diff --git a/opencc/TWVariantsRevPhrases.ocd2 b/opencc/TWVariantsRevPhrases.ocd2
index cd23619e..95f26afc 100644
Binary files a/opencc/TWVariantsRevPhrases.ocd2 and b/opencc/TWVariantsRevPhrases.ocd2 differ
diff --git a/opencc/hk2s.json b/opencc/hk2s.json
index 7e5da1da..cf0e9b97 100644
--- a/opencc/hk2s.json
+++ b/opencc/hk2s.json
@@ -1,5 +1,5 @@
 {
-  "name": "Traditional Chinese (Hong Kong standard) to Simplified Chinese",
+  "name": "Traditional Chinese (Hong Kong variant) to Simplified Chinese",
   "segmentation": {
     "type": "mmseg",
     "dict": {
diff --git a/opencc/hk2t.json b/opencc/hk2t.json
new file mode 100644
index 00000000..0d47b917
--- /dev/null
+++ b/opencc/hk2t.json
@@ -0,0 +1,22 @@
+{
+  "name": "Traditional Chinese (Hong Kong variant) to Traditional Chinese",
+  "segmentation": {
+    "type": "mmseg",
+    "dict": {
+      "type": "ocd2",
+      "file": "HKVariantsRevPhrases.ocd2"
+    }
+  },
+  "conversion_chain": [{
+    "dict": {
+      "type": "group",
+      "dicts": [{
+        "type": "ocd2",
+        "file": "HKVariantsRevPhrases.ocd2"
+      }, {
+        "type": "ocd2",
+        "file": "HKVariantsRev.ocd2"
+      }] 
+    }
+  }]
+}
diff --git a/opencc/s2hk.json b/opencc/s2hk.json
index 38638a8b..fcaa017e 100644
--- a/opencc/s2hk.json
+++ b/opencc/s2hk.json
@@ -1,5 +1,5 @@
 {
-  "name": "Simplified Chinese to Traditional Chinese (Hong Kong standard)",
+  "name": "Simplified Chinese to Traditional Chinese (Hong Kong variant)",
   "segmentation": {
     "type": "mmseg",
     "dict": {
@@ -20,14 +20,8 @@
     }
   }, {
     "dict": {
-      "type": "group",
-      "dicts": [{
-        "type": "ocd2",
-        "file": "HKVariantsPhrases.ocd2"
-      }, {
-        "type": "ocd2",
-        "file": "HKVariants.ocd2"
-      }] 
+      "type": "ocd2",
+      "file": "HKVariants.ocd2"
     }
   }]
 }
diff --git a/opencc/t2hk.json b/opencc/t2hk.json
index 32f70aa3..519d4a3f 100644
--- a/opencc/t2hk.json
+++ b/opencc/t2hk.json
@@ -1,22 +1,16 @@
 {
-  "name": "Traditional Chinese to Traditional Chinese (Hong Kong standard)",
+  "name": "Traditional Chinese to Traditional Chinese (Hong Kong variant)",
   "segmentation": {
     "type": "mmseg",
     "dict": {
       "type": "ocd2",
-      "file": "HKVariantsPhrases.ocd2"
+      "file": "HKVariants.ocd2"
     }
   },
   "conversion_chain": [{
     "dict": {
-      "type": "group",
-      "dicts": [{
-        "type": "ocd2",
-        "file": "HKVariantsPhrases.ocd2"
-      }, {
-        "type": "ocd2",
-        "file": "HKVariants.ocd2"
-      }]
+      "type": "ocd2",
+      "file": "HKVariants.ocd2"
     }
   }]
 }
diff --git a/opencc/tw2t.json b/opencc/tw2t.json
new file mode 100644
index 00000000..ad5295b6
--- /dev/null
+++ b/opencc/tw2t.json
@@ -0,0 +1,22 @@
+{
+  "name": "Traditional Chinese (Taiwan standard) to Traditional Chinese",
+  "segmentation": {
+    "type": "mmseg",
+    "dict": {
+      "type": "ocd2",
+      "file": "TWVariantsRevPhrases.ocd2"
+    }
+  },
+  "conversion_chain": [{
+    "dict": {
+      "type": "group",
+      "dicts": [{
+        "type": "ocd2",
+        "file": "TWVariantsRevPhrases.ocd2"
+      }, {
+        "type": "ocd2",
+        "file": "TWVariantsRev.ocd2"
+      }] 
+    }
+  }]
+}
diff --git a/opencc/vcpkg.spdx.json b/opencc/vcpkg.spdx.json
new file mode 100644
index 00000000..2701fd90
--- /dev/null
+++ b/opencc/vcpkg.spdx.json
@@ -0,0 +1,137 @@
+{
+  "$schema": "https://raw.githubusercontent.com/spdx/spdx-spec/v2.2.1/schemas/spdx-schema.json",
+  "spdxVersion": "SPDX-2.2",
+  "dataLicense": "CC0-1.0",
+  "SPDXID": "SPDXRef-DOCUMENT",
+  "documentNamespace": "https://spdx.org/spdxdocs/opencc-x64-windows-1.1.6#1-77e9ab4c-a73d-4494-a5a7-8c16f4c63181",
+  "name": "opencc:x64-windows@1.1.6#1 c2ced06b2a1f9dafc206a7e56d003ca36dc5b07462881e03cdfe6b0b9bec8ecb",
+  "creationInfo": {
+    "creators": [
+      "Tool: vcpkg-bedcba5172f5e4b91caac660ab7afe92c27a9895"
+    ],
+    "created": "2023-06-09T15:52:16Z"
+  },
+  "relationships": [
+    {
+      "spdxElementId": "SPDXRef-port",
+      "relationshipType": "GENERATES",
+      "relatedSpdxElement": "SPDXRef-binary"
+    },
+    {
+      "spdxElementId": "SPDXRef-port",
+      "relationshipType": "CONTAINS",
+      "relatedSpdxElement": "SPDXRef-file-0"
+    },
+    {
+      "spdxElementId": "SPDXRef-port",
+      "relationshipType": "CONTAINS",
+      "relatedSpdxElement": "SPDXRef-file-1"
+    },
+    {
+      "spdxElementId": "SPDXRef-port",
+      "relationshipType": "CONTAINS",
+      "relatedSpdxElement": "SPDXRef-file-2"
+    },
+    {
+      "spdxElementId": "SPDXRef-binary",
+      "relationshipType": "GENERATED_FROM",
+      "relatedSpdxElement": "SPDXRef-port"
+    },
+    {
+      "spdxElementId": "SPDXRef-file-0",
+      "relationshipType": "CONTAINED_BY",
+      "relatedSpdxElement": "SPDXRef-port"
+    },
+    {
+      "spdxElementId": "SPDXRef-file-1",
+      "relationshipType": "CONTAINED_BY",
+      "relatedSpdxElement": "SPDXRef-port"
+    },
+    {
+      "spdxElementId": "SPDXRef-file-2",
+      "relationshipType": "CONTAINED_BY",
+      "relatedSpdxElement": "SPDXRef-port"
+    },
+    {
+      "spdxElementId": "SPDXRef-file-2",
+      "relationshipType": "DEPENDENCY_MANIFEST_OF",
+      "relatedSpdxElement": "SPDXRef-port"
+    }
+  ],
+  "packages": [
+    {
+      "name": "opencc",
+      "SPDXID": "SPDXRef-port",
+      "versionInfo": "1.1.6#1",
+      "downloadLocation": "git+https://github.com/Microsoft/vcpkg#ports/opencc",
+      "homepage": "https://github.com/BYVoid/OpenCC",
+      "licenseConcluded": "Apache-2.0",
+      "licenseDeclared": "NOASSERTION",
+      "copyrightText": "NOASSERTION",
+      "description": "A project for conversions between Traditional Chinese, Simplified Chinese and Japanese Kanji (Shinjitai)",
+      "comment": "This is the port (recipe) consumed by vcpkg."
+    },
+    {
+      "name": "opencc:x64-windows",
+      "SPDXID": "SPDXRef-binary",
+      "versionInfo": "c2ced06b2a1f9dafc206a7e56d003ca36dc5b07462881e03cdfe6b0b9bec8ecb",
+      "downloadLocation": "NONE",
+      "licenseConcluded": "Apache-2.0",
+      "licenseDeclared": "NOASSERTION",
+      "copyrightText": "NOASSERTION",
+      "comment": "This is a binary package built by vcpkg."
+    },
+    {
+      "SPDXID": "SPDXRef-resource-1",
+      "name": "BYVoid/OpenCC",
+      "downloadLocation": "git+https://github.com/BYVoid/OpenCC@ver.${VERSION}",
+      "licenseConcluded": "NOASSERTION",
+      "licenseDeclared": "NOASSERTION",
+      "copyrightText": "NOASSERTION",
+      "checksums": [
+        {
+          "algorithm": "SHA512",
+          "checksumValue": "bfc40bdf1348e6a265b3304ab1e8acee2f4b6ac9c377ff3d8c996435a92dee98c3758503186b4fd424653faf44db339f8a90300e3290c59942ccf04b1bbb2a30"
+        }
+      ]
+    }
+  ],
+  "files": [
+    {
+      "fileName": "./fix-dependencies.patch",
+      "SPDXID": "SPDXRef-file-0",
+      "checksums": [
+        {
+          "algorithm": "SHA256",
+          "checksumValue": "495ac3be36e9d2a350d909e120ceb92dc7f5fc7edf10ffb274be803e8a8b79e5"
+        }
+      ],
+      "licenseConcluded": "NOASSERTION",
+      "copyrightText": "NOASSERTION"
+    },
+    {
+      "fileName": "./portfile.cmake",
+      "SPDXID": "SPDXRef-file-1",
+      "checksums": [
+        {
+          "algorithm": "SHA256",
+          "checksumValue": "b2292bfc8abd9ef70e09513a207a6351f9c887035206359ba89ee94fe0c5457c"
+        }
+      ],
+      "licenseConcluded": "NOASSERTION",
+      "copyrightText": "NOASSERTION"
+    },
+    {
+      "fileName": "./vcpkg.json",
+      "SPDXID": "SPDXRef-file-2",
+      "checksums": [
+        {
+          "algorithm": "SHA256",
+          "checksumValue": "4a3967777ea499bc78ee425ab5a513b94e4cad3add9c9358cc08dd44e355a69b"
+        }
+      ],
+      "licenseConcluded": "NOASSERTION",
+      "copyrightText": "NOASSERTION"
+    }
+  ]
+}
diff --git a/opencc/vcpkg_abi_info.txt b/opencc/vcpkg_abi_info.txt
index 0ff71abd..e41f7201 100644
--- a/opencc/vcpkg_abi_info.txt
+++ b/opencc/vcpkg_abi_info.txt
@@ -1,18 +1,26 @@
-cmake 3.21.1
+cmake 3.25.1
+darts-clone 89a71c3602a9a640e2a4c623e4b86a9c08cbe49c17e892e8b925fecbe9ff45fa
 features core
-portfile.cmake 9863613dceb7a5268bbb2d767d9098c35400b8a881a0815bfe7dbe36e793868f
-ports.cmake e01bcbe535b11a2fbda56cffd590218ddeb18cb899c00afb2ac22a2301df2b09
+fix-dependencies.patch 495ac3be36e9d2a350d909e120ceb92dc7f5fc7edf10ffb274be803e8a8b79e5
+marisa-trie 344ec03e241b42e674d4b138d50aa1e2ceea7e40029ed3212936b16cd4348cfb
+pkgconf b5677ec2a00cf34862a66513ae97571b40a8eb1e4600af08ac0a3ac5ff384d28
+portfile.cmake b2292bfc8abd9ef70e09513a207a6351f9c887035206359ba89ee94fe0c5457c
+ports.cmake 5a8e00cedff0c898b1f90f7d129329d0288801bc9056562b039698caf31ff3f3
 post_build_checks 2
-powershell 7.2.1
-triplet x64-windows-rel
-triplet_abi 4970dad5b87bdaa6176cb4f981bb32f09d8957ff9babdaf321bdb98198621b56-b569c9954a47274946415ff01b1a344c8549f3fc19cb931d50bc09d1e5630c1d-cc5606e89ff68c454d07a2425977151c05eb9158
-vcpkg.json d7125dc7d159ce1190e81cbc30003b28a55e53e7d88a455903040003606a0976
-vcpkg_add_to_path 5d7b62ed9fa23a49d3d842206e95e4211ab25b41321e30b6ddd9208febed9d18
-vcpkg_configure_cmake 0b91a87ccb0659953d3be8d9b5b82dc9bf680b7b84b50eba8f8790c6d27b03d3
-vcpkg_copy_pdbs 59e4c0d2321697848a899ba9537394cdee81725b11965c6d1341df53a6850380
-vcpkg_copy_tool_dependencies 4655cdf0d283d2e6bce5e2aee3745ab0bfd7e4fb048c532274de53ef56389ea9
-vcpkg_find_acquire_program a1240f46d8e1cb7eaacb8ac882ce597e5370be9b387d8a048d178d3b842b3520
-vcpkg_fixup_pkgconfig ff54f8b06c83b54a1af5e35286a6c36ea9e69376bed1d11b5521c254987c123f
-vcpkg_from_git 05d446731ca8f6cefe0e4dc04c17776e54b39d4f2bfeeec7952ced1cfe8bf89f
-vcpkg_from_github 1929b9ee1417dbf59f8a25ac321ef9ca792b6d67aee38bda69ee3700ea256b73
-vcpkg_install_cmake 6430f4795e65c4c44c545c590d431fe1a68d7444255d0da58362a267bbf6408d
+powershell 7.3.4
+rapidjson 28ccfa9831e8dc1ae50215d843daca2f9b2caec53ca86f769188f60229d45ba6
+tclap 50c1e4611a8a04be4a47c2539e14b605ff5930955b2edbabefd1496c453089e9
+triplet x64-windows
+triplet_abi 4556164a2cd3dd6f4742101eabb46def7e71b6e5856faa88e5d005aac12a803c-36b818778ba6f2c16962495caedb9a7b221d5be4c60de1cd3060f549319a9931-37ddf335dc10d14fa90c13a22cc1ec1cdbd1efcd
+vcpkg-cmake 9f162a8d81a98883f391b63412d4947ca06fc2fb875ff027f1e59e08ae945726
+vcpkg-cmake-config 71416eefbbd89d780c6a08a08da3b3a3699f2f4cfe8092a67b8df1821a96eff9
+vcpkg.json 4a3967777ea499bc78ee425ab5a513b94e4cad3add9c9358cc08dd44e355a69b
+vcpkg_add_to_path 5f5ae75cf37b2a58d1a8561ca96496b64cd91ec9a0afab0b976c3e5d59030bfe
+vcpkg_copy_pdbs d57e4f196c82dc562a9968c6155073094513c31e2de475694143d3aa47954b1c
+vcpkg_copy_tools 3d45ff761bddbabe8923b52330168dc3abd295fa469d3f2e47cb14dce85332d5
+vcpkg_find_acquire_program 722996708543bc3e10f7ae54acc4a6468478c28adb52c84a930d096ff56f76dd
+vcpkg_find_acquire_program(PYTHON3) bf78099b5a097427eb6fbaa1dabe3eccea50abbcfe37bfc89e6c9ad8c6c9cb90
+vcpkg_fixup_pkgconfig 588d833ff057d3ca99c14616c7ecfb5948b5e2a9e4fc02517dceb8b803473457
+vcpkg_from_git 8f27bff0d01c6d15a3e691758df52bfbb0b1b929da45c4ebba02ef76b54b1881
+vcpkg_from_github b743742296a114ea1b18ae99672e02f142c4eb2bef7f57d36c038bedbfb0502f
+vcpkg_install_copyright ba6c169ab4e59fa05682e530cdeb883767de22c8391f023d4e6844a7ec5dd3d2
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..192ef511
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,24 @@
+{
+  "name": "goldendict",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "prettier": "3.0.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/prettier/-/prettier-3.0.0.tgz",
+      "integrity": "sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..98061934
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "prettier": "3.0.0"
+  }
+}
diff --git a/redist/myInfo.plist b/redist/myInfo.plist
index 60302581..25c71583 100644
--- a/redist/myInfo.plist
+++ b/redist/myInfo.plist
@@ -15,7 +15,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@SHORT_VERSION@</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.goldendict</string>	
+	<string>org.xiaoyifang</string>	
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/resources.qrc b/resources.qrc
index 282ad1e1..0171ab46 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -16,12 +16,10 @@
         <file>icons/icon32_hunspell.png</file>
         <file>icons/icon32_wiki.png</file>
         <file>icons/wiktionary.png</file>
-        <file>icons/icon_dsl_native.png</file>
         <file>icons/forvo.png</file>
         <file>icons/lingualibre.svg</file>
         <file>CREDITS.txt</file>
         <file>icons/highlighter.png</file>
-        <file>icons/macicon.png</file>
         <file>icons/icon32_sdict.png</file>
         <file>icons/icon32_aard.png</file>
         <file>icons/expand_opt.png</file>
@@ -66,9 +64,13 @@
         <file>icons/network.svg</file>
         <file>icons/next.svg</file>
         <file>icons/playsound_color.svg</file>
+        <file>icons/sounddir.svg</file>
+        <file>icons/zipsound.svg</file>
+        <file>icons/lsasound.svg</file>
         <file>icons/previous.svg</file>
         <file>icons/print.svg</file>
         <file>icons/programs.svg</file>
+        <file>icons/programdict.svg</file>
         <file>icons/sources.png</file>
         <file>icons/star.svg</file>
         <file>icons/star_blue.svg</file>
@@ -89,5 +91,6 @@
         <file>icons/old-arrow.png</file>
         <file>icons/old-downarrow.png</file>
         <file>icons/custom_trans.svg</file>
+        <file>icons/splash.png</file>
     </qresource>
 </RCC>
diff --git a/src/ankiconnector.cc b/src/ankiconnector.cc
index 1f6b97b4..a6ba7f0e 100644
--- a/src/ankiconnector.cc
+++ b/src/ankiconnector.cc
@@ -4,14 +4,16 @@
 #include <QJsonValue>
 #include "utils.hh"
 
-QString markTargetWord(QString const& sentence, QString const& word)
+QString markTargetWord( QString const & sentence, QString const & word )
 {
   // TODO properly handle inflected words.
   QString result = sentence;
-  return result.replace(word, "<b>" + word + "</b>", Qt::CaseInsensitive);
+  return result.replace( word, "<b>" + word + "</b>", Qt::CaseInsensitive );
 }
 
-AnkiConnector::AnkiConnector( QObject * parent, Config::Class const & _cfg ) : QObject{ parent }, cfg( _cfg )
+AnkiConnector::AnkiConnector( QObject * parent, Config::Class const & _cfg ):
+  QObject{ parent },
+  cfg( _cfg )
 {
   mgr = new QNetworkAccessManager( this );
   connect( mgr, &QNetworkAccessManager::finished, this, &AnkiConnector::finishedSlot );
@@ -46,8 +48,8 @@ void AnkiConnector::sendToAnki( QString const & word, QString text, QString cons
   QJsonObject fields;
   fields.insert( cfg.preferences.ankiConnectServer.word, word );
   fields.insert( cfg.preferences.ankiConnectServer.text, text );
-  if (!cfg.preferences.ankiConnectServer.sentence.isEmpty()) {
-    QString sentence_changed = markTargetWord(sentence, word);
+  if ( !cfg.preferences.ankiConnectServer.sentence.isEmpty() ) {
+    QString sentence_changed = markTargetWord( sentence, word );
     fields.insert( cfg.preferences.ankiConnectServer.sentence, sentence_changed );
   }
 
@@ -55,25 +57,25 @@ void AnkiConnector::sendToAnki( QString const & word, QString text, QString cons
                                        cfg.preferences.ankiConnectServer.model,
                                        Utils::json2String( fields ) );
 
-//  qDebug().noquote() << postData;
+  //  qDebug().noquote() << postData;
   postToAnki( postData );
 }
 
 void AnkiConnector::ankiSearch( QString const & word )
 {
-    if( !cfg.preferences.ankiConnectServer.enabled ) {
-      emit this->errorText( tr( "Anki search: AnkiConnect is not enabled." ) );
-      return;
-    }
+  if ( !cfg.preferences.ankiConnectServer.enabled ) {
+    emit this->errorText( tr( "Anki search: AnkiConnect is not enabled." ) );
+    return;
+  }
 
-    QString postTemplate = R"anki({
+  QString postTemplate = R"anki({
         "action": "guiBrowse",
         "version": 6,
         "params": {
             "query": "%1"
         }
     })anki";
-    postToAnki( postTemplate.arg( word ) );
+  postToAnki( postTemplate.arg( word ) );
 }
 
 void AnkiConnector::postToAnki( QString const & postData )
@@ -87,37 +89,33 @@ void AnkiConnector::postToAnki( QString const & postData )
   //  request.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy );
   request.setHeader( QNetworkRequest::ContentTypeHeader, "application/json" );
   auto reply = mgr->post( request, postData.toUtf8() );
-  connect( reply,
-           &QNetworkReply::errorOccurred,
-           this,
-           [ this ]( QNetworkReply::NetworkError e )
-           {
-             qWarning() << e;
-             emit this->errorText( tr( "anki: post to anki failed" ) );
-           } );
+  connect( reply, &QNetworkReply::errorOccurred, this, [ this ]( QNetworkReply::NetworkError e ) {
+    qWarning() << e;
+    emit this->errorText( tr( "anki: post to anki failed" ) );
+  } );
 }
 
 void AnkiConnector::finishedSlot( QNetworkReply * reply )
 {
   if ( reply->error() == QNetworkReply::NoError ) {
-      QByteArray const bytes   = reply->readAll();
-      QJsonDocument const json = QJsonDocument::fromJson( bytes );
-      auto const obj           = json.object();
+    QByteArray const bytes   = reply->readAll();
+    QJsonDocument const json = QJsonDocument::fromJson( bytes );
+    auto const obj           = json.object();
 
-      // Normally AnkiConnect always returns result and error,
-      // unless Anki is not running.
-      if ( obj.size() == 2 && obj.contains( "result" ) && obj.contains( "error" ) && obj[ "error" ].isNull() ) {
-        emit errorText( tr( "anki: post to anki success" ) );
-      }
-      else {
-        emit errorText( tr( "anki: post to anki failed" ) );
-      }
+    // Normally AnkiConnect always returns result and error,
+    // unless Anki is not running.
+    if ( obj.size() == 2 && obj.contains( "result" ) && obj.contains( "error" ) && obj[ "error" ].isNull() ) {
+      emit errorText( tr( "anki: post to anki success" ) );
+    }
+    else {
+      emit errorText( tr( "anki: post to anki failed" ) );
+    }
 
-      qDebug().noquote() << "anki response:" << Utils::json2String( obj );
+    qDebug().noquote() << "anki response:" << Utils::json2String( obj );
   }
   else {
-      qDebug() << "anki connect error" << reply->errorString();
-      emit errorText( "anki:" + reply->errorString() );
+    qDebug() << "anki connect error" << reply->errorString();
+    emit errorText( "anki:" + reply->errorString() );
   }
 
   reply->deleteLater();
diff --git a/src/ankiconnector.hh b/src/ankiconnector.hh
index 460eb323..f5fae87d 100644
--- a/src/ankiconnector.hh
+++ b/src/ankiconnector.hh
@@ -7,25 +7,27 @@
 #include <QNetworkReply>
 #include <QObject>
 
-class AnkiConnector : public QObject
+class AnkiConnector: public QObject
 {
   Q_OBJECT
+
 public:
   explicit AnkiConnector( QObject * parent, Config::Class const & cfg );
 
   void sendToAnki( QString const & word, QString text, QString const & sentence );
-  void ankiSearch( QString const & word);
+  void ankiSearch( QString const & word );
 
 private:
   QNetworkAccessManager * mgr;
   Config::Class const & cfg;
   void postToAnki( QString const & postData );
   static constexpr auto transfer_timeout = 3000;
- public:
- signals:
+
+public:
+signals:
   void errorText( QString const & );
 private slots:
-  void finishedSlot(QNetworkReply * reply);
+  void finishedSlot( QNetworkReply * reply );
 };
 
 #endif // ANKICONNECTOR_H
diff --git a/src/article_maker.cc b/src/article_maker.cc
index 8c3e88de..b411bbee 100644
--- a/src/article_maker.cc
+++ b/src/article_maker.cc
@@ -25,7 +25,10 @@ using gd::wstring;
 using std::set;
 using std::list;
 
-inline bool ankiConnectEnabled() { return GlobalBroadcaster::instance()->getPreference()->ankiConnectServer.enabled; }
+inline bool ankiConnectEnabled()
+{
+  return GlobalBroadcaster::instance()->getPreference()->ankiConnectServer.enabled;
+}
 
 ArticleMaker::ArticleMaker( vector< sptr< Dictionary::Class > > const & dictionaries_,
                             vector< Instances::Group > const & groups_,
@@ -37,9 +40,7 @@ ArticleMaker::ArticleMaker( vector< sptr< Dictionary::Class > > const & dictiona
 }
 
 
-std::string ArticleMaker::makeHtmlHeader( QString const & word,
-                                          QString const & icon,
-                                          bool expandOptionalParts ) const
+std::string ArticleMaker::makeHtmlHeader( QString const & word, QString const & icon, bool expandOptionalParts ) const
 {
   string result = R"(<!DOCTYPE html>
 <html><head>
@@ -86,19 +87,16 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
         cfg.displayStyle.toStdString() );
     }
 
-    result += readCssFile(Config::getUserCssFileName() ,"all");
+    result += readCssFile( Config::getUserCssFileName(), "all" );
 
-    if( !cfg.addonStyle.isEmpty() )
-    {
-      QString name = Config::getStylesDir() + cfg.addonStyle
-                     + QDir::separator() + "article-style.css";
+    if ( !cfg.addonStyle.isEmpty() ) {
+      QString name = Config::getStylesDir() + cfg.addonStyle + QDir::separator() + "article-style.css";
 
-      result += readCssFile(name ,"all");
+      result += readCssFile( name, "all" );
     }
 
     // Turn on/off expanding of article optional parts
-    if( expandOptionalParts )
-    {
+    if ( expandOptionalParts ) {
       result += R"(<!-- Expand optional parts css -->
                    <style type="text/css" media="all">
                     .dsl_opt{
@@ -107,29 +105,27 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
                     .hidden_expand_opt{  display: none;}
                     </style>)";
     }
-
   }
 
   // Add print-only css
   {
     result += R"(<link href="qrc:///article-style-print.css"  media="print" rel="stylesheet" type="text/css">)";
 
-    result += readCssFile(Config::getUserCssPrintFileName() ,"print");
+    result += readCssFile( Config::getUserCssPrintFileName(), "print" );
 
-    if( !cfg.addonStyle.isEmpty() )
-    {
-      QString name = Config::getStylesDir() + cfg.addonStyle
-                     + QDir::separator() + "article-style-print.css";
-      result += readCssFile(name ,"print");
+    if ( !cfg.addonStyle.isEmpty() ) {
+      QString name = Config::getStylesDir() + cfg.addonStyle + QDir::separator() + "article-style-print.css";
+      result += readCssFile( name, "print" );
     }
   }
 
-  result += "<title>" + Html::escape( word.toStdString()) + "</title>";
+  result += "<title>" + Html::escape( word.toStdString() ) + "</title>";
 
   // This doesn't seem to be much of influence right now, but we'll keep
   // it anyway.
   if ( icon.size() )
-    result += R"(<link rel="icon" type="image/png" href="qrc:///flags/)" + Html::escape( icon.toUtf8().data() ) + "\" >\n";
+    result +=
+      R"(<link rel="icon" type="image/png" href="qrc:///flags/)" + Html::escape( icon.toUtf8().data() ) + "\" >\n";
 
   result += QString::fromUtf8( R"(
 <script>
@@ -140,15 +136,15 @@ std::string ArticleMaker::makeHtmlHeader( QString const & word,
             return tr_map[key] || '';
         }
 </script>
-)" ).arg( tr( "Expand article" ), tr( "Collapse article" ) )
-            .toStdString();
+)" )
+              .arg( tr( "Expand article" ), tr( "Collapse article" ) )
+              .toStdString();
 
-  result+= R"(<script src="qrc:///scripts/gd-builtin.js"></script>)";
+  result += R"(<script src="qrc:///scripts/gd-builtin.js"></script>)";
 
-  if( GlobalBroadcaster::instance()->getPreference()->darkReaderMode )
-  {
+  if ( GlobalBroadcaster::instance()->getPreference()->darkReaderMode ) {
     //only enable this darkmode on modern style.
-    if( cfg.displayStyle == "modern" ) {
+    if ( cfg.displayStyle == "modern" ) {
       result += R"(<link href="qrc:///article-style-darkmode.css"  media="all" rel="stylesheet" type="text/css">)";
     }
 
@@ -201,17 +197,24 @@ body { background: #242525; }
 </script>
 )";
   }
+
+  // load the `article-style.js` in user's config folder
+  if ( auto userJsFile = Config::getUserJsFileName(); userJsFile.has_value() ) {
+    result += fmt::format( FMT_COMPILE( R"(<script src="file://{}"></script>)" ), userJsFile.value() );
+  }
+
   result += "</head><body>";
 
   return result;
 }
 
- std::string ArticleMaker::readCssFile(QString  const & fileName, std::string media)  const{
-  QFile addonCss(fileName);
+std::string ArticleMaker::readCssFile( QString const & fileName, std::string media ) const
+{
+  QFile addonCss( fileName );
   std::string result;
-  if (addonCss.open(QFile::ReadOnly)) {
+  if ( addonCss.open( QFile::ReadOnly ) ) {
     QByteArray css = addonCss.readAll();
-    if (!css.isEmpty()) {
+    if ( !css.isEmpty() ) {
       result += "<!-- Addon style css -->\n";
       result += R"(<style type="text/css" media=")" + media + "\">\n";
       result += css.data();
@@ -221,8 +224,7 @@ body { background: #242525; }
   return result;
 }
 
-std::string ArticleMaker::makeNotFoundBody( QString const & word,
-                                            QString const & group )
+std::string ArticleMaker::makeNotFoundBody( QString const & word, QString const & group )
 {
   string result( "<div class=\"gdnotfound\"><p>" );
 
@@ -234,101 +236,106 @@ std::string ArticleMaker::makeNotFoundBody( QString const & word,
                 .toUtf8()
                 .data();
   else
-    result += tr( "No translation was found in group <b>%1</b>." ).
-              arg( QString::fromUtf8( Html::escape( group.toUtf8().data() ).c_str() ) ).
-                toUtf8().data();
+    result += tr( "No translation was found in group <b>%1</b>." )
+                .arg( QString::fromUtf8( Html::escape( group.toUtf8().data() ).c_str() ) )
+                .toUtf8()
+                .data();
 
   result += "</p></div>";
 
   return result;
 }
 
-sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor(
-  QString const & word, unsigned groupId,
-  QMap< QString, QString > const & contexts,
-  QSet< QString > const & mutedDicts,
-  QStringList const & dictIDs , bool ignoreDiacritics ) const
+sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor( QString const & word,
+                                                                 unsigned groupId,
+                                                                 QMap< QString, QString > const & contexts,
+                                                                 QSet< QString > const & mutedDicts,
+                                                                 QStringList const & dictIDs,
+                                                                 bool ignoreDiacritics ) const
 {
-  if( !dictIDs.isEmpty() )
-  {
+  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() ) )
-        {
+    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() )
+      if ( ids.isEmpty() )
         break;
     }
 
     string header = makeHtmlHeader( word, QString(), true );
 
-    return std::make_shared<ArticleRequest>( word, Instances::Group{groupId,""},
-                               contexts, ftsDicts, header,
-                               -1, true );
+    return std::make_shared< ArticleRequest >( word,
+                                               Instances::Group{ groupId, "" },
+                                               contexts,
+                                               ftsDicts,
+                                               header,
+                                               -1,
+                                               true );
   }
 
-  if ( groupId == Instances::Group::HelpGroupId )
-  {
+  if ( groupId == Instances::Group::HelpGroupId ) {
     // This is a special group containing internal welcome/help pages
-    string result = makeHtmlHeader( word, QString(), cfg.alwaysExpandOptionalParts);
+    string result = makeHtmlHeader( word, QString(), cfg.alwaysExpandOptionalParts );
 
-    if ( word == tr( "Welcome!" ) )
-    {
-      result += tr(
-"<h3 align=\"center\">Welcome to <b>GoldenDict</b>!</h3>"
-"<p>To start working with the program, first visit <b>Edit|Dictionaries</b> 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."
-"<p>And then you're ready to look up your words! You can do that in this window "
-"by using a pane to the left, or you can <a href=\"Working with popup\">look up words from other active applications</a>. "
-"<p>To customize program, check out the available preferences at <b>Edit|Preferences</b>. "
-"All settings there have tooltips, be sure to read them if you are in doubt about anything."
-"<p>Should you need further help, have any questions, "
-"suggestions or just wonder what the others think, you are welcome at the program's <a href=\"https://github.com/xiaoyifang/goldendict/discussions\">forum</a>."
-"<p>Check program's <a href=\"https://github.com/xiaoyifang/goldendict\">website</a> for the updates. "
-"<p>(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later."
+    if ( word == tr( "Welcome!" ) ) {
+      result +=
+        tr(
+          "<h3 align=\"center\">Welcome to <b>GoldenDict</b>!</h3>"
+          "<p>To start working with the program, first visit <b>Edit|Dictionaries</b> 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."
+          "<p>And then you're ready to look up your words! You can do that in this window "
+          "by using a pane to the left, or you can <a href=\"Working with popup\">look up words from other active applications</a>. "
+          "<p>To customize program, check out the available preferences at <b>Edit|Preferences</b>. "
+          "All settings there have tooltips, be sure to read them if you are in doubt about anything."
+          "<p>Should you need further help, have any questions, "
+          "suggestions or just wonder what the others think, you are welcome at the program's <a href=\"https://github.com/xiaoyifang/goldendict/discussions\">forum</a>."
+          "<p>Check program's <a href=\"https://github.com/xiaoyifang/goldendict\">website</a> for the updates. "
+          "<p>(c) 2008-2013 Konstantin Isakov. Licensed under GPLv3 or later."
 
-        ).toUtf8().data();
+          )
+          .toUtf8()
+          .data();
     }
-    else
-    if ( word == tr( "Working with popup" ) )
-    {
-      result += ( tr( "<h3 align=\"center\">Working with the popup</h3>"
+    else if ( word == tr( "Working with popup" ) ) {
+      result +=
+        ( tr(
+            "<h3 align=\"center\">Working with the popup</h3>"
 
-"To look up words from other active applications, you would need to first activate the <i>\"Scan popup functionality\"</i> in <b>Preferences</b>, "
-"and then enable it at any time either by triggering the 'Popup' icon above, or "
-"by clicking the tray icon down below with your right mouse button and choosing so in the menu you've popped. " ) +
+            "To look up words from other active applications, you would need to first activate the <i>\"Scan popup functionality\"</i> in <b>Preferences</b>, "
+            "and then enable it at any time either by triggering the 'Popup' icon above, or "
+            "by clicking the tray icon down below with your right mouse button and choosing so in the menu you've popped. " )
+          +
 
 #ifdef Q_OS_WIN32
-  tr( "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." )
+          tr( "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." )
 #else
-  tr( "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." )
+          tr( "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." )
 #endif
-  ).toUtf8().data();
+            )
+          .toUtf8()
+          .data();
     }
-    else
-    {
+    else {
       // Not found
       return makeNotFoundTextFor( word, "help" );
     }
 
     result += "</body></html>";
 
-    sptr< Dictionary::DataRequestInstant > r =  std::make_shared<Dictionary::DataRequestInstant>( true );
+    sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 
-    r->appendDataSlice( result.data(), result.size() );
+    r->appendString( result );
     return r;
   }
 
@@ -336,81 +343,80 @@ sptr< Dictionary::DataRequest > ArticleMaker::makeDefinitionFor(
 
   Instances::Group const * activeGroup = 0;
 
-  for( unsigned x = 0; x < groups.size(); ++x )
-    if ( groups[ x ].id == groupId )
-    {
+  for ( unsigned x = 0; x < groups.size(); ++x )
+    if ( groups[ x ].id == groupId ) {
       activeGroup = &groups[ x ];
       break;
     }
 
   // If we've found a group, use its dictionaries; otherwise, use the global
   // heap.
-  std::vector< sptr< Dictionary::Class > > const & activeDicts =
-    activeGroup ? activeGroup->dictionaries : dictionaries;
+  std::vector< sptr< Dictionary::Class > > const & activeDicts = activeGroup ? activeGroup->dictionaries : dictionaries;
 
   string header = makeHtmlHeader( word,
-                                  activeGroup && activeGroup->icon.size() ?
-                                    activeGroup->icon : QString(),
+                                  activeGroup && activeGroup->icon.size() ? activeGroup->icon : QString(),
                                   cfg.alwaysExpandOptionalParts );
 
-  if ( mutedDicts.size() )
-  {
+  if ( mutedDicts.size() ) {
     std::vector< sptr< Dictionary::Class > > unmutedDicts;
 
     unmutedDicts.reserve( activeDicts.size() );
 
-    for( unsigned x = 0; x < activeDicts.size(); ++x )
-      if ( !mutedDicts.contains(
-              QString::fromStdString( activeDicts[ x ]->getId() ) ) )
+    for ( unsigned x = 0; x < activeDicts.size(); ++x )
+      if ( !mutedDicts.contains( QString::fromStdString( activeDicts[ x ]->getId() ) ) )
         unmutedDicts.push_back( activeDicts[ x ] );
 
-    return  std::make_shared<ArticleRequest>( word, Instances::Group{ activeGroup ? activeGroup->id:0, activeGroup ? activeGroup->name : ""},
-                               contexts, unmutedDicts, header,
-                               cfg.collapseBigArticles ? cfg.articleSizeLimit : -1,
-                               cfg.alwaysExpandOptionalParts, ignoreDiacritics );
+    return std::make_shared< ArticleRequest >(
+      word,
+      Instances::Group{ activeGroup ? activeGroup->id : 0, activeGroup ? activeGroup->name : "" },
+      contexts,
+      unmutedDicts,
+      header,
+      cfg.collapseBigArticles ? cfg.articleSizeLimit : -1,
+      cfg.alwaysExpandOptionalParts,
+      ignoreDiacritics );
   }
   else
-    return std::make_shared<ArticleRequest>( word, Instances::Group{ activeGroup ? activeGroup->id:0, activeGroup ? activeGroup->name : ""},
-                               contexts, activeDicts, header,
-                               cfg.collapseBigArticles ? cfg.articleSizeLimit : -1,
-                               cfg.alwaysExpandOptionalParts, ignoreDiacritics );
+    return std::make_shared< ArticleRequest >(
+      word,
+      Instances::Group{ activeGroup ? activeGroup->id : 0, activeGroup ? activeGroup->name : "" },
+      contexts,
+      activeDicts,
+      header,
+      cfg.collapseBigArticles ? cfg.articleSizeLimit : -1,
+      cfg.alwaysExpandOptionalParts,
+      ignoreDiacritics );
 }
 
-sptr< Dictionary::DataRequest > ArticleMaker::makeNotFoundTextFor(
-  QString const & word, QString const & group ) const
+sptr< Dictionary::DataRequest > ArticleMaker::makeNotFoundTextFor( QString const & word, QString const & group ) const
 {
-  string result = makeHtmlHeader( word, QString(), true ) + makeNotFoundBody( word, group ) +
-    "</body></html>";
+  string result = makeHtmlHeader( word, QString(), true ) + makeNotFoundBody( word, group ) + "</body></html>";
 
-  sptr< Dictionary::DataRequestInstant > r = std::make_shared<Dictionary::DataRequestInstant>( true );
+  sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 
-  r->appendDataSlice( result.data(), result.size() );
+  r->appendString( result );
   return r;
 }
 
 sptr< Dictionary::DataRequest > ArticleMaker::makeEmptyPage() const
 {
-  string result = makeHtmlHeader( tr( "(untitled)" ), QString(), true ) +
-    "</body></html>";
+  string result = makeHtmlHeader( tr( "(untitled)" ), QString(), true ) + "</body></html>";
 
-  sptr< Dictionary::DataRequestInstant > r =
-    std::make_shared<Dictionary::DataRequestInstant>( true );
+  sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 
-  r->appendDataSlice( result.data(), result.size() );
+  r->appendString( result );
   return r;
 }
 
 sptr< Dictionary::DataRequest > ArticleMaker::makePicturePage( string const & url ) const
 {
   string result = makeHtmlHeader( tr( "(picture)" ), QString(), true )
-                  + "<a href=\"javascript: if(history.length>2) history.go(-1)\">"
-                  + "<img src=\"" + url + "\" /></a>"
-                  + "</body></html>";
+    + "<a href=\"javascript: if(history.length>2) history.go(-1)\">" + "<img src=\"" + url + "\" /></a>"
+    + "</body></html>";
 
-  sptr< Dictionary::DataRequestInstant > r =
-      std::make_shared<Dictionary::DataRequestInstant>( true );
+  sptr< Dictionary::DataRequestInstant > r = std::make_shared< Dictionary::DataRequestInstant >( true );
 
-  r->appendDataSlice( result.data(), result.size() );
+  r->appendString( result );
   return r;
 }
 
@@ -418,13 +424,11 @@ sptr< Dictionary::DataRequest > ArticleMaker::makePicturePage( string const & ur
 bool ArticleMaker::adjustFilePath( QString & fileName )
 {
   QFileInfo info( fileName );
-  if( !info.isFile() )
-  {
+  if ( !info.isFile() ) {
     QString dir = Config::getConfigDir();
     dir.chop( 1 );
-    info.setFile( dir + fileName);
-    if( info.isFile() )
-    {
+    info.setFile( dir + fileName );
+    if ( info.isFile() ) {
       fileName = info.canonicalFilePath();
       return true;
     }
@@ -454,15 +458,15 @@ ArticleRequest::ArticleRequest( QString const & word,
 
   hasAnyData = true;
 
-  appendDataSlice( (void *) header.data(), header.size() );
+  appendString( header );
 
   //clear founded dicts.
-  emit GlobalBroadcaster::instance()->dictionaryClear( ActiveDictIds{group.id, word} );
+  emit GlobalBroadcaster::instance()->dictionaryClear( ActiveDictIds{ group.id, word } );
 
   // Accumulate main forms
-  for( unsigned x = 0; x < activeDicts.size(); ++x )
-  {
-    sptr< Dictionary::WordSearchRequest > s = activeDicts[ x ]->findHeadwordsForSynonym( gd::removeTrailingZero( word ) );
+  for ( unsigned x = 0; x < activeDicts.size(); ++x ) {
+    sptr< Dictionary::WordSearchRequest > s =
+      activeDicts[ x ]->findHeadwordsForSynonym( gd::removeTrailingZero( word ) );
 
     connect( s.get(), &Dictionary::Request::finished, this, &ArticleRequest::altSearchFinished, Qt::QueuedConnection );
 
@@ -478,14 +482,11 @@ void ArticleRequest::altSearchFinished()
     return;
 
   // Check every request for finishing
-  for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
-         altSearches.begin(); i != altSearches.end(); )
-  {
-    if ( (*i)->isFinished() )
-    {
+  for ( list< sptr< Dictionary::WordSearchRequest > >::iterator i = altSearches.begin(); i != altSearches.end(); ) {
+    if ( ( *i )->isFinished() ) {
       // This one's finished
-      for( size_t count = (*i)->matchesCount(), x = 0; x < count; ++x )
-        alts.insert( (**i)[ x ].word );
+      for ( size_t count = ( *i )->matchesCount(), x = 0; x < count; ++x )
+        alts.insert( ( **i )[ x ].word );
 
       altSearches.erase( i++ );
     }
@@ -493,8 +494,7 @@ void ArticleRequest::altSearchFinished()
       ++i;
   }
 
-  if ( altSearches.empty() )
-  {
+  if ( altSearches.empty() ) {
 #ifdef QT_DEBUG
     qDebug( "alts finished" );
 #endif
@@ -506,34 +506,30 @@ void ArticleRequest::altSearchFinished()
     vector< wstring > altsVector( alts.begin(), alts.end() );
 
 #ifdef QT_DEBUG
-    for( unsigned x = 0; x < altsVector.size(); ++x )
-    {
+    for ( unsigned x = 0; x < altsVector.size(); ++x ) {
       qDebug() << "Alt:" << QString::fromStdU32String( altsVector[ x ] );
     }
 #endif
 
     wstring wordStd = gd::toWString( word );
 
-    if( activeDicts.size() <= 1 )
+    if ( activeDicts.size() <= 1 )
       articleSizeLimit = -1; // Don't collapse article if only one dictionary presented
 
-    for( unsigned x = 0; x < activeDicts.size(); ++x )
-    {
-      try
-      {
-        sptr< Dictionary::DataRequest > r =
-          activeDicts[ x ]->getArticle( wordStd, altsVector,
-                                        gd::removeTrailingZero( contexts.value( QString::fromStdString( activeDicts[ x ]->getId() ) ) ),
-                                        ignoreDiacritics );
+    for ( unsigned x = 0; x < activeDicts.size(); ++x ) {
+      try {
+        sptr< Dictionary::DataRequest > r = activeDicts[ x ]->getArticle(
+          wordStd,
+          altsVector,
+          gd::removeTrailingZero( contexts.value( QString::fromStdString( activeDicts[ x ]->getId() ) ) ),
+          ignoreDiacritics );
 
         connect( r.get(), &Dictionary::Request::finished, this, &ArticleRequest::bodyFinished, Qt::QueuedConnection );
 
         bodyRequests.push_back( r );
       }
-      catch( std::exception & e )
-      {
-        gdWarning( "getArticle request error (%s) in \"%s\"\n",
-                   e.what(), activeDicts[ x ]->getName().c_str() );
+      catch ( std::exception & e ) {
+        gdWarning( "getArticle request error (%s) in \"%s\"\n", e.what(), activeDicts[ x ]->getName().c_str() );
       }
     }
 
@@ -541,48 +537,43 @@ void ArticleRequest::altSearchFinished()
   }
 }
 
-int ArticleRequest::findEndOfCloseDiv( const QString &str, int pos )
+int ArticleRequest::findEndOfCloseDiv( const QString & str, int pos )
 {
-  for( ; ; )
-  {
+  for ( ;; ) {
     const int n1 = str.indexOf( "</div>", pos );
-    if( n1 <= 0 )
+    if ( n1 <= 0 )
       return n1;
 
     // will there be some custom tags starts with <div but not <div> ,such as <divider>
     const int n2 = str.indexOf( RX::Html::startDivTag, pos );
-    if( n2 <= 0 || n2 > n1 )
+    if ( n2 <= 0 || n2 > n1 )
       return n1 + 6;
 
     pos = findEndOfCloseDiv( str, n2 + 1 );
-    if( pos <= 0 )
+    if ( pos <= 0 )
       return pos;
   }
 }
 
-bool ArticleRequest::isCollapsable( Dictionary::DataRequest & req ,QString const & dictId) {
+bool ArticleRequest::isCollapsable( Dictionary::DataRequest & req, QString const & dictId )
+{
   if ( GlobalBroadcaster::instance()->collapsedDicts.contains( dictId ) )
     return true;
 
   bool collapse = false;
 
-  if( articleSizeLimit >= 0 )
-  {
-    try
-    {
+  if ( articleSizeLimit >= 0 ) {
+    try {
       QMutexLocker _( &dataMutex );
       QString text = QString::fromUtf8( req.getFullData().data(), req.getFullData().size() );
 
-      if( !needExpandOptionalParts )
-      {
+      if ( !needExpandOptionalParts ) {
         // Strip DSL optional parts
-        for( ; ; )
-        {
+        for ( ;; ) {
           const int pos = text.indexOf( "<div class=\"dsl_opt\"" );
-          if( pos > 0 )
-          {
+          if ( pos > 0 ) {
             const int endPos = findEndOfCloseDiv( text, pos + 1 );
-            if( endPos > pos)
+            if ( endPos > pos )
               text.remove( pos, endPos - pos );
             else
               break;
@@ -593,11 +584,10 @@ bool ArticleRequest::isCollapsable( Dictionary::DataRequest & req ,QString const
       }
 
       int size = htmlTextSize( text );
-      if( size > articleSizeLimit )
+      if ( size > articleSizeLimit )
         collapse = true;
     }
-    catch(...)
-    {
+    catch ( ... ) {
     }
   }
   return collapse;
@@ -613,11 +603,9 @@ void ArticleRequest::bodyFinished()
   bool wasUpdated = false;
 
   QStringList dictIds;
-  while ( bodyRequests.size() )
-  {
+  while ( bodyRequests.size() ) {
     // Since requests should go in order, check the first one first
-    if ( bodyRequests.front()->isFinished() )
-    {
+    if ( bodyRequests.front()->isFinished() ) {
       // Good
 
       GD_DPRINTF( "one finished." );
@@ -626,19 +614,20 @@ void ArticleRequest::bodyFinished()
 
       QString errorString = req.getErrorString();
 
-      if ( req.dataSize() >= 0 || errorString.size() )
-      {
-        sptr< Dictionary::Class > const & activeDict =
-            activeDicts[ activeDicts.size() - bodyRequests.size() ];
+      if ( req.dataSize() >= 0 || errorString.size() ) {
+        sptr< Dictionary::Class > const & activeDict = activeDicts[ activeDicts.size() - bodyRequests.size() ];
 
         string dictId = activeDict->getId();
-        dictIds << QString::fromStdString(dictId);
+
+        //signal finished dictionray for pronounciation
+        GlobalBroadcaster::instance()->pronounce_engine.finishDictionary( dictId );
+
+        dictIds << QString::fromStdString( dictId );
         string head;
 
         string gdFrom = "gdfrom-" + Html::escape( dictId );
 
-        if ( closePrevSpan )
-        {
+        if ( closePrevSpan ) {
           head += R"(</div></div><div style="clear:both;"></div><span class="gdarticleseparator"></span>)";
         }
 
@@ -697,20 +686,20 @@ void ArticleRequest::bodyFinished()
           collapse ? "none" : "inline",
           dictId );
 
-        if( errorString.size() ) {
+        if ( errorString.size() ) {
           head += "<div class=\"gderrordesc\">"
             + Html::escape( tr( "Query error: %1" ).arg( errorString ).toUtf8().data() ) + "</div>";
         }
 
-        appendDataSlice( head.data(), head.size() );
+        appendString( head );
 
         try {
-          if( req.dataSize() > 0 ) {
+          if ( req.dataSize() > 0 ) {
             auto d = bodyRequests.front()->getFullData();
             appendDataSlice( &d.front(), d.size() );
           }
         }
-        catch( std::exception & e ) {
+        catch ( std::exception & e ) {
           gdWarning( "getDataSlice error: %s\n", e.what() );
         }
 
@@ -722,8 +711,7 @@ void ArticleRequest::bodyFinished()
       bodyRequests.pop_front();
       GD_DPRINTF( "erase done.." );
     }
-    else
-    {
+    else {
       GD_DPRINTF( "one not finished." );
       break;
     }
@@ -731,8 +719,7 @@ void ArticleRequest::bodyFinished()
 
   ActiveDictIds hittedWord{ group.id, word, dictIds };
 
-  if ( bodyRequests.empty() )
-  {
+  if ( bodyRequests.empty() ) {
     // No requests left, end the article
 
     bodyDone = true;
@@ -740,14 +727,12 @@ void ArticleRequest::bodyFinished()
     {
       string footer;
 
-      if ( closePrevSpan )
-      {
+      if ( closePrevSpan ) {
         footer += "</div></div>";
         closePrevSpan = false;
       }
 
-      if ( !foundAnyDefinitions )
-      {
+      if ( !foundAnyDefinitions ) {
         // No definitions were ever found, say so to the user.
 
         // Larger words are usually whole sentences - don't clutter the output
@@ -771,7 +756,7 @@ void ArticleRequest::bodyFinished()
         footer += "</body></html>";
       }
 
-      appendDataSlice( footer.data(), footer.size() );
+      appendString( footer );
     }
 
 
@@ -799,8 +784,7 @@ void ArticleRequest::bodyFinished()
 int ArticleRequest::htmlTextSize( QString html )
 {
   // website dictionary.
-  if( html.contains( QRegularExpression( "<iframe\\s*[^>]*>", QRegularExpression::CaseInsensitiveOption ) ) )
-  {
+  if ( html.contains( QRegularExpression( "<iframe\\s*[^>]*>", QRegularExpression::CaseInsensitiveOption ) ) ) {
     //arbitary number;
     return 1000;
   }
@@ -808,7 +792,8 @@ int ArticleRequest::htmlTextSize( QString html )
   //https://bugreports.qt.io/browse/QTBUG-102757
   QString stripStyleSheet =
     html.remove( QRegularExpression( "<link\\s*[^>]*>", QRegularExpression::CaseInsensitiveOption ) )
-      .remove( QRegularExpression( R"(<script[\s\S]*?>[\s\S]*?<\/script>)", QRegularExpression::CaseInsensitiveOption|QRegularExpression::MultilineOption ) );
+      .remove( QRegularExpression( R"(<script[\s\S]*?>[\s\S]*?<\/script>)",
+                                   QRegularExpression::CaseInsensitiveOption | QRegularExpression::MultilineOption ) );
   int size = QTextDocumentFragment::fromHtml( stripStyleSheet ).toPlainText().length();
 
   return size;
@@ -824,18 +809,14 @@ void ArticleRequest::stemmedSearchFinished()
 
   bool continueMatching = false;
 
-  if ( sr.size() )
-  {
-    footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)" +
-      Html::escape( tr( "Close words: " ).toUtf8().data() ) +
-      "</span><span class=\"gdstemmedsuggestion_body\">";
+  if ( sr.size() ) {
+    footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)"
+      + Html::escape( tr( "Close words: " ).toUtf8().data() ) + "</span><span class=\"gdstemmedsuggestion_body\">";
 
-    for( unsigned x = 0; x < sr.size(); ++x )
-    {
+    for ( unsigned x = 0; x < sr.size(); ++x ) {
       footer += linkWord( sr[ x ].first );
 
-      if ( x != sr.size() - 1 )
-      {
+      if ( x != sr.size() - 1 ) {
         footer += ", ";
       }
     }
@@ -850,13 +831,13 @@ void ArticleRequest::stemmedSearchFinished()
     disconnect( stemmedWordFinder.get(), &WordFinder::finished, this, &ArticleRequest::stemmedSearchFinished );
 
     connect( stemmedWordFinder.get(),
-      &WordFinder::finished,
-      this,
-      &ArticleRequest::individualWordFinished,
-      Qt::QueuedConnection );
+             &WordFinder::finished,
+             this,
+             &ArticleRequest::individualWordFinished,
+             Qt::QueuedConnection );
 
     currentSplittedWordStart = -1;
-    currentSplittedWordEnd = currentSplittedWordStart;
+    currentSplittedWordEnd   = currentSplittedWordStart;
 
     firstCompoundWasFound = false;
 
@@ -869,10 +850,10 @@ void ArticleRequest::stemmedSearchFinished()
     footer += "</body></html>";
 
   {
-    appendDataSlice( footer.data(), footer.size() );
+    appendString( footer );
   }
 
-  if( continueMatching )
+  if ( continueMatching )
     update();
   else
     finish();
@@ -880,27 +861,24 @@ void ArticleRequest::stemmedSearchFinished()
 
 void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 {
-  if ( !lastSearchSucceeded )
-  {
+  if ( !lastSearchSucceeded ) {
     // Last search was unsuccessful. First, emit what we had.
 
     string footer;
 
     if ( lastGoodCompoundResult.size() ) // We have something to append
     {
-//      GD_DPRINTF( "Appending\n" );
+      //      GD_DPRINTF( "Appending\n" );
 
-      if ( !firstCompoundWasFound )
-      {
+      if ( !firstCompoundWasFound ) {
         // Append the beginning
-        footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)" +
-          Html::escape( tr( "Compound expressions: " ).toUtf8().data() ) +
-          "</span><span class=\"gdstemmedsuggestion_body\">";
+        footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)"
+          + Html::escape( tr( "Compound expressions: " ).toUtf8().data() )
+          + "</span><span class=\"gdstemmedsuggestion_body\">";
 
         firstCompoundWasFound = true;
       }
-      else
-      {
+      else {
         // Append the separator
         footer += " / ";
       }
@@ -912,8 +890,7 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 
     // Then, start a new search for the next word, if possible
 
-    if ( currentSplittedWordStart >= splittedWords.first.size() - 2 )
-    {
+    if ( currentSplittedWordStart >= splittedWords.first.size() - 2 ) {
       // The last word was the last possible to start from
 
       if ( firstCompoundWasFound )
@@ -921,17 +898,16 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 
       // Now add links to all the individual words. They conclude the result.
 
-      footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)" +
-        Html::escape( tr( "Individual words: " ).toUtf8().data() ) +
-        "</span><span class=\"gdstemmedsuggestion_body\"";
-      if( splittedWords.first[ 0 ].isRightToLeft() )
+      footer += R"(<div class="gdstemmedsuggestion"><span class="gdstemmedsuggestion_head">)"
+        + Html::escape( tr( "Individual words: " ).toUtf8().data() )
+        + "</span><span class=\"gdstemmedsuggestion_body\"";
+      if ( splittedWords.first[ 0 ].isRightToLeft() )
         footer += " dir=\"rtl\"";
       footer += ">";
 
       footer += escapeSpacing( splittedWords.second[ 0 ] );
 
-      for( int x = 0; x < splittedWords.first.size(); ++x )
-      {
+      for ( int x = 0; x < splittedWords.first.size(); ++x ) {
         footer += linkWord( splittedWords.first[ x ] );
         footer += escapeSpacing( splittedWords.second[ x + 1 ] );
       }
@@ -940,16 +916,15 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 
       footer += "</body></html>";
 
-      appendToData( footer );
+      appendString( footer );
 
       finish();
 
       return;
     }
 
-    if ( footer.size() )
-    {
-      appendToData( footer );
+    if ( footer.size() ) {
+      appendString( footer );
       update();
     }
 
@@ -957,17 +932,14 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
     ++currentSplittedWordStart;
     currentSplittedWordEnd = currentSplittedWordStart + 1;
   }
-  else
-  {
+  else {
     // Last lookup succeeded -- see if we can try the larger sequence
 
-    if ( currentSplittedWordEnd < splittedWords.first.size() - 1 )
-    {
+    if ( currentSplittedWordEnd < splittedWords.first.size() - 1 ) {
       // We can, indeed.
       ++currentSplittedWordEnd;
     }
-    else
-    {
+    else {
       // We can't. Emit what we have and start over.
 
       ++currentSplittedWordEnd; // So we could use the same code for result
@@ -986,9 +958,11 @@ void ArticleRequest::compoundSearchNextStep( bool lastSearchSucceeded )
 
   // Look it up
 
-//  GD_DPRINTF( "Looking up %s\n", qPrintable( currentSplittedWordCompound ) );
+  //  GD_DPRINTF( "Looking up %s\n", qPrintable( currentSplittedWordCompound ) );
 
-  stemmedWordFinder->expressionMatch( currentSplittedWordCompound, activeDicts, 40, // Would one be enough? Leave 40 to be safe.
+  stemmedWordFinder->expressionMatch( currentSplittedWordCompound,
+                                      activeDicts,
+                                      40, // Would one be enough? Leave 40 to be safe.
                                       Dictionary::SuitableForCompoundSearching );
 }
 
@@ -998,12 +972,10 @@ QString ArticleRequest::makeSplittedWordCompound()
 
   result.clear();
 
-  for( int x = currentSplittedWordStart; x <= currentSplittedWordEnd; ++x )
-  {
+  for ( int x = currentSplittedWordStart; x <= currentSplittedWordEnd; ++x ) {
     result.append( splittedWords.first[ x ] );
 
-    if ( x < currentSplittedWordEnd )
-    {
+    if ( x < currentSplittedWordEnd ) {
       result.append( splittedWords.second[ x + 1 ].simplified() );
     }
   }
@@ -1015,18 +987,15 @@ void ArticleRequest::individualWordFinished()
 {
   WordFinder::SearchResults const & results = stemmedWordFinder->getResults();
 
-  if ( results.size() )
-  {
-    wstring source = Folding::applySimpleCaseOnly(currentSplittedWordCompound);
+  if ( results.size() ) {
+    wstring source = Folding::applySimpleCaseOnly( currentSplittedWordCompound );
 
     bool hadSomething = false;
 
-    for( unsigned x = 0; x < results.size(); ++x )
-    {
-      if ( results[ x ].second )
-      {
+    for ( unsigned x = 0; x < results.size(); ++x ) {
+      if ( results[ x ].second ) {
         // Spelling suggestion match found. No need to continue.
-        hadSomething = true;
+        hadSomething           = true;
         lastGoodCompoundResult = currentSplittedWordCompound;
         break;
       }
@@ -1035,14 +1004,12 @@ void ArticleRequest::individualWordFinished()
 
       wstring result( Folding::applySimpleCaseOnly( results[ x ].first ) );
 
-      if ( source.size() <= result.size() && result.compare( 0, source.size(), source ) == 0 )
-      {
+      if ( source.size() <= result.size() && result.compare( 0, source.size(), source ) == 0 ) {
         // The resulting string begins with the source one
 
         hadSomething = true;
 
-        if ( source.size() == result.size() )
-        {
+        if ( source.size() == result.size() ) {
           // Got the match. No need to continue.
           lastGoodCompoundResult = currentSplittedWordCompound;
           break;
@@ -1050,8 +1017,7 @@ void ArticleRequest::individualWordFinished()
       }
     }
 
-    if ( hadSomething )
-    {
+    if ( hadSomething ) {
       compoundSearchNextStep( true );
       return;
     }
@@ -1060,29 +1026,24 @@ void ArticleRequest::individualWordFinished()
   compoundSearchNextStep( false );
 }
 
-void ArticleRequest::appendToData( std::string const & str )
-{
-  appendDataSlice( str.data(), str.size() );
-}
-
 QPair< ArticleRequest::Words, ArticleRequest::Spacings > ArticleRequest::splitIntoWords( QString const & input )
 {
   QPair< Words, Spacings > result;
 
   QChar const * ptr = input.data();
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     QString spacing;
 
-    for( ; ptr->unicode() && ( Folding::isPunct( ptr->unicode() ) || Folding::isWhitespace( ptr->unicode() ) ); ++ptr )
+    for ( ; ptr->unicode() && ( Folding::isPunct( ptr->unicode() ) || Folding::isWhitespace( ptr->unicode() ) ); ++ptr )
       spacing.append( *ptr );
 
     result.second.append( spacing );
 
     QString word;
 
-    for( ; ptr->unicode() && !( Folding::isPunct( ptr->unicode() ) || Folding::isWhitespace( ptr->unicode() ) ); ++ptr )
+    for ( ; ptr->unicode() && !( Folding::isPunct( ptr->unicode() ) || Folding::isWhitespace( ptr->unicode() ) );
+          ++ptr )
       word.append( *ptr );
 
     if ( word.isEmpty() )
@@ -1103,7 +1064,7 @@ string ArticleRequest::linkWord( QString const & str )
   url.setPath( Utils::Url::ensureLeadingSlash( str ) );
 
   string escapedResult = Html::escape( str.toUtf8().data() );
-  return string( "<a href=\"" ) + url.toEncoded().data() + "\">" + escapedResult +"</a>";
+  return string( "<a href=\"" ) + url.toEncoded().data() + "\">" + escapedResult + "</a>";
 }
 
 std::string ArticleRequest::escapeSpacing( QString const & str )
@@ -1117,24 +1078,20 @@ std::string ArticleRequest::escapeSpacing( QString const & str )
 
 void ArticleRequest::cancel()
 {
-    if( isFinished() )
-        return;
-    if( !altSearches.empty() )
-    {
-        for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
-               altSearches.begin(); i != altSearches.end(); ++i )
-        {
-            (*i)->cancel();
-        }
+  if ( isFinished() )
+    return;
+  if ( !altSearches.empty() ) {
+    for ( list< sptr< Dictionary::WordSearchRequest > >::iterator i = altSearches.begin(); i != altSearches.end();
+          ++i ) {
+      ( *i )->cancel();
     }
-    if( !bodyRequests.empty() )
-    {
-        for( list< sptr< Dictionary::DataRequest > >::iterator i =
-               bodyRequests.begin(); i != bodyRequests.end(); ++i )
-        {
-            (*i)->cancel();
-        }
+  }
+  if ( !bodyRequests.empty() ) {
+    for ( list< sptr< Dictionary::DataRequest > >::iterator i = bodyRequests.begin(); i != bodyRequests.end(); ++i ) {
+      ( *i )->cancel();
     }
-    if( stemmedWordFinder.get() ) stemmedWordFinder->cancel();
-    finish();
+  }
+  if ( stemmedWordFinder.get() )
+    stemmedWordFinder->cancel();
+  finish();
 }
diff --git a/src/article_maker.hh b/src/article_maker.hh
index e72e6f26..bff0d336 100644
--- a/src/article_maker.hh
+++ b/src/article_maker.hh
@@ -18,7 +18,7 @@ class ArticleMaker: public QObject
 {
   Q_OBJECT // We make it QObject to use tr() conveniently
 
-  std::vector< sptr< Dictionary::Class > > const & dictionaries;
+    std::vector< sptr< Dictionary::Class > > const & dictionaries;
   std::vector< Instances::Group > const & groups;
   const Config::Preferences & cfg;
 
@@ -28,9 +28,9 @@ public:
   /// groups' instances are to be passed. Those references are kept stored as
   /// references, and as such, any changes to them would reflect on the results
   /// of the inquiries, although those changes are perfectly legal.
- ArticleMaker( std::vector< sptr< Dictionary::Class > > const & dictionaries,
-               std::vector< Instances::Group > const & groups,
-               const Config::Preferences & cfg );
+  ArticleMaker( std::vector< sptr< Dictionary::Class > > const & dictionaries,
+                std::vector< Instances::Group > const & groups,
+                const Config::Preferences & cfg );
 
   /// Looks up the given phrase within the given group, and creates a full html
   /// page text containing its definition.
@@ -41,12 +41,12 @@ public:
   /// the keys are dictionary ids.
   /// If mutedDicts is not empty, the search would be limited only to those
   /// dictionaries in group which aren't listed there.
-  sptr< Dictionary::DataRequest > makeDefinitionFor( QString const & word, unsigned groupId,
+  sptr< Dictionary::DataRequest > makeDefinitionFor( QString const & word,
+                                                     unsigned groupId,
                                                      QMap< QString, QString > const & contexts,
-                                                     QSet< QString > const & mutedDicts =
-                                                       QSet< QString >(),
-                                                     QStringList const & dictIDs = QStringList(),
-                                                     bool ignoreDiacritics = false ) const;
+                                                     QSet< QString > const & mutedDicts = QSet< QString >(),
+                                                     QStringList const & dictIDs        = QStringList(),
+                                                     bool ignoreDiacritics              = false ) 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
@@ -64,10 +64,9 @@ public:
   static bool adjustFilePath( QString & fileName );
 
 private:
-  std::string readCssFile(QString const& fileName, std::string type) const;
+  std::string readCssFile( QString const & fileName, std::string type ) const;
   /// Makes everything up to and including the opening body tag.
-  std::string makeHtmlHeader( QString const & word, QString const & icon,
-                              bool expandOptionalParts ) 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 );
@@ -85,7 +84,7 @@ class ArticleRequest: public Dictionary::DataRequest
   Instances::Group group;
   QMap< QString, QString > contexts;
   std::vector< sptr< Dictionary::Class > > activeDicts;
-  
+
   std::set< gd::wstring, std::less<> > alts; // Accumulated main forms
   std::list< sptr< Dictionary::WordSearchRequest > > altSearches;
   std::list< sptr< Dictionary::DataRequest > > bodyRequests;
@@ -116,15 +115,17 @@ class ArticleRequest: public Dictionary::DataRequest
 
 public:
 
-  ArticleRequest( QString const & phrase, Instances::Group const & group,
+  ArticleRequest( QString const & phrase,
+                  Instances::Group const & group,
                   QMap< QString, QString > const & contexts,
                   std::vector< sptr< Dictionary::Class > > const & activeDicts,
                   std::string const & header,
-                  int sizeLimit, bool needExpandOptionalParts_,
+                  int sizeLimit,
+                  bool needExpandOptionalParts_,
                   bool ignoreDiacritics = false );
 
   virtual void cancel();
-//  { finish(); } // Add our own requests cancellation here
+  //  { finish(); } // Add our own requests cancellation here
 
 private slots:
 
@@ -135,8 +136,6 @@ private slots:
 
 private:
   int htmlTextSize( QString html );
-  /// Appends the given string to 'data', with locking its mutex.
-  void appendToData( std::string const & );
 
   /// Uses stemmedWordFinder to perform the next step of looking up word
   /// combinations.
@@ -153,7 +152,7 @@ private:
 
   /// Find end of corresponding </div> tag
   int findEndOfCloseDiv( QString const &, int pos );
-  bool isCollapsable( Dictionary::DataRequest & req,QString const & dictId );
+  bool isCollapsable( Dictionary::DataRequest & req, QString const & dictId );
 };
 
 
diff --git a/src/article_netmgr.cc b/src/article_netmgr.cc
index afa09e2e..744e27be 100644
--- a/src/article_netmgr.cc
+++ b/src/article_netmgr.cc
@@ -11,144 +11,134 @@
 
 using std::string;
 
-  // AllowFrameReply
+// AllowFrameReply
 
-  AllowFrameReply::AllowFrameReply( QNetworkReply * _reply ) :
-    baseReply( _reply )
-  {
-    // Set base data
+AllowFrameReply::AllowFrameReply( QNetworkReply * _reply ):
+  baseReply( _reply )
+{
+  // Set base data
 
-    setOperation( baseReply->operation() );
-    setRequest( baseReply->request() );
-    setUrl( baseReply->url() );
+  setOperation( baseReply->operation() );
+  setRequest( baseReply->request() );
+  setUrl( baseReply->url() );
 
-    // Signals to own slots
+  // Signals to own slots
 
-    connect( baseReply, &QNetworkReply::metaDataChanged, this, &AllowFrameReply::applyMetaData );
+  connect( baseReply, &QNetworkReply::metaDataChanged, this, &AllowFrameReply::applyMetaData );
 
-    connect( baseReply, &QNetworkReply::errorOccurred, this, &AllowFrameReply::applyError );
+  connect( baseReply, &QNetworkReply::errorOccurred, this, &AllowFrameReply::applyError );
 
-    connect( baseReply, &QIODevice::readyRead, this, &QIODevice::readyRead );
+  connect( baseReply, &QIODevice::readyRead, this, &QIODevice::readyRead );
 
-    // Redirect QNetworkReply signals
+  // Redirect QNetworkReply signals
 
-    connect( baseReply, &QNetworkReply::downloadProgress, this, &QNetworkReply::downloadProgress );
+  connect( baseReply, &QNetworkReply::downloadProgress, this, &QNetworkReply::downloadProgress );
 
-    connect( baseReply, &QNetworkReply::encrypted, this, &QNetworkReply::encrypted );
+  connect( baseReply, &QNetworkReply::encrypted, this, &QNetworkReply::encrypted );
 
-    connect( baseReply, &QNetworkReply::finished, this, &QNetworkReply::finished );
+  connect( baseReply, &QNetworkReply::finished, this, &QNetworkReply::finished );
 
-    connect( baseReply,
-      &QNetworkReply::preSharedKeyAuthenticationRequired,
-      this,
-      &QNetworkReply::preSharedKeyAuthenticationRequired );
+  connect( baseReply,
+           &QNetworkReply::preSharedKeyAuthenticationRequired,
+           this,
+           &QNetworkReply::preSharedKeyAuthenticationRequired );
 
-    connect( baseReply, &QNetworkReply::redirected, this, &QNetworkReply::redirected );
+  connect( baseReply, &QNetworkReply::redirected, this, &QNetworkReply::redirected );
 
-    connect( baseReply, &QNetworkReply::sslErrors, this, &QNetworkReply::sslErrors );
+  connect( baseReply, &QNetworkReply::sslErrors, this, &QNetworkReply::sslErrors );
 
-    connect( baseReply, &QNetworkReply::uploadProgress, this, &QNetworkReply::uploadProgress );
+  connect( baseReply, &QNetworkReply::uploadProgress, this, &QNetworkReply::uploadProgress );
 
-    // Redirect QIODevice signals
+  // Redirect QIODevice signals
 
-    connect( baseReply, &QIODevice::aboutToClose, this, &QIODevice::aboutToClose );
+  connect( baseReply, &QIODevice::aboutToClose, this, &QIODevice::aboutToClose );
 
-    connect( baseReply, &QIODevice::bytesWritten, this, &QIODevice::bytesWritten );
+  connect( baseReply, &QIODevice::bytesWritten, this, &QIODevice::bytesWritten );
 
-    connect( baseReply, &QIODevice::readChannelFinished, this, &QIODevice::readChannelFinished );
+  connect( baseReply, &QIODevice::readChannelFinished, this, &QIODevice::readChannelFinished );
 
-    setOpenMode( QIODevice::ReadOnly );
+  setOpenMode( QIODevice::ReadOnly );
+}
+
+void AllowFrameReply::applyMetaData()
+{
+  // Set raw headers except X-Frame-Options
+  QList< QByteArray > rawHeaders = baseReply->rawHeaderList();
+  for ( QList< QByteArray >::iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it ) {
+    auto headerName = it->toLower();
+    if ( headerName != "x-frame-options" && headerName != "content-security-policy" )
+      setRawHeader( *it, baseReply->rawHeader( *it ) );
   }
 
-  void AllowFrameReply::applyMetaData()
-  {
-    // Set raw headers except X-Frame-Options
-    QList< QByteArray > rawHeaders = baseReply->rawHeaderList();
-    for( QList< QByteArray >::iterator it = rawHeaders.begin(); it != rawHeaders.end(); ++it )
-    {
-      auto headerName = it->toLower();
-      if( headerName != "x-frame-options" && headerName != "content-security-policy")
-        setRawHeader( *it, baseReply->rawHeader( *it ) );
-    }
+  // Set known headers
+  setHeader( QNetworkRequest::ContentDispositionHeader,
+             baseReply->header( QNetworkRequest::ContentDispositionHeader ) );
+  setHeader( QNetworkRequest::ContentTypeHeader, baseReply->header( QNetworkRequest::ContentTypeHeader ) );
+  setHeader( QNetworkRequest::ContentLengthHeader, baseReply->header( QNetworkRequest::ContentLengthHeader ) );
+  setHeader( QNetworkRequest::LocationHeader, baseReply->header( QNetworkRequest::LocationHeader ) );
+  setHeader( QNetworkRequest::LastModifiedHeader, baseReply->header( QNetworkRequest::LastModifiedHeader ) );
+  setHeader( QNetworkRequest::CookieHeader, baseReply->header( QNetworkRequest::CookieHeader ) );
+  setHeader( QNetworkRequest::SetCookieHeader, baseReply->header( QNetworkRequest::SetCookieHeader ) );
+  setHeader( QNetworkRequest::UserAgentHeader, baseReply->header( QNetworkRequest::UserAgentHeader ) );
+  setHeader( QNetworkRequest::ServerHeader, baseReply->header( QNetworkRequest::ServerHeader ) );
 
-    // Set known headers
-    setHeader( QNetworkRequest::ContentDispositionHeader,
-               baseReply->header( QNetworkRequest::ContentDispositionHeader ) );
-    setHeader( QNetworkRequest::ContentTypeHeader,
-               baseReply->header( QNetworkRequest::ContentTypeHeader ) );
-    setHeader( QNetworkRequest::ContentLengthHeader,
-               baseReply->header( QNetworkRequest::ContentLengthHeader ) );
-    setHeader( QNetworkRequest::LocationHeader,
-               baseReply->header( QNetworkRequest::LocationHeader ) );
-    setHeader( QNetworkRequest::LastModifiedHeader,
-               baseReply->header( QNetworkRequest::LastModifiedHeader ) );
-    setHeader( QNetworkRequest::CookieHeader,
-               baseReply->header( QNetworkRequest::CookieHeader ) );
-    setHeader( QNetworkRequest::SetCookieHeader,
-               baseReply->header( QNetworkRequest::SetCookieHeader ) );
-    setHeader( QNetworkRequest::UserAgentHeader,
-               baseReply->header( QNetworkRequest::UserAgentHeader ) );
-    setHeader( QNetworkRequest::ServerHeader,
-               baseReply->header( QNetworkRequest::ServerHeader ) );
+  // Set attributes
+  setAttribute( QNetworkRequest::HttpStatusCodeAttribute,
+                baseReply->attribute( QNetworkRequest::HttpStatusCodeAttribute ) );
+  setAttribute( QNetworkRequest::HttpReasonPhraseAttribute,
+                baseReply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ) );
+  setAttribute( QNetworkRequest::RedirectionTargetAttribute,
+                baseReply->attribute( QNetworkRequest::RedirectionTargetAttribute ) );
+  setAttribute( QNetworkRequest::ConnectionEncryptedAttribute,
+                baseReply->attribute( QNetworkRequest::ConnectionEncryptedAttribute ) );
+  setAttribute( QNetworkRequest::SourceIsFromCacheAttribute,
+                baseReply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ) );
+  setAttribute( QNetworkRequest::HttpPipeliningWasUsedAttribute,
+                baseReply->attribute( QNetworkRequest::HttpPipeliningWasUsedAttribute ) );
+  setAttribute( QNetworkRequest::BackgroundRequestAttribute,
+                baseReply->attribute( QNetworkRequest::BackgroundRequestAttribute ) );
+  setAttribute( QNetworkRequest::Http2WasUsedAttribute,
+                baseReply->attribute( QNetworkRequest::Http2WasUsedAttribute ) );
 
-    // Set attributes
-    setAttribute( QNetworkRequest::HttpStatusCodeAttribute,
-                  baseReply->attribute( QNetworkRequest::HttpStatusCodeAttribute ) );
-    setAttribute( QNetworkRequest::HttpReasonPhraseAttribute,
-                  baseReply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ) );
-    setAttribute( QNetworkRequest::RedirectionTargetAttribute,
-                  baseReply->attribute( QNetworkRequest::RedirectionTargetAttribute ) );
-    setAttribute( QNetworkRequest::ConnectionEncryptedAttribute,
-                  baseReply->attribute( QNetworkRequest::ConnectionEncryptedAttribute ) );
-    setAttribute( QNetworkRequest::SourceIsFromCacheAttribute,
-                  baseReply->attribute( QNetworkRequest::SourceIsFromCacheAttribute ) );
-    setAttribute( QNetworkRequest::HttpPipeliningWasUsedAttribute,
-                  baseReply->attribute( QNetworkRequest::HttpPipeliningWasUsedAttribute ) );
-    setAttribute( QNetworkRequest::BackgroundRequestAttribute,
-                  baseReply->attribute( QNetworkRequest::BackgroundRequestAttribute ) );
-    setAttribute( QNetworkRequest::Http2WasUsedAttribute,
-                  baseReply->attribute( QNetworkRequest::Http2WasUsedAttribute ) );
+  emit metaDataChanged();
+}
 
-    emit metaDataChanged();
-  }
+void AllowFrameReply::setReadBufferSize( qint64 size )
+{
+  QNetworkReply::setReadBufferSize( size );
+  baseReply->setReadBufferSize( size );
+}
 
-  void AllowFrameReply::setReadBufferSize( qint64 size )
-  {
-    QNetworkReply::setReadBufferSize( size );
-    baseReply->setReadBufferSize( size );
-  }
+qint64 AllowFrameReply::bytesAvailable() const
+{
+  return baseReply->bytesAvailable();
+}
 
-  qint64 AllowFrameReply::bytesAvailable() const
-  {
-    return baseReply->bytesAvailable();
-  }
+void AllowFrameReply::applyError( QNetworkReply::NetworkError code )
+{
+  setError( code, baseReply->errorString() );
+  emit errorOccurred( code );
+}
 
-  void AllowFrameReply::applyError( QNetworkReply::NetworkError code )
-  {
-    setError( code, baseReply->errorString() );
-    emit errorOccurred( code );
-  }
-
-  qint64 AllowFrameReply::readData( char * data, qint64 maxSize )
-  {
-    auto bytesAvailable= baseReply->bytesAvailable();
-    qint64 size = qMin( maxSize, bytesAvailable );
-    baseReply->read( data, size );
-    return size;
-  }
-  void AllowFrameReply::finishedSlot()
-  {
-    setFinished( true );
-    emit finished();
-  }
+qint64 AllowFrameReply::readData( char * data, qint64 maxSize )
+{
+  auto bytesAvailable = baseReply->bytesAvailable();
+  qint64 size         = qMin( maxSize, bytesAvailable );
+  baseReply->read( data, size );
+  return size;
+}
+void AllowFrameReply::finishedSlot()
+{
+  setFinished( true );
+  emit finished();
+}
 
 QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest const & req )
 {
   QUrl url;
   auto op = GetOperation;
 
-  if ( req.url().scheme() == "qrcx" )
-    {
+  if ( req.url().scheme() == "qrcx" ) {
     // We had to override the local load policy for the qrc URL scheme until QWebSecurityOrigin::addLocalScheme() was
     // introduced in Qt 4.6. Hence we used a custom qrcx URL scheme and redirected it here back to qrc. Qt versions
     // older than 4.6 are no longer supported, so GoldenDict itself no longer uses the qrcx scheme. However, qrcx has
@@ -156,43 +146,42 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
     // TODO: deprecate (print a warning or show a warning message box) and eventually remove support for the obsolete
     // qrcx URL scheme. A recent commit "Add support for qrc:// URL scheme" is the first one where the qrc scheme
     // works correctly. So the deprecation has to wait until older GoldenDict versions become rarely used.
-      QUrl newUrl( req.url() );
+    QUrl newUrl( req.url() );
 
-      newUrl.setScheme( "qrc" );
-      newUrl.setHost( "" );
+    newUrl.setScheme( "qrc" );
+    newUrl.setHost( "" );
 
-      QNetworkRequest newReq( req );
-      newReq.setUrl( newUrl );
+    QNetworkRequest newReq( req );
+    newReq.setUrl( newUrl );
 
-      return QNetworkAccessManager::createRequest( op, newReq, nullptr );
+    return QNetworkAccessManager::createRequest( op, newReq, nullptr );
+  }
+
+  url                 = req.url();
+  QMimeType mineType  = db.mimeTypeForUrl( url );
+  QString contentType = mineType.name();
+
+  if ( req.url().scheme() == "gdlookup" ) {
+    QString path = url.path();
+    if ( !path.isEmpty() ) {
+      url.setPath( "" );
+
+      Utils::Url::addQueryItem( url, "word", path.mid( 1 ) );
+      Utils::Url::addQueryItem( url, "group", QString::number( GlobalBroadcaster::instance()->currentGroupId ) );
     }
+  }
 
-    url=req.url();
-    QMimeType mineType=db.mimeTypeForUrl (url);
-    QString contentType=mineType.name();
+  sptr< Dictionary::DataRequest > dr = getResource( url, contentType );
 
-    if(req.url().scheme()=="gdlookup"){
-        QString path=url.path();
-        if( !path.isEmpty() )
-        {
-          url.setPath( "" );
+  if ( dr.get() )
+    return new ArticleResourceReply( this, req, dr, contentType );
 
-          Utils::Url::addQueryItem( url, "word", path.mid( 1 ) );
-          Utils::Url::addQueryItem( url, "group", QString::number(GlobalBroadcaster::instance()->currentGroupId ) );
-        }
-    }
-
-    sptr< Dictionary::DataRequest > dr = getResource( url, contentType );
-
-    if ( dr.get() )
-      return new ArticleResourceReply( this, req, dr, contentType );
-
-    //dr.get() can be null. code continue to execute.
+  //dr.get() can be null. code continue to execute.
 
   //can not match dictionary in the above code,means the url must be external links.
   //if not external url,can be blocked from here. no need to continue execute the following code.
   //such as bres://upload.wikimedia....  etc .
-  if (!Utils::isExternalLink(url)) {
+  if ( !Utils::isExternalLink( url ) ) {
     gdWarning( "Blocking element \"%s\" as built-in link ", req.url().toEncoded().data() );
     return new BlockedNetworkReply( this );
   }
@@ -200,27 +189,24 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
   // Check the Referer. If the user has opted-in to block elements from external
   // pages, we block them.
 
-  if ( disallowContentFromOtherSites && req.hasRawHeader( "Referer" ) )
-  {
+  if ( disallowContentFromOtherSites && req.hasRawHeader( "Referer" ) ) {
     QByteArray referer = req.rawHeader( "Referer" );
 
     QUrl refererUrl = QUrl::fromEncoded( referer );
 
-    if ( !url.host().endsWith( refererUrl.host() ) &&
-        Utils::Url::getHostBaseFromUrl( url ) != Utils::Url::getHostBaseFromUrl( refererUrl ) && !url.scheme().startsWith("data") )
-    {
+    if ( !url.host().endsWith( refererUrl.host() )
+         && Utils::Url::getHostBaseFromUrl( url ) != Utils::Url::getHostBaseFromUrl( refererUrl )
+         && !url.scheme().startsWith( "data" ) ) {
       gdWarning( "Blocking element \"%s\" due to not same domain", url.toEncoded().data() );
 
       return new BlockedNetworkReply( this );
     }
   }
 
-  if( req.url().scheme() == "file" )
-  {
+  if ( req.url().scheme() == "file" ) {
     // Check file presence and adjust path if necessary
     QString fileName = req.url().toLocalFile();
-    if( req.url().host().isEmpty() && articleMaker.adjustFilePath( fileName ) )
-    {
+    if ( req.url().host().isEmpty() && articleMaker.adjustFilePath( fileName ) ) {
       QUrl newUrl( req.url() );
       QUrl localUrl = QUrl::fromLocalFile( fileName );
 
@@ -236,39 +222,33 @@ QNetworkReply * ArticleNetworkAccessManager::getArticleReply( QNetworkRequest co
 
   // spoof User-Agent
   QNetworkRequest newReq;
-  newReq.setUrl(url);
+  newReq.setUrl( url );
   newReq.setAttribute( QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy );
-  if ( hideGoldenDictHeader && url.scheme().startsWith("http", Qt::CaseInsensitive))
-  {
-    newReq.setRawHeader("User-Agent", req.rawHeader("User-Agent").replace(qApp->applicationName().toUtf8(), ""));
+  if ( hideGoldenDictHeader && url.scheme().startsWith( "http", Qt::CaseInsensitive ) ) {
+    newReq.setRawHeader( "User-Agent", req.rawHeader( "User-Agent" ).replace( qApp->applicationName().toUtf8(), "" ) );
   }
 
-  QNetworkReply *  reply = QNetworkAccessManager::createRequest( op, newReq, nullptr );
+  QNetworkReply * reply = QNetworkAccessManager::createRequest( op, newReq, nullptr );
 
-  if( url.scheme() == "https")
-  {
+  if ( url.scheme() == "https" ) {
 #ifndef QT_NO_SSL
-    connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ),
-             reply, SLOT( ignoreSslErrors() ) );
+    connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) );
 #endif
   }
 
-  return  new AllowFrameReply( reply );
+  return new AllowFrameReply( reply );
 }
 
-sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
-  QUrl const & url, QString & contentType )
+sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource( QUrl const & url, QString & contentType )
 {
   qDebug() << "getResource:" << url.toString();
   qDebug() << "scheme:" << url.scheme();
   qDebug() << "host:" << url.host();
 
-  if ( url.scheme() == "gdlookup" )
-  {
-    if( !url.host().isEmpty() && url.host() != "localhost" )
-    {
+  if ( url.scheme() == "gdlookup" ) {
+    if ( !url.host().isEmpty() && url.host() != "localhost" ) {
       // Strange request - ignore it
-      return std::make_shared<Dictionary::DataRequestInstant>( false );
+      return std::make_shared< Dictionary::DataRequestInstant >( false );
     }
 
     contentType = "text/html";
@@ -276,14 +256,13 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
     if ( Utils::Url::queryItemValue( url, "blank" ) == "1" )
       return articleMaker.makeEmptyPage();
 
-    QString word =  Utils::Url::queryItemValue( url, "word" ).trimmed();
+    QString word = Utils::Url::queryItemValue( url, "word" ).trimmed();
 
     bool groupIsValid = false;
-    unsigned group = Utils::Url::queryItemValue( url, "group" ).toUInt( &groupIsValid );
-   
+    unsigned group    = Utils::Url::queryItemValue( url, "group" ).toUInt( &groupIsValid );
+
     QString dictIDs = Utils::Url::queryItemValue( url, "dictionaries" );
-    if( !dictIDs.isEmpty() )
-    {
+    if ( !dictIDs.isEmpty() ) {
       // Individual dictionaries set from full-text search
       QStringList dictIDList = dictIDs.split( "," );
       return articleMaker.makeDefinitionFor( word, group, QMap< QString, QString >(), QSet< QString >(), dictIDList );
@@ -291,8 +270,8 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
 
     // See if we have some dictionaries muted
 
-    QStringList mutedDictLists=Utils::Url::queryItemValue( url, "muted" ).split( ',' );
-    QSet< QString > mutedDicts ( mutedDictLists.begin(),mutedDictLists.end());
+    QStringList mutedDictLists = Utils::Url::queryItemValue( url, "muted" ).split( ',' );
+    QSet< QString > mutedDicts( mutedDictLists.begin(), mutedDictLists.end() );
 
     // Unpack contexts
 
@@ -300,11 +279,10 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
 
     QString contextsEncoded = Utils::Url::queryItemValue( url, "contexts" );
 
-    if ( contextsEncoded.size() )
-    {
+    if ( contextsEncoded.size() ) {
       QByteArray ba = QByteArray::fromBase64( contextsEncoded.toLatin1() );
 
-      QBuffer buf( & ba );
+      QBuffer buf( &ba );
 
       buf.open( QBuffer::ReadOnly );
 
@@ -321,9 +299,8 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
       return articleMaker.makeDefinitionFor( word, group, contexts, mutedDicts, QStringList(), ignoreDiacritics );
   }
 
-  if ( ( url.scheme() == "bres" || url.scheme() == "gdau" || url.scheme() == "gdvideo" || url.scheme() == "gico" ) &&
-       url.path().size() )
-  {
+  if ( ( url.scheme() == "bres" || url.scheme() == "gdau" || url.scheme() == "gdvideo" || url.scheme() == "gico" )
+       && url.path().size() ) {
     //GD_DPRINTF( "Get %s\n", req.url().host().toLocal8Bit().data() );
     //GD_DPRINTF( "Get %s\n", req.url().path().toLocal8Bit().data() );
 
@@ -331,42 +308,34 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
 
     bool search = ( id == "search" );
 
-    if ( !search )
-    {
-      for( unsigned x = 0; x < dictionaries.size(); ++x )
-        if ( dictionaries[ x ]->getId() == id )
-        {
-            if( url.scheme() == "gico" )
-            {
-                QByteArray bytes;
-                QBuffer buffer(&bytes);
-                buffer.open(QIODevice::WriteOnly);
-                dictionaries[ x ]->getIcon().pixmap( 64 ).save(&buffer, "PNG");
-                buffer.close();
-                sptr< Dictionary::DataRequestInstant > ico = std::make_shared<Dictionary::DataRequestInstant>( true );
-                ico->getData().resize( bytes.size() );
-                memcpy( &( ico->getData().front() ), bytes.data(), bytes.size() );
-                return ico;
-            }
-            try
-            {
-              return  dictionaries[ x ]->getResource( Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
-            }
-            catch( std::exception & e )
-            {
-              gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
-                         dictionaries[ x ]->getName().c_str() );
-              return sptr< Dictionary::DataRequest >();
-            }
+    if ( !search ) {
+      for ( unsigned x = 0; x < dictionaries.size(); ++x )
+        if ( dictionaries[ x ]->getId() == id ) {
+          if ( url.scheme() == "gico" ) {
+            QByteArray bytes;
+            QBuffer buffer( &bytes );
+            buffer.open( QIODevice::WriteOnly );
+            dictionaries[ x ]->getIcon().pixmap( 64 ).save( &buffer, "PNG" );
+            buffer.close();
+            sptr< Dictionary::DataRequestInstant > ico = std::make_shared< Dictionary::DataRequestInstant >( true );
+            ico->getData().resize( bytes.size() );
+            memcpy( &( ico->getData().front() ), bytes.data(), bytes.size() );
+            return ico;
+          }
+          try {
+            return dictionaries[ x ]->getResource( Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
+          }
+          catch ( std::exception & e ) {
+            gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(), dictionaries[ x ]->getName().c_str() );
+            return sptr< Dictionary::DataRequest >();
+          }
         }
     }
-
   }
 
-  if ( url.scheme() == "gdpicture" )
-  {
+  if ( url.scheme() == "gdpicture" ) {
     contentType = "text/html";
-    QUrl imgUrl ( url );
+    QUrl imgUrl( url );
     imgUrl.setScheme( "bres" );
     return articleMaker.makePicturePage( imgUrl.toEncoded().data() );
   }
@@ -375,14 +344,16 @@ sptr< Dictionary::DataRequest > ArticleNetworkAccessManager::getResource(
 }
 
 ArticleResourceReply::ArticleResourceReply( QObject * parent,
-  QNetworkRequest const & netReq,
-  sptr< Dictionary::DataRequest > const & req_,
-  QString const & contentType ):
-  QNetworkReply( parent ), req( req_ ), alreadyRead( 0 )
+                                            QNetworkRequest const & netReq,
+                                            sptr< Dictionary::DataRequest > const & req_,
+                                            QString const & contentType ):
+  QNetworkReply( parent ),
+  req( req_ ),
+  alreadyRead( 0 )
 {
   setRequest( netReq );
   setOpenMode( ReadOnly );
-  setUrl(netReq.url());
+  setUrl( netReq.url() );
 
   if ( contentType.size() )
     setHeader( QNetworkRequest::ContentTypeHeader, contentType );
@@ -391,8 +362,7 @@ ArticleResourceReply::ArticleResourceReply( QObject * parent,
 
   connect( req.get(), &Dictionary::Request::finished, this, &ArticleResourceReply::reqFinished );
 
-  if ( req->isFinished() || req->dataSize() > 0 )
-  {
+  if ( req->isFinished() || req->dataSize() > 0 ) {
     connect( this,
              &ArticleResourceReply::readyReadSignal,
              this,
@@ -406,8 +376,7 @@ ArticleResourceReply::ArticleResourceReply( QObject * parent,
 
     emit readyReadSignal();
 
-    if ( req->isFinished() )
-    {
+    if ( req->isFinished() ) {
       emit finishedSignal();
       GD_DPRINTF( "In-place finish.\n" );
     }
@@ -433,10 +402,10 @@ void ArticleResourceReply::reqFinished()
 qint64 ArticleResourceReply::bytesAvailable() const
 {
   qint64 avail = req->dataSize();
-  
+
   if ( avail < 0 )
     return 0;
-  
+
   return avail - alreadyRead + QNetworkReply::bytesAvailable();
 }
 
@@ -456,16 +425,15 @@ qint64 ArticleResourceReply::readData( char * out, qint64 maxSize )
     return 0;
 
   bool finished = req->isFinished();
-  
+
   qint64 avail = req->dataSize();
 
   if ( avail < 0 )
     return finished ? -1 : 0;
 
   qint64 left = avail - alreadyRead;
-  
-  if(  left == 0 && !finished )
-  {
+
+  if ( left == 0 && !finished ) {
     // Work around endlessly repeated useless calls to readData(). The sleep duration is a tradeoff.
     // On the one hand, lowering the duration reduces CPU usage. On the other hand, overly long
     // sleep duration reduces page content update frequency in the web view.
@@ -479,12 +447,10 @@ qint64 ArticleResourceReply::readData( char * out, qint64 maxSize )
   qint64 toRead = maxSize < left ? maxSize : left;
   GD_DPRINTF( "====reading  %d of (%d) bytes . Finished: %d", (int)toRead, avail, finished );
 
-  try
-  {
+  try {
     req->getDataSlice( alreadyRead, toRead, out );
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     qWarning( "getDataSlice error: %s", e.what() );
   }
 
@@ -503,20 +469,20 @@ void ArticleResourceReply::readyReadSlot()
 
 void ArticleResourceReply::finishedSlot()
 {
-  if (req->dataSize() < 0) {
-    emit errorOccurred(ContentNotFoundError);
-    setError(ContentNotFoundError, "content not found");
+  if ( req->dataSize() < 0 ) {
+    emit errorOccurred( ContentNotFoundError );
+    setError( ContentNotFoundError, "content not found" );
   }
   //prevent sent multi times.
-  if (!finishSignalSent.loadAcquire())
-  {
+  if ( !finishSignalSent.loadAcquire() ) {
     finishSignalSent.ref();
     setFinished( true );
     emit finished();
   }
 }
 
-BlockedNetworkReply::BlockedNetworkReply( QObject * parent ): QNetworkReply( parent )
+BlockedNetworkReply::BlockedNetworkReply( QObject * parent ):
+  QNetworkReply( parent )
 {
   setError( QNetworkReply::ContentOperationNotPermittedError, "Content Blocked" );
 
@@ -533,24 +499,23 @@ void BlockedNetworkReply::finishedSlot()
   emit finished();
 }
 
-LocalSchemeHandler::LocalSchemeHandler(ArticleNetworkAccessManager& articleNetMgr, QObject *parent):
-    QWebEngineUrlSchemeHandler(parent),
-    mManager(articleNetMgr){
-
+LocalSchemeHandler::LocalSchemeHandler( ArticleNetworkAccessManager & articleNetMgr, QObject * parent ):
+  QWebEngineUrlSchemeHandler( parent ),
+  mManager( articleNetMgr )
+{
 }
 
-void LocalSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
+void LocalSchemeHandler::requestStarted( QWebEngineUrlRequestJob * requestJob )
 {
   QUrl url = requestJob->requestUrl();
   QNetworkRequest request;
   request.setUrl( url );
 
   //all the url reached here must be either gdlookup or bword scheme.
-  auto [valid, word] = Utils::Url::getQueryWord( url );
+  auto [ valid, word ] = Utils::Url::getQueryWord( url );
   // or the condition can be (!queryWord.first || word.isEmpty())
   // ( queryWord.first && word.isEmpty() ) is only part of the above condition.
-  if( valid && word.isEmpty() )
-  {
+  if ( valid && word.isEmpty() ) {
     // invalid gdlookup url.
     return;
   }
diff --git a/src/article_netmgr.hh b/src/article_netmgr.hh
index ea042100..dcdb12d8 100644
--- a/src/article_netmgr.hh
+++ b/src/article_netmgr.hh
@@ -24,9 +24,10 @@ using std::vector;
 // Proxy class for QNetworkReply to remove X-Frame-Options header
 // It allow to show websites in <iframe> tag like Qt 4.x
 
-class AllowFrameReply : public QNetworkReply
+class AllowFrameReply: public QNetworkReply
 {
   Q_OBJECT
+
 private:
   QNetworkReply * baseReply;
   QByteArray buffer;
@@ -37,65 +38,97 @@ private:
 public:
   explicit AllowFrameReply( QNetworkReply * _reply );
   ~AllowFrameReply()
-  { delete baseReply; }
+  {
+    delete baseReply;
+  }
 
   // QNetworkReply virtual functions
   void setReadBufferSize( qint64 size );
   void close()
-  { baseReply->close(); }
+  {
+    baseReply->close();
+  }
 
   // QIODevice virtual functions
   qint64 bytesAvailable() const;
   bool atEnd() const
-  { return baseReply->atEnd(); }
+  {
+    return baseReply->atEnd();
+  }
   qint64 bytesToWrite() const
-  { return baseReply->bytesToWrite(); }
+  {
+    return baseReply->bytesToWrite();
+  }
   bool canReadLine() const
-  { return baseReply->canReadLine(); }
+  {
+    return baseReply->canReadLine();
+  }
   bool isSequential() const
-  { return baseReply->isSequential(); }
+  {
+    return baseReply->isSequential();
+  }
   bool waitForReadyRead( int msecs )
-  { return baseReply->waitForReadyRead( msecs ); }
+  {
+    return baseReply->waitForReadyRead( msecs );
+  }
   bool waitForBytesWritten( int msecs )
-  { return baseReply->waitForBytesWritten( msecs ); }
+  {
+    return baseReply->waitForBytesWritten( msecs );
+  }
   bool reset()
-  { return baseReply->reset(); }
+  {
+    return baseReply->reset();
+  }
 
 public slots:
 
   // Own AllowFrameReply slots
   void applyMetaData();
   void applyError( QNetworkReply::NetworkError code );
-//  void readDataFromBase();
+  //  void readDataFromBase();
 
   // Redirect QNetworkReply slots
   virtual void abort()
-  { baseReply->abort(); }
+  {
+    baseReply->abort();
+  }
   virtual void ignoreSslErrors()
-  { baseReply->ignoreSslErrors(); }
+  {
+    baseReply->ignoreSslErrors();
+  }
   void finishedSlot();
 
 protected:
   // QNetworkReply virtual functions
   void ignoreSslErrorsImplementation( const QList< QSslError > & errors )
-  { baseReply->ignoreSslErrors( errors ); }
+  {
+    baseReply->ignoreSslErrors( errors );
+  }
   void setSslConfigurationImplementation( const QSslConfiguration & configuration )
-  { baseReply->setSslConfiguration( configuration ); }
+  {
+    baseReply->setSslConfiguration( configuration );
+  }
   void sslConfigurationImplementation( QSslConfiguration & configuration ) const
-  { configuration = baseReply->sslConfiguration(); }
+  {
+    configuration = baseReply->sslConfiguration();
+  }
 
   // QIODevice virtual functions
   qint64 readData( char * data, qint64 maxSize );
   qint64 readLineData( char * data, qint64 maxSize )
-  { return baseReply->readLine( data, maxSize ); }
+  {
+    return baseReply->readLine( data, maxSize );
+  }
   qint64 writeData( const char * data, qint64 maxSize )
-  { return baseReply->write( data, maxSize ); }
+  {
+    return baseReply->write( data, maxSize );
+  }
 };
 
 
 class ArticleNetworkAccessManager: public QNetworkAccessManager
 {
-    Q_OBJECT
+  Q_OBJECT
   vector< sptr< Dictionary::Class > > const & dictionaries;
   ArticleMaker const & articleMaker;
   bool const & disallowContentFromOtherSites;
@@ -105,26 +138,25 @@ class ArticleNetworkAccessManager: public QNetworkAccessManager
 public:
 
   ArticleNetworkAccessManager( QObject * parent,
-                               vector< sptr< Dictionary::Class > > const &
-                               dictionaries_,
+                               vector< sptr< Dictionary::Class > > const & dictionaries_,
                                ArticleMaker const & articleMaker_,
                                bool const & disallowContentFromOtherSites_,
                                bool const & hideGoldenDictHeader_ ):
-    QNetworkAccessManager( parent ), dictionaries( dictionaries_ ),
+    QNetworkAccessManager( parent ),
+    dictionaries( dictionaries_ ),
     articleMaker( articleMaker_ ),
     disallowContentFromOtherSites( disallowContentFromOtherSites_ ),
     hideGoldenDictHeader( hideGoldenDictHeader_ )
-  {}
+  {
+  }
 
   /// Tries handling any kind of internal resources referenced by dictionaries.
   /// If it succeeds, the result is a dictionary request object. Otherwise, an
   /// empty pointer is returned.
   /// The function can optionally set the Content-Type header correspondingly.
-  sptr< Dictionary::DataRequest > getResource( QUrl const & url,
-                                               QString & contentType );
+  sptr< Dictionary::DataRequest > getResource( QUrl const & url, QString & contentType );
 
   virtual QNetworkReply * getArticleReply( QNetworkRequest const & req );
-
 };
 
 class ArticleResourceReply: public QNetworkReply
@@ -149,8 +181,7 @@ protected:
 
   virtual qint64 bytesAvailable() const;
   bool atEnd() const override;
-  virtual void abort()
-  {}
+  virtual void abort() {}
   virtual qint64 readData( char * data, qint64 maxSize );
 
   // We use the hackery below to work around the fact that we need to emit
@@ -164,7 +195,7 @@ private slots:
 
   void reqUpdated();
   void reqFinished();
-  
+
   void readyReadSlot();
   void finishedSlot();
 };
@@ -182,8 +213,7 @@ public:
     return -1;
   }
 
-  virtual void abort()
-  {}
+  virtual void abort() {}
 
 protected:
 
@@ -199,14 +229,16 @@ private slots:
   void finishedSlot();
 };
 
-class LocalSchemeHandler : public QWebEngineUrlSchemeHandler
+class LocalSchemeHandler: public QWebEngineUrlSchemeHandler
 {
   Q_OBJECT
+
 public:
-  LocalSchemeHandler( ArticleNetworkAccessManager & articleNetMgr, QObject *parent = nullptr);
+  LocalSchemeHandler( ArticleNetworkAccessManager & articleNetMgr, QObject * parent = nullptr );
   void requestStarted( QWebEngineUrlRequestJob * requestJob );
 
 protected:
+
 private:
   ArticleNetworkAccessManager & mManager;
   QNetworkAccessManager mgr;
diff --git a/src/audiolink.cc b/src/audiolink.cc
index 480d41be..19cd804e 100644
--- a/src/audiolink.cc
+++ b/src/audiolink.cc
@@ -2,38 +2,43 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "audiolink.hh"
+#include "globalbroadcaster.hh"
 
-std::string addAudioLink( std::string const & url,
-                          std::string const & dictionaryId )
+std::string addAudioLink( std::string const & url, std::string const & dictionaryId )
 {
-    return std::string( "<script type=\"text/javascript\">" +
-                        makeAudioLinkScript( url, dictionaryId ) +
-                        "</script>" );
+  if ( url.empty() || url.length() < 2 )
+    return {};
+  GlobalBroadcaster::instance()->pronounce_engine.sendAudio(
+    dictionaryId,
+    QString::fromStdString( url.substr( 1, url.length() - 2 ) ) );
+
+  return std::string( "<script type=\"text/javascript\">" + makeAudioLinkScript( url, dictionaryId ) + "</script>" );
 }
 
-std::string makeAudioLinkScript( std::string const & url,
-                                 std::string const & dictionaryId )
+std::string makeAudioLinkScript( std::string const & url, std::string const & dictionaryId )
 {
   /// Convert "'" to "\'" - this char broke autoplay of audiolinks
 
   std::string ref;
   bool escaped = false;
-  for( unsigned x = 0; x < url.size(); x++ )
-  {
-    char ch = url[ x ];
-    if( escaped )
-    {
+  for ( const char ch : url ) {
+    if ( escaped ) {
       ref += ch;
       escaped = false;
       continue;
     }
-    if( ch == '\'' )
+    if ( ch == '\'' )
       ref += '\\';
     ref += ch;
     escaped = ( ch == '\\' );
   }
 
-  std::string audioLinkForDict = "gdAudioLinks['" + dictionaryId + "']";
-  return "gdAudioLinks.first = gdAudioLinks.first || " + ref + ";" +
-         audioLinkForDict + " = " + audioLinkForDict + " || " + ref + ";";
+  const std::string audioLinkForDict = QString::fromStdString( R"(
+if(!gdAudioMap.has('%1')){
+    gdAudioMap.set('%1',%2);
+}
+)" )
+                                         .arg( QString::fromStdString( dictionaryId ), QString::fromStdString( url ) )
+                                         .toStdString();
+  return "gdAudioLinks.first = gdAudioLinks.first || " + ref + ";" + audioLinkForDict;
 }
diff --git a/src/audiolink.hh b/src/audiolink.hh
index 51f673b4..edb65317 100644
--- a/src/audiolink.hh
+++ b/src/audiolink.hh
@@ -12,10 +12,8 @@
 /// 'say sound' functionality.
 /// The url should be escaped and surrounded by quotes.
 /// The dictionary id is used to make active dictionary feature work.
-std::string addAudioLink( std::string const & url,
-                          std::string const & dictionaryId );
+std::string addAudioLink( std::string const & url, std::string const & dictionaryId );
 
-std::string makeAudioLinkScript( std::string const & url,
-                                 std::string const & dictionaryId );
+std::string makeAudioLinkScript( std::string const & url, std::string const & dictionaryId );
 
 #endif
diff --git a/src/audiooutput.cc b/src/audiooutput.cc
index afe30f64..a195c5f4 100644
--- a/src/audiooutput.cc
+++ b/src/audiooutput.cc
@@ -41,7 +41,7 @@ static QAudioFormat format( int sampleRate, int channelCount )
 
 class AudioOutputPrivate: public QIODevice
 {
- public:
+public:
   AudioOutputPrivate()
   {
     open( QIODevice::ReadOnly );
@@ -73,25 +73,23 @@ class AudioOutputPrivate: public QIODevice
 
   qint64 readData( char * data, qint64 len ) override
   {
-    if( !len )
+    if ( !len )
       return 0;
 
     QMutexLocker locker( &mutex );
     qint64 bytesWritten = 0;
-    while( len && !quit )
-    {
-      if( buffer.isEmpty() )
-      {
+    while ( len && !quit ) {
+      if ( buffer.isEmpty() ) {
         // Wait for more frames
-        if( bytesWritten == 0 )
+        if ( bytesWritten == 0 )
           cond.wait( &mutex );
-        if( buffer.isEmpty() )
+        if ( buffer.isEmpty() )
           break;
       }
 
       auto sampleData   = buffer.data();
-      const int toWrite = qMin( (qint64) buffer.size(), len );
-      memcpy( &data[bytesWritten], sampleData, toWrite );
+      const int toWrite = qMin( (qint64)buffer.size(), len );
+      memcpy( &data[ bytesWritten ], sampleData, toWrite );
       buffer.remove( 0, toWrite );
       bytesWritten += toWrite;
       //      data += toWrite;
@@ -101,26 +99,38 @@ class AudioOutputPrivate: public QIODevice
     return bytesWritten;
   }
 
-  qint64 writeData( const char *, qint64 ) override { return 0; }
-  qint64 size() const override { return buffer.size(); }
-  qint64 bytesAvailable() const override { return buffer.size(); }
-  bool isSequential() const override { return true; }
-  bool atEnd() const override { return buffer.isEmpty(); }
+  qint64 writeData( const char *, qint64 ) override
+  {
+    return 0;
+  }
+  qint64 size() const override
+  {
+    return buffer.size();
+  }
+  qint64 bytesAvailable() const override
+  {
+    return buffer.size();
+  }
+  bool isSequential() const override
+  {
+    return true;
+  }
+  bool atEnd() const override
+  {
+    return buffer.isEmpty();
+  }
 
   void init( const QAudioFormat & fmt )
   {
-    if( !audioOutput || ( fmt.isValid() && audioOutput->format() != fmt )
-      || audioOutput->state() == QAudio::StoppedState )
-    {
-      if( audioOutput )
+    if ( !audioOutput || ( fmt.isValid() && audioOutput->format() != fmt )
+         || audioOutput->state() == QAudio::StoppedState ) {
+      if ( audioOutput )
         audioOutput->deleteLater();
       audioOutput = new AudioOutput( fmt );
       QObject::connect( audioOutput, &AudioOutput::stateChanged, audioOutput, [ & ]( QAudio::State state ) {
-        switch( state )
-        {
+        switch ( state ) {
           case QAudio::StoppedState:
-            if( audioOutput->error() != QAudio::NoError )
-            {
+            if ( audioOutput->error() != QAudio::NoError ) {
               qWarning() << "QAudioOutput stopped:" << audioOutput->error();
               quit = true;
             }
@@ -131,7 +141,7 @@ class AudioOutputPrivate: public QIODevice
       } );
 
       audioOutput->start( this );
-      if( audioOutput && audioOutput->state() == QAudio::StoppedState )
+      if ( audioOutput && audioOutput->state() == QAudio::StoppedState )
         quit = true;
     }
 
@@ -140,18 +150,16 @@ class AudioOutputPrivate: public QIODevice
 
   void doPlayAudio()
   {
-    while( !quit )
-    {
+    while ( !quit ) {
       QMutexLocker locker( &mutex );
       cond.wait( &mutex, 10 );
       auto fmt = sampleRate == 0 ? QAudioFormat() : format( sampleRate, channels );
       locker.unlock();
-      if( fmt.isValid() )
+      if ( fmt.isValid() )
         init( fmt );
       QCoreApplication::processEvents();
     }
-    if( audioOutput )
-    {
+    if ( audioOutput ) {
       audioOutput->stop();
       audioOutput->deleteLater();
     }
@@ -159,7 +167,9 @@ class AudioOutputPrivate: public QIODevice
   }
 };
 
-AudioOutput::AudioOutput( QObject * parent ): QObject( parent ), d_ptr( new AudioOutputPrivate )
+AudioOutput::AudioOutput( QObject * parent ):
+  QObject( parent ),
+  d_ptr( new AudioOutputPrivate )
 {
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
   d_ptr->audioPlayFuture = QtConcurrent::run( &d_ptr->threadPool, d_ptr.data(), &AudioOutputPrivate::doPlayAudio );
@@ -168,7 +178,10 @@ AudioOutput::AudioOutput( QObject * parent ): QObject( parent ), d_ptr( new Audi
 #endif
 }
 
-void AudioOutput::setAudioFormat( int sampleRate, int channels ) { d_ptr->setAudioFormat( sampleRate, channels ); }
+void AudioOutput::setAudioFormat( int sampleRate, int channels )
+{
+  d_ptr->setAudioFormat( sampleRate, channels );
+}
 
 AudioOutput::~AudioOutput()
 {
@@ -181,7 +194,7 @@ AudioOutput::~AudioOutput()
 bool AudioOutput::play( const uint8_t * data, qint64 len )
 {
   Q_D( AudioOutput );
-  if( d->quit )
+  if ( d->quit )
     return false;
 
   QMutexLocker locker( &d->mutex );
diff --git a/src/audiooutput.hh b/src/audiooutput.hh
index 30ef6f7c..85eead90 100644
--- a/src/audiooutput.hh
+++ b/src/audiooutput.hh
@@ -7,16 +7,17 @@
 class AudioOutputPrivate;
 class AudioOutput: public QObject
 {
- public:
+public:
   AudioOutput( QObject * parent = nullptr );
   ~AudioOutput();
 
   bool play( const uint8_t * data, qint64 len );
   void setAudioFormat( int sampleRate, int channels );
- protected:
+
+protected:
   QScopedPointer< AudioOutputPrivate > d_ptr;
 
- private:
+private:
   Q_DISABLE_COPY( AudioOutput )
   Q_DECLARE_PRIVATE( AudioOutput )
 };
diff --git a/src/audioplayerfactory.cc b/src/audioplayerfactory.cc
index afe91cf5..05ff67c3 100644
--- a/src/audioplayerfactory.cc
+++ b/src/audioplayerfactory.cc
@@ -9,7 +9,7 @@
 #include "externalaudioplayer.hh"
 #include "gddebug.hh"
 
-AudioPlayerFactory::AudioPlayerFactory( Config::Preferences const & p ) :
+AudioPlayerFactory::AudioPlayerFactory( Config::Preferences const & p ):
   useInternalPlayer( p.useInternalPlayer ),
   internalPlayerBackend( p.internalPlayerBackend ),
   audioPlaybackProgram( p.audioPlaybackProgram )
@@ -19,26 +19,20 @@ AudioPlayerFactory::AudioPlayerFactory( Config::Preferences const & p ) :
 
 void AudioPlayerFactory::setPreferences( Config::Preferences const & p )
 {
-  if( p.useInternalPlayer != useInternalPlayer )
-  {
-    useInternalPlayer = p.useInternalPlayer;
+  if ( p.useInternalPlayer != useInternalPlayer ) {
+    useInternalPlayer     = p.useInternalPlayer;
     internalPlayerBackend = p.internalPlayerBackend;
-    audioPlaybackProgram = p.audioPlaybackProgram;
+    audioPlaybackProgram  = p.audioPlaybackProgram;
     reset();
   }
-  else
-  if( useInternalPlayer && p.internalPlayerBackend != internalPlayerBackend )
-  {
+  else if ( useInternalPlayer && p.internalPlayerBackend != internalPlayerBackend ) {
     internalPlayerBackend = p.internalPlayerBackend;
     reset();
   }
-  else
-  if( !useInternalPlayer && p.audioPlaybackProgram != audioPlaybackProgram )
-  {
-    audioPlaybackProgram = p.audioPlaybackProgram;
-    ExternalAudioPlayer * const externalPlayer =
-        qobject_cast< ExternalAudioPlayer * >( playerPtr.data() );
-    if( externalPlayer )
+  else if ( !useInternalPlayer && p.audioPlaybackProgram != audioPlaybackProgram ) {
+    audioPlaybackProgram                       = p.audioPlaybackProgram;
+    ExternalAudioPlayer * const externalPlayer = qobject_cast< ExternalAudioPlayer * >( playerPtr.data() );
+    if ( externalPlayer )
       setAudioPlaybackProgram( *externalPlayer );
     else
       gdWarning( "External player was expected, but it does not exist.\n" );
@@ -47,8 +41,7 @@ void AudioPlayerFactory::setPreferences( Config::Preferences const & p )
 
 void AudioPlayerFactory::reset()
 {
-  if( useInternalPlayer )
-  {
+  if ( useInternalPlayer ) {
     // qobject_cast checks below account for the case when an unsupported backend
     // is stored in config. After this backend is replaced with the default one
     // upon preferences saving, the code below does not reset playerPtr with
@@ -58,16 +51,15 @@ void AudioPlayerFactory::reset()
     Q_ASSERT( Config::InternalPlayerBackend::defaultBackend().isFfmpeg()
               && "Adjust the code below after changing the default backend." );
 
-    if( !internalPlayerBackend.isQtmultimedia() )
-    {
-      if( !playerPtr || !qobject_cast< Ffmpeg::AudioPlayer * >( playerPtr.data() ) )
+    if ( !internalPlayerBackend.isQtmultimedia() ) {
+      if ( !playerPtr || !qobject_cast< Ffmpeg::AudioPlayer * >( playerPtr.data() ) )
         playerPtr.reset( new Ffmpeg::AudioPlayer );
       return;
     }
 #endif
 
 #ifdef MAKE_QTMULTIMEDIA_PLAYER
-    if( !playerPtr || !qobject_cast< MultimediaAudioPlayer * >( playerPtr.data() ) )
+    if ( !playerPtr || !qobject_cast< MultimediaAudioPlayer * >( playerPtr.data() ) )
       playerPtr.reset( new MultimediaAudioPlayer );
     return;
 #endif
diff --git a/src/audioplayerfactory.hh b/src/audioplayerfactory.hh
index 3775a81e..39abfcc2 100644
--- a/src/audioplayerfactory.hh
+++ b/src/audioplayerfactory.hh
@@ -12,13 +12,17 @@ class ExternalAudioPlayer;
 class AudioPlayerFactory
 {
   Q_DISABLE_COPY( AudioPlayerFactory )
+
 public:
   explicit AudioPlayerFactory( Config::Preferences const & );
   void setPreferences( Config::Preferences const & );
   /// The returned reference to a smart pointer is valid as long as this object
   /// exists. The pointer to the owned AudioPlayerInterface may change after the
   /// call to setPreferences(), but it is guaranteed to never be null.
-  AudioPlayerPtr const & player() const { return playerPtr; }
+  AudioPlayerPtr const & player() const
+  {
+    return playerPtr;
+  }
 
 private:
   void reset();
diff --git a/src/audioplayerinterface.hh b/src/audioplayerinterface.hh
index d9cd22e6..a88de319 100644
--- a/src/audioplayerinterface.hh
+++ b/src/audioplayerinterface.hh
@@ -8,9 +8,10 @@
 #include <QString>
 #include <QObject>
 
-class AudioPlayerInterface : public QObject
+class AudioPlayerInterface: public QObject
 {
   Q_OBJECT
+
 public:
   /// Stops current playback if any, copies the audio buffer at [data, data + size),
   /// then plays this buffer. It is safe to invalidate \p data after this function call.
diff --git a/src/btreeidx.cc b/src/btreeidx.cc
index b75914bc..93e83018 100644
--- a/src/btreeidx.cc
+++ b/src/btreeidx.cc
@@ -27,19 +27,18 @@ using gd::wstring;
 using gd::wchar;
 using std::pair;
 
-enum
-{
+enum {
   BtreeMinElements = 64,
   BtreeMaxElements = 8192
 };
 
 BtreeIndex::BtreeIndex():
-  idxFile( 0 ), rootNodeLoaded( false )
+  idxFile( nullptr ),
+  rootNodeLoaded( false )
 {
 }
 
-BtreeDictionary::BtreeDictionary( string const & id,
-                                  vector< string > const & dictionaryFiles ):
+BtreeDictionary::BtreeDictionary( string const & id, vector< string > const & dictionaryFiles ):
   Dictionary::Class( id, dictionaryFiles )
 {
 }
@@ -54,25 +53,25 @@ string const & BtreeDictionary::ensureInitDone()
 void BtreeIndex::openIndex( IndexInfo const & indexInfo, File::Class & file, QMutex & mutex )
 {
   indexNodeSize = indexInfo.btreeMaxElements;
-  rootOffset = indexInfo.rootOffset;
+  rootOffset    = indexInfo.rootOffset;
 
-  idxFile = &file;
+  idxFile      = &file;
   idxFileMutex = &mutex;
 
   rootNodeLoaded = false;
   rootNode.clear();
 }
 
-vector< WordArticleLink > BtreeIndex::findArticles( wstring const & search_word, bool ignoreDiacritics )
+vector< WordArticleLink >
+BtreeIndex::findArticles( wstring const & search_word, bool ignoreDiacritics, uint32_t maxMatchCount )
 {
   //First trim ending zero
   wstring word = gd::removeTrailingZero( search_word );
   vector< WordArticleLink > result;
 
-  try
-  {
+  try {
     wstring folded = Folding::apply( word );
-    if( folded.empty() )
+    if ( folded.empty() )
       folded = Folding::applyWhitespaceOnly( word );
 
     bool exactMatch;
@@ -82,24 +81,19 @@ vector< WordArticleLink > BtreeIndex::findArticles( wstring const & search_word,
 
     char const * leafEnd;
 
-    char const * chainOffset = findChainOffsetExactOrPrefix( folded, exactMatch,
-                                                             leaf, nextLeaf,
-                                                             leafEnd );
+    char const * chainOffset = findChainOffsetExactOrPrefix( folded, exactMatch, leaf, nextLeaf, leafEnd );
 
-    if ( chainOffset && exactMatch )
-    {
-      result = readChain( chainOffset );
+    if ( chainOffset && exactMatch ) {
+      result = readChain( chainOffset, maxMatchCount );
 
       antialias( word, result, ignoreDiacritics );
     }
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     gdWarning( "Articles searching failed, error: %s\n", e.what() );
     result.clear();
   }
-  catch(...)
-  {
+  catch ( ... ) {
     qWarning( "Articles searching failed\n" );
     result.clear();
   }
@@ -107,6 +101,7 @@ vector< WordArticleLink > BtreeIndex::findArticles( wstring const & search_word,
   return result;
 }
 
+
 BtreeWordSearchRequest::BtreeWordSearchRequest( BtreeDictionary & dict_,
                                                 wstring const & str_,
                                                 unsigned minLength_,
@@ -114,14 +109,14 @@ BtreeWordSearchRequest::BtreeWordSearchRequest( BtreeDictionary & dict_,
                                                 bool allowMiddleMatches_,
                                                 unsigned long maxResults_,
                                                 bool startRunnable ):
-  dict( dict_ ), str( str_ ),
+  dict( dict_ ),
+  str( str_ ),
   maxResults( maxResults_ ),
   minLength( minLength_ ),
   maxSuffixVariation( maxSuffixVariation_ ),
   allowMiddleMatches( allowMiddleMatches_ )
 {
-  if( startRunnable )
-  {
+  if ( startRunnable ) {
     f = QtConcurrent::run( [ this ]() {
       this->run();
     } );
@@ -130,43 +125,39 @@ BtreeWordSearchRequest::BtreeWordSearchRequest( BtreeDictionary & dict_,
 
 void BtreeWordSearchRequest::findMatches()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
   }
-  
+
   QRegularExpression regexp;
 
   bool useWildcards = false;
-  if( allowMiddleMatches )
-    useWildcards = ( str.find( '*' ) != wstring::npos ||
-                     str.find( '?' ) != wstring::npos ||
-                     str.find( '[' ) != wstring::npos ||
-                     str.find( ']' ) != wstring::npos );
+  if ( allowMiddleMatches )
+    useWildcards = ( str.find( '*' ) != wstring::npos || str.find( '?' ) != wstring::npos
+                     || str.find( '[' ) != wstring::npos || str.find( ']' ) != wstring::npos );
 
   wstring folded = Folding::apply( str );
 
   int minMatchLength = 0;
 
-  if( useWildcards )
-  {
-    regexp.setPattern( wildcardsToRegexp( QString::fromStdU32String( Folding::applyDiacriticsOnly( Folding::applySimpleCaseOnly( str ) ) ) ) );
-    if( !regexp.isValid() )
+  if ( useWildcards ) {
+    regexp.setPattern( wildcardsToRegexp(
+      QString::fromStdU32String( Folding::applyDiacriticsOnly( Folding::applySimpleCaseOnly( str ) ) ) ) );
+    if ( !regexp.isValid() )
       regexp.setPattern( QRegularExpression::escape( regexp.pattern() ) );
     regexp.setPatternOptions( QRegularExpression::CaseInsensitiveOption );
 
     bool bNoLetters = folded.empty();
     wstring foldedWithWildcards;
 
-    if( bNoLetters )
+    if ( bNoLetters )
       foldedWithWildcards = Folding::applyWhitespaceOnly( str );
     else
       foldedWithWildcards = Folding::apply( str, useWildcards );
@@ -174,37 +165,30 @@ void BtreeWordSearchRequest::findMatches()
     // 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 )
-      {
+    bool escaped   = false;
+    for ( char32_t ch : foldedWithWildcards ) {
+      if ( ch == L'\\' && !escaped ) {
         escaped = true;
         continue;
       }
 
-      if( ch == L']' && !escaped )
-      {
+      if ( ch == L']' && !escaped ) {
         insideSet = false;
         continue;
       }
 
-      if( insideSet )
-      {
+      if ( insideSet ) {
         escaped = false;
         continue;
       }
 
-      if( ch == L'[' && !escaped )
-      {
+      if ( ch == L'[' && !escaped ) {
         minMatchLength += 1;
         insideSet = true;
         continue;
       }
 
-      if( ch == L'*' && !escaped )
+      if ( ch == L'*' && !escaped )
         continue;
 
       escaped = false;
@@ -216,22 +200,16 @@ void BtreeWordSearchRequest::findMatches()
     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']' ) )
+    for ( char32_t ch : foldedWithWildcards ) {
+      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() )
-        {
+      if ( ch == L'\\' ) {
+        if ( bNoLetters || folded.empty() ) {
           escaped = true;
           continue;
         }
@@ -239,15 +217,14 @@ void BtreeWordSearchRequest::findMatches()
           break;
       }
 
-      if( ch == '*' || ch == '?' || ch == '[' || ch == ']' )
+      if ( ch == '*' || ch == '?' || ch == '[' || ch == ']' )
         break;
 
       folded.push_back( ch );
     }
   }
-  else
-  {
-    if( folded.empty() )
+  else {
+    if ( folded.empty() )
       folded = Folding::applyWhitespaceOnly( str );
   }
 
@@ -255,127 +232,109 @@ void BtreeWordSearchRequest::findMatches()
 
   int charsLeftToChop = 0;
 
-  if ( maxSuffixVariation >= 0 )
-  {
+  if ( maxSuffixVariation >= 0 ) {
     charsLeftToChop = initialFoldedSize - (int)minLength;
 
     if ( charsLeftToChop < 0 )
       charsLeftToChop = 0;
-    else
-    if ( charsLeftToChop > maxSuffixVariation )
+    else if ( charsLeftToChop > maxSuffixVariation )
       charsLeftToChop = maxSuffixVariation;
   }
 
-  try
-  {
-    for( ; ; )
-    {
+  try {
+    for ( ;; ) {
       bool exactMatch;
       vector< char > leaf;
       uint32_t nextLeaf;
       char const * leafEnd;
 
-      char const * chainOffset = dict.findChainOffsetExactOrPrefix( folded, exactMatch,
-                                                                    leaf, nextLeaf,
-                                                                    leafEnd );
+      char const * chainOffset = dict.findChainOffsetExactOrPrefix( folded, exactMatch, leaf, nextLeaf, leafEnd );
 
       if ( chainOffset )
-      for( ; ; )
-      {
-        if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-          break;
+        for ( ;; ) {
+          if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
+            break;
 
-        //GD_DPRINTF( "offset = %u, size = %u\n", chainOffset - &leaf.front(), leaf.size() );
+          //GD_DPRINTF( "offset = %u, size = %u\n", chainOffset - &leaf.front(), leaf.size() );
 
-        vector< WordArticleLink > chain = dict.readChain( chainOffset );
+          vector< WordArticleLink > chain = dict.readChain( chainOffset );
 
-        wstring chainHead = Utf8::decode( chain[ 0 ].word );
+          wstring chainHead = Utf8::decode( chain[ 0 ].word );
 
-        wstring resultFolded = Folding::apply( chainHead );
-        if( resultFolded.empty() )
-          resultFolded = Folding::applyWhitespaceOnly( chainHead );
+          wstring resultFolded = Folding::apply( chainHead );
+          if ( resultFolded.empty() )
+            resultFolded = Folding::applyWhitespaceOnly( chainHead );
 
-        if ( ( useWildcards && folded.empty() ) ||
-             ( resultFolded.size() >= folded.size()
-               && !resultFolded.compare( 0, folded.size(), folded ) ) )
-        {
-          // Exact or prefix match
+          if ( ( useWildcards && folded.empty() )
+               || ( resultFolded.size() >= folded.size() && !resultFolded.compare( 0, folded.size(), folded ) ) ) {
+            // Exact or prefix match
 
-          QMutexLocker _( &dataMutex );
+            QMutexLocker _( &dataMutex );
 
-          for( unsigned x = 0; x < chain.size(); ++x )
-          {
-            if( useWildcards )
-            {
-              wstring word = Utf8::decode( chain[ x ].prefix + chain[ x ].word );
-              wstring result = Folding::applyDiacriticsOnly( word );
-              if( result.size() >= (wstring::size_type)minMatchLength )
-              {
-                QRegularExpressionMatch match = regexp.match( QString::fromStdU32String( result ) );
-                if( match.hasMatch() && match.capturedStart() == 0 )
-                {
-                  addMatch( word );
+            for ( auto & x : chain ) {
+              if ( useWildcards ) {
+                wstring word   = Utf8::decode( x.prefix + x.word );
+                wstring result = Folding::applyDiacriticsOnly( word );
+                if ( result.size() >= (wstring::size_type)minMatchLength ) {
+                  QRegularExpressionMatch match = regexp.match( QString::fromStdU32String( result ) );
+                  if ( match.hasMatch() && match.capturedStart() == 0 ) {
+                    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( x.prefix ) ).empty() )
+                     && ( maxSuffixVariation < 0
+                          || (int)resultFolded.size() - initialFoldedSize <= maxSuffixVariation ) )
+                  addMatch( Utf8::decode( x.prefix + x.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( Utils::AtomicInt::loadAcquire( isCancelled ) )
-            break;
+            if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
+              break;
 
-          if ( matches.size() >= maxResults )
-          {
-            // For now we actually allow more than maxResults if the last
-            // chain yield more than one result. That's ok and maybe even more
-            // desirable.
-            break;
-          }
-        }
-        else
-          // Neither exact nor a prefix match, end this
-          break;
-
-        // Fetch new leaf if we're out of chains here
-
-        if ( chainOffset >= leafEnd )
-        {
-          // We're past the current leaf, fetch the next one
-
-          //GD_DPRINTF( "advancing\n" );
-
-          if ( nextLeaf )
-          {
-            QMutexLocker _( dict.idxFileMutex );
-
-            dict.readNode( nextLeaf, leaf );
-            leafEnd = &leaf.front() + leaf.size();
-
-            nextLeaf = dict.idxFile->read< uint32_t >();
-            chainOffset = &leaf.front() + sizeof( uint32_t );
-
-            uint32_t leafEntries = *(uint32_t *)&leaf.front();
-
-            if ( leafEntries == 0xffffFFFF )
-            {
-              //GD_DPRINTF( "bah!\n" );
-              exit( 1 );
+            if ( matches.size() >= maxResults ) {
+              // For now we actually allow more than maxResults if the last
+              // chain yield more than one result. That's ok and maybe even more
+              // desirable.
+              break;
             }
           }
           else
-            break; // That was the last leaf
-        }
-      }
+            // Neither exact nor a prefix match, end this
+            break;
 
-      if ( charsLeftToChop && !Utils::AtomicInt::loadAcquire( isCancelled ) )
-      {
+          // Fetch new leaf if we're out of chains here
+
+          if ( chainOffset >= leafEnd ) {
+            // We're past the current leaf, fetch the next one
+
+            //GD_DPRINTF( "advancing\n" );
+
+            if ( nextLeaf ) {
+              QMutexLocker _( dict.idxFileMutex );
+
+              dict.readNode( nextLeaf, leaf );
+              leafEnd = &leaf.front() + leaf.size();
+
+              nextLeaf    = dict.idxFile->read< uint32_t >();
+              chainOffset = &leaf.front() + sizeof( uint32_t );
+
+              uint32_t leafEntries = *(uint32_t *)&leaf.front();
+
+              if ( leafEntries == 0xffffFFFF ) {
+                //GD_DPRINTF( "bah!\n" );
+                exit( 1 );
+              }
+            }
+            else
+              break; // That was the last leaf
+          }
+        }
+
+      if ( charsLeftToChop && !Utils::AtomicInt::loadAcquire( isCancelled ) ) {
         --charsLeftToChop;
         folded.resize( folded.size() - 1 );
       }
@@ -383,27 +342,22 @@ void BtreeWordSearchRequest::findMatches()
         break;
     }
   }
-  catch( std::exception & e )
-  {
-    qWarning( "Index searching failed: \"%s\", error: %s\n",
-              dict.getName().c_str(), e.what() );
+  catch ( std::exception & e ) {
+    qWarning( "Index searching failed: \"%s\", error: %s\n", dict.getName().c_str(), e.what() );
   }
-  catch(...)
-  {
+  catch ( ... ) {
     gdWarning( "Index searching failed: \"%s\"\n", dict.getName().c_str() );
   }
 }
 
 void BtreeWordSearchRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
@@ -420,20 +374,24 @@ BtreeWordSearchRequest::~BtreeWordSearchRequest()
   f.waitForFinished();
 }
 
-sptr< Dictionary::WordSearchRequest > BtreeDictionary::prefixMatch(
-  wstring const & str, unsigned long maxResults )
-  
+sptr< Dictionary::WordSearchRequest > BtreeDictionary::prefixMatch( wstring const & str, unsigned long maxResults )
+
 {
-  return std::make_shared<BtreeWordSearchRequest>( *this, str, 0, -1, true, maxResults );
+  return std::make_shared< BtreeWordSearchRequest >( *this, str, 0, -1, true, maxResults );
 }
 
-sptr< Dictionary::WordSearchRequest > BtreeDictionary::stemmedMatch(
-  wstring const & str, unsigned minLength, unsigned maxSuffixVariation,
-  unsigned long maxResults )
-  
+sptr< Dictionary::WordSearchRequest > BtreeDictionary::stemmedMatch( wstring const & str,
+                                                                     unsigned minLength,
+                                                                     unsigned maxSuffixVariation,
+                                                                     unsigned long maxResults )
+
 {
-  return std::make_shared<BtreeWordSearchRequest>( *this, str, minLength, (int)maxSuffixVariation,
-                                     false, maxResults );
+  return std::make_shared< BtreeWordSearchRequest >( *this,
+                                                     str,
+                                                     minLength,
+                                                     (int)maxSuffixVariation,
+                                                     false,
+                                                     maxResults );
 }
 
 void BtreeIndex::readNode( uint32_t offset, vector< char > & out )
@@ -441,7 +399,7 @@ void BtreeIndex::readNode( uint32_t offset, vector< char > & out )
   idxFile->seek( offset );
 
   uint32_t uncompressedSize = idxFile->read< uint32_t >();
-  uint32_t compressedSize = idxFile->read< uint32_t >();
+  uint32_t compressedSize   = idxFile->read< uint32_t >();
 
   //GD_DPRINTF( "%x,%x\n", uncompressedSize, compressedSize );
 
@@ -453,19 +411,14 @@ void BtreeIndex::readNode( uint32_t offset, vector< char > & out )
 
   unsigned long decompressedLength = out.size();
 
-  if ( uncompress( (unsigned char *)&out.front(),
-                   &decompressedLength,
-                   &compressedData.front(),
-                   compressedData.size() ) != Z_OK ||
-       decompressedLength != out.size() )
+  if ( uncompress( (unsigned char *)&out.front(), &decompressedLength, &compressedData.front(), compressedData.size() )
+         != Z_OK
+       || decompressedLength != out.size() )
     throw exFailedToDecompressNode();
 }
 
-char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
-                                                       bool & exactMatch,
-                                                       vector< char > & extLeaf,
-                                                       uint32_t & nextLeaf,
-                                                       char const * & leafEnd )
+char const * BtreeIndex::findChainOffsetExactOrPrefix(
+  wstring const & target, bool & exactMatch, vector< char > & extLeaf, uint32_t & nextLeaf, char const *& leafEnd )
 {
   if ( !idxFile )
     throw exIndexWasNotOpened();
@@ -482,64 +435,55 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
 
   uint32_t currentNodeOffset = rootOffset;
 
-  if ( !rootNodeLoaded )
-  {
+  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();
-  leafEnd = leaf + rootNode.size();
+  leafEnd           = leaf + rootNode.size();
 
-  if( target.empty() )
-  {
+  if ( target.empty() ) {
     //For empty target string we return first chain in index
-    for( ; ; )
-    {
+    for ( ;; ) {
       uint32_t leafEntries = *(uint32_t *)leaf;
 
-      if ( leafEntries == 0xffffFFFF )
-      {
+      if ( leafEntries == 0xffffFFFF ) {
         // A node
         currentNodeOffset = *( (uint32_t *)leaf + 1 );
         readNode( currentNodeOffset, extLeaf );
-        leaf = &extLeaf.front();
-        leafEnd = leaf + extLeaf.size();
+        leaf     = &extLeaf.front();
+        leafEnd  = leaf + extLeaf.size();
         nextLeaf = idxFile->read< uint32_t >();
       }
-      else
-      {
+      else {
         // A leaf
-        if( currentNodeOffset == rootOffset )
-        {
+        if ( currentNodeOffset == rootOffset ) {
           // Only one leaf in index, there's no next leaf
           nextLeaf = 0;
         }
-        if( !leafEntries )
-          return 0;
+        if ( !leafEntries )
+          return nullptr;
 
         return leaf + sizeof( uint32_t );
       }
     }
   }
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     // Is it a leaf or a node?
 
     uint32_t leafEntries = *(uint32_t *)leaf;
 
-    if ( leafEntries == 0xffffFFFF )
-    {
+    if ( leafEntries == 0xffffFFFF ) {
       // A node
 
       //GD_DPRINTF( "=>a node\n" );
 
       uint32_t const * offsets = (uint32_t *)leaf + 1;
 
-      char const * ptr = leaf + sizeof( uint32_t ) +
-                         ( indexNodeSize + 1 ) * sizeof( uint32_t );
+      char const * ptr = leaf + sizeof( uint32_t ) + ( indexNodeSize + 1 ) * sizeof( uint32_t );
 
       // ptr now points to a span of zero-separated strings, up to leafEnd.
       // We find our match using a binary search.
@@ -551,30 +495,27 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
       char const * window = ptr;
       unsigned windowSize = leafEnd - ptr;
 
-      for( ; ; )
-      {  
+      for ( ;; ) {
         // We boldly shoot in the middle of the whole mess, and then adjust
         // to the beginning of the string that we've hit.
-        char const * testPoint = window + windowSize/2;
-  
+        char const * testPoint = window + windowSize / 2;
+
         closestString = testPoint;
-  
-        while( closestString > ptr && closestString[ -1 ] )
+
+        while ( closestString > ptr && closestString[ -1 ] )
           --closestString;
-  
+
         size_t wordSize = strlen( closestString );
 
         w_word = Utf8::decode( string( closestString, wordSize ) );
 
-        compareResult = target.compare( w_word);
-  
-        if ( !compareResult )
-        {
+        compareResult = target.compare( w_word );
+
+        if ( !compareResult ) {
           // The target string matches the current one. Finish the search.
           break;
         }
-        if ( compareResult < 0 )
-        {
+        if ( compareResult < 0 ) {
           // The target string is smaller than the current one.
           // Go to the left.
           windowSize = closestString - window;
@@ -582,11 +523,10 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
           if ( !windowSize )
             break;
         }
-        else
-        {
+        else {
           // The target string is larger than the current one.
           // Go to the right.
-          windowSize -= ( closestString - window )  + wordSize + 1;
+          windowSize -= ( closestString - window ) + wordSize + 1;
           window = closestString + wordSize + 1;
 
           if ( !windowSize )
@@ -597,28 +537,25 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
 
       // Now, whatever the outcome (compareResult) is, we need to find
       // entry number for the closestMatch string.
-       
+
       unsigned entry = 0;
 
-      for( char const * next = ptr; next != closestString;
-           next += strlen( next ) + 1, ++entry ) ;
+      for ( char const * next = ptr; next != closestString; next += strlen( next ) + 1, ++entry )
+        ;
 
       // Ok, now check the outcome
 
-      if ( !compareResult )
-      {
+      if ( !compareResult ) {
         // The target string matches the one found.
         // Go to the right, since it's there where we store such results.
         currentNodeOffset = offsets[ entry + 1 ];
       }
-      if ( compareResult < 0 )
-      {
+      if ( compareResult < 0 ) {
         // The target string is smaller than the one found.
         // Go to the left.
         currentNodeOffset = offsets[ entry ];
       }
-      else
-      {
+      else {
         // The target string is larger than the one found.
         // Go to the right.
         currentNodeOffset = offsets[ entry + 1 ];
@@ -626,11 +563,10 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
 
       //GD_DPRINTF( "reading node at %x\n", currentNodeOffset );
       readNode( currentNodeOffset, extLeaf );
-      leaf = &extLeaf.front();
+      leaf    = &extLeaf.front();
       leafEnd = leaf + extLeaf.size();
     }
-    else
-    {
+    else {
       //GD_DPRINTF( "=>a leaf\n" );
       // A leaf
 
@@ -639,13 +575,12 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
       // be in the right place for root node anyway, since we precache it.
       nextLeaf = ( currentNodeOffset != rootOffset ? idxFile->read< uint32_t >() : 0 );
 
-      if ( !leafEntries )
-      {
+      if ( !leafEntries ) {
         // Empty leaf? This may only be possible for entirely empty trees only.
         if ( currentNodeOffset != rootOffset )
           throw exCorruptedChainData();
         else
-          return 0; // No match
+          return nullptr; // No match
       }
 
       // Build an array containing all chain pointers
@@ -658,8 +593,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
       {
         char const ** nextOffset = &chainOffsets.front();
 
-        while( leafEntries-- )
-        {
+        while ( leafEntries-- ) {
           *nextOffset++ = ptr;
 
           memcpy( &chainSize, ptr, sizeof( uint32_t ) );
@@ -674,78 +608,69 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
       // string lands.
 
       char const ** window = &chainOffsets.front();
-      unsigned windowSize = chainOffsets.size();
+      unsigned windowSize  = chainOffsets.size();
 
-      for( ; ; )
-      {
+      for ( ;; ) {
         //GD_DPRINTF( "window = %u, ws = %u\n", window - &chainOffsets.front(), windowSize );
 
-        char const ** chainToCheck = window + windowSize/2;
-        ptr = *chainToCheck;
-  
+        char const ** chainToCheck = window + windowSize / 2;
+        ptr                        = *chainToCheck;
+
         memcpy( &chainSize, ptr, sizeof( uint32_t ) );
         ptr += sizeof( uint32_t );
-  
+
         size_t wordSize = strlen( ptr );
 
         w_word = Utf8::decode( string( ptr, wordSize ) );
-  
+
         wstring foldedWord = Folding::apply( w_word );
-        if( foldedWord.empty() )
+        if ( foldedWord.empty() )
           foldedWord = Folding::applyWhitespaceOnly( w_word );
-  
+
         int compareResult = target.compare( foldedWord );
-  
-        if ( !compareResult )
-        {
+
+        if ( !compareResult ) {
           // Exact match -- return and be done
           exactMatch = true;
-  
+
           return ptr - sizeof( uint32_t );
         }
-        else
-        if ( compareResult < 0 )
-        {
+        else if ( compareResult < 0 ) {
           // The target string is smaller than the current one.
           // Go to the first half
-           
+
           windowSize /= 2;
 
-          if ( !windowSize )
-          {
+          if ( !windowSize ) {
             // That finishes our search. Since our target string
             // landed before the last tested chain, we return a possible
             // prefix match against that chain.
             return ptr - sizeof( uint32_t );
           }
         }
-        else
-        {
+        else {
           // The target string is larger than the current one.
           // Go to the second half
 
-          windowSize -= windowSize/2 + 1;
+          windowSize -= windowSize / 2 + 1;
 
-          if ( !windowSize )
-          {
+          if ( !windowSize ) {
             // That finishes our search. Since our target string
             // landed after the last tested chain, we return the next
             // chain. If there's no next chain in this leaf, this
             // would mean the first element in the next leaf.
-            if ( chainToCheck == &chainOffsets.back() )
-            {
-              if ( nextLeaf )
-              {
+            if ( chainToCheck == &chainOffsets.back() ) {
+              if ( nextLeaf ) {
                 readNode( nextLeaf, extLeaf );
-  
+
                 leafEnd = &extLeaf.front() + extLeaf.size();
-  
+
                 nextLeaf = idxFile->read< uint32_t >();
-  
+
                 return &extLeaf.front() + sizeof( uint32_t );
               }
               else
-                return 0; // This was the last leaf
+                return nullptr; // This was the last leaf
             }
             else
               return chainToCheck[ 1 ];
@@ -758,7 +683,7 @@ char const * BtreeIndex::findChainOffsetExactOrPrefix( wstring const & target,
   }
 }
 
-vector< WordArticleLink > BtreeIndex::readChain( char const * & ptr )
+vector< WordArticleLink > BtreeIndex::readChain( char const *& ptr, uint32_t maxMatchCount )
 {
   uint32_t chainSize;
 
@@ -768,8 +693,7 @@ vector< WordArticleLink > BtreeIndex::readChain( char const * & ptr )
 
   vector< WordArticleLink > result;
 
-  while( chainSize )
-  {
+  while ( chainSize && ( maxMatchCount < 0 || result.size() < maxMatchCount ) ) {
     string str = ptr;
     ptr += str.size() + 1;
 
@@ -782,7 +706,7 @@ vector< WordArticleLink > BtreeIndex::readChain( char const * & ptr )
 
     ptr += sizeof( uint32_t );
 
-    result.emplace_back(str, articleOffset, prefix);
+    result.emplace_back( str, articleOffset, prefix );
 
     if ( chainSize < str.size() + 1 + prefix.size() + 1 + sizeof( uint32_t ) )
       throw exCorruptedChainData();
@@ -793,26 +717,24 @@ vector< WordArticleLink > BtreeIndex::readChain( char const * & ptr )
   return result;
 }
 
-void BtreeIndex::antialias( wstring const & str,
-                            vector< WordArticleLink > & chain,
-                            bool ignoreDiacritics )
+void BtreeIndex::antialias( wstring const & str, vector< WordArticleLink > & chain, bool ignoreDiacritics )
 {
   wstring caseFolded = Folding::applySimpleCaseOnly( gd::normalize( str ) );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     caseFolded = Folding::applyDiacriticsOnly( caseFolded );
 
-  if(GlobalBroadcaster::instance()->getPreference()->ignorePunctuation)
+  if ( GlobalBroadcaster::instance()->getPreference()->ignorePunctuation )
     caseFolded = Folding::trimWhitespaceOrPunct( caseFolded );
 
-  for( unsigned x = chain.size(); x--; )
-  {
+  for ( unsigned x = chain.size(); x--; ) {
     // If after applying case folding to each word they wouldn't match, we
     // drop the entry.
-    wstring entry = Folding::applySimpleCaseOnly( gd::normalize( Utf8::decode( chain[ x ].prefix + chain[ x ].word ) ) );
-    if( ignoreDiacritics )
+    wstring entry =
+      Folding::applySimpleCaseOnly( gd::normalize( Utf8::decode( chain[ x ].prefix + chain[ x ].word ) ) );
+    if ( ignoreDiacritics )
       entry = Folding::applyDiacriticsOnly( entry );
 
-    if( GlobalBroadcaster::instance()->getPreference()->ignorePunctuation )
+    if ( GlobalBroadcaster::instance()->getPreference()->ignorePunctuation )
       entry = Folding::trimWhitespaceOrPunct( entry );
 
     if ( entry != caseFolded )
@@ -832,7 +754,8 @@ void BtreeIndex::antialias( wstring const & str,
 /// leaf nodes.
 static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
                                 size_t indexSize,
-                                File::Class & file, size_t maxElements,
+                                File::Class & file,
+                                size_t maxElements,
                                 uint32_t & lastLeafLinkOffset )
 {
   // We compress all the node data. This buffer would hold it.
@@ -840,16 +763,14 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
   bool isLeaf = indexSize <= maxElements;
 
-  if ( isLeaf )
-  {
+  if ( isLeaf ) {
     // A leaf.
 
     uint32_t totalChainsLength = 0;
 
     auto nextWord = nextIndex;
 
-    for( unsigned x = indexSize; x--; ++nextWord )
-    {
+    for ( unsigned x = indexSize; x--; ++nextWord ) {
       totalChainsLength += sizeof( uint32_t );
 
       vector< WordArticleLink > const & chain = nextWord->second;
@@ -865,8 +786,7 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
     unsigned char * ptr = &uncompressedData.front() + sizeof( uint32_t );
 
-    for( unsigned x = indexSize; x--; ++nextIndex )
-    {
+    for ( unsigned x = indexSize; x--; ++nextIndex ) {
       vector< WordArticleLink > const & chain = nextIndex->second;
 
       unsigned char * saveSizeHere = ptr;
@@ -891,8 +811,7 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
       memcpy( saveSizeHere, &size, sizeof( uint32_t ) );
     }
   }
-  else
-  {
+  else {
     // A node which will have children.
 
     uncompressedData.resize( sizeof( uint32_t ) + ( maxElements + 1 ) * sizeof( uint32_t ) );
@@ -902,14 +821,10 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
     unsigned prevEntry = 0;
 
-    for( unsigned x = 0; x < maxElements; ++x )
-    {
-      unsigned curEntry = (uint64_t) indexSize * ( x + 1 ) / ( maxElements + 1 );
+    for ( unsigned x = 0; x < maxElements; ++x ) {
+      unsigned curEntry = (uint64_t)indexSize * ( x + 1 ) / ( maxElements + 1 );
 
-      uint32_t offset = buildBtreeNode( nextIndex,
-                                        curEntry - prevEntry,
-                                        file, maxElements,
-                                        lastLeafLinkOffset );
+      uint32_t offset = buildBtreeNode( nextIndex, curEntry - prevEntry, file, maxElements, lastLeafLinkOffset );
 
       memcpy( &uncompressedData.front() + sizeof( uint32_t ) + x * sizeof( uint32_t ), &offset, sizeof( uint32_t ) );
 
@@ -918,19 +833,16 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
       size_t prevSize = uncompressedData.size();
       uncompressedData.resize( prevSize + sz );
 
-      memcpy( &uncompressedData.front() + prevSize, nextIndex->first.c_str(),
-              sz );
+      memcpy( &uncompressedData.front() + prevSize, nextIndex->first.c_str(), sz );
 
       prevEntry = curEntry;
     }
 
     // Rightmost child
-    uint32_t offset = buildBtreeNode( nextIndex,
-                                      indexSize - prevEntry,
-                                      file, maxElements,
-                                      lastLeafLinkOffset );
-    memcpy( &uncompressedData.front() + sizeof( uint32_t ) +
-            maxElements * sizeof( uint32_t ), &offset, sizeof( offset ) );
+    uint32_t offset = buildBtreeNode( nextIndex, indexSize - prevEntry, file, maxElements, lastLeafLinkOffset );
+    memcpy( &uncompressedData.front() + sizeof( uint32_t ) + maxElements * sizeof( uint32_t ),
+            &offset,
+            sizeof( offset ) );
   }
 
   // Save the result.
@@ -938,9 +850,8 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
   unsigned long compressedSize = compressedData.size();
 
-  if ( compress( &compressedData.front(), &compressedSize,
-                 &uncompressedData.front(), uncompressedData.size() ) != Z_OK )
-  {
+  if ( compress( &compressedData.front(), &compressedSize, &uncompressedData.front(), uncompressedData.size() )
+       != Z_OK ) {
     qFatal( "Failed to compress btree node." );
     abort();
   }
@@ -951,17 +862,15 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
   file.write< uint32_t >( compressedSize );
   file.write( &compressedData.front(), compressedSize );
 
-  if ( isLeaf )
-  {
+  if ( isLeaf ) {
     // A link to the next leef, which is zero and which will be updated
     // should we happen to have another leaf.
-    
-    file.write( ( uint32_t ) 0 );
+
+    file.write( (uint32_t)0 );
 
     uint32_t here = file.tell();
 
-    if ( lastLeafLinkOffset )
-    {
+    if ( lastLeafLinkOffset ) {
       // Update the previous leaf to have the offset of this one.
       file.seek( lastLeafLinkOffset );
       file.write( offset );
@@ -977,28 +886,26 @@ static uint32_t buildBtreeNode( IndexedWords::const_iterator & nextIndex,
 
 void IndexedWords::addWord( wstring const & index_word, uint32_t articleOffset, unsigned int maxHeadwordSize )
 {
-  wstring const & word = gd::removeTrailingZero( index_word );
-  wchar const * wordBegin = word.c_str();
+  wstring const & word       = gd::removeTrailingZero( index_word );
+  wchar const * wordBegin    = word.c_str();
   string::size_type wordSize = word.size();
 
   // Safeguard us against various bugs here. Don't attempt adding words
   // which are freakishly huge.
-  if( wordSize > maxHeadwordSize )
-  {
+  if ( wordSize > maxHeadwordSize ) {
     qWarning() << "Skipped too long headword: " << QString::fromStdU32String( word.substr( 0, 30 ) )
                << "size:" << wordSize;
     return;
   }
 
   // Skip any leading whitespace
-  while( *wordBegin && Folding::isWhitespace( *wordBegin ) )
-  {
+  while ( *wordBegin && Folding::isWhitespace( *wordBegin ) ) {
     ++wordBegin;
     --wordSize;
   }
 
   // Skip any trailing whitespace
-  while( wordSize && Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) )
+  while ( wordSize && Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) )
     --wordSize;
 
   wchar const * nextChar = wordBegin;
@@ -1007,28 +914,24 @@ void IndexedWords::addWord( wstring const & index_word, uint32_t articleOffset,
 
   int wordsAdded = 0; // Number of stored parts
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     // Skip any whitespace/punctuation
-    for( ; ; ++nextChar )
-    {
+    for ( ;; ++nextChar ) {
       if ( !*nextChar ) // End of string ends everything
       {
-          if( wordsAdded == 0)
-          {
-              wstring folded = Folding::applyWhitespaceOnly( wstring( wordBegin, wordSize ) );
-              if( !folded.empty() )
-              {
-                auto i = insert( { Utf8::encode( folded ), vector< WordArticleLink >() } ).first;
+        if ( wordsAdded == 0 ) {
+          wstring folded = Folding::applyWhitespaceOnly( wstring( wordBegin, wordSize ) );
+          if ( !folded.empty() ) {
+            auto i = insert( { Utf8::encode( folded ), vector< WordArticleLink >() } ).first;
 
-                string utfWord=Utf8::encode( wstring(wordBegin, wordSize )) ;
-                  string utfPrefix;
-                  i->second.emplace_back(utfWord, articleOffset, utfPrefix);
-              }
+            string utfWord = Utf8::encode( wstring( wordBegin, wordSize ) );
+            string utfPrefix;
+            i->second.emplace_back( utfWord, articleOffset, utfPrefix );
           }
-          return;
+        }
+        return;
       }
-  
+
       if ( !Folding::isWhitespace( *nextChar ) && !Folding::isPunct( *nextChar ) )
         break;
     }
@@ -1039,15 +942,14 @@ void IndexedWords::addWord( wstring const & index_word, uint32_t articleOffset,
 
     auto i = insert( { std::move( name ), vector< WordArticleLink >() } ).first;
 
-    if( ( i->second.size() < 1024 ) || ( nextChar == wordBegin ) ) // Don't overpopulate chains with middle matches
+    if ( ( i->second.size() < 1024 ) || ( nextChar == wordBegin ) ) // Don't overpopulate chains with middle matches
     {
-      string utfWord = Utf8::encode( wstring( nextChar, wordSize - ( nextChar - wordBegin ) ) );
+      string utfWord   = Utf8::encode( wstring( nextChar, wordSize - ( nextChar - wordBegin ) ) );
       string utfPrefix = Utf8::encode( wstring( wordBegin, nextChar - wordBegin ) );
 
-      i->second.emplace_back(std::move(utfWord), articleOffset, std::move(utfPrefix));
+      i->second.emplace_back( std::move( utfWord ), articleOffset, std::move( utfPrefix ) );
       // reduce the vector reallocation.
-      if( i->second.size() * 1.0 / i->second.capacity() > 0.75 )
-      {
+      if ( i->second.size() * 1.0 / i->second.capacity() > 0.75 ) {
         i->second.reserve( i->second.capacity() * 2 );
       }
     }
@@ -1055,8 +957,7 @@ void IndexedWords::addWord( wstring const & index_word, uint32_t articleOffset,
     wordsAdded += 1;
 
     // Skip all non-whitespace/punctuation
-    for( ++nextChar; ; ++nextChar )
-    {
+    for ( ++nextChar;; ++nextChar ) {
       if ( !*nextChar )
         return; // End of string ends everything
 
@@ -1069,10 +970,10 @@ void IndexedWords::addWord( wstring const & index_word, uint32_t articleOffset,
 void IndexedWords::addSingleWord( wstring const & index_word, uint32_t articleOffset )
 {
   wstring const & word = gd::removeTrailingZero( index_word );
-  wstring folded = Folding::apply( word );
-  if( folded.empty() )
-      folded = Folding::applyWhitespaceOnly( word );
-  operator []( Utf8::encode( folded ) ).emplace_back(Utf8::encode( word ), articleOffset);
+  wstring folded       = Folding::apply( word );
+  if ( folded.empty() )
+    folded = Folding::applyWhitespaceOnly( word );
+  operator[]( Utf8::encode( folded ) ).emplace_back( Utf8::encode( word ), articleOffset );
 }
 
 IndexInfo buildIndex( IndexedWords const & indexedWords, File::Class & file )
@@ -1083,8 +984,7 @@ IndexInfo buildIndex( IndexedWords const & indexedWords, File::Class & file )
   // Skip any empty words. No point in indexing those, and some dictionaries
   // are known to have buggy empty-word entries (Stardict's jargon for instance).
 
-  while( indexSize && nextIndex->first.empty() )
-  {
+  while ( indexSize && nextIndex->first.empty() ) {
     indexSize--;
     ++nextIndex;
   }
@@ -1092,22 +992,19 @@ IndexInfo buildIndex( IndexedWords const & indexedWords, File::Class & file )
   // We try to stick to two-level tree for most dictionaries. Try finding
   // the right size for it.
 
-  size_t btreeMaxElements = ( (size_t) sqrt( (double) indexSize ) ) + 1;
+  size_t btreeMaxElements = ( (size_t)sqrt( (double)indexSize ) ) + 1;
 
   if ( btreeMaxElements < BtreeMinElements )
     btreeMaxElements = BtreeMinElements;
-  else
-  if ( btreeMaxElements > BtreeMaxElements )
+  else if ( btreeMaxElements > BtreeMaxElements )
     btreeMaxElements = BtreeMaxElements;
 
-  GD_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;
 
-  uint32_t rootOffset = buildBtreeNode( nextIndex, indexSize,
-                                        file, btreeMaxElements,
-                                        lastLeafOffset );
+  uint32_t rootOffset = buildBtreeNode( nextIndex, indexSize, file, btreeMaxElements, lastLeafOffset );
 
   return IndexInfo( btreeMaxElements, rootOffset );
 }
@@ -1117,7 +1014,7 @@ void BtreeIndex::getAllHeadwords( QSet< QString > & headwords )
   if ( !idxFile )
     throw exIndexWasNotOpened();
 
-  findArticleLinks( NULL, NULL, &headwords );
+  findArticleLinks( nullptr, nullptr, &headwords );
 }
 
 void BtreeIndex::findAllArticleLinks( QVector< WordArticleLink > & articleLinks )
@@ -1127,61 +1024,56 @@ void BtreeIndex::findAllArticleLinks( QVector< WordArticleLink > & articleLinks
 
   QSet< uint32_t > offsets;
 
-  findArticleLinks( &articleLinks, &offsets, NULL );
+  findArticleLinks( &articleLinks, &offsets, nullptr );
 }
 
 void BtreeIndex::findArticleLinks( QVector< WordArticleLink > * articleLinks,
                                    QSet< uint32_t > * offsets,
-                                   QSet< QString > *headwords,
+                                   QSet< QString > * headwords,
                                    QAtomicInt * isCancelled )
 {
   uint32_t currentNodeOffset = rootOffset;
-  uint32_t nextLeaf = 0;
+  uint32_t nextLeaf          = 0;
   uint32_t leafEntries;
 
   QMutexLocker _( idxFileMutex );
 
-  if ( !rootNodeLoaded )
-  {
+  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;
+  char const * leaf     = &rootNode.front();
+  char const * leafEnd  = leaf + rootNode.size();
+  char const * chainPtr = nullptr;
 
   vector< char > extLeaf;
 
   // Find first leaf
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     leafEntries = *(uint32_t *)leaf;
 
-    if( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
+    if ( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
       return;
 
-    if ( leafEntries == 0xffffFFFF )
-    {
+    if ( leafEntries == 0xffffFFFF ) {
       // A node
       currentNodeOffset = *( (uint32_t *)leaf + 1 );
       readNode( currentNodeOffset, extLeaf );
-      leaf = &extLeaf.front();
-      leafEnd = leaf + extLeaf.size();
+      leaf     = &extLeaf.front();
+      leafEnd  = leaf + extLeaf.size();
       nextLeaf = idxFile->read< uint32_t >();
     }
-    else
-    {
+    else {
       // A leaf
       chainPtr = leaf + sizeof( uint32_t );
       break;
     }
   }
 
-  if ( !leafEntries )
-  {
+  if ( !leafEntries ) {
     // Empty leaf? This may only be possible for entirely empty trees only.
     if ( currentNodeOffset != rootOffset )
       throw exCorruptedChainData();
@@ -1191,54 +1083,53 @@ void BtreeIndex::findArticleLinks( QVector< WordArticleLink > * articleLinks,
 
   // Read all chains
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     vector< WordArticleLink > result = readChain( chainPtr );
 
-    if( headwords && static_cast< vector< WordArticleLink >::size_type >( headwords->capacity() ) < headwords->size() + result.size() )
-    {
+    if ( headwords
+         && static_cast< vector< WordArticleLink >::size_type >( headwords->capacity() )
+           < headwords->size() + result.size() ) {
       int n = headwords->capacity();
       headwords->reserve( n + n / 10 );
     }
 
-    if( offsets && static_cast< vector< WordArticleLink >::size_type >( offsets->capacity() ) < offsets->size() + result.size() )
-    {
+    if ( offsets
+         && static_cast< vector< WordArticleLink >::size_type >( offsets->capacity() )
+           < offsets->size() + result.size() ) {
       int n = offsets->capacity();
       offsets->reserve( n + n / 10 );
     }
 
-    if( articleLinks && static_cast< vector< WordArticleLink >::size_type >( articleLinks->capacity() ) < articleLinks->size() + result.size() )
-    {
+    if ( articleLinks
+         && static_cast< vector< WordArticleLink >::size_type >( articleLinks->capacity() )
+           < articleLinks->size() + result.size() ) {
       int n = articleLinks->capacity();
       articleLinks->reserve( n + n / 10 );
     }
 
-    for( unsigned i = 0; i < result.size(); i++ )
-    {
-      if( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
+    for ( auto & i : result ) {
+      if ( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
         return;
 
-      if( headwords )
-        headwords->insert( QString::fromUtf8( ( result[ i ].prefix + result[ i ].word ).c_str() ) );
+      if ( headwords )
+        headwords->insert( QString::fromUtf8( ( i.prefix + i.word ).c_str() ) );
 
-      if( offsets && offsets->contains( result[ i ].articleOffset ) )
+      if ( offsets && offsets->contains( i.articleOffset ) )
         continue;
 
-      if( offsets )
-        offsets->insert( result[ i ].articleOffset );
+      if ( offsets )
+        offsets->insert( i.articleOffset );
 
-      if( articleLinks )
-        articleLinks->push_back( WordArticleLink( result[ i ].prefix + result[ i ].word, result[ i ].articleOffset ) );
+      if ( articleLinks )
+        articleLinks->push_back( WordArticleLink( i.prefix + i.word, i.articleOffset ) );
     }
 
-    if ( chainPtr >= leafEnd )
-    {
+    if ( chainPtr >= leafEnd ) {
       // We're past the current leaf, fetch the next one
 
-      if ( nextLeaf )
-      {
+      if ( nextLeaf ) {
         readNode( nextLeaf, extLeaf );
-        leaf = &extLeaf.front();
+        leaf    = &extLeaf.front();
         leafEnd = leaf + extLeaf.size();
 
         nextLeaf = idxFile->read< uint32_t >();
@@ -1255,33 +1146,30 @@ void BtreeIndex::findArticleLinks( QVector< WordArticleLink > * articleLinks,
   }
 }
 
-void BtreeIndex::findHeadWords( QSet<uint32_t> offsets,int& index,
-                                   QSet< QString > * headwords,
-                                   uint32_t length )
+void BtreeIndex::findHeadWords( QSet< uint32_t > offsets, int & index, QSet< QString > * headwords, uint32_t length )
 {
-  int i=0;
-  for(auto begin=offsets.begin();begin!=offsets.end();begin++,i++){
-    if(i<index){
+  int i = 0;
+  for ( auto begin = offsets.begin(); begin != offsets.end(); begin++, i++ ) {
+    if ( i < index ) {
       continue;
     }
-    findSingleNodeHeadwords(*begin,headwords);
+    findSingleNodeHeadwords( *begin, headwords );
     index++;
 
-    if(headwords->size()>=length)
+    if ( headwords->size() >= length )
       break;
   }
 }
 
-void BtreeIndex::findSingleNodeHeadwords( uint32_t offsets,
-                                QSet< QString > * headwords)
+void BtreeIndex::findSingleNodeHeadwords( uint32_t offsets, QSet< QString > * headwords )
 {
   uint32_t currentNodeOffset = offsets;
 
   QMutexLocker _( idxFileMutex );
 
-  char const * leaf = 0;
-  char const * leafEnd = 0;
-  char const * chainPtr = 0;
+  char const * leaf     = nullptr;
+  char const * leafEnd  = nullptr;
+  char const * chainPtr = nullptr;
 
   vector< char > extLeaf;
 
@@ -1293,45 +1181,39 @@ void BtreeIndex::findSingleNodeHeadwords( uint32_t offsets,
   // A leaf
   chainPtr = leaf + sizeof( uint32_t );
 
-  for( ;; )
-  {
+  for ( ;; ) {
     vector< WordArticleLink > result = readChain( chainPtr );
 
-    if( headwords )
-    {
-      for( unsigned i = 0; i < result.size(); i++ )
-      {
-        headwords->insert( QString::fromUtf8( ( result[ i ].prefix + result[ i ].word ).c_str() ) );
+    if ( headwords ) {
+      for ( auto & i : result ) {
+        headwords->insert( QString::fromUtf8( ( i.prefix + i.word ).c_str() ) );
       }
     }
 
-    if( chainPtr >= leafEnd )
-    {
-        break; // That was the last leaf
+    if ( chainPtr >= leafEnd ) {
+      break; // That was the last leaf
     }
   }
 }
 
 //find the next chain ptr ,which is large than this currentChainPtr
-QSet<uint32_t> BtreeIndex::findNodes()
+QSet< uint32_t > BtreeIndex::findNodes()
 {
   QMutexLocker _( idxFileMutex );
 
-  if( !rootNodeLoaded )
-  {
+  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();
-  QSet<uint32_t> leafOffset;
+  char const * leaf = &rootNode.front();
+  QSet< uint32_t > leafOffset;
 
   uint32_t leafEntries;
   leafEntries = *(uint32_t *)leaf;
-  if ( leafEntries != 0xffffFFFF )
-  {
-    leafOffset.insert(rootOffset);
+  if ( leafEntries != 0xffffFFFF ) {
+    leafOffset.insert( rootOffset );
     return leafOffset;
   }
 
@@ -1339,67 +1221,62 @@ QSet<uint32_t> BtreeIndex::findNodes()
 
   // A node offset
   uint32_t * offsets = (uint32_t *)leaf + 1;
-  uint32_t i=0;
+  uint32_t i         = 0;
 
-  while(i++ < (indexNodeSize+1) )
-    leafOffset.insert(*(offsets++));
+  while ( i++ < ( indexNodeSize + 1 ) )
+    leafOffset.insert( *( offsets++ ) );
 
   return leafOffset;
 }
 
-void BtreeIndex::getHeadwordsFromOffsets( QList<uint32_t> & offsets,
-                                          QVector<QString> & headwords,
+void BtreeIndex::getHeadwordsFromOffsets( QList< uint32_t > & offsets,
+                                          QVector< QString > & headwords,
                                           QAtomicInt * isCancelled )
 {
   uint32_t currentNodeOffset = rootOffset;
-  uint32_t nextLeaf = 0;
+  uint32_t nextLeaf          = 0;
   uint32_t leafEntries;
 
   std::sort( offsets.begin(), offsets.end() );
 
   QMutexLocker _( idxFileMutex );
 
-  if ( !rootNodeLoaded )
-  {
+  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;
+  char const * leaf     = &rootNode.front();
+  char const * leafEnd  = leaf + rootNode.size();
+  char const * chainPtr = nullptr;
 
   vector< char > extLeaf;
 
   // Find first leaf
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     leafEntries = *(uint32_t *)leaf;
 
-    if( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
+    if ( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
       return;
 
-    if ( leafEntries == 0xffffFFFF )
-    {
+    if ( leafEntries == 0xffffFFFF ) {
       // A node
       currentNodeOffset = *( (uint32_t *)leaf + 1 );
       readNode( currentNodeOffset, extLeaf );
-      leaf = &extLeaf.front();
-      leafEnd = leaf + extLeaf.size();
+      leaf     = &extLeaf.front();
+      leafEnd  = leaf + extLeaf.size();
       nextLeaf = idxFile->read< uint32_t >();
     }
-    else
-    {
+    else {
       // A leaf
       chainPtr = leaf + sizeof( uint32_t );
       break;
     }
   }
 
-  if ( !leafEntries )
-  {
+  if ( !leafEntries ) {
     // Empty leaf? This may only be possible for entirely empty trees only.
     if ( currentNodeOffset != rootOffset )
       throw exCorruptedChainData();
@@ -1412,45 +1289,41 @@ void BtreeIndex::getHeadwordsFromOffsets( QList<uint32_t> & offsets,
   QList< uint32_t >::Iterator begOffsets = offsets.begin();
   QList< uint32_t >::Iterator endOffsets = offsets.end();
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     vector< WordArticleLink > result = readChain( chainPtr );
 
-    for( unsigned i = 0; i < result.size(); i++ )
-    {
-      uint32_t articleOffset =   result.at(i).articleOffset;
+    for ( auto & i : result ) {
+      uint32_t articleOffset = i.articleOffset;
 
-      QList<uint32_t>::Iterator  it = std::lower_bound( begOffsets, endOffsets,
-                                                    articleOffset );
+      QList< uint32_t >::Iterator it = std::lower_bound( begOffsets, endOffsets, articleOffset );
 
-      if( it != offsets.end() && *it == articleOffset )
-      {
-        if( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
+      if ( it != offsets.end() && *it == articleOffset ) {
+        if ( isCancelled && Utils::AtomicInt::loadAcquire( *isCancelled ) )
           return;
 
-        auto word = QString::fromUtf8( ( result[ i ].prefix + result[ i ].word ).c_str() );
+        auto word = QString::fromUtf8( ( i.prefix + i.word ).c_str() );
 
-        headwords.append(  word );
-        offsets.erase( it);
+        if ( headwords.indexOf( word ) == -1 ) {
+          headwords.append( word );
+        }
+        offsets.erase( it );
         begOffsets = offsets.begin();
         endOffsets = offsets.end();
       }
 
-      if( offsets.isEmpty() )
+      if ( offsets.isEmpty() )
         break;
     }
 
-    if( offsets.isEmpty() )
+    if ( offsets.isEmpty() )
       break;
 
-    if ( chainPtr >= leafEnd )
-    {
+    if ( chainPtr >= leafEnd ) {
       // We're past the current leaf, fetch the next one
 
-      if ( nextLeaf )
-      {
+      if ( nextLeaf ) {
         readNode( nextLeaf, extLeaf );
-        leaf = &extLeaf.front();
+        leaf    = &extLeaf.front();
         leafEnd = leaf + extLeaf.size();
 
         nextLeaf = idxFile->read< uint32_t >();
@@ -1467,30 +1340,27 @@ void BtreeIndex::getHeadwordsFromOffsets( QList<uint32_t> & offsets,
   }
 }
 
-bool BtreeDictionary::getHeadwords( QStringList &headwords )
+bool BtreeDictionary::getHeadwords( QStringList & headwords )
 {
   QSet< QString > setOfHeadwords;
 
   headwords.clear();
   setOfHeadwords.reserve( getWordCount() );
 
-  try
-  {
+  try {
     getAllHeadwords( setOfHeadwords );
 
-    if( setOfHeadwords.size() )
-    {
+    if ( setOfHeadwords.size() ) {
       headwords.reserve( setOfHeadwords.size() );
 
-      QSet< QString >::const_iterator it = setOfHeadwords.constBegin();
+      QSet< QString >::const_iterator it  = setOfHeadwords.constBegin();
       QSet< QString >::const_iterator end = setOfHeadwords.constEnd();
 
-      for( ; it != end; ++it )
+      for ( ; it != end; ++it )
         headwords.append( *it );
     }
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Failed headwords retrieving for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 
@@ -1500,11 +1370,9 @@ bool BtreeDictionary::getHeadwords( QStringList &headwords )
 void BtreeDictionary::findHeadWordsWithLenth( int & index, QSet< QString > * headwords, uint32_t length )
 {
   auto leafNodeOffsets = findNodes();
-  findHeadWords(leafNodeOffsets,index,headwords,length);
+  findHeadWords( leafNodeOffsets, index, headwords, length );
 }
 
-void BtreeDictionary::getArticleText(uint32_t, QString &, QString & )
-{
-}
+void BtreeDictionary::getArticleText( uint32_t, QString &, QString & ) {}
 
-}
+} // namespace BtreeIndexing
diff --git a/src/btreeidx.hh b/src/btreeidx.hh
index 1b0cc1d8..77c90546 100644
--- a/src/btreeidx.hh
+++ b/src/btreeidx.hh
@@ -28,8 +28,7 @@ using gd::wstring;
 using std::vector;
 using std::map;
 
-enum
-{
+enum {
   /// This is to be bumped up each time the internal format changes.
   /// The value isn't used here by itself, it is supposed to be added
   /// to each dictionary's internal format version.
@@ -49,12 +48,14 @@ struct WordArticleLink
   string word, prefix; // in utf8
   uint32_t articleOffset;
 
-  WordArticleLink()
-  {}
+  WordArticleLink() {}
 
   WordArticleLink( string const & word_, uint32_t articleOffset_, string const & prefix_ = string() ):
-    word( word_ ), prefix( prefix_ ), articleOffset( articleOffset_ )
-  {}
+    word( word_ ),
+    prefix( prefix_ ),
+    articleOffset( articleOffset_ )
+  {
+  }
 };
 
 /// Information needed to open the index
@@ -63,8 +64,10 @@ struct IndexInfo
   uint32_t btreeMaxElements, rootOffset;
 
   IndexInfo( uint32_t btreeMaxElements_, uint32_t rootOffset_ ):
-    btreeMaxElements( btreeMaxElements_ ), rootOffset( rootOffset_ )
-  {}
+    btreeMaxElements( btreeMaxElements_ ),
+    rootOffset( rootOffset_ )
+  {
+  }
 };
 
 /// Base btree indexing class which allows using what buildIndex() function
@@ -83,7 +86,7 @@ public:
 
   /// Finds articles that match the given string. A case-insensitive search
   /// is performed.
-  vector< WordArticleLink > findArticles( wstring const &, bool ignoreDiacritics = false );
+  vector< WordArticleLink > findArticles( wstring const &, bool ignoreDiacritics = false, uint32_t maxMatchCount = -1 );
 
   /// Find all unique article links in the index
   void findAllArticleLinks( QVector< WordArticleLink > & articleLinks );
@@ -97,15 +100,13 @@ public:
                          QSet< QString > * headwords,
                          QAtomicInt * isCancelled = 0 );
 
-  void findHeadWords( QSet<uint32_t> offsets,int& index, QSet< QString > * headwords, uint32_t length );
-  void findSingleNodeHeadwords( uint32_t offsets,
-                                            QSet< QString > * headwords);
-  QSet<uint32_t> findNodes( );
+  void findHeadWords( QSet< uint32_t > offsets, int & index, QSet< QString > * headwords, uint32_t length );
+  void findSingleNodeHeadwords( uint32_t offsets, QSet< QString > * headwords );
+  QSet< uint32_t > findNodes();
 
   /// Retrieve headwords for presented article addresses
-  void getHeadwordsFromOffsets( QList< uint32_t > & offsets,
-                                QVector< QString > & headwords,
-                                QAtomicInt * isCancelled = 0 );
+  void
+  getHeadwordsFromOffsets( QList< uint32_t > & offsets, QVector< QString > & headwords, QAtomicInt * isCancelled = 0 );
 
 protected:
 
@@ -121,11 +122,8 @@ protected:
   /// case, the returned pointer wouldn't belong to 'leaf' at all. To that end,
   /// the leafEnd pointer always holds the pointer to the first byte outside
   /// the node data.
-  char const * findChainOffsetExactOrPrefix( wstring const & target,
-                                             bool & exactMatch,
-                                             vector< char > & leaf,
-                                             uint32_t & nextLeaf,
-                                             char const * & leafEnd );
+  char const * findChainOffsetExactOrPrefix(
+    wstring const & target, bool & exactMatch, vector< char > & leaf, uint32_t & nextLeaf, char const *& leafEnd );
 
   /// Reads a node or leaf at the given offset. Just uncompresses its data
   /// to the given vector and does nothing more.
@@ -133,7 +131,7 @@ protected:
 
   /// Reads the word-article links' chain at the given offset. The pointer
   /// is updated to point to the next chain, if there's any.
-  vector< WordArticleLink > readChain( char const * & );
+  vector< WordArticleLink > readChain( char const *&, uint32_t maxMatchCount = -1 );
 
   /// Drops any aliases which arose due to folding. Only case-folded aliases
   /// are left.
@@ -163,30 +161,31 @@ public:
 
   /// Btree-indexed dictionaries are usually a good source for compound searches.
   virtual Dictionary::Features getFeatures() const noexcept
-  { return Dictionary::SuitableForCompoundSearching; }
+  {
+    return Dictionary::SuitableForCompoundSearching;
+  }
 
   /// 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 )
-    ;
+  virtual sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &, unsigned long );
 
-  virtual sptr< Dictionary::WordSearchRequest > stemmedMatch( wstring const &,
-                                                              unsigned minLength,
-                                                              unsigned maxSuffixVariation,
-                                                              unsigned long maxResults )
-    ;
+  virtual sptr< Dictionary::WordSearchRequest >
+  stemmedMatch( wstring const &, unsigned minLength, unsigned maxSuffixVariation, unsigned long maxResults );
 
   virtual bool isLocalDictionary()
-  { return true; }
+  {
+    return true;
+  }
 
-  virtual bool getHeadwords( QStringList &headwords );
-  virtual  void findHeadWordsWithLenth( int &, QSet< QString > * headwords, uint32_t length );
+  virtual bool getHeadwords( QStringList & headwords );
+  virtual void findHeadWordsWithLenth( int &, QSet< QString > * headwords, uint32_t length );
 
   virtual void getArticleText( uint32_t articleAddress, QString & headword, QString & text );
 
   string const & ftsIndexName() const
-  { return ftsIdxName; }
+  {
+    return ftsIdxName;
+  }
 
   QMutex & getFtsMutex()
   {
@@ -194,14 +193,18 @@ public:
   }
 
   virtual uint32_t getFtsIndexVersion()
-  { return 0; }
+  {
+    return 0;
+  }
 
   // Sort articles offsets for full-text search in dictionary-specific order
   // to increase of articles retrieving speed
   // Default - simple sorting in increase order
-  virtual void sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets,
-                                          QAtomicInt & isCancelled )
-  { Q_UNUSED( isCancelled ); std::sort( offsets.begin(), offsets.end() ); }
+  virtual void sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets, QAtomicInt & isCancelled )
+  {
+    Q_UNUSED( isCancelled );
+    std::sort( offsets.begin(), offsets.end() );
+  }
 
   /// Called before each matching operation to ensure that any child init
   /// has completed. Mainly used for deferred init. The default implementation
@@ -275,7 +278,6 @@ struct IndexedWords: public map< string, vector< WordArticleLink > >
 /// position.
 IndexInfo buildIndex( IndexedWords const &, File::Class & file );
 
-}
+} // namespace BtreeIndexing
 
 #endif
-
diff --git a/src/chunkedstorage.cc b/src/chunkedstorage.cc
index 3ec7efe3..9a33e7a4 100644
--- a/src/chunkedstorage.cc
+++ b/src/chunkedstorage.cc
@@ -10,13 +10,14 @@
 
 namespace ChunkedStorage {
 
-enum
-{
+enum {
   ChunkMaxSize = 65536 // Can't be more since it would overflow the address
 };
 
 Writer::Writer( File::Class & f ):
-  file( f ), chunkStarted( false ), bufferUsed( 0 )
+  file( f ),
+  chunkStarted( false ),
+  bufferUsed( 0 )
 {
   // Create a sratchpad at the beginning of file. We use it to write chunk
   // table if it would fit, in order to save some seek times.
@@ -26,15 +27,14 @@ Writer::Writer( File::Class & f ):
   memset( zero, 0, sizeof( zero ) );
 
   scratchPadOffset = file.tell();
-  scratchPadSize = sizeof( zero );
+  scratchPadSize   = sizeof( zero );
 
   file.write( zero, sizeof( zero ) );
 }
 
 uint32_t Writer::startNewBlock()
 {
-  if ( bufferUsed >= ChunkMaxSize )
-  {
+  if ( bufferUsed >= ChunkMaxSize ) {
     // Need to flush first.
     saveCurrentChunk();
   }
@@ -71,14 +71,13 @@ void Writer::saveCurrentChunk()
 
   unsigned long compressedSize = bufferCompressed.size();
 
-  if ( compress( &bufferCompressed.front(), &compressedSize,
-                 &buffer.front(), bufferUsed ) != Z_OK )
+  if ( compress( &bufferCompressed.front(), &compressedSize, &buffer.front(), bufferUsed ) != Z_OK )
     throw exFailedToCompressChunk();
 
   offsets.push_back( file.tell() );
 
-  file.write( (uint32_t) bufferUsed );
-  file.write( (uint32_t) compressedSize );
+  file.write( (uint32_t)bufferUsed );
+  file.write( (uint32_t)compressedSize );
   file.write( &bufferCompressed.front(), compressedSize );
 
   bufferUsed = 0;
@@ -91,19 +90,18 @@ uint32_t Writer::finish()
   if ( bufferUsed || chunkStarted )
     saveCurrentChunk();
 
-  bool useScratchPad = false;
+  bool useScratchPad   = false;
   uint32_t savedOffset = 0;
 
-  if ( scratchPadSize >= offsets.size() * sizeof( uint32_t ) + sizeof( uint32_t ) )
-  {
+  if ( scratchPadSize >= offsets.size() * sizeof( uint32_t ) + sizeof( uint32_t ) ) {
     useScratchPad = true;
-    savedOffset = file.tell();
+    savedOffset   = file.tell();
     file.seek( scratchPadOffset );
   }
 
   uint32_t offset = file.tell();
 
-  file.write( (uint32_t) offsets.size() );
+  file.write( (uint32_t)offsets.size() );
 
   if ( offsets.size() )
     file.write( &offsets.front(), offsets.size() * sizeof( uint32_t ) );
@@ -117,11 +115,12 @@ uint32_t Writer::finish()
   return offset;
 }
 
-Reader::Reader( File::Class & f, uint32_t offset ): file( f )
+Reader::Reader( File::Class & f, uint32_t offset ):
+  file( f )
 {
   file.seek( offset );
 
-  uint32_t size =  file.read< uint32_t >();
+  uint32_t size = file.read< uint32_t >();
   if ( size == 0 )
     return;
   offsets.resize( size );
@@ -140,9 +139,9 @@ char * Reader::getBlock( uint32_t address, vector< char > & chunk )
     // file.seek( offsets[ chunkIdx ] );
     QMutexLocker _( &file.lock );
     auto bytes = file.map( offsets[ chunkIdx ], 8 );
-    if( bytes == nullptr )
+    if ( bytes == nullptr )
       throw mapFailed();
-    auto qBytes = QByteArray::fromRawData( reinterpret_cast< char * >(bytes), 8 );
+    auto qBytes = QByteArray::fromRawData( reinterpret_cast< char * >( bytes ), 8 );
     QDataStream in( qBytes );
     in.setByteOrder( QDataStream::LittleEndian );
 
@@ -156,23 +155,20 @@ char * Reader::getBlock( uint32_t address, vector< char > & chunk )
 
     // vector< unsigned char > compressedData( compressedSize );
     auto chunkDataBytes = file.map( offsets[ chunkIdx ] + 8, compressedSize );
-    if( chunkDataBytes == nullptr )
+    if ( chunkDataBytes == nullptr )
       throw mapFailed();
     // file.read( &compressedData.front(), compressedData.size() );
-    auto autoUnmap = qScopeGuard(
-      [ & ] {
-        file.unmap( chunkDataBytes );
-      } );
+    auto autoUnmap = qScopeGuard( [ & ] {
+      file.unmap( chunkDataBytes );
+    } );
     Q_UNUSED( autoUnmap )
 
     unsigned long decompressedLength = chunk.size();
 
-    if( uncompress( (unsigned char *)&chunk.front(), &decompressedLength, chunkDataBytes, compressedSize ) != Z_OK
-        || decompressedLength != chunk.size() )
-    {
+    if ( uncompress( (unsigned char *)&chunk.front(), &decompressedLength, chunkDataBytes, compressedSize ) != Z_OK
+         || decompressedLength != chunk.size() ) {
       throw exFailedToDecompressChunk();
     }
-
   }
 
   size_t offsetInChunk = address & 0xffFF;
@@ -183,4 +179,4 @@ char * Reader::getBlock( uint32_t address, vector< char > & chunk )
   return &chunk.front() + offsetInChunk;
 }
 
-}
+} // namespace ChunkedStorage
diff --git a/src/chunkedstorage.hh b/src/chunkedstorage.hh
index 22864695..76e958ed 100644
--- a/src/chunkedstorage.hh
+++ b/src/chunkedstorage.hh
@@ -85,6 +85,6 @@ public:
   char * getBlock( uint32_t address, vector< char > & );
 };
 
-}
+} // namespace ChunkedStorage
 
 #endif
diff --git a/src/common/atomic_rename.cc b/src/common/atomic_rename.cc
index 1d6b1070..d4e0fc1e 100644
--- a/src/common/atomic_rename.cc
+++ b/src/common/atomic_rename.cc
@@ -9,7 +9,7 @@
 #include <QDir>
 
 #ifdef Q_OS_WIN32
-#include <windows.h>
+  #include <windows.h>
 #endif
 
 #include <stdio.h>
@@ -27,7 +27,7 @@ bool renameAtomically( QString const & oldName, QString const & newName )
   QVector< wchar_t > destFileW( destFile.size() + 1 );
   destFileW[ destFile.toWCharArray( destFileW.data() ) ] = 0;
 
-  if ( !MoveFileExW( srcFileW.data(), destFileW.data(),  MOVEFILE_REPLACE_EXISTING ) )
+  if ( !MoveFileExW( srcFileW.data(), destFileW.data(), MOVEFILE_REPLACE_EXISTING ) )
     return false;
 
 #else
diff --git a/src/common/base_type.hh b/src/common/base_type.hh
index 69d28388..c36ada7b 100644
--- a/src/common/base_type.hh
+++ b/src/common/base_type.hh
@@ -3,5 +3,5 @@
 
 #include <QString>
 
-  typedef QMap< QString, QString > Contexts;
+typedef QMap< QString, QString > Contexts;
 #endif // BASE_TYPE_H
diff --git a/src/common/ex.hh b/src/common/ex.hh
index 59e00306..4bcbdc6e 100644
--- a/src/common/ex.hh
+++ b/src/common/ex.hh
@@ -12,26 +12,40 @@
 /// DEF_EX( exFooNotFound, "Foo was not found", exErrorInFoo )
 
 #define DEF_EX( exName, exDescription, exParent ) \
-class exName: public exParent { \
-public: \
-virtual const char * what() const noexcept { return (exDescription); } \
-virtual ~exName() noexcept {} };
+  class exName: public exParent                   \
+  {                                               \
+  public:                                         \
+    virtual const char * what() const noexcept    \
+    {                                             \
+      return ( exDescription );                   \
+    }                                             \
+    virtual ~exName() noexcept {}                 \
+  };
 
 /// Same as DEF_EX, but takes a runtime string argument, which gets concatenated
 /// with the description.
-/// 
+///
 ///   DEF_EX_STR( exCantOpen, "can't open file", std::exception )
 ///   ...
 ///   throw exCantOpen( "example.txt" );
 ///
 ///   what() would return "can't open file example.txt"
 
-#define DEF_EX_STR( exName, exDescription, exParent ) \
-class exName: public exParent { \
-std::string value; \
-public: \
-  explicit exName( std::string const & value_ ): value( std::string( exDescription ) + " " + value_ ) {} \
-virtual const char * what() const noexcept { return value.c_str(); } \
-virtual ~exName() noexcept {} };
+#define DEF_EX_STR( exName, exDescription, exParent )      \
+  class exName: public exParent                            \
+  {                                                        \
+    std::string value;                                     \
+                                                           \
+  public:                                                  \
+    explicit exName( std::string const & value_ ):         \
+      value( std::string( exDescription ) + " " + value_ ) \
+    {                                                      \
+    }                                                      \
+    virtual const char * what() const noexcept             \
+    {                                                      \
+      return value.c_str();                                \
+    }                                                      \
+    virtual ~exName() noexcept {}                          \
+  };
 
 #endif
diff --git a/src/common/filetype.cc b/src/common/filetype.cc
index e28ca128..adee23fc 100644
--- a/src/common/filetype.cc
+++ b/src/common/filetype.cc
@@ -12,11 +12,10 @@ namespace {
 /// Checks if the given string ends with the given substring
 bool endsWith( string const & str, string const & tail )
 {
-  return str.size() >= tail.size() &&
-    str.compare( str.size() - tail.size(), tail.size(), tail ) == 0;
+  return str.size() >= tail.size() && str.compare( str.size() - tail.size(), tail.size(), tail ) == 0;
 }
 
-}
+} // namespace
 
 /// Removes any trailing or leading spaces and lowercases the string.
 /// The lowercasing is done simplistically, but it is enough for file
@@ -27,20 +26,20 @@ string simplifyString( string const & str, bool lowercase )
 
   size_t beginPos = 0;
 
-  while( beginPos < str.size() && Utf8::isspace( str[ beginPos ] ) )
+  while ( beginPos < str.size() && Utf8::isspace( str[ beginPos ] ) )
     ++beginPos;
 
   size_t endPos = str.size();
 
-  while( endPos && Utf8::isspace( str[ endPos - 1 ] ) )
+  while ( endPos && Utf8::isspace( str[ endPos - 1 ] ) )
     --endPos;
 
-  if( endPos <= beginPos )
+  if ( endPos <= beginPos )
     return string();
 
   result.reserve( endPos - beginPos );
 
-  while( beginPos < endPos )
+  while ( beginPos < endPos )
     result.push_back( lowercase ? tolower( str[ beginPos++ ] ) : str[ beginPos++ ] );
 
   return result;
@@ -50,94 +49,52 @@ bool isNameOfSound( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".wav" ) ||
-    endsWith( s, ".au" ) ||
-    endsWith( s, ".voc" ) ||
-    endsWith( s, ".ogg" ) ||
-    endsWith( s, ".oga" ) ||
-    endsWith( s, ".mp3" ) ||
-    endsWith( s, ".m4a") ||
-    endsWith( s, ".aac" ) ||
-    endsWith( s, ".flac" ) ||
-    endsWith( s, ".mid" ) ||
-    endsWith( s, ".kar" ) ||
-    endsWith( s, ".mpc" ) ||
-    endsWith( s, ".wma" ) ||
-    endsWith( s, ".wv" ) ||
-    endsWith( s, ".ape" ) ||
-    endsWith( s, ".spx" ) ||
-    endsWith( s, ".opus" ) ||
-    endsWith( s, ".mpa" ) ||
-    endsWith( s, ".mp2" );
+  return endsWith( s, ".wav" ) || endsWith( s, ".au" ) || endsWith( s, ".voc" ) || endsWith( s, ".ogg" )
+    || endsWith( s, ".oga" ) || endsWith( s, ".mp3" ) || endsWith( s, ".m4a" ) || endsWith( s, ".aac" )
+    || endsWith( s, ".flac" ) || endsWith( s, ".mid" ) || endsWith( s, ".kar" ) || endsWith( s, ".mpc" )
+    || endsWith( s, ".wma" ) || endsWith( s, ".wv" ) || endsWith( s, ".ape" ) || endsWith( s, ".spx" )
+    || endsWith( s, ".opus" ) || endsWith( s, ".mpa" ) || endsWith( s, ".mp2" );
 }
 
 bool isNameOfVideo( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".mpg" ) ||
-    endsWith( s, ".mpeg" )||
-    endsWith( s, ".mpe" ) ||
-    endsWith( s, ".ogv" ) ||
-    endsWith( s, ".ogm" ) ||
-    endsWith( s, ".avi" ) ||
-    endsWith( s, ".m4v" ) ||
-    endsWith( s, ".mp4" ) ||
-    endsWith( s, ".mkv" ) ||
-    endsWith( s, ".wmv" ) ||
-    endsWith( s, ".sfw" ) ||
-    endsWith( s, ".flv" ) ||
-    endsWith( s, ".divx" ) ||
-    endsWith( s, ".3gp" ) ||
-    endsWith( s, ".webm" ) ||
-    endsWith( s, ".mov" );
+  return endsWith( s, ".mpg" ) || endsWith( s, ".mpeg" ) || endsWith( s, ".mpe" ) || endsWith( s, ".ogv" )
+    || endsWith( s, ".ogm" ) || endsWith( s, ".avi" ) || endsWith( s, ".m4v" ) || endsWith( s, ".mp4" )
+    || endsWith( s, ".mkv" ) || endsWith( s, ".wmv" ) || endsWith( s, ".sfw" ) || endsWith( s, ".flv" )
+    || endsWith( s, ".divx" ) || endsWith( s, ".3gp" ) || endsWith( s, ".webm" ) || endsWith( s, ".mov" );
 }
 
 bool isNameOfPicture( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".jpg" ) ||
-    endsWith( s, ".jpeg" ) ||
-    endsWith( s, ".jpe" ) ||
-    endsWith( s, ".png" ) ||
-    endsWith( s, ".gif" ) ||
-    endsWith( s, ".bmp" ) ||
-    endsWith( s, ".tif" ) ||
-    endsWith( s, ".tiff" ) ||
-    endsWith( s, ".tga" ) ||
-    endsWith( s, ".pcx" ) ||
-    endsWith( s, ".ico" ) ||
-    endsWith( s, ".webp" ) ||
-    endsWith( s, ".svg" );
+  return endsWith( s, ".jpg" ) || endsWith( s, ".jpeg" ) || endsWith( s, ".jpe" ) || endsWith( s, ".png" )
+    || endsWith( s, ".gif" ) || endsWith( s, ".bmp" ) || endsWith( s, ".tif" ) || endsWith( s, ".tiff" )
+    || endsWith( s, ".tga" ) || endsWith( s, ".pcx" ) || endsWith( s, ".ico" ) || endsWith( s, ".webp" )
+    || endsWith( s, ".svg" );
 }
 
 bool isNameOfTiff( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".tif" ) ||
-    endsWith( s, ".tiff" );
+  return endsWith( s, ".tif" ) || endsWith( s, ".tiff" );
 }
 
 bool isNameOfCSS( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".css" );
+  return endsWith( s, ".css" );
 }
 
 bool isNameOfSvg( string const & name )
 {
   string s = simplifyString( name );
 
-  return
-    endsWith( s, ".svg" );
+  return endsWith( s, ".svg" );
 }
 
-}
+} // namespace Filetype
diff --git a/src/common/filetype.hh b/src/common/filetype.hh
index f847b3de..f111c580 100644
--- a/src/common/filetype.hh
+++ b/src/common/filetype.hh
@@ -31,7 +31,6 @@ bool isNameOfCSS( string const & );
 /// Returns true if the name resembles the one of a .svg file
 bool isNameOfSvg( string const & name );
 
-}
+} // namespace Filetype
 
 #endif
-
diff --git a/src/common/fixx11h.h b/src/common/fixx11h.h
index eb576901..a6d8dff3 100644
--- a/src/common/fixx11h.h
+++ b/src/common/fixx11h.h
@@ -2,62 +2,61 @@
 // with X11 headers mess.
 
 #ifdef Unsorted
-#undef Unsorted
+  #undef Unsorted
 #endif
 
 #ifdef None
-#undef None
+  #undef None
 #endif
 
 #ifdef Bool
-#undef Bool
+  #undef Bool
 #endif
 
 #ifdef FontChange
-#undef FontChange
+  #undef FontChange
 #endif
 
 #ifdef KeyPress
-#undef KeyPress
+  #undef KeyPress
 #endif
 
 #ifdef KeyRelease
-#undef KeyRelease
+  #undef KeyRelease
 #endif
 
 #ifdef Above
-#undef Above
+  #undef Above
 #endif
 
 #ifdef Below
-#undef Below
+  #undef Below
 #endif
 
 #ifdef FocusIn
-#undef FocusIn
+  #undef FocusIn
 #endif
 
 #ifdef FocusOut
-#undef FocusOut
+  #undef FocusOut
 #endif
 
 #ifdef Always
-#undef Always
+  #undef Always
 #endif
 
 #ifdef Success
-#undef Success
+  #undef Success
 #endif
 
 #ifdef GrayScale
-#undef GrayScale
+  #undef GrayScale
 #endif
 
 #ifdef Status
-#undef Status
+  #undef Status
 #endif
 
 #ifdef CursorShape
-#undef CursorShape
+  #undef CursorShape
 #endif
-
diff --git a/src/common/folding.cc b/src/common/folding.cc
index 24578d82..bf81b631 100644
--- a/src/common/folding.cc
+++ b/src/common/folding.cc
@@ -2,22 +2,20 @@
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
 #include "folding.hh"
-#include <QRegularExpression>
 
 #include "utf8.hh"
 #include "globalregex.hh"
+#include "inc_case_folding.hh"
 
 namespace Folding {
 
-#include "inc_case_folding.hh"
-
 /// Tests if the given char is one of the Unicode combining marks. Some are
 /// caught by the diacritics folding table, but they are only handled there
 /// when they come with their main characters, not by themselves. The rest
 /// are caught here.
 bool isCombiningMark( wchar ch )
 {
-  return QChar::isMark(ch);
+  return QChar::isMark( ch );
 }
 
 wstring apply( wstring const & in, bool preserveWildcards )
@@ -67,7 +65,7 @@ wstring applySimpleCaseOnly( wstring const & in )
 
   out.reserve( in.size() );
 
-  for( size_t left = in.size(); left--; )
+  for ( size_t left = in.size(); left--; )
     out.push_back( foldCaseSimple( *nextChar++ ) );
 
   return out;
@@ -95,8 +93,8 @@ wstring applyFullCaseOnly( wstring const & in )
 
   wchar buf[ foldCaseMaxOut ];
 
-  for( size_t left = in.size(); left--; )
-    caseFolded.append( buf, foldCase(  *nextChar++, buf ) );
+  for ( size_t left = in.size(); left--; )
+    caseFolded.append( buf, foldCase( *nextChar++, buf ) );
 
   return caseFolded;
 }
@@ -115,7 +113,7 @@ wstring applyPunctOnly( wstring const & in )
 
   out.reserve( in.size() );
 
-  for( size_t left = in.size(); left--; ++nextChar )
+  for ( size_t left = in.size(); left--; ++nextChar )
     if ( !isPunct( *nextChar ) )
       out.push_back( *nextChar );
 
@@ -140,7 +138,7 @@ wstring applyWhitespaceOnly( wstring const & in )
 
   out.reserve( in.size() );
 
-  for( size_t left = in.size(); left--; ++nextChar )
+  for ( size_t left = in.size(); left--; ++nextChar )
     if ( !isWhitespace( *nextChar ) )
       out.push_back( *nextChar );
 
@@ -155,9 +153,10 @@ wstring applyWhitespaceAndPunctOnly( wstring const & in )
 
   out.reserve( in.size() );
 
-  for( size_t left = in.size(); left--; ++nextChar )
+  for ( size_t left = in.size(); left--; ++nextChar ) {
     if ( !isWhitespace( *nextChar ) && !isPunct( *nextChar ) )
       out.push_back( *nextChar );
+  }
 
   return out;
 }
@@ -167,6 +166,11 @@ bool isWhitespace( wchar ch )
   return QChar::isSpace( ch );
 }
 
+bool isWhitespaceOrPunct( wchar ch )
+{
+  return QChar::isSpace( ch ) || QChar::isPunct( ch );
+}
+
 bool isPunct( wchar ch )
 {
   return QChar::isPunct( ch );
@@ -174,19 +178,18 @@ bool isPunct( wchar ch )
 
 wstring trimWhitespaceOrPunct( wstring const & in )
 {
-  wchar const * wordBegin = in.c_str();
+  wchar const * wordBegin     = in.c_str();
   wstring::size_type wordSize = in.size();
 
   // Skip any leading whitespace
-  while( *wordBegin && ( Folding::isWhitespace( *wordBegin ) || Folding::isPunct( *wordBegin ) ) )
-  {
+  while ( *wordBegin && ( Folding::isWhitespace( *wordBegin ) || Folding::isPunct( *wordBegin ) ) ) {
     ++wordBegin;
     --wordSize;
   }
 
   // Skip any trailing whitespace
-  while( wordSize && ( Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) ||
-                       Folding::isPunct( wordBegin[ wordSize - 1 ] ) ) )
+  while ( wordSize
+          && ( Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) || Folding::isPunct( wordBegin[ wordSize - 1 ] ) ) )
     --wordSize;
 
   return wstring( wordBegin, wordSize );
@@ -197,7 +200,7 @@ QString trimWhitespaceOrPunct( QString const & in )
   auto wordSize = in.size();
 
   int wordBegin = 0;
-  int wordEnd   = wordSize ;
+  int wordEnd   = wordSize;
   // Skip any leading whitespace
   while ( wordBegin < wordSize && ( in[ wordBegin ].isSpace() || in[ wordBegin ].isPunct() ) ) {
     ++wordBegin;
@@ -210,25 +213,24 @@ QString trimWhitespaceOrPunct( QString const & in )
     wordSize--;
   }
 
-  return in.mid( wordBegin,wordSize );
+  return in.mid( wordBegin, wordSize );
 }
 
 wstring trimWhitespace( wstring const & in )
 {
-  if( in.empty() )
+  if ( in.empty() )
     return in;
-  wchar const * wordBegin = in.c_str();
+  wchar const * wordBegin     = in.c_str();
   wstring::size_type wordSize = in.size();
 
   // Skip any leading whitespace
-  while( *wordBegin && Folding::isWhitespace( *wordBegin ) )
-  {
+  while ( *wordBegin && Folding::isWhitespace( *wordBegin ) ) {
     ++wordBegin;
     --wordSize;
   }
 
   // Skip any trailing whitespace
-  while( wordSize && Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) )
+  while ( wordSize && Folding::isWhitespace( wordBegin[ wordSize - 1 ] ) )
     --wordSize;
 
   return wstring( wordBegin, wordSize );
@@ -242,7 +244,7 @@ QString trimWhitespace( QString const & in )
 QString escapeWildcardSymbols( const QString & str )
 {
   QString escaped( str );
-  escaped.replace( QRegularExpression( R"(([\[\]\?\*]))" ), "\\\\1" );
+  escaped.replace( QRegularExpression( R"(([\[\]\?\*]))" ), R"(\\1)" );
 
   return escaped;
 }
@@ -250,8 +252,8 @@ QString escapeWildcardSymbols( const QString & str )
 QString unescapeWildcardSymbols( const QString & str )
 {
   QString unescaped( str );
-  unescaped.replace( QRegularExpression( R"(\\([\[\]\?\*]))" ), "\\1" );
+  unescaped.replace( QRegularExpression( R"(\\([\[\]\?\*]))" ), R"(\1)" );
 
   return unescaped;
 }
-}
+} // namespace Folding
diff --git a/src/common/folding.hh b/src/common/folding.hh
index f89b01ec..33f82079 100644
--- a/src/common/folding.hh
+++ b/src/common/folding.hh
@@ -22,8 +22,7 @@ using gd::wstring;
 using gd::wchar;
 
 /// The algorithm's version.
-enum
-{
+enum {
   Version = 5
 };
 
@@ -47,7 +46,7 @@ wstring applyDiacriticsOnly( wstring const & );
 /// Applies only punctuation folding algorithm.
 wstring applyPunctOnly( wstring const & );
 QString applyPunctOnly( QString const & in );
-  /// Applies only whitespace folding algorithm.
+/// Applies only whitespace folding algorithm.
 wstring applyWhitespaceOnly( wstring const & );
 
 /// Applies only whitespace&punctuation folding algorithm.
@@ -57,6 +56,7 @@ wstring applyWhitespaceAndPunctOnly( wstring const & );
 /// otherwise. Whitespace corresponds to Zl/Zp/Zs Unicode classes, and also
 /// includes \n, \r and \t.
 bool isWhitespace( wchar ch );
+bool isWhitespaceOrPunct( wchar ch );
 
 /// Returns true if the given character is any form of punctuation, false
 /// otherwise. Punctuation corresponds to Pc/Pd/Pe/Pf/Pi/Po/Ps classes.
@@ -89,7 +89,6 @@ QString escapeWildcardSymbols( QString const & );
 /// Tests if the given char is one of the Unicode combining marks.
 bool isCombiningMark( wchar ch );
 
-}
+} // namespace Folding
 
 #endif
-
diff --git a/src/common/gddebug.cc b/src/common/gddebug.cc
index 59958bc0..be9d365d 100644
--- a/src/common/gddebug.cc
+++ b/src/common/gddebug.cc
@@ -4,10 +4,10 @@
 #include <QString>
 #include "gddebug.hh"
 #include <QDebug>
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 
 QFile * logFilePtr;
diff --git a/src/common/gddebug.hh b/src/common/gddebug.hh
index 5e1dfe26..3194ea4d 100644
--- a/src/common/gddebug.hh
+++ b/src/common/gddebug.hh
@@ -4,24 +4,28 @@
 #include <QFile>
 
 #ifdef NO_CONSOLE
-#define GD_DPRINTF(...) do {} while( 0 )
-#define GD_FDPRINTF(...) do {} while( 0 )
+  #define GD_DPRINTF( ... ) \
+    do {                    \
+    } while ( 0 )
+  #define GD_FDPRINTF( ... ) \
+    do {                     \
+    } while ( 0 )
 #else
-#define GD_DPRINTF(...) gdDebug(__VA_ARGS__)
-#define GD_FDPRINTF(...) fprintf(__VA_ARGS__)
+  #define GD_DPRINTF( ... )  gdDebug( __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)))
+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)))
+void gdDebug( const char *, ... )
+#if defined( Q_CC_GNU ) && !defined( __INSURE__ )
+  __attribute__( ( format( printf, 1, 2 ) ) )
 #endif
-;
+  ;
 
 extern QFile * logFilePtr;
 
diff --git a/src/common/globalbroadcaster.cc b/src/common/globalbroadcaster.cc
index 9b53612c..e8b1b885 100644
--- a/src/common/globalbroadcaster.cc
+++ b/src/common/globalbroadcaster.cc
@@ -3,12 +3,12 @@
 #include "utils.hh"
 
 Q_GLOBAL_STATIC( GlobalBroadcaster, bdcaster )
-GlobalBroadcaster::GlobalBroadcaster( QObject * parent ) : QObject( parent )
+GlobalBroadcaster::GlobalBroadcaster( QObject * parent ):
+  QObject( parent )
 {
   QStringList whiteUrlHosts = { "ajax.googleapis.com" };
- 
-  for( auto host : whiteUrlHosts )
-  {
+
+  for ( auto host : whiteUrlHosts ) {
     addWhitelist( host );
   }
 }
@@ -35,6 +35,6 @@ void GlobalBroadcaster::addWhitelist( QString url )
 
 bool GlobalBroadcaster::existedInWhitelist( QString url )
 {
-  return whitelist.contains(url);
+  return whitelist.contains( url );
 }
 // namespace global
diff --git a/src/common/globalbroadcaster.hh b/src/common/globalbroadcaster.hh
index 9ac7e6a7..41466164 100644
--- a/src/common/globalbroadcaster.hh
+++ b/src/common/globalbroadcaster.hh
@@ -4,6 +4,8 @@
 #include <QObject>
 #include <vector>
 #include "config.hh"
+#include "pronounceengine.hh"
+#include <QCache>
 
 struct ActiveDictIds
 {
@@ -17,19 +19,20 @@ struct ActiveDictIds
   }
 };
 
-class GlobalBroadcaster : public QObject
+
+class GlobalBroadcaster: public QObject
 {
   Q_OBJECT
-private:
+
   Config::Preferences * preference;
-  QSet<QString> whitelist;
+  QSet< QString > whitelist;
 
 public:
   void setPreference( Config::Preferences * _pre );
   Config::Preferences * getPreference();
   GlobalBroadcaster( QObject * parent = nullptr );
-  void addWhitelist(QString host);
-  bool existedInWhitelist(QString host);
+  void addWhitelist( QString host );
+  bool existedInWhitelist( QString host );
   static GlobalBroadcaster * instance();
   unsigned currentGroupId;
   QString translateLineText{};
@@ -37,7 +40,8 @@ public:
   QSet< QString > collapsedDicts;
   QMap< QString, QSet< QString > > folderFavoritesMap;
   QMap< unsigned, QString > groupFolderMap;
-
+  PronounceEngine pronounce_engine;
+  QCache< QString, QByteArray > cache;
 
 signals:
   void dictionaryChanges( ActiveDictIds ad );
diff --git a/src/common/globalregex.cc b/src/common/globalregex.cc
index e568c586..bb604abf 100644
--- a/src/common/globalregex.cc
+++ b/src/common/globalregex.cc
@@ -3,9 +3,9 @@
 
 using namespace RX;
 
-QRegularExpression Ftx::regBrackets(
-  R"((\([\w\p{M}]+\)){0,1}([\w\p{M}]+)(\([\w\p{M}]+\)){0,1}([\w\p{M}]+){0,1}(\([\w\p{M}]+\)){0,1})",
-  QRegularExpression::UseUnicodePropertiesOption );
+QRegularExpression
+  Ftx::regBrackets( R"((\([\w\p{M}]+\)){0,1}([\w\p{M}]+)(\([\w\p{M}]+\)){0,1}([\w\p{M}]+){0,1}(\([\w\p{M}]+\)){0,1})",
+                    QRegularExpression::UseUnicodePropertiesOption );
 QRegularExpression Ftx::regSplit( "[^\\w\\p{M}]+", QRegularExpression::UseUnicodePropertiesOption );
 
 QRegularExpression Ftx::spacesRegExp( "\\W+", QRegularExpression::UseUnicodePropertiesOption );
@@ -15,13 +15,13 @@ QRegularExpression Ftx::setsRegExp( R"(\[[^\]]+\])", QRegularExpression::CaseIns
 QRegularExpression Ftx::regexRegExp( R"(\\[afnrtvdDwWsSbB]|\\x([0-9A-Fa-f]{4})|\\0([0-7]{3}))",
                                      QRegularExpression::CaseInsensitiveOption );
 
-QRegularExpression Ftx::handleRoundBracket( R"([^\w\(\)\p{M}]+)" ,
-                                            QRegularExpression::UseUnicodePropertiesOption );
-QRegularExpression Ftx::noRoundBracket( "[^\\w\\p{M}]+",
-                                        QRegularExpression::UseUnicodePropertiesOption );
+QRegularExpression Ftx::handleRoundBracket( R"([^\w\(\)\p{M}]+)", QRegularExpression::UseUnicodePropertiesOption );
+QRegularExpression Ftx::noRoundBracket( R"([^\w\p{M}]+)", QRegularExpression::UseUnicodePropertiesOption );
 
 QRegularExpression Ftx::tokenBoundary( R"([\*\?\+]|\bAnd\b|\bOR\b)", QRegularExpression::CaseInsensitiveOption );
-QRegularExpression Ftx::token(R"((".*?")|([\w\W\+\-]+))",QRegularExpression::DotMatchesEverythingOption|QRegularExpression::CaseInsensitiveOption);
+QRegularExpression Ftx::token( R"((".*?")|([\w\W\+\-]+))",
+                               QRegularExpression::DotMatchesEverythingOption
+                                 | QRegularExpression::CaseInsensitiveOption );
 //mdx
 
 QRegularExpression Mdx::allLinksRe( R"((?:<\s*(a(?:rea)?|img|link|script|source)(?:\s+[^>]+|\s*)>))",
@@ -47,7 +47,7 @@ QRegularExpression Mdx::stylesRe2(
   QRegularExpression::CaseInsensitiveOption );
 QRegularExpression Mdx::inlineScriptRe( R"(<\s*script(?:(?=\s)(?:(?![\s"']src\s*=)[^>])+|\s*)>)",
                                         QRegularExpression::CaseInsensitiveOption );
-QRegularExpression Mdx::closeScriptTagRe( "<\\s*/script\\s*>", QRegularExpression::CaseInsensitiveOption );
+QRegularExpression Mdx::closeScriptTagRe( R"(<\s*/script\s*>)", QRegularExpression::CaseInsensitiveOption );
 QRegularExpression Mdx::srcRe(
   R"(([\s"'](?:src|srcset)\s*=)\s*(["'])(?!\s*\b(?:(?:bres|https?|ftp)://|(?:data|javascript):))(?:file://)?[\x00-\x1f\x7f]*\.*/?([^">]+)\2)",
   QRegularExpression::CaseInsensitiveOption );
@@ -55,17 +55,17 @@ QRegularExpression Mdx::srcRe2(
   R"(([\s"'](?:src|srcset)\s*=)\s*(?![\s"']|\b(?:(?:bres|https?|ftp)://|(?:data|javascript):))(?:file://)?[\x00-\x1f\x7f]*\.*/?([^\s">]+))",
   QRegularExpression::CaseInsensitiveOption );
 
-QRegularExpression Mdx::links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))",
-                               QRegularExpression::CaseInsensitiveOption );
+QRegularExpression Mdx::links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))", QRegularExpression::CaseInsensitiveOption );
 
 QRegularExpression Mdx::fontFace( R"((?:url\s*\(\s*\"(.*?)\"\s*)\))",
-                                    QRegularExpression::CaseInsensitiveOption|QRegularExpression::DotMatchesEverythingOption );
+                                  QRegularExpression::CaseInsensitiveOption
+                                    | QRegularExpression::DotMatchesEverythingOption );
 
 QRegularExpression Mdx::styleElement( R"((<style[^>]*>)([\w\W]*?)(<\/style>))",
                                       QRegularExpression::CaseInsensitiveOption );
 
 
-QRegularExpression Epwing::refWord(R"([r|p](\d+)at(\d+))", QRegularExpression::CaseInsensitiveOption);
+QRegularExpression Epwing::refWord( R"([r|p](\d+)at(\d+))", QRegularExpression::CaseInsensitiveOption );
 
 
 bool Html::containHtmlEntity( std::string const & text )
diff --git a/src/common/globalregex.hh b/src/common/globalregex.hh
index 47daaadb..c0344a7f 100644
--- a/src/common/globalregex.hh
+++ b/src/common/globalregex.hh
@@ -3,8 +3,7 @@
 
 #include <QRegularExpression>
 
-namespace RX
-{
+namespace RX {
 class Ftx
 {
 public:
@@ -50,8 +49,9 @@ namespace Zim {
 const static QRegularExpression leadingDotSlash( R"(^\.{0,2}\/)" );
 } // namespace Zim
 
-class Epwing{
- public:
+class Epwing
+{
+public:
   static QRegularExpression refWord;
 };
 
@@ -61,16 +61,16 @@ const static QRegularExpression htmlEntity( R"(&(?:#\d+|#[xX][\da-fA-F]+|[0-9a-z
 
 
 // exclude <br/> <hr/>
-const static QRegularExpression emptyXmlTag(R"(<(?!(br|hr)\b)([^/ >]*)\s*/>)");
+const static QRegularExpression emptyXmlTag( R"(<(?!(br|hr)\b)([^/ >]*)\s*/>)" );
 
 bool containHtmlEntity( std::string const & text );
-}
+} // namespace Html
 
-const static QRegularExpression accentMark( R"(\p{M})" );
+const static QRegularExpression accentMark( R"(\p{M})", QRegularExpression::UseUnicodePropertiesOption );
 //contain unicode space mark and punctuation
-const static QRegularExpression markPuncSpace( R"([\p{M}\p{Z}\p{P}])" );
+const static QRegularExpression markPuncSpace( R"([\p{M}\p{Z}\p{P}])", QRegularExpression::UseUnicodePropertiesOption );
 //contain unicode space and mark.
-const static QRegularExpression markSpace( R"([\p{M}\p{Z}])" );
+const static QRegularExpression markSpace( R"([\p{M}\p{Z}])", QRegularExpression::UseUnicodePropertiesOption );
 
 } // namespace RX
 
diff --git a/src/common/htmlescape.cc b/src/common/htmlescape.cc
index 8bd08fc4..b19bed52 100644
--- a/src/common/htmlescape.cc
+++ b/src/common/htmlescape.cc
@@ -14,31 +14,30 @@ string escape( string const & str )
 {
   string result( str );
 
-  for( size_t x = result.size(); x--; )
-    switch ( result[ x ] )
-    {
+  for ( size_t x = result.size(); x--; )
+    switch ( result[ x ] ) {
       case '&':
         result.erase( x, 1 );
         result.insert( x, "&amp;" );
-      break;
+        break;
 
       case '<':
         result.erase( x, 1 );
         result.insert( x, "&lt;" );
-      break;
+        break;
 
       case '>':
         result.erase( x, 1 );
         result.insert( x, "&gt;" );
-      break;
+        break;
 
       case '"':
         result.erase( x, 1 );
         result.insert( x, "&quot;" );
-      break;
+        break;
 
       default:
-      break;
+        break;
     }
 
   return result;
@@ -47,8 +46,7 @@ string escape( string const & str )
 static void storeLineInDiv( string & result, string const & line, bool baseRightToLeft )
 {
   result += "<div";
-  if( unescape( QString::fromUtf8( line.c_str(), line.size() ) ).isRightToLeft() != baseRightToLeft )
-  {
+  if ( unescape( QString::fromUtf8( line.c_str(), line.size() ) ).isRightToLeft() != baseRightToLeft ) {
     result += " dir=\"";
     result += baseRightToLeft ? "ltr\"" : "rtl\"";
   }
@@ -56,7 +54,7 @@ static void storeLineInDiv( string & result, string const & line, bool baseRight
   result += line + "</div>";
 }
 
-string preformat(string const & str , bool baseRightToLeft )
+string preformat( string const & str, bool baseRightToLeft )
 {
   string escaped = escape( str ), result, line;
 
@@ -65,25 +63,19 @@ string preformat(string const & str , bool baseRightToLeft )
 
   bool leading = true;
 
-  for( char const * nextChar = escaped.c_str(); *nextChar; ++nextChar )
-  {
-    if ( leading )
-    {
-      if ( *nextChar == ' ' )
-      {
+  for ( char const * nextChar = escaped.c_str(); *nextChar; ++nextChar ) {
+    if ( leading ) {
+      if ( *nextChar == ' ' ) {
         line += "&nbsp;";
         continue;
       }
-      else
-      if ( *nextChar == '\t' )
-      {
+      else if ( *nextChar == '\t' ) {
         line += "&nbsp;&nbsp;&nbsp;&nbsp;";
         continue;
       }
     }
 
-    if ( *nextChar == '\n' )
-    {
+    if ( *nextChar == '\n' ) {
       storeLineInDiv( result, line, baseRightToLeft );
       line.clear();
       leading = true;
@@ -98,7 +90,7 @@ string preformat(string const & str , bool baseRightToLeft )
     leading = false;
   }
 
-  if( !line.empty() )
+  if ( !line.empty() )
     storeLineInDiv( result, line, baseRightToLeft );
 
   return result;
@@ -108,32 +100,31 @@ string escapeForJavaScript( string const & str )
 {
   string result( str );
 
-  for( size_t x = result.size(); x--; )
-    switch ( result[ x ] )
-    {
+  for ( size_t x = result.size(); x--; )
+    switch ( result[ x ] ) {
       case '\\':
       case '"':
       case '\'':
         result.insert( x, 1, '\\' );
-      break;
+        break;
 
       case '\n':
         result.erase( x, 1 );
         result.insert( x, "\\n" );
-      break;
+        break;
 
       case '\r':
         result.erase( x, 1 );
         result.insert( x, "\\r" );
-      break;
+        break;
 
       case '\t':
         result.erase( x, 1 );
         result.insert( x, "\\t" );
-      break;
+        break;
 
       default:
-      break;
+        break;
     }
 
   return result;
@@ -141,59 +132,57 @@ string escapeForJavaScript( string const & str )
 
 QString stripHtml( QString & tmp )
 {
-  tmp.replace( QRegularExpression( "<(?:\\s*/?(?:div|h[1-6r]|q|p(?![alr])|br|li(?![ns])|td|blockquote|[uo]l|pre|d[dl]|nav|address))[^>]{0,}>",
-                                   QRegularExpression::CaseInsensitiveOption ), " " );
-  tmp.replace( QRegularExpression( "<[^>]*>"), " ");
+  tmp.replace(
+    QRegularExpression(
+      "<(?:\\s*/?(?:div|h[1-6r]|q|p(?![alr])|br|li(?![ns])|td|blockquote|[uo]l|pre|d[dl]|nav|address))[^>]{0,}>",
+      QRegularExpression::CaseInsensitiveOption ),
+    " " );
+  tmp.replace( QRegularExpression( "<[^>]*>" ), " " );
   return tmp;
 }
 
-QString unescape( QString const & str, HtmlOption option  )
+QString unescape( QString const & str, HtmlOption option )
 {
   // Does it contain HTML? If it does, we need to strip it
-  if ( str.contains( '<' ) || str.contains( '&' ) )
-  {
+  if ( str.contains( '<' ) || str.contains( '&' ) ) {
     QString tmp = str;
-    if ( option == HtmlOption::Strip )
-    {
-        stripHtml( tmp );
+    if ( option == HtmlOption::Strip ) {
+      stripHtml( tmp );
     }
     return QTextDocumentFragment::fromHtml( tmp.trimmed() ).toPlainText();
   }
   return str;
 }
 
-QString fromHtmlEscaped( QString const & str){
+QString fromHtmlEscaped( QString const & str )
+{
   QString retVal = str;
-  QRegularExpression regExp(R"((?<lt>\&lt\;)|(?<gt>\&gt\;)|(?<amp>\&amp\;)|(?<quot>\&quot\;))", QRegularExpression::PatternOption::CaseInsensitiveOption);
-  auto match = regExp.match(str, 0);
+  QRegularExpression regExp( R"((?<lt>\&lt\;)|(?<gt>\&gt\;)|(?<amp>\&amp\;)|(?<quot>\&quot\;))",
+                             QRegularExpression::PatternOption::CaseInsensitiveOption );
+  auto match = regExp.match( str, 0 );
 
-  while (match.hasMatch())
-  {
-    if (!match.captured("lt").isEmpty())
-    {
-      retVal.replace(match.capturedStart("lt"), match.capturedLength("lt"), "<");
+  while ( match.hasMatch() ) {
+    if ( !match.captured( "lt" ).isEmpty() ) {
+      retVal.replace( match.capturedStart( "lt" ), match.capturedLength( "lt" ), "<" );
     }
-    else if (!match.captured("gt").isEmpty())
-    {
-      retVal.replace(match.capturedStart("gt"), match.capturedLength("gt"), ">");
+    else if ( !match.captured( "gt" ).isEmpty() ) {
+      retVal.replace( match.capturedStart( "gt" ), match.capturedLength( "gt" ), ">" );
     }
-    else if (!match.captured("amp").isEmpty())
-    {
-      retVal.replace(match.capturedStart("amp"), match.capturedLength("amp"), "&");
+    else if ( !match.captured( "amp" ).isEmpty() ) {
+      retVal.replace( match.capturedStart( "amp" ), match.capturedLength( "amp" ), "&" );
     }
-    else if (!match.captured("quot").isEmpty())
-    {
-      retVal.replace(match.capturedStart("quot"), match.capturedLength("quot"), "\"");
+    else if ( !match.captured( "quot" ).isEmpty() ) {
+      retVal.replace( match.capturedStart( "quot" ), match.capturedLength( "quot" ), "\"" );
     }
-    match = regExp.match(retVal, match.capturedStart() + 1);
+    match = regExp.match( retVal, match.capturedStart() + 1 );
   }
 
   return retVal;
 }
 
-string unescapeUtf8( const string &str, HtmlOption option )
+string unescapeUtf8( const string & str, HtmlOption option )
 {
   return string( unescape( QString::fromStdString( str ), option ).toUtf8().data() );
 }
 
-}
+} // namespace Html
diff --git a/src/common/htmlescape.hh b/src/common/htmlescape.hh
index 0625932b..0c3442bd 100644
--- a/src/common/htmlescape.hh
+++ b/src/common/htmlescape.hh
@@ -26,12 +26,12 @@ string preformat( string const &, bool baseRightToLeft = false );
 // Escapes the given string to be included in JavaScript.
 string escapeForJavaScript( string const & );
 QString stripHtml( QString & tmp );
-  // Replace html entities
-QString unescape( QString const & str, HtmlOption option = HtmlOption::Strip);
+// Replace html entities
+QString unescape( QString const & str, HtmlOption option = HtmlOption::Strip );
 
-QString fromHtmlEscaped( QString const & str);
+QString fromHtmlEscaped( QString const & str );
 string unescapeUtf8( string const & str, HtmlOption option = HtmlOption::Strip );
 
-}
+} // namespace Html
 
 #endif
diff --git a/src/common/iconv.cc b/src/common/iconv.cc
index c05a07ad..206cdbd7 100644
--- a/src/common/iconv.cc
+++ b/src/common/iconv.cc
@@ -9,18 +9,19 @@
 
 char const * const Iconv::GdWchar = "UTF-32LE";
 char const * const Iconv::Utf16Le = "UTF-16LE";
-char const * const Iconv::Utf8 = "UTF-8";
+char const * const Iconv::Utf8    = "UTF-8";
 
 using gd::wchar;
 
-Iconv::Iconv( char const * to, char const * from )
+Iconv::Iconv( char const * from )
 #ifdef USE_ICONV
-// the to encoding must be UTF8
-    :state( iconv_open( Utf8, from ) )
+  // the to encoding must be UTF8
+  :
+  state( iconv_open( Utf8, from ) )
 #endif
 {
 #ifdef USE_ICONV
-  if( state == (iconv_t) -1 )
+  if ( state == (iconv_t)-1 )
     throw exCantInit( strerror( errno ) );
 #else
   codec = QTextCodec::codecForName( from );
@@ -29,35 +30,31 @@ Iconv::Iconv( char const * to, char const * from )
 
 Iconv::~Iconv()
 {
- #ifdef USE_ICONV
- iconv_close( state );
-  #endif
+#ifdef USE_ICONV
+  iconv_close( state );
+#endif
 }
 
-QString Iconv::convert(void const* & inBuf, size_t& inBytesLeft)
+QString Iconv::convert( void const *& inBuf, size_t & inBytesLeft )
 {
 #ifdef USE_ICONV
- size_t dsz = inBytesLeft;
- //avoid most realloc
- std::vector< char > outBuf( dsz + 32 );
+  size_t dsz = inBytesLeft;
+  //avoid most realloc
+  std::vector< char > outBuf( dsz + 32 );
 
- void * outBufPtr = &outBuf.front();
+  void * outBufPtr = &outBuf.front();
 
- size_t outBufLeft = outBuf.size();
- size_t result;
- while( inBytesLeft > 0 )
- {
-    result = iconv( state, (char **) &inBuf, &inBytesLeft, (char **) &outBufPtr, &outBufLeft );
-    if( result == (size_t) -1 )
-    {
-      if( errno == E2BIG || outBufLeft == 0 )
-      {
+  size_t outBufLeft = outBuf.size();
+  size_t result;
+  while ( inBytesLeft > 0 ) {
+    result = iconv( state, (char **)&inBuf, &inBytesLeft, (char **)&outBufPtr, &outBufLeft );
+    if ( result == (size_t)-1 ) {
+      if ( errno == E2BIG || outBufLeft == 0 ) {
 
-        if( inBytesLeft > 0 )
-        {
+        if ( inBytesLeft > 0 ) {
           // Grow the buffer and retry
           // The pointer may get invalidated so we save the diff and restore it
-          size_t offset = (char *) outBufPtr - &outBuf.front();
+          size_t offset = (char *)outBufPtr - &outBuf.front();
           outBuf.resize( outBuf.size() + dsz );
           outBufPtr = &outBuf.front() + offset;
           outBufLeft += dsz;
@@ -66,49 +63,43 @@ QString Iconv::convert(void const* & inBuf, size_t& inBytesLeft)
       }
       break;
     }
- }
+  }
 
- //flush output
- if( result != (size_t) ( -1 ) )
- {
+  //flush output
+  if ( result != (size_t)( -1 ) ) {
     /* flush the shift-out sequences */
-    for( ;; )
-    {
-      result = iconv( state, NULL, NULL, (char **) &outBufPtr, &outBufLeft );
+    for ( ;; ) {
+      result = iconv( state, NULL, NULL, (char **)&outBufPtr, &outBufLeft );
 
-      if( result != (size_t) ( -1 ) )
-      {
+      if ( result != (size_t)( -1 ) ) {
         break;
       }
 
-      if( errno == E2BIG )
-      {
-        size_t offset = (char *) outBufPtr - &outBuf.front();
+      if ( errno == E2BIG ) {
+        size_t offset = (char *)outBufPtr - &outBuf.front();
         outBuf.resize( outBuf.size() + 256 );
         outBufPtr = &outBuf.front() + offset;
         outBufLeft += 256;
       }
-      else
-      {
+      else {
         break;
       }
     }
- }
+  }
 
- size_t datasize = outBuf.size() - outBufLeft;
-//  QByteArray ba( &outBuf.front(), datasize );
- return QString::fromUtf8( &outBuf.front(), datasize );
+  size_t datasize = outBuf.size() - outBufLeft;
+  //  QByteArray ba( &outBuf.front(), datasize );
+  return QString::fromUtf8( &outBuf.front(), datasize );
 #else
-  if( codec )
+  if ( codec )
     return codec->toUnicode( static_cast< const char * >( inBuf ), inBytesLeft );
   QByteArray ba( static_cast< const char * >( inBuf ), inBytesLeft );
   return QString( ba );
 #endif
 }
 
-gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData,
-                              size_t dataSize )
-  
+gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData, size_t dataSize )
+
 {
   /// Special-case the dataSize == 0 to avoid any kind of iconv-specific
   /// behaviour in that regard.
@@ -116,24 +107,22 @@ gd::wstring Iconv::toWstring( char const * fromEncoding, void const * fromData,
   if ( !dataSize )
     return {};
 
-  Iconv ic( Utf8, fromEncoding );
+  Iconv ic( fromEncoding );
 
-  QString outStr = ic.convert(fromData, dataSize);
-  return gd::toWString(outStr);
+  QString outStr = ic.convert( fromData, dataSize );
+  return gd::toWString( outStr );
 }
 
-std::string Iconv::toUtf8( char const * fromEncoding, void const * fromData,
-                           size_t dataSize )
-  
+std::string Iconv::toUtf8( char const * fromEncoding, void const * fromData, size_t dataSize )
+
 {
   // Similar to toWstring
 
   if ( !dataSize )
     return {};
 
-  Iconv ic( Utf8, fromEncoding );
+  Iconv ic( fromEncoding );
 
-  const QString outStr = ic.convert(fromData, dataSize);
+  const QString outStr = ic.convert( fromData, dataSize );
   return outStr.toStdString();
 }
-
diff --git a/src/common/iconv.hh b/src/common/iconv.hh
index dda3d2e0..ec2312eb 100644
--- a/src/common/iconv.hh
+++ b/src/common/iconv.hh
@@ -10,7 +10,7 @@
 #include "ex.hh"
 
 #ifdef USE_ICONV
-#include <iconv.h>
+  #include <iconv.h>
 #endif
 
 /// A wrapper for the iconv() character set conversion functions
@@ -19,7 +19,7 @@ class Iconv
 #ifdef USE_ICONV
   iconv_t state;
 #else
-  QTextCodec* codec;
+  QTextCodec * codec;
 
 #endif
 
@@ -34,26 +34,24 @@ public:
   static char const * const Utf16Le;
   static char const * const Utf8;
 
-  Iconv( char const * to, char const * from );
+  Iconv( char const * from );
 
   ~Iconv();
 
-  QString convert(void const* & inBuf, size_t& inBytesLeft);
+  QString convert( void const *& inBuf, size_t & inBytesLeft );
 
   // Converts a given block of data from the given encoding to a wide string.
-  static gd::wstring toWstring( char const * fromEncoding, void const * fromData,
-                                 size_t dataSize );
+  static gd::wstring toWstring( char const * fromEncoding, void const * fromData, size_t dataSize );
 
   // Converts a given block of data from the given encoding to an utf8-encoded
   // string.
-  static std::string toUtf8( char const * fromEncoding, void const * fromData,
-                             size_t dataSize );
+  static std::string toUtf8( char const * fromEncoding, void const * fromData, size_t dataSize );
+
 private:
 
   // Copying/assigning not supported
   Iconv( Iconv const & );
-  Iconv & operator = ( Iconv const & );
+  Iconv & operator=( Iconv const & );
 };
 
 #endif
-
diff --git a/src/common/inc_case_folding.hh b/src/common/inc_case_folding.hh
index 5a3addec..a481459c 100644
--- a/src/common/inc_case_folding.hh
+++ b/src/common/inc_case_folding.hh
@@ -1,3003 +1,7640 @@
 // This file was generated automatically. Do not edit directly.
+#pragma once
+enum {
+  foldCaseMaxOut = 3
+};
 
-enum { foldCaseMaxOut = 3 };
-
-size_t foldCase( wchar in, wchar * out )
+inline size_t foldCase( char32_t in, char32_t * out )
 {
-  switch( in )
-  {
-    case 0x41: *out = 0x61; return 1;
-    case 0x42: *out = 0x62; return 1;
-    case 0x43: *out = 0x63; return 1;
-    case 0x44: *out = 0x64; return 1;
-    case 0x45: *out = 0x65; return 1;
-    case 0x46: *out = 0x66; return 1;
-    case 0x47: *out = 0x67; return 1;
-    case 0x48: *out = 0x68; return 1;
-    case 0x49: *out = 0x69; return 1;
-    case 0x4a: *out = 0x6a; return 1;
-    case 0x4b: *out = 0x6b; return 1;
-    case 0x4c: *out = 0x6c; return 1;
-    case 0x4d: *out = 0x6d; return 1;
-    case 0x4e: *out = 0x6e; return 1;
-    case 0x4f: *out = 0x6f; return 1;
-    case 0x50: *out = 0x70; return 1;
-    case 0x51: *out = 0x71; return 1;
-    case 0x52: *out = 0x72; return 1;
-    case 0x53: *out = 0x73; return 1;
-    case 0x54: *out = 0x74; return 1;
-    case 0x55: *out = 0x75; return 1;
-    case 0x56: *out = 0x76; return 1;
-    case 0x57: *out = 0x77; return 1;
-    case 0x58: *out = 0x78; return 1;
-    case 0x59: *out = 0x79; return 1;
-    case 0x5a: *out = 0x7a; return 1;
-    case 0xb5: *out = 0x3bc; return 1;
-    case 0xc0: *out = 0xe0; return 1;
-    case 0xc1: *out = 0xe1; return 1;
-    case 0xc2: *out = 0xe2; return 1;
-    case 0xc3: *out = 0xe3; return 1;
-    case 0xc4: *out = 0xe4; return 1;
-    case 0xc5: *out = 0xe5; return 1;
-    case 0xc6: *out = 0xe6; return 1;
-    case 0xc7: *out = 0xe7; return 1;
-    case 0xc8: *out = 0xe8; return 1;
-    case 0xc9: *out = 0xe9; return 1;
-    case 0xca: *out = 0xea; return 1;
-    case 0xcb: *out = 0xeb; return 1;
-    case 0xcc: *out = 0xec; return 1;
-    case 0xcd: *out = 0xed; return 1;
-    case 0xce: *out = 0xee; return 1;
-    case 0xcf: *out = 0xef; return 1;
-    case 0xd0: *out = 0xf0; return 1;
-    case 0xd1: *out = 0xf1; return 1;
-    case 0xd2: *out = 0xf2; return 1;
-    case 0xd3: *out = 0xf3; return 1;
-    case 0xd4: *out = 0xf4; return 1;
-    case 0xd5: *out = 0xf5; return 1;
-    case 0xd6: *out = 0xf6; return 1;
-    case 0xd8: *out = 0xf8; return 1;
-    case 0xd9: *out = 0xf9; return 1;
-    case 0xda: *out = 0xfa; return 1;
-    case 0xdb: *out = 0xfb; return 1;
-    case 0xdc: *out = 0xfc; return 1;
-    case 0xdd: *out = 0xfd; return 1;
-    case 0xde: *out = 0xfe; return 1;
-    case 0xdf: out[ 0 ] = 0x73; out[ 1 ] = 0x73; return 2;
-    case 0x100: *out = 0x101; return 1;
-    case 0x102: *out = 0x103; return 1;
-    case 0x104: *out = 0x105; return 1;
-    case 0x106: *out = 0x107; return 1;
-    case 0x108: *out = 0x109; return 1;
-    case 0x10a: *out = 0x10b; return 1;
-    case 0x10c: *out = 0x10d; return 1;
-    case 0x10e: *out = 0x10f; return 1;
-    case 0x110: *out = 0x111; return 1;
-    case 0x112: *out = 0x113; return 1;
-    case 0x114: *out = 0x115; return 1;
-    case 0x116: *out = 0x117; return 1;
-    case 0x118: *out = 0x119; return 1;
-    case 0x11a: *out = 0x11b; return 1;
-    case 0x11c: *out = 0x11d; return 1;
-    case 0x11e: *out = 0x11f; return 1;
-    case 0x120: *out = 0x121; return 1;
-    case 0x122: *out = 0x123; return 1;
-    case 0x124: *out = 0x125; return 1;
-    case 0x126: *out = 0x127; return 1;
-    case 0x128: *out = 0x129; return 1;
-    case 0x12a: *out = 0x12b; return 1;
-    case 0x12c: *out = 0x12d; return 1;
-    case 0x12e: *out = 0x12f; return 1;
-    case 0x130: out[ 0 ] = 0x69; out[ 1 ] = 0x307; return 2;
-    case 0x132: *out = 0x133; return 1;
-    case 0x134: *out = 0x135; return 1;
-    case 0x136: *out = 0x137; return 1;
-    case 0x139: *out = 0x13a; return 1;
-    case 0x13b: *out = 0x13c; return 1;
-    case 0x13d: *out = 0x13e; return 1;
-    case 0x13f: *out = 0x140; return 1;
-    case 0x141: *out = 0x142; return 1;
-    case 0x143: *out = 0x144; return 1;
-    case 0x145: *out = 0x146; return 1;
-    case 0x147: *out = 0x148; return 1;
-    case 0x149: out[ 0 ] = 0x2bc; out[ 1 ] = 0x6e; return 2;
-    case 0x14a: *out = 0x14b; return 1;
-    case 0x14c: *out = 0x14d; return 1;
-    case 0x14e: *out = 0x14f; return 1;
-    case 0x150: *out = 0x151; return 1;
-    case 0x152: *out = 0x153; return 1;
-    case 0x154: *out = 0x155; return 1;
-    case 0x156: *out = 0x157; return 1;
-    case 0x158: *out = 0x159; return 1;
-    case 0x15a: *out = 0x15b; return 1;
-    case 0x15c: *out = 0x15d; return 1;
-    case 0x15e: *out = 0x15f; return 1;
-    case 0x160: *out = 0x161; return 1;
-    case 0x162: *out = 0x163; return 1;
-    case 0x164: *out = 0x165; return 1;
-    case 0x166: *out = 0x167; return 1;
-    case 0x168: *out = 0x169; return 1;
-    case 0x16a: *out = 0x16b; return 1;
-    case 0x16c: *out = 0x16d; return 1;
-    case 0x16e: *out = 0x16f; return 1;
-    case 0x170: *out = 0x171; return 1;
-    case 0x172: *out = 0x173; return 1;
-    case 0x174: *out = 0x175; return 1;
-    case 0x176: *out = 0x177; return 1;
-    case 0x178: *out = 0xff; return 1;
-    case 0x179: *out = 0x17a; return 1;
-    case 0x17b: *out = 0x17c; return 1;
-    case 0x17d: *out = 0x17e; return 1;
-    case 0x17f: *out = 0x73; return 1;
-    case 0x181: *out = 0x253; return 1;
-    case 0x182: *out = 0x183; return 1;
-    case 0x184: *out = 0x185; return 1;
-    case 0x186: *out = 0x254; return 1;
-    case 0x187: *out = 0x188; return 1;
-    case 0x189: *out = 0x256; return 1;
-    case 0x18a: *out = 0x257; return 1;
-    case 0x18b: *out = 0x18c; return 1;
-    case 0x18e: *out = 0x1dd; return 1;
-    case 0x18f: *out = 0x259; return 1;
-    case 0x190: *out = 0x25b; return 1;
-    case 0x191: *out = 0x192; return 1;
-    case 0x193: *out = 0x260; return 1;
-    case 0x194: *out = 0x263; return 1;
-    case 0x196: *out = 0x269; return 1;
-    case 0x197: *out = 0x268; return 1;
-    case 0x198: *out = 0x199; return 1;
-    case 0x19c: *out = 0x26f; return 1;
-    case 0x19d: *out = 0x272; return 1;
-    case 0x19f: *out = 0x275; return 1;
-    case 0x1a0: *out = 0x1a1; return 1;
-    case 0x1a2: *out = 0x1a3; return 1;
-    case 0x1a4: *out = 0x1a5; return 1;
-    case 0x1a6: *out = 0x280; return 1;
-    case 0x1a7: *out = 0x1a8; return 1;
-    case 0x1a9: *out = 0x283; return 1;
-    case 0x1ac: *out = 0x1ad; return 1;
-    case 0x1ae: *out = 0x288; return 1;
-    case 0x1af: *out = 0x1b0; return 1;
-    case 0x1b1: *out = 0x28a; return 1;
-    case 0x1b2: *out = 0x28b; return 1;
-    case 0x1b3: *out = 0x1b4; return 1;
-    case 0x1b5: *out = 0x1b6; return 1;
-    case 0x1b7: *out = 0x292; return 1;
-    case 0x1b8: *out = 0x1b9; return 1;
-    case 0x1bc: *out = 0x1bd; return 1;
-    case 0x1c4: *out = 0x1c6; return 1;
-    case 0x1c5: *out = 0x1c6; return 1;
-    case 0x1c7: *out = 0x1c9; return 1;
-    case 0x1c8: *out = 0x1c9; return 1;
-    case 0x1ca: *out = 0x1cc; return 1;
-    case 0x1cb: *out = 0x1cc; return 1;
-    case 0x1cd: *out = 0x1ce; return 1;
-    case 0x1cf: *out = 0x1d0; return 1;
-    case 0x1d1: *out = 0x1d2; return 1;
-    case 0x1d3: *out = 0x1d4; return 1;
-    case 0x1d5: *out = 0x1d6; return 1;
-    case 0x1d7: *out = 0x1d8; return 1;
-    case 0x1d9: *out = 0x1da; return 1;
-    case 0x1db: *out = 0x1dc; return 1;
-    case 0x1de: *out = 0x1df; return 1;
-    case 0x1e0: *out = 0x1e1; return 1;
-    case 0x1e2: *out = 0x1e3; return 1;
-    case 0x1e4: *out = 0x1e5; return 1;
-    case 0x1e6: *out = 0x1e7; return 1;
-    case 0x1e8: *out = 0x1e9; return 1;
-    case 0x1ea: *out = 0x1eb; return 1;
-    case 0x1ec: *out = 0x1ed; return 1;
-    case 0x1ee: *out = 0x1ef; return 1;
-    case 0x1f0: out[ 0 ] = 0x6a; out[ 1 ] = 0x30c; return 2;
-    case 0x1f1: *out = 0x1f3; return 1;
-    case 0x1f2: *out = 0x1f3; return 1;
-    case 0x1f4: *out = 0x1f5; return 1;
-    case 0x1f6: *out = 0x195; return 1;
-    case 0x1f7: *out = 0x1bf; return 1;
-    case 0x1f8: *out = 0x1f9; return 1;
-    case 0x1fa: *out = 0x1fb; return 1;
-    case 0x1fc: *out = 0x1fd; return 1;
-    case 0x1fe: *out = 0x1ff; return 1;
-    case 0x200: *out = 0x201; return 1;
-    case 0x202: *out = 0x203; return 1;
-    case 0x204: *out = 0x205; return 1;
-    case 0x206: *out = 0x207; return 1;
-    case 0x208: *out = 0x209; return 1;
-    case 0x20a: *out = 0x20b; return 1;
-    case 0x20c: *out = 0x20d; return 1;
-    case 0x20e: *out = 0x20f; return 1;
-    case 0x210: *out = 0x211; return 1;
-    case 0x212: *out = 0x213; return 1;
-    case 0x214: *out = 0x215; return 1;
-    case 0x216: *out = 0x217; return 1;
-    case 0x218: *out = 0x219; return 1;
-    case 0x21a: *out = 0x21b; return 1;
-    case 0x21c: *out = 0x21d; return 1;
-    case 0x21e: *out = 0x21f; return 1;
-    case 0x220: *out = 0x19e; return 1;
-    case 0x222: *out = 0x223; return 1;
-    case 0x224: *out = 0x225; return 1;
-    case 0x226: *out = 0x227; return 1;
-    case 0x228: *out = 0x229; return 1;
-    case 0x22a: *out = 0x22b; return 1;
-    case 0x22c: *out = 0x22d; return 1;
-    case 0x22e: *out = 0x22f; return 1;
-    case 0x230: *out = 0x231; return 1;
-    case 0x232: *out = 0x233; return 1;
-    case 0x23a: *out = 0x2c65; return 1;
-    case 0x23b: *out = 0x23c; return 1;
-    case 0x23d: *out = 0x19a; return 1;
-    case 0x23e: *out = 0x2c66; return 1;
-    case 0x241: *out = 0x242; return 1;
-    case 0x243: *out = 0x180; return 1;
-    case 0x244: *out = 0x289; return 1;
-    case 0x245: *out = 0x28c; return 1;
-    case 0x246: *out = 0x247; return 1;
-    case 0x248: *out = 0x249; return 1;
-    case 0x24a: *out = 0x24b; return 1;
-    case 0x24c: *out = 0x24d; return 1;
-    case 0x24e: *out = 0x24f; return 1;
-    case 0x345: *out = 0x3b9; return 1;
-    case 0x370: *out = 0x371; return 1;
-    case 0x372: *out = 0x373; return 1;
-    case 0x376: *out = 0x377; return 1;
-    case 0x37f: *out = 0x3f3; return 1;
-    case 0x386: *out = 0x3ac; return 1;
-    case 0x388: *out = 0x3ad; return 1;
-    case 0x389: *out = 0x3ae; return 1;
-    case 0x38a: *out = 0x3af; return 1;
-    case 0x38c: *out = 0x3cc; return 1;
-    case 0x38e: *out = 0x3cd; return 1;
-    case 0x38f: *out = 0x3ce; return 1;
-    case 0x390: out[ 0 ] = 0x3b9; out[ 1 ] = 0x308; out[ 2 ] = 0x301; return 3;
-    case 0x391: *out = 0x3b1; return 1;
-    case 0x392: *out = 0x3b2; return 1;
-    case 0x393: *out = 0x3b3; return 1;
-    case 0x394: *out = 0x3b4; return 1;
-    case 0x395: *out = 0x3b5; return 1;
-    case 0x396: *out = 0x3b6; return 1;
-    case 0x397: *out = 0x3b7; return 1;
-    case 0x398: *out = 0x3b8; return 1;
-    case 0x399: *out = 0x3b9; return 1;
-    case 0x39a: *out = 0x3ba; return 1;
-    case 0x39b: *out = 0x3bb; return 1;
-    case 0x39c: *out = 0x3bc; return 1;
-    case 0x39d: *out = 0x3bd; return 1;
-    case 0x39e: *out = 0x3be; return 1;
-    case 0x39f: *out = 0x3bf; return 1;
-    case 0x3a0: *out = 0x3c0; return 1;
-    case 0x3a1: *out = 0x3c1; return 1;
-    case 0x3a3: *out = 0x3c3; return 1;
-    case 0x3a4: *out = 0x3c4; return 1;
-    case 0x3a5: *out = 0x3c5; return 1;
-    case 0x3a6: *out = 0x3c6; return 1;
-    case 0x3a7: *out = 0x3c7; return 1;
-    case 0x3a8: *out = 0x3c8; return 1;
-    case 0x3a9: *out = 0x3c9; return 1;
-    case 0x3aa: *out = 0x3ca; return 1;
-    case 0x3ab: *out = 0x3cb; return 1;
-    case 0x3b0: out[ 0 ] = 0x3c5; out[ 1 ] = 0x308; out[ 2 ] = 0x301; return 3;
-    case 0x3c2: *out = 0x3c3; return 1;
-    case 0x3cf: *out = 0x3d7; return 1;
-    case 0x3d0: *out = 0x3b2; return 1;
-    case 0x3d1: *out = 0x3b8; return 1;
-    case 0x3d5: *out = 0x3c6; return 1;
-    case 0x3d6: *out = 0x3c0; return 1;
-    case 0x3d8: *out = 0x3d9; return 1;
-    case 0x3da: *out = 0x3db; return 1;
-    case 0x3dc: *out = 0x3dd; return 1;
-    case 0x3de: *out = 0x3df; return 1;
-    case 0x3e0: *out = 0x3e1; return 1;
-    case 0x3e2: *out = 0x3e3; return 1;
-    case 0x3e4: *out = 0x3e5; return 1;
-    case 0x3e6: *out = 0x3e7; return 1;
-    case 0x3e8: *out = 0x3e9; return 1;
-    case 0x3ea: *out = 0x3eb; return 1;
-    case 0x3ec: *out = 0x3ed; return 1;
-    case 0x3ee: *out = 0x3ef; return 1;
-    case 0x3f0: *out = 0x3ba; return 1;
-    case 0x3f1: *out = 0x3c1; return 1;
-    case 0x3f4: *out = 0x3b8; return 1;
-    case 0x3f5: *out = 0x3b5; return 1;
-    case 0x3f7: *out = 0x3f8; return 1;
-    case 0x3f9: *out = 0x3f2; return 1;
-    case 0x3fa: *out = 0x3fb; return 1;
-    case 0x3fd: *out = 0x37b; return 1;
-    case 0x3fe: *out = 0x37c; return 1;
-    case 0x3ff: *out = 0x37d; return 1;
-    case 0x400: *out = 0x450; return 1;
-    case 0x401: *out = 0x451; return 1;
-    case 0x402: *out = 0x452; return 1;
-    case 0x403: *out = 0x453; return 1;
-    case 0x404: *out = 0x454; return 1;
-    case 0x405: *out = 0x455; return 1;
-    case 0x406: *out = 0x456; return 1;
-    case 0x407: *out = 0x457; return 1;
-    case 0x408: *out = 0x458; return 1;
-    case 0x409: *out = 0x459; return 1;
-    case 0x40a: *out = 0x45a; return 1;
-    case 0x40b: *out = 0x45b; return 1;
-    case 0x40c: *out = 0x45c; return 1;
-    case 0x40d: *out = 0x45d; return 1;
-    case 0x40e: *out = 0x45e; return 1;
-    case 0x40f: *out = 0x45f; return 1;
-    case 0x410: *out = 0x430; return 1;
-    case 0x411: *out = 0x431; return 1;
-    case 0x412: *out = 0x432; return 1;
-    case 0x413: *out = 0x433; return 1;
-    case 0x414: *out = 0x434; return 1;
-    case 0x415: *out = 0x435; return 1;
-    case 0x416: *out = 0x436; return 1;
-    case 0x417: *out = 0x437; return 1;
-    case 0x418: *out = 0x438; return 1;
-    case 0x419: *out = 0x439; return 1;
-    case 0x41a: *out = 0x43a; return 1;
-    case 0x41b: *out = 0x43b; return 1;
-    case 0x41c: *out = 0x43c; return 1;
-    case 0x41d: *out = 0x43d; return 1;
-    case 0x41e: *out = 0x43e; return 1;
-    case 0x41f: *out = 0x43f; return 1;
-    case 0x420: *out = 0x440; return 1;
-    case 0x421: *out = 0x441; return 1;
-    case 0x422: *out = 0x442; return 1;
-    case 0x423: *out = 0x443; return 1;
-    case 0x424: *out = 0x444; return 1;
-    case 0x425: *out = 0x445; return 1;
-    case 0x426: *out = 0x446; return 1;
-    case 0x427: *out = 0x447; return 1;
-    case 0x428: *out = 0x448; return 1;
-    case 0x429: *out = 0x449; return 1;
-    case 0x42a: *out = 0x44a; return 1;
-    case 0x42b: *out = 0x44b; return 1;
-    case 0x42c: *out = 0x44c; return 1;
-    case 0x42d: *out = 0x44d; return 1;
-    case 0x42e: *out = 0x44e; return 1;
-    case 0x42f: *out = 0x44f; return 1;
-    case 0x460: *out = 0x461; return 1;
-    case 0x462: *out = 0x463; return 1;
-    case 0x464: *out = 0x465; return 1;
-    case 0x466: *out = 0x467; return 1;
-    case 0x468: *out = 0x469; return 1;
-    case 0x46a: *out = 0x46b; return 1;
-    case 0x46c: *out = 0x46d; return 1;
-    case 0x46e: *out = 0x46f; return 1;
-    case 0x470: *out = 0x471; return 1;
-    case 0x472: *out = 0x473; return 1;
-    case 0x474: *out = 0x475; return 1;
-    case 0x476: *out = 0x477; return 1;
-    case 0x478: *out = 0x479; return 1;
-    case 0x47a: *out = 0x47b; return 1;
-    case 0x47c: *out = 0x47d; return 1;
-    case 0x47e: *out = 0x47f; return 1;
-    case 0x480: *out = 0x481; return 1;
-    case 0x48a: *out = 0x48b; return 1;
-    case 0x48c: *out = 0x48d; return 1;
-    case 0x48e: *out = 0x48f; return 1;
-    case 0x490: *out = 0x491; return 1;
-    case 0x492: *out = 0x493; return 1;
-    case 0x494: *out = 0x495; return 1;
-    case 0x496: *out = 0x497; return 1;
-    case 0x498: *out = 0x499; return 1;
-    case 0x49a: *out = 0x49b; return 1;
-    case 0x49c: *out = 0x49d; return 1;
-    case 0x49e: *out = 0x49f; return 1;
-    case 0x4a0: *out = 0x4a1; return 1;
-    case 0x4a2: *out = 0x4a3; return 1;
-    case 0x4a4: *out = 0x4a5; return 1;
-    case 0x4a6: *out = 0x4a7; return 1;
-    case 0x4a8: *out = 0x4a9; return 1;
-    case 0x4aa: *out = 0x4ab; return 1;
-    case 0x4ac: *out = 0x4ad; return 1;
-    case 0x4ae: *out = 0x4af; return 1;
-    case 0x4b0: *out = 0x4b1; return 1;
-    case 0x4b2: *out = 0x4b3; return 1;
-    case 0x4b4: *out = 0x4b5; return 1;
-    case 0x4b6: *out = 0x4b7; return 1;
-    case 0x4b8: *out = 0x4b9; return 1;
-    case 0x4ba: *out = 0x4bb; return 1;
-    case 0x4bc: *out = 0x4bd; return 1;
-    case 0x4be: *out = 0x4bf; return 1;
-    case 0x4c0: *out = 0x4cf; return 1;
-    case 0x4c1: *out = 0x4c2; return 1;
-    case 0x4c3: *out = 0x4c4; return 1;
-    case 0x4c5: *out = 0x4c6; return 1;
-    case 0x4c7: *out = 0x4c8; return 1;
-    case 0x4c9: *out = 0x4ca; return 1;
-    case 0x4cb: *out = 0x4cc; return 1;
-    case 0x4cd: *out = 0x4ce; return 1;
-    case 0x4d0: *out = 0x4d1; return 1;
-    case 0x4d2: *out = 0x4d3; return 1;
-    case 0x4d4: *out = 0x4d5; return 1;
-    case 0x4d6: *out = 0x4d7; return 1;
-    case 0x4d8: *out = 0x4d9; return 1;
-    case 0x4da: *out = 0x4db; return 1;
-    case 0x4dc: *out = 0x4dd; return 1;
-    case 0x4de: *out = 0x4df; return 1;
-    case 0x4e0: *out = 0x4e1; return 1;
-    case 0x4e2: *out = 0x4e3; return 1;
-    case 0x4e4: *out = 0x4e5; return 1;
-    case 0x4e6: *out = 0x4e7; return 1;
-    case 0x4e8: *out = 0x4e9; return 1;
-    case 0x4ea: *out = 0x4eb; return 1;
-    case 0x4ec: *out = 0x4ed; return 1;
-    case 0x4ee: *out = 0x4ef; return 1;
-    case 0x4f0: *out = 0x4f1; return 1;
-    case 0x4f2: *out = 0x4f3; return 1;
-    case 0x4f4: *out = 0x4f5; return 1;
-    case 0x4f6: *out = 0x4f7; return 1;
-    case 0x4f8: *out = 0x4f9; return 1;
-    case 0x4fa: *out = 0x4fb; return 1;
-    case 0x4fc: *out = 0x4fd; return 1;
-    case 0x4fe: *out = 0x4ff; return 1;
-    case 0x500: *out = 0x501; return 1;
-    case 0x502: *out = 0x503; return 1;
-    case 0x504: *out = 0x505; return 1;
-    case 0x506: *out = 0x507; return 1;
-    case 0x508: *out = 0x509; return 1;
-    case 0x50a: *out = 0x50b; return 1;
-    case 0x50c: *out = 0x50d; return 1;
-    case 0x50e: *out = 0x50f; return 1;
-    case 0x510: *out = 0x511; return 1;
-    case 0x512: *out = 0x513; return 1;
-    case 0x514: *out = 0x515; return 1;
-    case 0x516: *out = 0x517; return 1;
-    case 0x518: *out = 0x519; return 1;
-    case 0x51a: *out = 0x51b; return 1;
-    case 0x51c: *out = 0x51d; return 1;
-    case 0x51e: *out = 0x51f; return 1;
-    case 0x520: *out = 0x521; return 1;
-    case 0x522: *out = 0x523; return 1;
-    case 0x524: *out = 0x525; return 1;
-    case 0x526: *out = 0x527; return 1;
-    case 0x528: *out = 0x529; return 1;
-    case 0x52a: *out = 0x52b; return 1;
-    case 0x52c: *out = 0x52d; return 1;
-    case 0x52e: *out = 0x52f; return 1;
-    case 0x531: *out = 0x561; return 1;
-    case 0x532: *out = 0x562; return 1;
-    case 0x533: *out = 0x563; return 1;
-    case 0x534: *out = 0x564; return 1;
-    case 0x535: *out = 0x565; return 1;
-    case 0x536: *out = 0x566; return 1;
-    case 0x537: *out = 0x567; return 1;
-    case 0x538: *out = 0x568; return 1;
-    case 0x539: *out = 0x569; return 1;
-    case 0x53a: *out = 0x56a; return 1;
-    case 0x53b: *out = 0x56b; return 1;
-    case 0x53c: *out = 0x56c; return 1;
-    case 0x53d: *out = 0x56d; return 1;
-    case 0x53e: *out = 0x56e; return 1;
-    case 0x53f: *out = 0x56f; return 1;
-    case 0x540: *out = 0x570; return 1;
-    case 0x541: *out = 0x571; return 1;
-    case 0x542: *out = 0x572; return 1;
-    case 0x543: *out = 0x573; return 1;
-    case 0x544: *out = 0x574; return 1;
-    case 0x545: *out = 0x575; return 1;
-    case 0x546: *out = 0x576; return 1;
-    case 0x547: *out = 0x577; return 1;
-    case 0x548: *out = 0x578; return 1;
-    case 0x549: *out = 0x579; return 1;
-    case 0x54a: *out = 0x57a; return 1;
-    case 0x54b: *out = 0x57b; return 1;
-    case 0x54c: *out = 0x57c; return 1;
-    case 0x54d: *out = 0x57d; return 1;
-    case 0x54e: *out = 0x57e; return 1;
-    case 0x54f: *out = 0x57f; return 1;
-    case 0x550: *out = 0x580; return 1;
-    case 0x551: *out = 0x581; return 1;
-    case 0x552: *out = 0x582; return 1;
-    case 0x553: *out = 0x583; return 1;
-    case 0x554: *out = 0x584; return 1;
-    case 0x555: *out = 0x585; return 1;
-    case 0x556: *out = 0x586; return 1;
-    case 0x587: out[ 0 ] = 0x565; out[ 1 ] = 0x582; return 2;
-    case 0x10a0: *out = 0x2d00; return 1;
-    case 0x10a1: *out = 0x2d01; return 1;
-    case 0x10a2: *out = 0x2d02; return 1;
-    case 0x10a3: *out = 0x2d03; return 1;
-    case 0x10a4: *out = 0x2d04; return 1;
-    case 0x10a5: *out = 0x2d05; return 1;
-    case 0x10a6: *out = 0x2d06; return 1;
-    case 0x10a7: *out = 0x2d07; return 1;
-    case 0x10a8: *out = 0x2d08; return 1;
-    case 0x10a9: *out = 0x2d09; return 1;
-    case 0x10aa: *out = 0x2d0a; return 1;
-    case 0x10ab: *out = 0x2d0b; return 1;
-    case 0x10ac: *out = 0x2d0c; return 1;
-    case 0x10ad: *out = 0x2d0d; return 1;
-    case 0x10ae: *out = 0x2d0e; return 1;
-    case 0x10af: *out = 0x2d0f; return 1;
-    case 0x10b0: *out = 0x2d10; return 1;
-    case 0x10b1: *out = 0x2d11; return 1;
-    case 0x10b2: *out = 0x2d12; return 1;
-    case 0x10b3: *out = 0x2d13; return 1;
-    case 0x10b4: *out = 0x2d14; return 1;
-    case 0x10b5: *out = 0x2d15; return 1;
-    case 0x10b6: *out = 0x2d16; return 1;
-    case 0x10b7: *out = 0x2d17; return 1;
-    case 0x10b8: *out = 0x2d18; return 1;
-    case 0x10b9: *out = 0x2d19; return 1;
-    case 0x10ba: *out = 0x2d1a; return 1;
-    case 0x10bb: *out = 0x2d1b; return 1;
-    case 0x10bc: *out = 0x2d1c; return 1;
-    case 0x10bd: *out = 0x2d1d; return 1;
-    case 0x10be: *out = 0x2d1e; return 1;
-    case 0x10bf: *out = 0x2d1f; return 1;
-    case 0x10c0: *out = 0x2d20; return 1;
-    case 0x10c1: *out = 0x2d21; return 1;
-    case 0x10c2: *out = 0x2d22; return 1;
-    case 0x10c3: *out = 0x2d23; return 1;
-    case 0x10c4: *out = 0x2d24; return 1;
-    case 0x10c5: *out = 0x2d25; return 1;
-    case 0x10c7: *out = 0x2d27; return 1;
-    case 0x10cd: *out = 0x2d2d; return 1;
-    case 0x13f8: *out = 0x13f0; return 1;
-    case 0x13f9: *out = 0x13f1; return 1;
-    case 0x13fa: *out = 0x13f2; return 1;
-    case 0x13fb: *out = 0x13f3; return 1;
-    case 0x13fc: *out = 0x13f4; return 1;
-    case 0x13fd: *out = 0x13f5; return 1;
-    case 0x1c80: *out = 0x432; return 1;
-    case 0x1c81: *out = 0x434; return 1;
-    case 0x1c82: *out = 0x43e; return 1;
-    case 0x1c83: *out = 0x441; return 1;
-    case 0x1c84: *out = 0x442; return 1;
-    case 0x1c85: *out = 0x442; return 1;
-    case 0x1c86: *out = 0x44a; return 1;
-    case 0x1c87: *out = 0x463; return 1;
-    case 0x1c88: *out = 0xa64b; return 1;
-    case 0x1c90: *out = 0x10d0; return 1;
-    case 0x1c91: *out = 0x10d1; return 1;
-    case 0x1c92: *out = 0x10d2; return 1;
-    case 0x1c93: *out = 0x10d3; return 1;
-    case 0x1c94: *out = 0x10d4; return 1;
-    case 0x1c95: *out = 0x10d5; return 1;
-    case 0x1c96: *out = 0x10d6; return 1;
-    case 0x1c97: *out = 0x10d7; return 1;
-    case 0x1c98: *out = 0x10d8; return 1;
-    case 0x1c99: *out = 0x10d9; return 1;
-    case 0x1c9a: *out = 0x10da; return 1;
-    case 0x1c9b: *out = 0x10db; return 1;
-    case 0x1c9c: *out = 0x10dc; return 1;
-    case 0x1c9d: *out = 0x10dd; return 1;
-    case 0x1c9e: *out = 0x10de; return 1;
-    case 0x1c9f: *out = 0x10df; return 1;
-    case 0x1ca0: *out = 0x10e0; return 1;
-    case 0x1ca1: *out = 0x10e1; return 1;
-    case 0x1ca2: *out = 0x10e2; return 1;
-    case 0x1ca3: *out = 0x10e3; return 1;
-    case 0x1ca4: *out = 0x10e4; return 1;
-    case 0x1ca5: *out = 0x10e5; return 1;
-    case 0x1ca6: *out = 0x10e6; return 1;
-    case 0x1ca7: *out = 0x10e7; return 1;
-    case 0x1ca8: *out = 0x10e8; return 1;
-    case 0x1ca9: *out = 0x10e9; return 1;
-    case 0x1caa: *out = 0x10ea; return 1;
-    case 0x1cab: *out = 0x10eb; return 1;
-    case 0x1cac: *out = 0x10ec; return 1;
-    case 0x1cad: *out = 0x10ed; return 1;
-    case 0x1cae: *out = 0x10ee; return 1;
-    case 0x1caf: *out = 0x10ef; return 1;
-    case 0x1cb0: *out = 0x10f0; return 1;
-    case 0x1cb1: *out = 0x10f1; return 1;
-    case 0x1cb2: *out = 0x10f2; return 1;
-    case 0x1cb3: *out = 0x10f3; return 1;
-    case 0x1cb4: *out = 0x10f4; return 1;
-    case 0x1cb5: *out = 0x10f5; return 1;
-    case 0x1cb6: *out = 0x10f6; return 1;
-    case 0x1cb7: *out = 0x10f7; return 1;
-    case 0x1cb8: *out = 0x10f8; return 1;
-    case 0x1cb9: *out = 0x10f9; return 1;
-    case 0x1cba: *out = 0x10fa; return 1;
-    case 0x1cbd: *out = 0x10fd; return 1;
-    case 0x1cbe: *out = 0x10fe; return 1;
-    case 0x1cbf: *out = 0x10ff; return 1;
-    case 0x1e00: *out = 0x1e01; return 1;
-    case 0x1e02: *out = 0x1e03; return 1;
-    case 0x1e04: *out = 0x1e05; return 1;
-    case 0x1e06: *out = 0x1e07; return 1;
-    case 0x1e08: *out = 0x1e09; return 1;
-    case 0x1e0a: *out = 0x1e0b; return 1;
-    case 0x1e0c: *out = 0x1e0d; return 1;
-    case 0x1e0e: *out = 0x1e0f; return 1;
-    case 0x1e10: *out = 0x1e11; return 1;
-    case 0x1e12: *out = 0x1e13; return 1;
-    case 0x1e14: *out = 0x1e15; return 1;
-    case 0x1e16: *out = 0x1e17; return 1;
-    case 0x1e18: *out = 0x1e19; return 1;
-    case 0x1e1a: *out = 0x1e1b; return 1;
-    case 0x1e1c: *out = 0x1e1d; return 1;
-    case 0x1e1e: *out = 0x1e1f; return 1;
-    case 0x1e20: *out = 0x1e21; return 1;
-    case 0x1e22: *out = 0x1e23; return 1;
-    case 0x1e24: *out = 0x1e25; return 1;
-    case 0x1e26: *out = 0x1e27; return 1;
-    case 0x1e28: *out = 0x1e29; return 1;
-    case 0x1e2a: *out = 0x1e2b; return 1;
-    case 0x1e2c: *out = 0x1e2d; return 1;
-    case 0x1e2e: *out = 0x1e2f; return 1;
-    case 0x1e30: *out = 0x1e31; return 1;
-    case 0x1e32: *out = 0x1e33; return 1;
-    case 0x1e34: *out = 0x1e35; return 1;
-    case 0x1e36: *out = 0x1e37; return 1;
-    case 0x1e38: *out = 0x1e39; return 1;
-    case 0x1e3a: *out = 0x1e3b; return 1;
-    case 0x1e3c: *out = 0x1e3d; return 1;
-    case 0x1e3e: *out = 0x1e3f; return 1;
-    case 0x1e40: *out = 0x1e41; return 1;
-    case 0x1e42: *out = 0x1e43; return 1;
-    case 0x1e44: *out = 0x1e45; return 1;
-    case 0x1e46: *out = 0x1e47; return 1;
-    case 0x1e48: *out = 0x1e49; return 1;
-    case 0x1e4a: *out = 0x1e4b; return 1;
-    case 0x1e4c: *out = 0x1e4d; return 1;
-    case 0x1e4e: *out = 0x1e4f; return 1;
-    case 0x1e50: *out = 0x1e51; return 1;
-    case 0x1e52: *out = 0x1e53; return 1;
-    case 0x1e54: *out = 0x1e55; return 1;
-    case 0x1e56: *out = 0x1e57; return 1;
-    case 0x1e58: *out = 0x1e59; return 1;
-    case 0x1e5a: *out = 0x1e5b; return 1;
-    case 0x1e5c: *out = 0x1e5d; return 1;
-    case 0x1e5e: *out = 0x1e5f; return 1;
-    case 0x1e60: *out = 0x1e61; return 1;
-    case 0x1e62: *out = 0x1e63; return 1;
-    case 0x1e64: *out = 0x1e65; return 1;
-    case 0x1e66: *out = 0x1e67; return 1;
-    case 0x1e68: *out = 0x1e69; return 1;
-    case 0x1e6a: *out = 0x1e6b; return 1;
-    case 0x1e6c: *out = 0x1e6d; return 1;
-    case 0x1e6e: *out = 0x1e6f; return 1;
-    case 0x1e70: *out = 0x1e71; return 1;
-    case 0x1e72: *out = 0x1e73; return 1;
-    case 0x1e74: *out = 0x1e75; return 1;
-    case 0x1e76: *out = 0x1e77; return 1;
-    case 0x1e78: *out = 0x1e79; return 1;
-    case 0x1e7a: *out = 0x1e7b; return 1;
-    case 0x1e7c: *out = 0x1e7d; return 1;
-    case 0x1e7e: *out = 0x1e7f; return 1;
-    case 0x1e80: *out = 0x1e81; return 1;
-    case 0x1e82: *out = 0x1e83; return 1;
-    case 0x1e84: *out = 0x1e85; return 1;
-    case 0x1e86: *out = 0x1e87; return 1;
-    case 0x1e88: *out = 0x1e89; return 1;
-    case 0x1e8a: *out = 0x1e8b; return 1;
-    case 0x1e8c: *out = 0x1e8d; return 1;
-    case 0x1e8e: *out = 0x1e8f; return 1;
-    case 0x1e90: *out = 0x1e91; return 1;
-    case 0x1e92: *out = 0x1e93; return 1;
-    case 0x1e94: *out = 0x1e95; return 1;
-    case 0x1e96: out[ 0 ] = 0x68; out[ 1 ] = 0x331; return 2;
-    case 0x1e97: out[ 0 ] = 0x74; out[ 1 ] = 0x308; return 2;
-    case 0x1e98: out[ 0 ] = 0x77; out[ 1 ] = 0x30a; return 2;
-    case 0x1e99: out[ 0 ] = 0x79; out[ 1 ] = 0x30a; return 2;
-    case 0x1e9a: out[ 0 ] = 0x61; out[ 1 ] = 0x2be; return 2;
-    case 0x1e9b: *out = 0x1e61; return 1;
-    case 0x1e9e: out[ 0 ] = 0x73; out[ 1 ] = 0x73; return 2;
-    case 0x1ea0: *out = 0x1ea1; return 1;
-    case 0x1ea2: *out = 0x1ea3; return 1;
-    case 0x1ea4: *out = 0x1ea5; return 1;
-    case 0x1ea6: *out = 0x1ea7; return 1;
-    case 0x1ea8: *out = 0x1ea9; return 1;
-    case 0x1eaa: *out = 0x1eab; return 1;
-    case 0x1eac: *out = 0x1ead; return 1;
-    case 0x1eae: *out = 0x1eaf; return 1;
-    case 0x1eb0: *out = 0x1eb1; return 1;
-    case 0x1eb2: *out = 0x1eb3; return 1;
-    case 0x1eb4: *out = 0x1eb5; return 1;
-    case 0x1eb6: *out = 0x1eb7; return 1;
-    case 0x1eb8: *out = 0x1eb9; return 1;
-    case 0x1eba: *out = 0x1ebb; return 1;
-    case 0x1ebc: *out = 0x1ebd; return 1;
-    case 0x1ebe: *out = 0x1ebf; return 1;
-    case 0x1ec0: *out = 0x1ec1; return 1;
-    case 0x1ec2: *out = 0x1ec3; return 1;
-    case 0x1ec4: *out = 0x1ec5; return 1;
-    case 0x1ec6: *out = 0x1ec7; return 1;
-    case 0x1ec8: *out = 0x1ec9; return 1;
-    case 0x1eca: *out = 0x1ecb; return 1;
-    case 0x1ecc: *out = 0x1ecd; return 1;
-    case 0x1ece: *out = 0x1ecf; return 1;
-    case 0x1ed0: *out = 0x1ed1; return 1;
-    case 0x1ed2: *out = 0x1ed3; return 1;
-    case 0x1ed4: *out = 0x1ed5; return 1;
-    case 0x1ed6: *out = 0x1ed7; return 1;
-    case 0x1ed8: *out = 0x1ed9; return 1;
-    case 0x1eda: *out = 0x1edb; return 1;
-    case 0x1edc: *out = 0x1edd; return 1;
-    case 0x1ede: *out = 0x1edf; return 1;
-    case 0x1ee0: *out = 0x1ee1; return 1;
-    case 0x1ee2: *out = 0x1ee3; return 1;
-    case 0x1ee4: *out = 0x1ee5; return 1;
-    case 0x1ee6: *out = 0x1ee7; return 1;
-    case 0x1ee8: *out = 0x1ee9; return 1;
-    case 0x1eea: *out = 0x1eeb; return 1;
-    case 0x1eec: *out = 0x1eed; return 1;
-    case 0x1eee: *out = 0x1eef; return 1;
-    case 0x1ef0: *out = 0x1ef1; return 1;
-    case 0x1ef2: *out = 0x1ef3; return 1;
-    case 0x1ef4: *out = 0x1ef5; return 1;
-    case 0x1ef6: *out = 0x1ef7; return 1;
-    case 0x1ef8: *out = 0x1ef9; return 1;
-    case 0x1efa: *out = 0x1efb; return 1;
-    case 0x1efc: *out = 0x1efd; return 1;
-    case 0x1efe: *out = 0x1eff; return 1;
-    case 0x1f08: *out = 0x1f00; return 1;
-    case 0x1f09: *out = 0x1f01; return 1;
-    case 0x1f0a: *out = 0x1f02; return 1;
-    case 0x1f0b: *out = 0x1f03; return 1;
-    case 0x1f0c: *out = 0x1f04; return 1;
-    case 0x1f0d: *out = 0x1f05; return 1;
-    case 0x1f0e: *out = 0x1f06; return 1;
-    case 0x1f0f: *out = 0x1f07; return 1;
-    case 0x1f18: *out = 0x1f10; return 1;
-    case 0x1f19: *out = 0x1f11; return 1;
-    case 0x1f1a: *out = 0x1f12; return 1;
-    case 0x1f1b: *out = 0x1f13; return 1;
-    case 0x1f1c: *out = 0x1f14; return 1;
-    case 0x1f1d: *out = 0x1f15; return 1;
-    case 0x1f28: *out = 0x1f20; return 1;
-    case 0x1f29: *out = 0x1f21; return 1;
-    case 0x1f2a: *out = 0x1f22; return 1;
-    case 0x1f2b: *out = 0x1f23; return 1;
-    case 0x1f2c: *out = 0x1f24; return 1;
-    case 0x1f2d: *out = 0x1f25; return 1;
-    case 0x1f2e: *out = 0x1f26; return 1;
-    case 0x1f2f: *out = 0x1f27; return 1;
-    case 0x1f38: *out = 0x1f30; return 1;
-    case 0x1f39: *out = 0x1f31; return 1;
-    case 0x1f3a: *out = 0x1f32; return 1;
-    case 0x1f3b: *out = 0x1f33; return 1;
-    case 0x1f3c: *out = 0x1f34; return 1;
-    case 0x1f3d: *out = 0x1f35; return 1;
-    case 0x1f3e: *out = 0x1f36; return 1;
-    case 0x1f3f: *out = 0x1f37; return 1;
-    case 0x1f48: *out = 0x1f40; return 1;
-    case 0x1f49: *out = 0x1f41; return 1;
-    case 0x1f4a: *out = 0x1f42; return 1;
-    case 0x1f4b: *out = 0x1f43; return 1;
-    case 0x1f4c: *out = 0x1f44; return 1;
-    case 0x1f4d: *out = 0x1f45; return 1;
-    case 0x1f50: out[ 0 ] = 0x3c5; out[ 1 ] = 0x313; return 2;
-    case 0x1f52: out[ 0 ] = 0x3c5; out[ 1 ] = 0x313; out[ 2 ] = 0x300; return 3;
-    case 0x1f54: out[ 0 ] = 0x3c5; out[ 1 ] = 0x313; out[ 2 ] = 0x301; return 3;
-    case 0x1f56: out[ 0 ] = 0x3c5; out[ 1 ] = 0x313; out[ 2 ] = 0x342; return 3;
-    case 0x1f59: *out = 0x1f51; return 1;
-    case 0x1f5b: *out = 0x1f53; return 1;
-    case 0x1f5d: *out = 0x1f55; return 1;
-    case 0x1f5f: *out = 0x1f57; return 1;
-    case 0x1f68: *out = 0x1f60; return 1;
-    case 0x1f69: *out = 0x1f61; return 1;
-    case 0x1f6a: *out = 0x1f62; return 1;
-    case 0x1f6b: *out = 0x1f63; return 1;
-    case 0x1f6c: *out = 0x1f64; return 1;
-    case 0x1f6d: *out = 0x1f65; return 1;
-    case 0x1f6e: *out = 0x1f66; return 1;
-    case 0x1f6f: *out = 0x1f67; return 1;
-    case 0x1f80: out[ 0 ] = 0x1f00; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f81: out[ 0 ] = 0x1f01; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f82: out[ 0 ] = 0x1f02; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f83: out[ 0 ] = 0x1f03; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f84: out[ 0 ] = 0x1f04; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f85: out[ 0 ] = 0x1f05; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f86: out[ 0 ] = 0x1f06; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f87: out[ 0 ] = 0x1f07; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f88: out[ 0 ] = 0x1f00; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f89: out[ 0 ] = 0x1f01; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8a: out[ 0 ] = 0x1f02; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8b: out[ 0 ] = 0x1f03; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8c: out[ 0 ] = 0x1f04; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8d: out[ 0 ] = 0x1f05; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8e: out[ 0 ] = 0x1f06; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f8f: out[ 0 ] = 0x1f07; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f90: out[ 0 ] = 0x1f20; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f91: out[ 0 ] = 0x1f21; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f92: out[ 0 ] = 0x1f22; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f93: out[ 0 ] = 0x1f23; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f94: out[ 0 ] = 0x1f24; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f95: out[ 0 ] = 0x1f25; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f96: out[ 0 ] = 0x1f26; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f97: out[ 0 ] = 0x1f27; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f98: out[ 0 ] = 0x1f20; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f99: out[ 0 ] = 0x1f21; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9a: out[ 0 ] = 0x1f22; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9b: out[ 0 ] = 0x1f23; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9c: out[ 0 ] = 0x1f24; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9d: out[ 0 ] = 0x1f25; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9e: out[ 0 ] = 0x1f26; out[ 1 ] = 0x3b9; return 2;
-    case 0x1f9f: out[ 0 ] = 0x1f27; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa0: out[ 0 ] = 0x1f60; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa1: out[ 0 ] = 0x1f61; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa2: out[ 0 ] = 0x1f62; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa3: out[ 0 ] = 0x1f63; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa4: out[ 0 ] = 0x1f64; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa5: out[ 0 ] = 0x1f65; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa6: out[ 0 ] = 0x1f66; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa7: out[ 0 ] = 0x1f67; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa8: out[ 0 ] = 0x1f60; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fa9: out[ 0 ] = 0x1f61; out[ 1 ] = 0x3b9; return 2;
-    case 0x1faa: out[ 0 ] = 0x1f62; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fab: out[ 0 ] = 0x1f63; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fac: out[ 0 ] = 0x1f64; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fad: out[ 0 ] = 0x1f65; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fae: out[ 0 ] = 0x1f66; out[ 1 ] = 0x3b9; return 2;
-    case 0x1faf: out[ 0 ] = 0x1f67; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fb2: out[ 0 ] = 0x1f70; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fb3: out[ 0 ] = 0x3b1; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fb4: out[ 0 ] = 0x3ac; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fb6: out[ 0 ] = 0x3b1; out[ 1 ] = 0x342; return 2;
-    case 0x1fb7: out[ 0 ] = 0x3b1; out[ 1 ] = 0x342; out[ 2 ] = 0x3b9; return 3;
-    case 0x1fb8: *out = 0x1fb0; return 1;
-    case 0x1fb9: *out = 0x1fb1; return 1;
-    case 0x1fba: *out = 0x1f70; return 1;
-    case 0x1fbb: *out = 0x1f71; return 1;
-    case 0x1fbc: out[ 0 ] = 0x3b1; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fbe: *out = 0x3b9; return 1;
-    case 0x1fc2: out[ 0 ] = 0x1f74; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fc3: out[ 0 ] = 0x3b7; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fc4: out[ 0 ] = 0x3ae; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fc6: out[ 0 ] = 0x3b7; out[ 1 ] = 0x342; return 2;
-    case 0x1fc7: out[ 0 ] = 0x3b7; out[ 1 ] = 0x342; out[ 2 ] = 0x3b9; return 3;
-    case 0x1fc8: *out = 0x1f72; return 1;
-    case 0x1fc9: *out = 0x1f73; return 1;
-    case 0x1fca: *out = 0x1f74; return 1;
-    case 0x1fcb: *out = 0x1f75; return 1;
-    case 0x1fcc: out[ 0 ] = 0x3b7; out[ 1 ] = 0x3b9; return 2;
-    case 0x1fd2: out[ 0 ] = 0x3b9; out[ 1 ] = 0x308; out[ 2 ] = 0x300; return 3;
-    case 0x1fd3: out[ 0 ] = 0x3b9; out[ 1 ] = 0x308; out[ 2 ] = 0x301; return 3;
-    case 0x1fd6: out[ 0 ] = 0x3b9; out[ 1 ] = 0x342; return 2;
-    case 0x1fd7: out[ 0 ] = 0x3b9; out[ 1 ] = 0x308; out[ 2 ] = 0x342; return 3;
-    case 0x1fd8: *out = 0x1fd0; return 1;
-    case 0x1fd9: *out = 0x1fd1; return 1;
-    case 0x1fda: *out = 0x1f76; return 1;
-    case 0x1fdb: *out = 0x1f77; return 1;
-    case 0x1fe2: out[ 0 ] = 0x3c5; out[ 1 ] = 0x308; out[ 2 ] = 0x300; return 3;
-    case 0x1fe3: out[ 0 ] = 0x3c5; out[ 1 ] = 0x308; out[ 2 ] = 0x301; return 3;
-    case 0x1fe4: out[ 0 ] = 0x3c1; out[ 1 ] = 0x313; return 2;
-    case 0x1fe6: out[ 0 ] = 0x3c5; out[ 1 ] = 0x342; return 2;
-    case 0x1fe7: out[ 0 ] = 0x3c5; out[ 1 ] = 0x308; out[ 2 ] = 0x342; return 3;
-    case 0x1fe8: *out = 0x1fe0; return 1;
-    case 0x1fe9: *out = 0x1fe1; return 1;
-    case 0x1fea: *out = 0x1f7a; return 1;
-    case 0x1feb: *out = 0x1f7b; return 1;
-    case 0x1fec: *out = 0x1fe5; return 1;
-    case 0x1ff2: out[ 0 ] = 0x1f7c; out[ 1 ] = 0x3b9; return 2;
-    case 0x1ff3: out[ 0 ] = 0x3c9; out[ 1 ] = 0x3b9; return 2;
-    case 0x1ff4: out[ 0 ] = 0x3ce; out[ 1 ] = 0x3b9; return 2;
-    case 0x1ff6: out[ 0 ] = 0x3c9; out[ 1 ] = 0x342; return 2;
-    case 0x1ff7: out[ 0 ] = 0x3c9; out[ 1 ] = 0x342; out[ 2 ] = 0x3b9; return 3;
-    case 0x1ff8: *out = 0x1f78; return 1;
-    case 0x1ff9: *out = 0x1f79; return 1;
-    case 0x1ffa: *out = 0x1f7c; return 1;
-    case 0x1ffb: *out = 0x1f7d; return 1;
-    case 0x1ffc: out[ 0 ] = 0x3c9; out[ 1 ] = 0x3b9; return 2;
-    case 0x2126: *out = 0x3c9; return 1;
-    case 0x212a: *out = 0x6b; return 1;
-    case 0x212b: *out = 0xe5; return 1;
-    case 0x2132: *out = 0x214e; return 1;
-    case 0x2160: *out = 0x2170; return 1;
-    case 0x2161: *out = 0x2171; return 1;
-    case 0x2162: *out = 0x2172; return 1;
-    case 0x2163: *out = 0x2173; return 1;
-    case 0x2164: *out = 0x2174; return 1;
-    case 0x2165: *out = 0x2175; return 1;
-    case 0x2166: *out = 0x2176; return 1;
-    case 0x2167: *out = 0x2177; return 1;
-    case 0x2168: *out = 0x2178; return 1;
-    case 0x2169: *out = 0x2179; return 1;
-    case 0x216a: *out = 0x217a; return 1;
-    case 0x216b: *out = 0x217b; return 1;
-    case 0x216c: *out = 0x217c; return 1;
-    case 0x216d: *out = 0x217d; return 1;
-    case 0x216e: *out = 0x217e; return 1;
-    case 0x216f: *out = 0x217f; return 1;
-    case 0x2183: *out = 0x2184; return 1;
-    case 0x24b6: *out = 0x24d0; return 1;
-    case 0x24b7: *out = 0x24d1; return 1;
-    case 0x24b8: *out = 0x24d2; return 1;
-    case 0x24b9: *out = 0x24d3; return 1;
-    case 0x24ba: *out = 0x24d4; return 1;
-    case 0x24bb: *out = 0x24d5; return 1;
-    case 0x24bc: *out = 0x24d6; return 1;
-    case 0x24bd: *out = 0x24d7; return 1;
-    case 0x24be: *out = 0x24d8; return 1;
-    case 0x24bf: *out = 0x24d9; return 1;
-    case 0x24c0: *out = 0x24da; return 1;
-    case 0x24c1: *out = 0x24db; return 1;
-    case 0x24c2: *out = 0x24dc; return 1;
-    case 0x24c3: *out = 0x24dd; return 1;
-    case 0x24c4: *out = 0x24de; return 1;
-    case 0x24c5: *out = 0x24df; return 1;
-    case 0x24c6: *out = 0x24e0; return 1;
-    case 0x24c7: *out = 0x24e1; return 1;
-    case 0x24c8: *out = 0x24e2; return 1;
-    case 0x24c9: *out = 0x24e3; return 1;
-    case 0x24ca: *out = 0x24e4; return 1;
-    case 0x24cb: *out = 0x24e5; return 1;
-    case 0x24cc: *out = 0x24e6; return 1;
-    case 0x24cd: *out = 0x24e7; return 1;
-    case 0x24ce: *out = 0x24e8; return 1;
-    case 0x24cf: *out = 0x24e9; return 1;
-    case 0x2c00: *out = 0x2c30; return 1;
-    case 0x2c01: *out = 0x2c31; return 1;
-    case 0x2c02: *out = 0x2c32; return 1;
-    case 0x2c03: *out = 0x2c33; return 1;
-    case 0x2c04: *out = 0x2c34; return 1;
-    case 0x2c05: *out = 0x2c35; return 1;
-    case 0x2c06: *out = 0x2c36; return 1;
-    case 0x2c07: *out = 0x2c37; return 1;
-    case 0x2c08: *out = 0x2c38; return 1;
-    case 0x2c09: *out = 0x2c39; return 1;
-    case 0x2c0a: *out = 0x2c3a; return 1;
-    case 0x2c0b: *out = 0x2c3b; return 1;
-    case 0x2c0c: *out = 0x2c3c; return 1;
-    case 0x2c0d: *out = 0x2c3d; return 1;
-    case 0x2c0e: *out = 0x2c3e; return 1;
-    case 0x2c0f: *out = 0x2c3f; return 1;
-    case 0x2c10: *out = 0x2c40; return 1;
-    case 0x2c11: *out = 0x2c41; return 1;
-    case 0x2c12: *out = 0x2c42; return 1;
-    case 0x2c13: *out = 0x2c43; return 1;
-    case 0x2c14: *out = 0x2c44; return 1;
-    case 0x2c15: *out = 0x2c45; return 1;
-    case 0x2c16: *out = 0x2c46; return 1;
-    case 0x2c17: *out = 0x2c47; return 1;
-    case 0x2c18: *out = 0x2c48; return 1;
-    case 0x2c19: *out = 0x2c49; return 1;
-    case 0x2c1a: *out = 0x2c4a; return 1;
-    case 0x2c1b: *out = 0x2c4b; return 1;
-    case 0x2c1c: *out = 0x2c4c; return 1;
-    case 0x2c1d: *out = 0x2c4d; return 1;
-    case 0x2c1e: *out = 0x2c4e; return 1;
-    case 0x2c1f: *out = 0x2c4f; return 1;
-    case 0x2c20: *out = 0x2c50; return 1;
-    case 0x2c21: *out = 0x2c51; return 1;
-    case 0x2c22: *out = 0x2c52; return 1;
-    case 0x2c23: *out = 0x2c53; return 1;
-    case 0x2c24: *out = 0x2c54; return 1;
-    case 0x2c25: *out = 0x2c55; return 1;
-    case 0x2c26: *out = 0x2c56; return 1;
-    case 0x2c27: *out = 0x2c57; return 1;
-    case 0x2c28: *out = 0x2c58; return 1;
-    case 0x2c29: *out = 0x2c59; return 1;
-    case 0x2c2a: *out = 0x2c5a; return 1;
-    case 0x2c2b: *out = 0x2c5b; return 1;
-    case 0x2c2c: *out = 0x2c5c; return 1;
-    case 0x2c2d: *out = 0x2c5d; return 1;
-    case 0x2c2e: *out = 0x2c5e; return 1;
-    case 0x2c2f: *out = 0x2c5f; return 1;
-    case 0x2c60: *out = 0x2c61; return 1;
-    case 0x2c62: *out = 0x26b; return 1;
-    case 0x2c63: *out = 0x1d7d; return 1;
-    case 0x2c64: *out = 0x27d; return 1;
-    case 0x2c67: *out = 0x2c68; return 1;
-    case 0x2c69: *out = 0x2c6a; return 1;
-    case 0x2c6b: *out = 0x2c6c; return 1;
-    case 0x2c6d: *out = 0x251; return 1;
-    case 0x2c6e: *out = 0x271; return 1;
-    case 0x2c6f: *out = 0x250; return 1;
-    case 0x2c70: *out = 0x252; return 1;
-    case 0x2c72: *out = 0x2c73; return 1;
-    case 0x2c75: *out = 0x2c76; return 1;
-    case 0x2c7e: *out = 0x23f; return 1;
-    case 0x2c7f: *out = 0x240; return 1;
-    case 0x2c80: *out = 0x2c81; return 1;
-    case 0x2c82: *out = 0x2c83; return 1;
-    case 0x2c84: *out = 0x2c85; return 1;
-    case 0x2c86: *out = 0x2c87; return 1;
-    case 0x2c88: *out = 0x2c89; return 1;
-    case 0x2c8a: *out = 0x2c8b; return 1;
-    case 0x2c8c: *out = 0x2c8d; return 1;
-    case 0x2c8e: *out = 0x2c8f; return 1;
-    case 0x2c90: *out = 0x2c91; return 1;
-    case 0x2c92: *out = 0x2c93; return 1;
-    case 0x2c94: *out = 0x2c95; return 1;
-    case 0x2c96: *out = 0x2c97; return 1;
-    case 0x2c98: *out = 0x2c99; return 1;
-    case 0x2c9a: *out = 0x2c9b; return 1;
-    case 0x2c9c: *out = 0x2c9d; return 1;
-    case 0x2c9e: *out = 0x2c9f; return 1;
-    case 0x2ca0: *out = 0x2ca1; return 1;
-    case 0x2ca2: *out = 0x2ca3; return 1;
-    case 0x2ca4: *out = 0x2ca5; return 1;
-    case 0x2ca6: *out = 0x2ca7; return 1;
-    case 0x2ca8: *out = 0x2ca9; return 1;
-    case 0x2caa: *out = 0x2cab; return 1;
-    case 0x2cac: *out = 0x2cad; return 1;
-    case 0x2cae: *out = 0x2caf; return 1;
-    case 0x2cb0: *out = 0x2cb1; return 1;
-    case 0x2cb2: *out = 0x2cb3; return 1;
-    case 0x2cb4: *out = 0x2cb5; return 1;
-    case 0x2cb6: *out = 0x2cb7; return 1;
-    case 0x2cb8: *out = 0x2cb9; return 1;
-    case 0x2cba: *out = 0x2cbb; return 1;
-    case 0x2cbc: *out = 0x2cbd; return 1;
-    case 0x2cbe: *out = 0x2cbf; return 1;
-    case 0x2cc0: *out = 0x2cc1; return 1;
-    case 0x2cc2: *out = 0x2cc3; return 1;
-    case 0x2cc4: *out = 0x2cc5; return 1;
-    case 0x2cc6: *out = 0x2cc7; return 1;
-    case 0x2cc8: *out = 0x2cc9; return 1;
-    case 0x2cca: *out = 0x2ccb; return 1;
-    case 0x2ccc: *out = 0x2ccd; return 1;
-    case 0x2cce: *out = 0x2ccf; return 1;
-    case 0x2cd0: *out = 0x2cd1; return 1;
-    case 0x2cd2: *out = 0x2cd3; return 1;
-    case 0x2cd4: *out = 0x2cd5; return 1;
-    case 0x2cd6: *out = 0x2cd7; return 1;
-    case 0x2cd8: *out = 0x2cd9; return 1;
-    case 0x2cda: *out = 0x2cdb; return 1;
-    case 0x2cdc: *out = 0x2cdd; return 1;
-    case 0x2cde: *out = 0x2cdf; return 1;
-    case 0x2ce0: *out = 0x2ce1; return 1;
-    case 0x2ce2: *out = 0x2ce3; return 1;
-    case 0x2ceb: *out = 0x2cec; return 1;
-    case 0x2ced: *out = 0x2cee; return 1;
-    case 0x2cf2: *out = 0x2cf3; return 1;
-    case 0xa640: *out = 0xa641; return 1;
-    case 0xa642: *out = 0xa643; return 1;
-    case 0xa644: *out = 0xa645; return 1;
-    case 0xa646: *out = 0xa647; return 1;
-    case 0xa648: *out = 0xa649; return 1;
-    case 0xa64a: *out = 0xa64b; return 1;
-    case 0xa64c: *out = 0xa64d; return 1;
-    case 0xa64e: *out = 0xa64f; return 1;
-    case 0xa650: *out = 0xa651; return 1;
-    case 0xa652: *out = 0xa653; return 1;
-    case 0xa654: *out = 0xa655; return 1;
-    case 0xa656: *out = 0xa657; return 1;
-    case 0xa658: *out = 0xa659; return 1;
-    case 0xa65a: *out = 0xa65b; return 1;
-    case 0xa65c: *out = 0xa65d; return 1;
-    case 0xa65e: *out = 0xa65f; return 1;
-    case 0xa660: *out = 0xa661; return 1;
-    case 0xa662: *out = 0xa663; return 1;
-    case 0xa664: *out = 0xa665; return 1;
-    case 0xa666: *out = 0xa667; return 1;
-    case 0xa668: *out = 0xa669; return 1;
-    case 0xa66a: *out = 0xa66b; return 1;
-    case 0xa66c: *out = 0xa66d; return 1;
-    case 0xa680: *out = 0xa681; return 1;
-    case 0xa682: *out = 0xa683; return 1;
-    case 0xa684: *out = 0xa685; return 1;
-    case 0xa686: *out = 0xa687; return 1;
-    case 0xa688: *out = 0xa689; return 1;
-    case 0xa68a: *out = 0xa68b; return 1;
-    case 0xa68c: *out = 0xa68d; return 1;
-    case 0xa68e: *out = 0xa68f; return 1;
-    case 0xa690: *out = 0xa691; return 1;
-    case 0xa692: *out = 0xa693; return 1;
-    case 0xa694: *out = 0xa695; return 1;
-    case 0xa696: *out = 0xa697; return 1;
-    case 0xa698: *out = 0xa699; return 1;
-    case 0xa69a: *out = 0xa69b; return 1;
-    case 0xa722: *out = 0xa723; return 1;
-    case 0xa724: *out = 0xa725; return 1;
-    case 0xa726: *out = 0xa727; return 1;
-    case 0xa728: *out = 0xa729; return 1;
-    case 0xa72a: *out = 0xa72b; return 1;
-    case 0xa72c: *out = 0xa72d; return 1;
-    case 0xa72e: *out = 0xa72f; return 1;
-    case 0xa732: *out = 0xa733; return 1;
-    case 0xa734: *out = 0xa735; return 1;
-    case 0xa736: *out = 0xa737; return 1;
-    case 0xa738: *out = 0xa739; return 1;
-    case 0xa73a: *out = 0xa73b; return 1;
-    case 0xa73c: *out = 0xa73d; return 1;
-    case 0xa73e: *out = 0xa73f; return 1;
-    case 0xa740: *out = 0xa741; return 1;
-    case 0xa742: *out = 0xa743; return 1;
-    case 0xa744: *out = 0xa745; return 1;
-    case 0xa746: *out = 0xa747; return 1;
-    case 0xa748: *out = 0xa749; return 1;
-    case 0xa74a: *out = 0xa74b; return 1;
-    case 0xa74c: *out = 0xa74d; return 1;
-    case 0xa74e: *out = 0xa74f; return 1;
-    case 0xa750: *out = 0xa751; return 1;
-    case 0xa752: *out = 0xa753; return 1;
-    case 0xa754: *out = 0xa755; return 1;
-    case 0xa756: *out = 0xa757; return 1;
-    case 0xa758: *out = 0xa759; return 1;
-    case 0xa75a: *out = 0xa75b; return 1;
-    case 0xa75c: *out = 0xa75d; return 1;
-    case 0xa75e: *out = 0xa75f; return 1;
-    case 0xa760: *out = 0xa761; return 1;
-    case 0xa762: *out = 0xa763; return 1;
-    case 0xa764: *out = 0xa765; return 1;
-    case 0xa766: *out = 0xa767; return 1;
-    case 0xa768: *out = 0xa769; return 1;
-    case 0xa76a: *out = 0xa76b; return 1;
-    case 0xa76c: *out = 0xa76d; return 1;
-    case 0xa76e: *out = 0xa76f; return 1;
-    case 0xa779: *out = 0xa77a; return 1;
-    case 0xa77b: *out = 0xa77c; return 1;
-    case 0xa77d: *out = 0x1d79; return 1;
-    case 0xa77e: *out = 0xa77f; return 1;
-    case 0xa780: *out = 0xa781; return 1;
-    case 0xa782: *out = 0xa783; return 1;
-    case 0xa784: *out = 0xa785; return 1;
-    case 0xa786: *out = 0xa787; return 1;
-    case 0xa78b: *out = 0xa78c; return 1;
-    case 0xa78d: *out = 0x265; return 1;
-    case 0xa790: *out = 0xa791; return 1;
-    case 0xa792: *out = 0xa793; return 1;
-    case 0xa796: *out = 0xa797; return 1;
-    case 0xa798: *out = 0xa799; return 1;
-    case 0xa79a: *out = 0xa79b; return 1;
-    case 0xa79c: *out = 0xa79d; return 1;
-    case 0xa79e: *out = 0xa79f; return 1;
-    case 0xa7a0: *out = 0xa7a1; return 1;
-    case 0xa7a2: *out = 0xa7a3; return 1;
-    case 0xa7a4: *out = 0xa7a5; return 1;
-    case 0xa7a6: *out = 0xa7a7; return 1;
-    case 0xa7a8: *out = 0xa7a9; return 1;
-    case 0xa7aa: *out = 0x266; return 1;
-    case 0xa7ab: *out = 0x25c; return 1;
-    case 0xa7ac: *out = 0x261; return 1;
-    case 0xa7ad: *out = 0x26c; return 1;
-    case 0xa7ae: *out = 0x26a; return 1;
-    case 0xa7b0: *out = 0x29e; return 1;
-    case 0xa7b1: *out = 0x287; return 1;
-    case 0xa7b2: *out = 0x29d; return 1;
-    case 0xa7b3: *out = 0xab53; return 1;
-    case 0xa7b4: *out = 0xa7b5; return 1;
-    case 0xa7b6: *out = 0xa7b7; return 1;
-    case 0xa7b8: *out = 0xa7b9; return 1;
-    case 0xa7ba: *out = 0xa7bb; return 1;
-    case 0xa7bc: *out = 0xa7bd; return 1;
-    case 0xa7be: *out = 0xa7bf; return 1;
-    case 0xa7c0: *out = 0xa7c1; return 1;
-    case 0xa7c2: *out = 0xa7c3; return 1;
-    case 0xa7c4: *out = 0xa794; return 1;
-    case 0xa7c5: *out = 0x282; return 1;
-    case 0xa7c6: *out = 0x1d8e; return 1;
-    case 0xa7c7: *out = 0xa7c8; return 1;
-    case 0xa7c9: *out = 0xa7ca; return 1;
-    case 0xa7d0: *out = 0xa7d1; return 1;
-    case 0xa7d6: *out = 0xa7d7; return 1;
-    case 0xa7d8: *out = 0xa7d9; return 1;
-    case 0xa7f5: *out = 0xa7f6; return 1;
-    case 0xab70: *out = 0x13a0; return 1;
-    case 0xab71: *out = 0x13a1; return 1;
-    case 0xab72: *out = 0x13a2; return 1;
-    case 0xab73: *out = 0x13a3; return 1;
-    case 0xab74: *out = 0x13a4; return 1;
-    case 0xab75: *out = 0x13a5; return 1;
-    case 0xab76: *out = 0x13a6; return 1;
-    case 0xab77: *out = 0x13a7; return 1;
-    case 0xab78: *out = 0x13a8; return 1;
-    case 0xab79: *out = 0x13a9; return 1;
-    case 0xab7a: *out = 0x13aa; return 1;
-    case 0xab7b: *out = 0x13ab; return 1;
-    case 0xab7c: *out = 0x13ac; return 1;
-    case 0xab7d: *out = 0x13ad; return 1;
-    case 0xab7e: *out = 0x13ae; return 1;
-    case 0xab7f: *out = 0x13af; return 1;
-    case 0xab80: *out = 0x13b0; return 1;
-    case 0xab81: *out = 0x13b1; return 1;
-    case 0xab82: *out = 0x13b2; return 1;
-    case 0xab83: *out = 0x13b3; return 1;
-    case 0xab84: *out = 0x13b4; return 1;
-    case 0xab85: *out = 0x13b5; return 1;
-    case 0xab86: *out = 0x13b6; return 1;
-    case 0xab87: *out = 0x13b7; return 1;
-    case 0xab88: *out = 0x13b8; return 1;
-    case 0xab89: *out = 0x13b9; return 1;
-    case 0xab8a: *out = 0x13ba; return 1;
-    case 0xab8b: *out = 0x13bb; return 1;
-    case 0xab8c: *out = 0x13bc; return 1;
-    case 0xab8d: *out = 0x13bd; return 1;
-    case 0xab8e: *out = 0x13be; return 1;
-    case 0xab8f: *out = 0x13bf; return 1;
-    case 0xab90: *out = 0x13c0; return 1;
-    case 0xab91: *out = 0x13c1; return 1;
-    case 0xab92: *out = 0x13c2; return 1;
-    case 0xab93: *out = 0x13c3; return 1;
-    case 0xab94: *out = 0x13c4; return 1;
-    case 0xab95: *out = 0x13c5; return 1;
-    case 0xab96: *out = 0x13c6; return 1;
-    case 0xab97: *out = 0x13c7; return 1;
-    case 0xab98: *out = 0x13c8; return 1;
-    case 0xab99: *out = 0x13c9; return 1;
-    case 0xab9a: *out = 0x13ca; return 1;
-    case 0xab9b: *out = 0x13cb; return 1;
-    case 0xab9c: *out = 0x13cc; return 1;
-    case 0xab9d: *out = 0x13cd; return 1;
-    case 0xab9e: *out = 0x13ce; return 1;
-    case 0xab9f: *out = 0x13cf; return 1;
-    case 0xaba0: *out = 0x13d0; return 1;
-    case 0xaba1: *out = 0x13d1; return 1;
-    case 0xaba2: *out = 0x13d2; return 1;
-    case 0xaba3: *out = 0x13d3; return 1;
-    case 0xaba4: *out = 0x13d4; return 1;
-    case 0xaba5: *out = 0x13d5; return 1;
-    case 0xaba6: *out = 0x13d6; return 1;
-    case 0xaba7: *out = 0x13d7; return 1;
-    case 0xaba8: *out = 0x13d8; return 1;
-    case 0xaba9: *out = 0x13d9; return 1;
-    case 0xabaa: *out = 0x13da; return 1;
-    case 0xabab: *out = 0x13db; return 1;
-    case 0xabac: *out = 0x13dc; return 1;
-    case 0xabad: *out = 0x13dd; return 1;
-    case 0xabae: *out = 0x13de; return 1;
-    case 0xabaf: *out = 0x13df; return 1;
-    case 0xabb0: *out = 0x13e0; return 1;
-    case 0xabb1: *out = 0x13e1; return 1;
-    case 0xabb2: *out = 0x13e2; return 1;
-    case 0xabb3: *out = 0x13e3; return 1;
-    case 0xabb4: *out = 0x13e4; return 1;
-    case 0xabb5: *out = 0x13e5; return 1;
-    case 0xabb6: *out = 0x13e6; return 1;
-    case 0xabb7: *out = 0x13e7; return 1;
-    case 0xabb8: *out = 0x13e8; return 1;
-    case 0xabb9: *out = 0x13e9; return 1;
-    case 0xabba: *out = 0x13ea; return 1;
-    case 0xabbb: *out = 0x13eb; return 1;
-    case 0xabbc: *out = 0x13ec; return 1;
-    case 0xabbd: *out = 0x13ed; return 1;
-    case 0xabbe: *out = 0x13ee; return 1;
-    case 0xabbf: *out = 0x13ef; return 1;
-    case 0xfb00: out[ 0 ] = 0x66; out[ 1 ] = 0x66; return 2;
-    case 0xfb01: out[ 0 ] = 0x66; out[ 1 ] = 0x69; return 2;
-    case 0xfb02: out[ 0 ] = 0x66; out[ 1 ] = 0x6c; return 2;
-    case 0xfb03: out[ 0 ] = 0x66; out[ 1 ] = 0x66; out[ 2 ] = 0x69; return 3;
-    case 0xfb04: out[ 0 ] = 0x66; out[ 1 ] = 0x66; out[ 2 ] = 0x6c; return 3;
-    case 0xfb05: out[ 0 ] = 0x73; out[ 1 ] = 0x74; return 2;
-    case 0xfb06: out[ 0 ] = 0x73; out[ 1 ] = 0x74; return 2;
-    case 0xfb13: out[ 0 ] = 0x574; out[ 1 ] = 0x576; return 2;
-    case 0xfb14: out[ 0 ] = 0x574; out[ 1 ] = 0x565; return 2;
-    case 0xfb15: out[ 0 ] = 0x574; out[ 1 ] = 0x56b; return 2;
-    case 0xfb16: out[ 0 ] = 0x57e; out[ 1 ] = 0x576; return 2;
-    case 0xfb17: out[ 0 ] = 0x574; out[ 1 ] = 0x56d; return 2;
-    case 0xff21: *out = 0xff41; return 1;
-    case 0xff22: *out = 0xff42; return 1;
-    case 0xff23: *out = 0xff43; return 1;
-    case 0xff24: *out = 0xff44; return 1;
-    case 0xff25: *out = 0xff45; return 1;
-    case 0xff26: *out = 0xff46; return 1;
-    case 0xff27: *out = 0xff47; return 1;
-    case 0xff28: *out = 0xff48; return 1;
-    case 0xff29: *out = 0xff49; return 1;
-    case 0xff2a: *out = 0xff4a; return 1;
-    case 0xff2b: *out = 0xff4b; return 1;
-    case 0xff2c: *out = 0xff4c; return 1;
-    case 0xff2d: *out = 0xff4d; return 1;
-    case 0xff2e: *out = 0xff4e; return 1;
-    case 0xff2f: *out = 0xff4f; return 1;
-    case 0xff30: *out = 0xff50; return 1;
-    case 0xff31: *out = 0xff51; return 1;
-    case 0xff32: *out = 0xff52; return 1;
-    case 0xff33: *out = 0xff53; return 1;
-    case 0xff34: *out = 0xff54; return 1;
-    case 0xff35: *out = 0xff55; return 1;
-    case 0xff36: *out = 0xff56; return 1;
-    case 0xff37: *out = 0xff57; return 1;
-    case 0xff38: *out = 0xff58; return 1;
-    case 0xff39: *out = 0xff59; return 1;
-    case 0xff3a: *out = 0xff5a; return 1;
-    case 0x10400: *out = 0x10428; return 1;
-    case 0x10401: *out = 0x10429; return 1;
-    case 0x10402: *out = 0x1042a; return 1;
-    case 0x10403: *out = 0x1042b; return 1;
-    case 0x10404: *out = 0x1042c; return 1;
-    case 0x10405: *out = 0x1042d; return 1;
-    case 0x10406: *out = 0x1042e; return 1;
-    case 0x10407: *out = 0x1042f; return 1;
-    case 0x10408: *out = 0x10430; return 1;
-    case 0x10409: *out = 0x10431; return 1;
-    case 0x1040a: *out = 0x10432; return 1;
-    case 0x1040b: *out = 0x10433; return 1;
-    case 0x1040c: *out = 0x10434; return 1;
-    case 0x1040d: *out = 0x10435; return 1;
-    case 0x1040e: *out = 0x10436; return 1;
-    case 0x1040f: *out = 0x10437; return 1;
-    case 0x10410: *out = 0x10438; return 1;
-    case 0x10411: *out = 0x10439; return 1;
-    case 0x10412: *out = 0x1043a; return 1;
-    case 0x10413: *out = 0x1043b; return 1;
-    case 0x10414: *out = 0x1043c; return 1;
-    case 0x10415: *out = 0x1043d; return 1;
-    case 0x10416: *out = 0x1043e; return 1;
-    case 0x10417: *out = 0x1043f; return 1;
-    case 0x10418: *out = 0x10440; return 1;
-    case 0x10419: *out = 0x10441; return 1;
-    case 0x1041a: *out = 0x10442; return 1;
-    case 0x1041b: *out = 0x10443; return 1;
-    case 0x1041c: *out = 0x10444; return 1;
-    case 0x1041d: *out = 0x10445; return 1;
-    case 0x1041e: *out = 0x10446; return 1;
-    case 0x1041f: *out = 0x10447; return 1;
-    case 0x10420: *out = 0x10448; return 1;
-    case 0x10421: *out = 0x10449; return 1;
-    case 0x10422: *out = 0x1044a; return 1;
-    case 0x10423: *out = 0x1044b; return 1;
-    case 0x10424: *out = 0x1044c; return 1;
-    case 0x10425: *out = 0x1044d; return 1;
-    case 0x10426: *out = 0x1044e; return 1;
-    case 0x10427: *out = 0x1044f; return 1;
-    case 0x104b0: *out = 0x104d8; return 1;
-    case 0x104b1: *out = 0x104d9; return 1;
-    case 0x104b2: *out = 0x104da; return 1;
-    case 0x104b3: *out = 0x104db; return 1;
-    case 0x104b4: *out = 0x104dc; return 1;
-    case 0x104b5: *out = 0x104dd; return 1;
-    case 0x104b6: *out = 0x104de; return 1;
-    case 0x104b7: *out = 0x104df; return 1;
-    case 0x104b8: *out = 0x104e0; return 1;
-    case 0x104b9: *out = 0x104e1; return 1;
-    case 0x104ba: *out = 0x104e2; return 1;
-    case 0x104bb: *out = 0x104e3; return 1;
-    case 0x104bc: *out = 0x104e4; return 1;
-    case 0x104bd: *out = 0x104e5; return 1;
-    case 0x104be: *out = 0x104e6; return 1;
-    case 0x104bf: *out = 0x104e7; return 1;
-    case 0x104c0: *out = 0x104e8; return 1;
-    case 0x104c1: *out = 0x104e9; return 1;
-    case 0x104c2: *out = 0x104ea; return 1;
-    case 0x104c3: *out = 0x104eb; return 1;
-    case 0x104c4: *out = 0x104ec; return 1;
-    case 0x104c5: *out = 0x104ed; return 1;
-    case 0x104c6: *out = 0x104ee; return 1;
-    case 0x104c7: *out = 0x104ef; return 1;
-    case 0x104c8: *out = 0x104f0; return 1;
-    case 0x104c9: *out = 0x104f1; return 1;
-    case 0x104ca: *out = 0x104f2; return 1;
-    case 0x104cb: *out = 0x104f3; return 1;
-    case 0x104cc: *out = 0x104f4; return 1;
-    case 0x104cd: *out = 0x104f5; return 1;
-    case 0x104ce: *out = 0x104f6; return 1;
-    case 0x104cf: *out = 0x104f7; return 1;
-    case 0x104d0: *out = 0x104f8; return 1;
-    case 0x104d1: *out = 0x104f9; return 1;
-    case 0x104d2: *out = 0x104fa; return 1;
-    case 0x104d3: *out = 0x104fb; return 1;
-    case 0x10570: *out = 0x10597; return 1;
-    case 0x10571: *out = 0x10598; return 1;
-    case 0x10572: *out = 0x10599; return 1;
-    case 0x10573: *out = 0x1059a; return 1;
-    case 0x10574: *out = 0x1059b; return 1;
-    case 0x10575: *out = 0x1059c; return 1;
-    case 0x10576: *out = 0x1059d; return 1;
-    case 0x10577: *out = 0x1059e; return 1;
-    case 0x10578: *out = 0x1059f; return 1;
-    case 0x10579: *out = 0x105a0; return 1;
-    case 0x1057a: *out = 0x105a1; return 1;
-    case 0x1057c: *out = 0x105a3; return 1;
-    case 0x1057d: *out = 0x105a4; return 1;
-    case 0x1057e: *out = 0x105a5; return 1;
-    case 0x1057f: *out = 0x105a6; return 1;
-    case 0x10580: *out = 0x105a7; return 1;
-    case 0x10581: *out = 0x105a8; return 1;
-    case 0x10582: *out = 0x105a9; return 1;
-    case 0x10583: *out = 0x105aa; return 1;
-    case 0x10584: *out = 0x105ab; return 1;
-    case 0x10585: *out = 0x105ac; return 1;
-    case 0x10586: *out = 0x105ad; return 1;
-    case 0x10587: *out = 0x105ae; return 1;
-    case 0x10588: *out = 0x105af; return 1;
-    case 0x10589: *out = 0x105b0; return 1;
-    case 0x1058a: *out = 0x105b1; return 1;
-    case 0x1058c: *out = 0x105b3; return 1;
-    case 0x1058d: *out = 0x105b4; return 1;
-    case 0x1058e: *out = 0x105b5; return 1;
-    case 0x1058f: *out = 0x105b6; return 1;
-    case 0x10590: *out = 0x105b7; return 1;
-    case 0x10591: *out = 0x105b8; return 1;
-    case 0x10592: *out = 0x105b9; return 1;
-    case 0x10594: *out = 0x105bb; return 1;
-    case 0x10595: *out = 0x105bc; return 1;
-    case 0x10c80: *out = 0x10cc0; return 1;
-    case 0x10c81: *out = 0x10cc1; return 1;
-    case 0x10c82: *out = 0x10cc2; return 1;
-    case 0x10c83: *out = 0x10cc3; return 1;
-    case 0x10c84: *out = 0x10cc4; return 1;
-    case 0x10c85: *out = 0x10cc5; return 1;
-    case 0x10c86: *out = 0x10cc6; return 1;
-    case 0x10c87: *out = 0x10cc7; return 1;
-    case 0x10c88: *out = 0x10cc8; return 1;
-    case 0x10c89: *out = 0x10cc9; return 1;
-    case 0x10c8a: *out = 0x10cca; return 1;
-    case 0x10c8b: *out = 0x10ccb; return 1;
-    case 0x10c8c: *out = 0x10ccc; return 1;
-    case 0x10c8d: *out = 0x10ccd; return 1;
-    case 0x10c8e: *out = 0x10cce; return 1;
-    case 0x10c8f: *out = 0x10ccf; return 1;
-    case 0x10c90: *out = 0x10cd0; return 1;
-    case 0x10c91: *out = 0x10cd1; return 1;
-    case 0x10c92: *out = 0x10cd2; return 1;
-    case 0x10c93: *out = 0x10cd3; return 1;
-    case 0x10c94: *out = 0x10cd4; return 1;
-    case 0x10c95: *out = 0x10cd5; return 1;
-    case 0x10c96: *out = 0x10cd6; return 1;
-    case 0x10c97: *out = 0x10cd7; return 1;
-    case 0x10c98: *out = 0x10cd8; return 1;
-    case 0x10c99: *out = 0x10cd9; return 1;
-    case 0x10c9a: *out = 0x10cda; return 1;
-    case 0x10c9b: *out = 0x10cdb; return 1;
-    case 0x10c9c: *out = 0x10cdc; return 1;
-    case 0x10c9d: *out = 0x10cdd; return 1;
-    case 0x10c9e: *out = 0x10cde; return 1;
-    case 0x10c9f: *out = 0x10cdf; return 1;
-    case 0x10ca0: *out = 0x10ce0; return 1;
-    case 0x10ca1: *out = 0x10ce1; return 1;
-    case 0x10ca2: *out = 0x10ce2; return 1;
-    case 0x10ca3: *out = 0x10ce3; return 1;
-    case 0x10ca4: *out = 0x10ce4; return 1;
-    case 0x10ca5: *out = 0x10ce5; return 1;
-    case 0x10ca6: *out = 0x10ce6; return 1;
-    case 0x10ca7: *out = 0x10ce7; return 1;
-    case 0x10ca8: *out = 0x10ce8; return 1;
-    case 0x10ca9: *out = 0x10ce9; return 1;
-    case 0x10caa: *out = 0x10cea; return 1;
-    case 0x10cab: *out = 0x10ceb; return 1;
-    case 0x10cac: *out = 0x10cec; return 1;
-    case 0x10cad: *out = 0x10ced; return 1;
-    case 0x10cae: *out = 0x10cee; return 1;
-    case 0x10caf: *out = 0x10cef; return 1;
-    case 0x10cb0: *out = 0x10cf0; return 1;
-    case 0x10cb1: *out = 0x10cf1; return 1;
-    case 0x10cb2: *out = 0x10cf2; return 1;
-    case 0x118a0: *out = 0x118c0; return 1;
-    case 0x118a1: *out = 0x118c1; return 1;
-    case 0x118a2: *out = 0x118c2; return 1;
-    case 0x118a3: *out = 0x118c3; return 1;
-    case 0x118a4: *out = 0x118c4; return 1;
-    case 0x118a5: *out = 0x118c5; return 1;
-    case 0x118a6: *out = 0x118c6; return 1;
-    case 0x118a7: *out = 0x118c7; return 1;
-    case 0x118a8: *out = 0x118c8; return 1;
-    case 0x118a9: *out = 0x118c9; return 1;
-    case 0x118aa: *out = 0x118ca; return 1;
-    case 0x118ab: *out = 0x118cb; return 1;
-    case 0x118ac: *out = 0x118cc; return 1;
-    case 0x118ad: *out = 0x118cd; return 1;
-    case 0x118ae: *out = 0x118ce; return 1;
-    case 0x118af: *out = 0x118cf; return 1;
-    case 0x118b0: *out = 0x118d0; return 1;
-    case 0x118b1: *out = 0x118d1; return 1;
-    case 0x118b2: *out = 0x118d2; return 1;
-    case 0x118b3: *out = 0x118d3; return 1;
-    case 0x118b4: *out = 0x118d4; return 1;
-    case 0x118b5: *out = 0x118d5; return 1;
-    case 0x118b6: *out = 0x118d6; return 1;
-    case 0x118b7: *out = 0x118d7; return 1;
-    case 0x118b8: *out = 0x118d8; return 1;
-    case 0x118b9: *out = 0x118d9; return 1;
-    case 0x118ba: *out = 0x118da; return 1;
-    case 0x118bb: *out = 0x118db; return 1;
-    case 0x118bc: *out = 0x118dc; return 1;
-    case 0x118bd: *out = 0x118dd; return 1;
-    case 0x118be: *out = 0x118de; return 1;
-    case 0x118bf: *out = 0x118df; return 1;
-    case 0x16e40: *out = 0x16e60; return 1;
-    case 0x16e41: *out = 0x16e61; return 1;
-    case 0x16e42: *out = 0x16e62; return 1;
-    case 0x16e43: *out = 0x16e63; return 1;
-    case 0x16e44: *out = 0x16e64; return 1;
-    case 0x16e45: *out = 0x16e65; return 1;
-    case 0x16e46: *out = 0x16e66; return 1;
-    case 0x16e47: *out = 0x16e67; return 1;
-    case 0x16e48: *out = 0x16e68; return 1;
-    case 0x16e49: *out = 0x16e69; return 1;
-    case 0x16e4a: *out = 0x16e6a; return 1;
-    case 0x16e4b: *out = 0x16e6b; return 1;
-    case 0x16e4c: *out = 0x16e6c; return 1;
-    case 0x16e4d: *out = 0x16e6d; return 1;
-    case 0x16e4e: *out = 0x16e6e; return 1;
-    case 0x16e4f: *out = 0x16e6f; return 1;
-    case 0x16e50: *out = 0x16e70; return 1;
-    case 0x16e51: *out = 0x16e71; return 1;
-    case 0x16e52: *out = 0x16e72; return 1;
-    case 0x16e53: *out = 0x16e73; return 1;
-    case 0x16e54: *out = 0x16e74; return 1;
-    case 0x16e55: *out = 0x16e75; return 1;
-    case 0x16e56: *out = 0x16e76; return 1;
-    case 0x16e57: *out = 0x16e77; return 1;
-    case 0x16e58: *out = 0x16e78; return 1;
-    case 0x16e59: *out = 0x16e79; return 1;
-    case 0x16e5a: *out = 0x16e7a; return 1;
-    case 0x16e5b: *out = 0x16e7b; return 1;
-    case 0x16e5c: *out = 0x16e7c; return 1;
-    case 0x16e5d: *out = 0x16e7d; return 1;
-    case 0x16e5e: *out = 0x16e7e; return 1;
-    case 0x16e5f: *out = 0x16e7f; return 1;
-    case 0x1e900: *out = 0x1e922; return 1;
-    case 0x1e901: *out = 0x1e923; return 1;
-    case 0x1e902: *out = 0x1e924; return 1;
-    case 0x1e903: *out = 0x1e925; return 1;
-    case 0x1e904: *out = 0x1e926; return 1;
-    case 0x1e905: *out = 0x1e927; return 1;
-    case 0x1e906: *out = 0x1e928; return 1;
-    case 0x1e907: *out = 0x1e929; return 1;
-    case 0x1e908: *out = 0x1e92a; return 1;
-    case 0x1e909: *out = 0x1e92b; return 1;
-    case 0x1e90a: *out = 0x1e92c; return 1;
-    case 0x1e90b: *out = 0x1e92d; return 1;
-    case 0x1e90c: *out = 0x1e92e; return 1;
-    case 0x1e90d: *out = 0x1e92f; return 1;
-    case 0x1e90e: *out = 0x1e930; return 1;
-    case 0x1e90f: *out = 0x1e931; return 1;
-    case 0x1e910: *out = 0x1e932; return 1;
-    case 0x1e911: *out = 0x1e933; return 1;
-    case 0x1e912: *out = 0x1e934; return 1;
-    case 0x1e913: *out = 0x1e935; return 1;
-    case 0x1e914: *out = 0x1e936; return 1;
-    case 0x1e915: *out = 0x1e937; return 1;
-    case 0x1e916: *out = 0x1e938; return 1;
-    case 0x1e917: *out = 0x1e939; return 1;
-    case 0x1e918: *out = 0x1e93a; return 1;
-    case 0x1e919: *out = 0x1e93b; return 1;
-    case 0x1e91a: *out = 0x1e93c; return 1;
-    case 0x1e91b: *out = 0x1e93d; return 1;
-    case 0x1e91c: *out = 0x1e93e; return 1;
-    case 0x1e91d: *out = 0x1e93f; return 1;
-    case 0x1e91e: *out = 0x1e940; return 1;
-    case 0x1e91f: *out = 0x1e941; return 1;
-    case 0x1e920: *out = 0x1e942; return 1;
-    case 0x1e921: *out = 0x1e943; return 1;
-    default: *out = in; return 1;
+  switch ( in ) {
+    case 0x41:
+      *out = 0x61;
+      return 1;
+    case 0x42:
+      *out = 0x62;
+      return 1;
+    case 0x43:
+      *out = 0x63;
+      return 1;
+    case 0x44:
+      *out = 0x64;
+      return 1;
+    case 0x45:
+      *out = 0x65;
+      return 1;
+    case 0x46:
+      *out = 0x66;
+      return 1;
+    case 0x47:
+      *out = 0x67;
+      return 1;
+    case 0x48:
+      *out = 0x68;
+      return 1;
+    case 0x49:
+      *out = 0x69;
+      return 1;
+    case 0x4a:
+      *out = 0x6a;
+      return 1;
+    case 0x4b:
+      *out = 0x6b;
+      return 1;
+    case 0x4c:
+      *out = 0x6c;
+      return 1;
+    case 0x4d:
+      *out = 0x6d;
+      return 1;
+    case 0x4e:
+      *out = 0x6e;
+      return 1;
+    case 0x4f:
+      *out = 0x6f;
+      return 1;
+    case 0x50:
+      *out = 0x70;
+      return 1;
+    case 0x51:
+      *out = 0x71;
+      return 1;
+    case 0x52:
+      *out = 0x72;
+      return 1;
+    case 0x53:
+      *out = 0x73;
+      return 1;
+    case 0x54:
+      *out = 0x74;
+      return 1;
+    case 0x55:
+      *out = 0x75;
+      return 1;
+    case 0x56:
+      *out = 0x76;
+      return 1;
+    case 0x57:
+      *out = 0x77;
+      return 1;
+    case 0x58:
+      *out = 0x78;
+      return 1;
+    case 0x59:
+      *out = 0x79;
+      return 1;
+    case 0x5a:
+      *out = 0x7a;
+      return 1;
+    case 0xb5:
+      *out = 0x3bc;
+      return 1;
+    case 0xc0:
+      *out = 0xe0;
+      return 1;
+    case 0xc1:
+      *out = 0xe1;
+      return 1;
+    case 0xc2:
+      *out = 0xe2;
+      return 1;
+    case 0xc3:
+      *out = 0xe3;
+      return 1;
+    case 0xc4:
+      *out = 0xe4;
+      return 1;
+    case 0xc5:
+      *out = 0xe5;
+      return 1;
+    case 0xc6:
+      *out = 0xe6;
+      return 1;
+    case 0xc7:
+      *out = 0xe7;
+      return 1;
+    case 0xc8:
+      *out = 0xe8;
+      return 1;
+    case 0xc9:
+      *out = 0xe9;
+      return 1;
+    case 0xca:
+      *out = 0xea;
+      return 1;
+    case 0xcb:
+      *out = 0xeb;
+      return 1;
+    case 0xcc:
+      *out = 0xec;
+      return 1;
+    case 0xcd:
+      *out = 0xed;
+      return 1;
+    case 0xce:
+      *out = 0xee;
+      return 1;
+    case 0xcf:
+      *out = 0xef;
+      return 1;
+    case 0xd0:
+      *out = 0xf0;
+      return 1;
+    case 0xd1:
+      *out = 0xf1;
+      return 1;
+    case 0xd2:
+      *out = 0xf2;
+      return 1;
+    case 0xd3:
+      *out = 0xf3;
+      return 1;
+    case 0xd4:
+      *out = 0xf4;
+      return 1;
+    case 0xd5:
+      *out = 0xf5;
+      return 1;
+    case 0xd6:
+      *out = 0xf6;
+      return 1;
+    case 0xd8:
+      *out = 0xf8;
+      return 1;
+    case 0xd9:
+      *out = 0xf9;
+      return 1;
+    case 0xda:
+      *out = 0xfa;
+      return 1;
+    case 0xdb:
+      *out = 0xfb;
+      return 1;
+    case 0xdc:
+      *out = 0xfc;
+      return 1;
+    case 0xdd:
+      *out = 0xfd;
+      return 1;
+    case 0xde:
+      *out = 0xfe;
+      return 1;
+    case 0xdf:
+      out[ 0 ] = 0x73;
+      out[ 1 ] = 0x73;
+      return 2;
+    case 0x100:
+      *out = 0x101;
+      return 1;
+    case 0x102:
+      *out = 0x103;
+      return 1;
+    case 0x104:
+      *out = 0x105;
+      return 1;
+    case 0x106:
+      *out = 0x107;
+      return 1;
+    case 0x108:
+      *out = 0x109;
+      return 1;
+    case 0x10a:
+      *out = 0x10b;
+      return 1;
+    case 0x10c:
+      *out = 0x10d;
+      return 1;
+    case 0x10e:
+      *out = 0x10f;
+      return 1;
+    case 0x110:
+      *out = 0x111;
+      return 1;
+    case 0x112:
+      *out = 0x113;
+      return 1;
+    case 0x114:
+      *out = 0x115;
+      return 1;
+    case 0x116:
+      *out = 0x117;
+      return 1;
+    case 0x118:
+      *out = 0x119;
+      return 1;
+    case 0x11a:
+      *out = 0x11b;
+      return 1;
+    case 0x11c:
+      *out = 0x11d;
+      return 1;
+    case 0x11e:
+      *out = 0x11f;
+      return 1;
+    case 0x120:
+      *out = 0x121;
+      return 1;
+    case 0x122:
+      *out = 0x123;
+      return 1;
+    case 0x124:
+      *out = 0x125;
+      return 1;
+    case 0x126:
+      *out = 0x127;
+      return 1;
+    case 0x128:
+      *out = 0x129;
+      return 1;
+    case 0x12a:
+      *out = 0x12b;
+      return 1;
+    case 0x12c:
+      *out = 0x12d;
+      return 1;
+    case 0x12e:
+      *out = 0x12f;
+      return 1;
+    case 0x130:
+      out[ 0 ] = 0x69;
+      out[ 1 ] = 0x307;
+      return 2;
+    case 0x132:
+      *out = 0x133;
+      return 1;
+    case 0x134:
+      *out = 0x135;
+      return 1;
+    case 0x136:
+      *out = 0x137;
+      return 1;
+    case 0x139:
+      *out = 0x13a;
+      return 1;
+    case 0x13b:
+      *out = 0x13c;
+      return 1;
+    case 0x13d:
+      *out = 0x13e;
+      return 1;
+    case 0x13f:
+      *out = 0x140;
+      return 1;
+    case 0x141:
+      *out = 0x142;
+      return 1;
+    case 0x143:
+      *out = 0x144;
+      return 1;
+    case 0x145:
+      *out = 0x146;
+      return 1;
+    case 0x147:
+      *out = 0x148;
+      return 1;
+    case 0x149:
+      out[ 0 ] = 0x2bc;
+      out[ 1 ] = 0x6e;
+      return 2;
+    case 0x14a:
+      *out = 0x14b;
+      return 1;
+    case 0x14c:
+      *out = 0x14d;
+      return 1;
+    case 0x14e:
+      *out = 0x14f;
+      return 1;
+    case 0x150:
+      *out = 0x151;
+      return 1;
+    case 0x152:
+      *out = 0x153;
+      return 1;
+    case 0x154:
+      *out = 0x155;
+      return 1;
+    case 0x156:
+      *out = 0x157;
+      return 1;
+    case 0x158:
+      *out = 0x159;
+      return 1;
+    case 0x15a:
+      *out = 0x15b;
+      return 1;
+    case 0x15c:
+      *out = 0x15d;
+      return 1;
+    case 0x15e:
+      *out = 0x15f;
+      return 1;
+    case 0x160:
+      *out = 0x161;
+      return 1;
+    case 0x162:
+      *out = 0x163;
+      return 1;
+    case 0x164:
+      *out = 0x165;
+      return 1;
+    case 0x166:
+      *out = 0x167;
+      return 1;
+    case 0x168:
+      *out = 0x169;
+      return 1;
+    case 0x16a:
+      *out = 0x16b;
+      return 1;
+    case 0x16c:
+      *out = 0x16d;
+      return 1;
+    case 0x16e:
+      *out = 0x16f;
+      return 1;
+    case 0x170:
+      *out = 0x171;
+      return 1;
+    case 0x172:
+      *out = 0x173;
+      return 1;
+    case 0x174:
+      *out = 0x175;
+      return 1;
+    case 0x176:
+      *out = 0x177;
+      return 1;
+    case 0x178:
+      *out = 0xff;
+      return 1;
+    case 0x179:
+      *out = 0x17a;
+      return 1;
+    case 0x17b:
+      *out = 0x17c;
+      return 1;
+    case 0x17d:
+      *out = 0x17e;
+      return 1;
+    case 0x17f:
+      *out = 0x73;
+      return 1;
+    case 0x181:
+      *out = 0x253;
+      return 1;
+    case 0x182:
+      *out = 0x183;
+      return 1;
+    case 0x184:
+      *out = 0x185;
+      return 1;
+    case 0x186:
+      *out = 0x254;
+      return 1;
+    case 0x187:
+      *out = 0x188;
+      return 1;
+    case 0x189:
+      *out = 0x256;
+      return 1;
+    case 0x18a:
+      *out = 0x257;
+      return 1;
+    case 0x18b:
+      *out = 0x18c;
+      return 1;
+    case 0x18e:
+      *out = 0x1dd;
+      return 1;
+    case 0x18f:
+      *out = 0x259;
+      return 1;
+    case 0x190:
+      *out = 0x25b;
+      return 1;
+    case 0x191:
+      *out = 0x192;
+      return 1;
+    case 0x193:
+      *out = 0x260;
+      return 1;
+    case 0x194:
+      *out = 0x263;
+      return 1;
+    case 0x196:
+      *out = 0x269;
+      return 1;
+    case 0x197:
+      *out = 0x268;
+      return 1;
+    case 0x198:
+      *out = 0x199;
+      return 1;
+    case 0x19c:
+      *out = 0x26f;
+      return 1;
+    case 0x19d:
+      *out = 0x272;
+      return 1;
+    case 0x19f:
+      *out = 0x275;
+      return 1;
+    case 0x1a0:
+      *out = 0x1a1;
+      return 1;
+    case 0x1a2:
+      *out = 0x1a3;
+      return 1;
+    case 0x1a4:
+      *out = 0x1a5;
+      return 1;
+    case 0x1a6:
+      *out = 0x280;
+      return 1;
+    case 0x1a7:
+      *out = 0x1a8;
+      return 1;
+    case 0x1a9:
+      *out = 0x283;
+      return 1;
+    case 0x1ac:
+      *out = 0x1ad;
+      return 1;
+    case 0x1ae:
+      *out = 0x288;
+      return 1;
+    case 0x1af:
+      *out = 0x1b0;
+      return 1;
+    case 0x1b1:
+      *out = 0x28a;
+      return 1;
+    case 0x1b2:
+      *out = 0x28b;
+      return 1;
+    case 0x1b3:
+      *out = 0x1b4;
+      return 1;
+    case 0x1b5:
+      *out = 0x1b6;
+      return 1;
+    case 0x1b7:
+      *out = 0x292;
+      return 1;
+    case 0x1b8:
+      *out = 0x1b9;
+      return 1;
+    case 0x1bc:
+      *out = 0x1bd;
+      return 1;
+    case 0x1c4:
+      *out = 0x1c6;
+      return 1;
+    case 0x1c5:
+      *out = 0x1c6;
+      return 1;
+    case 0x1c7:
+      *out = 0x1c9;
+      return 1;
+    case 0x1c8:
+      *out = 0x1c9;
+      return 1;
+    case 0x1ca:
+      *out = 0x1cc;
+      return 1;
+    case 0x1cb:
+      *out = 0x1cc;
+      return 1;
+    case 0x1cd:
+      *out = 0x1ce;
+      return 1;
+    case 0x1cf:
+      *out = 0x1d0;
+      return 1;
+    case 0x1d1:
+      *out = 0x1d2;
+      return 1;
+    case 0x1d3:
+      *out = 0x1d4;
+      return 1;
+    case 0x1d5:
+      *out = 0x1d6;
+      return 1;
+    case 0x1d7:
+      *out = 0x1d8;
+      return 1;
+    case 0x1d9:
+      *out = 0x1da;
+      return 1;
+    case 0x1db:
+      *out = 0x1dc;
+      return 1;
+    case 0x1de:
+      *out = 0x1df;
+      return 1;
+    case 0x1e0:
+      *out = 0x1e1;
+      return 1;
+    case 0x1e2:
+      *out = 0x1e3;
+      return 1;
+    case 0x1e4:
+      *out = 0x1e5;
+      return 1;
+    case 0x1e6:
+      *out = 0x1e7;
+      return 1;
+    case 0x1e8:
+      *out = 0x1e9;
+      return 1;
+    case 0x1ea:
+      *out = 0x1eb;
+      return 1;
+    case 0x1ec:
+      *out = 0x1ed;
+      return 1;
+    case 0x1ee:
+      *out = 0x1ef;
+      return 1;
+    case 0x1f0:
+      out[ 0 ] = 0x6a;
+      out[ 1 ] = 0x30c;
+      return 2;
+    case 0x1f1:
+      *out = 0x1f3;
+      return 1;
+    case 0x1f2:
+      *out = 0x1f3;
+      return 1;
+    case 0x1f4:
+      *out = 0x1f5;
+      return 1;
+    case 0x1f6:
+      *out = 0x195;
+      return 1;
+    case 0x1f7:
+      *out = 0x1bf;
+      return 1;
+    case 0x1f8:
+      *out = 0x1f9;
+      return 1;
+    case 0x1fa:
+      *out = 0x1fb;
+      return 1;
+    case 0x1fc:
+      *out = 0x1fd;
+      return 1;
+    case 0x1fe:
+      *out = 0x1ff;
+      return 1;
+    case 0x200:
+      *out = 0x201;
+      return 1;
+    case 0x202:
+      *out = 0x203;
+      return 1;
+    case 0x204:
+      *out = 0x205;
+      return 1;
+    case 0x206:
+      *out = 0x207;
+      return 1;
+    case 0x208:
+      *out = 0x209;
+      return 1;
+    case 0x20a:
+      *out = 0x20b;
+      return 1;
+    case 0x20c:
+      *out = 0x20d;
+      return 1;
+    case 0x20e:
+      *out = 0x20f;
+      return 1;
+    case 0x210:
+      *out = 0x211;
+      return 1;
+    case 0x212:
+      *out = 0x213;
+      return 1;
+    case 0x214:
+      *out = 0x215;
+      return 1;
+    case 0x216:
+      *out = 0x217;
+      return 1;
+    case 0x218:
+      *out = 0x219;
+      return 1;
+    case 0x21a:
+      *out = 0x21b;
+      return 1;
+    case 0x21c:
+      *out = 0x21d;
+      return 1;
+    case 0x21e:
+      *out = 0x21f;
+      return 1;
+    case 0x220:
+      *out = 0x19e;
+      return 1;
+    case 0x222:
+      *out = 0x223;
+      return 1;
+    case 0x224:
+      *out = 0x225;
+      return 1;
+    case 0x226:
+      *out = 0x227;
+      return 1;
+    case 0x228:
+      *out = 0x229;
+      return 1;
+    case 0x22a:
+      *out = 0x22b;
+      return 1;
+    case 0x22c:
+      *out = 0x22d;
+      return 1;
+    case 0x22e:
+      *out = 0x22f;
+      return 1;
+    case 0x230:
+      *out = 0x231;
+      return 1;
+    case 0x232:
+      *out = 0x233;
+      return 1;
+    case 0x23a:
+      *out = 0x2c65;
+      return 1;
+    case 0x23b:
+      *out = 0x23c;
+      return 1;
+    case 0x23d:
+      *out = 0x19a;
+      return 1;
+    case 0x23e:
+      *out = 0x2c66;
+      return 1;
+    case 0x241:
+      *out = 0x242;
+      return 1;
+    case 0x243:
+      *out = 0x180;
+      return 1;
+    case 0x244:
+      *out = 0x289;
+      return 1;
+    case 0x245:
+      *out = 0x28c;
+      return 1;
+    case 0x246:
+      *out = 0x247;
+      return 1;
+    case 0x248:
+      *out = 0x249;
+      return 1;
+    case 0x24a:
+      *out = 0x24b;
+      return 1;
+    case 0x24c:
+      *out = 0x24d;
+      return 1;
+    case 0x24e:
+      *out = 0x24f;
+      return 1;
+    case 0x345:
+      *out = 0x3b9;
+      return 1;
+    case 0x370:
+      *out = 0x371;
+      return 1;
+    case 0x372:
+      *out = 0x373;
+      return 1;
+    case 0x376:
+      *out = 0x377;
+      return 1;
+    case 0x37f:
+      *out = 0x3f3;
+      return 1;
+    case 0x386:
+      *out = 0x3ac;
+      return 1;
+    case 0x388:
+      *out = 0x3ad;
+      return 1;
+    case 0x389:
+      *out = 0x3ae;
+      return 1;
+    case 0x38a:
+      *out = 0x3af;
+      return 1;
+    case 0x38c:
+      *out = 0x3cc;
+      return 1;
+    case 0x38e:
+      *out = 0x3cd;
+      return 1;
+    case 0x38f:
+      *out = 0x3ce;
+      return 1;
+    case 0x390:
+      out[ 0 ] = 0x3b9;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x301;
+      return 3;
+    case 0x391:
+      *out = 0x3b1;
+      return 1;
+    case 0x392:
+      *out = 0x3b2;
+      return 1;
+    case 0x393:
+      *out = 0x3b3;
+      return 1;
+    case 0x394:
+      *out = 0x3b4;
+      return 1;
+    case 0x395:
+      *out = 0x3b5;
+      return 1;
+    case 0x396:
+      *out = 0x3b6;
+      return 1;
+    case 0x397:
+      *out = 0x3b7;
+      return 1;
+    case 0x398:
+      *out = 0x3b8;
+      return 1;
+    case 0x399:
+      *out = 0x3b9;
+      return 1;
+    case 0x39a:
+      *out = 0x3ba;
+      return 1;
+    case 0x39b:
+      *out = 0x3bb;
+      return 1;
+    case 0x39c:
+      *out = 0x3bc;
+      return 1;
+    case 0x39d:
+      *out = 0x3bd;
+      return 1;
+    case 0x39e:
+      *out = 0x3be;
+      return 1;
+    case 0x39f:
+      *out = 0x3bf;
+      return 1;
+    case 0x3a0:
+      *out = 0x3c0;
+      return 1;
+    case 0x3a1:
+      *out = 0x3c1;
+      return 1;
+    case 0x3a3:
+      *out = 0x3c3;
+      return 1;
+    case 0x3a4:
+      *out = 0x3c4;
+      return 1;
+    case 0x3a5:
+      *out = 0x3c5;
+      return 1;
+    case 0x3a6:
+      *out = 0x3c6;
+      return 1;
+    case 0x3a7:
+      *out = 0x3c7;
+      return 1;
+    case 0x3a8:
+      *out = 0x3c8;
+      return 1;
+    case 0x3a9:
+      *out = 0x3c9;
+      return 1;
+    case 0x3aa:
+      *out = 0x3ca;
+      return 1;
+    case 0x3ab:
+      *out = 0x3cb;
+      return 1;
+    case 0x3b0:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x301;
+      return 3;
+    case 0x3c2:
+      *out = 0x3c3;
+      return 1;
+    case 0x3cf:
+      *out = 0x3d7;
+      return 1;
+    case 0x3d0:
+      *out = 0x3b2;
+      return 1;
+    case 0x3d1:
+      *out = 0x3b8;
+      return 1;
+    case 0x3d5:
+      *out = 0x3c6;
+      return 1;
+    case 0x3d6:
+      *out = 0x3c0;
+      return 1;
+    case 0x3d8:
+      *out = 0x3d9;
+      return 1;
+    case 0x3da:
+      *out = 0x3db;
+      return 1;
+    case 0x3dc:
+      *out = 0x3dd;
+      return 1;
+    case 0x3de:
+      *out = 0x3df;
+      return 1;
+    case 0x3e0:
+      *out = 0x3e1;
+      return 1;
+    case 0x3e2:
+      *out = 0x3e3;
+      return 1;
+    case 0x3e4:
+      *out = 0x3e5;
+      return 1;
+    case 0x3e6:
+      *out = 0x3e7;
+      return 1;
+    case 0x3e8:
+      *out = 0x3e9;
+      return 1;
+    case 0x3ea:
+      *out = 0x3eb;
+      return 1;
+    case 0x3ec:
+      *out = 0x3ed;
+      return 1;
+    case 0x3ee:
+      *out = 0x3ef;
+      return 1;
+    case 0x3f0:
+      *out = 0x3ba;
+      return 1;
+    case 0x3f1:
+      *out = 0x3c1;
+      return 1;
+    case 0x3f4:
+      *out = 0x3b8;
+      return 1;
+    case 0x3f5:
+      *out = 0x3b5;
+      return 1;
+    case 0x3f7:
+      *out = 0x3f8;
+      return 1;
+    case 0x3f9:
+      *out = 0x3f2;
+      return 1;
+    case 0x3fa:
+      *out = 0x3fb;
+      return 1;
+    case 0x3fd:
+      *out = 0x37b;
+      return 1;
+    case 0x3fe:
+      *out = 0x37c;
+      return 1;
+    case 0x3ff:
+      *out = 0x37d;
+      return 1;
+    case 0x400:
+      *out = 0x450;
+      return 1;
+    case 0x401:
+      *out = 0x451;
+      return 1;
+    case 0x402:
+      *out = 0x452;
+      return 1;
+    case 0x403:
+      *out = 0x453;
+      return 1;
+    case 0x404:
+      *out = 0x454;
+      return 1;
+    case 0x405:
+      *out = 0x455;
+      return 1;
+    case 0x406:
+      *out = 0x456;
+      return 1;
+    case 0x407:
+      *out = 0x457;
+      return 1;
+    case 0x408:
+      *out = 0x458;
+      return 1;
+    case 0x409:
+      *out = 0x459;
+      return 1;
+    case 0x40a:
+      *out = 0x45a;
+      return 1;
+    case 0x40b:
+      *out = 0x45b;
+      return 1;
+    case 0x40c:
+      *out = 0x45c;
+      return 1;
+    case 0x40d:
+      *out = 0x45d;
+      return 1;
+    case 0x40e:
+      *out = 0x45e;
+      return 1;
+    case 0x40f:
+      *out = 0x45f;
+      return 1;
+    case 0x410:
+      *out = 0x430;
+      return 1;
+    case 0x411:
+      *out = 0x431;
+      return 1;
+    case 0x412:
+      *out = 0x432;
+      return 1;
+    case 0x413:
+      *out = 0x433;
+      return 1;
+    case 0x414:
+      *out = 0x434;
+      return 1;
+    case 0x415:
+      *out = 0x435;
+      return 1;
+    case 0x416:
+      *out = 0x436;
+      return 1;
+    case 0x417:
+      *out = 0x437;
+      return 1;
+    case 0x418:
+      *out = 0x438;
+      return 1;
+    case 0x419:
+      *out = 0x439;
+      return 1;
+    case 0x41a:
+      *out = 0x43a;
+      return 1;
+    case 0x41b:
+      *out = 0x43b;
+      return 1;
+    case 0x41c:
+      *out = 0x43c;
+      return 1;
+    case 0x41d:
+      *out = 0x43d;
+      return 1;
+    case 0x41e:
+      *out = 0x43e;
+      return 1;
+    case 0x41f:
+      *out = 0x43f;
+      return 1;
+    case 0x420:
+      *out = 0x440;
+      return 1;
+    case 0x421:
+      *out = 0x441;
+      return 1;
+    case 0x422:
+      *out = 0x442;
+      return 1;
+    case 0x423:
+      *out = 0x443;
+      return 1;
+    case 0x424:
+      *out = 0x444;
+      return 1;
+    case 0x425:
+      *out = 0x445;
+      return 1;
+    case 0x426:
+      *out = 0x446;
+      return 1;
+    case 0x427:
+      *out = 0x447;
+      return 1;
+    case 0x428:
+      *out = 0x448;
+      return 1;
+    case 0x429:
+      *out = 0x449;
+      return 1;
+    case 0x42a:
+      *out = 0x44a;
+      return 1;
+    case 0x42b:
+      *out = 0x44b;
+      return 1;
+    case 0x42c:
+      *out = 0x44c;
+      return 1;
+    case 0x42d:
+      *out = 0x44d;
+      return 1;
+    case 0x42e:
+      *out = 0x44e;
+      return 1;
+    case 0x42f:
+      *out = 0x44f;
+      return 1;
+    case 0x460:
+      *out = 0x461;
+      return 1;
+    case 0x462:
+      *out = 0x463;
+      return 1;
+    case 0x464:
+      *out = 0x465;
+      return 1;
+    case 0x466:
+      *out = 0x467;
+      return 1;
+    case 0x468:
+      *out = 0x469;
+      return 1;
+    case 0x46a:
+      *out = 0x46b;
+      return 1;
+    case 0x46c:
+      *out = 0x46d;
+      return 1;
+    case 0x46e:
+      *out = 0x46f;
+      return 1;
+    case 0x470:
+      *out = 0x471;
+      return 1;
+    case 0x472:
+      *out = 0x473;
+      return 1;
+    case 0x474:
+      *out = 0x475;
+      return 1;
+    case 0x476:
+      *out = 0x477;
+      return 1;
+    case 0x478:
+      *out = 0x479;
+      return 1;
+    case 0x47a:
+      *out = 0x47b;
+      return 1;
+    case 0x47c:
+      *out = 0x47d;
+      return 1;
+    case 0x47e:
+      *out = 0x47f;
+      return 1;
+    case 0x480:
+      *out = 0x481;
+      return 1;
+    case 0x48a:
+      *out = 0x48b;
+      return 1;
+    case 0x48c:
+      *out = 0x48d;
+      return 1;
+    case 0x48e:
+      *out = 0x48f;
+      return 1;
+    case 0x490:
+      *out = 0x491;
+      return 1;
+    case 0x492:
+      *out = 0x493;
+      return 1;
+    case 0x494:
+      *out = 0x495;
+      return 1;
+    case 0x496:
+      *out = 0x497;
+      return 1;
+    case 0x498:
+      *out = 0x499;
+      return 1;
+    case 0x49a:
+      *out = 0x49b;
+      return 1;
+    case 0x49c:
+      *out = 0x49d;
+      return 1;
+    case 0x49e:
+      *out = 0x49f;
+      return 1;
+    case 0x4a0:
+      *out = 0x4a1;
+      return 1;
+    case 0x4a2:
+      *out = 0x4a3;
+      return 1;
+    case 0x4a4:
+      *out = 0x4a5;
+      return 1;
+    case 0x4a6:
+      *out = 0x4a7;
+      return 1;
+    case 0x4a8:
+      *out = 0x4a9;
+      return 1;
+    case 0x4aa:
+      *out = 0x4ab;
+      return 1;
+    case 0x4ac:
+      *out = 0x4ad;
+      return 1;
+    case 0x4ae:
+      *out = 0x4af;
+      return 1;
+    case 0x4b0:
+      *out = 0x4b1;
+      return 1;
+    case 0x4b2:
+      *out = 0x4b3;
+      return 1;
+    case 0x4b4:
+      *out = 0x4b5;
+      return 1;
+    case 0x4b6:
+      *out = 0x4b7;
+      return 1;
+    case 0x4b8:
+      *out = 0x4b9;
+      return 1;
+    case 0x4ba:
+      *out = 0x4bb;
+      return 1;
+    case 0x4bc:
+      *out = 0x4bd;
+      return 1;
+    case 0x4be:
+      *out = 0x4bf;
+      return 1;
+    case 0x4c0:
+      *out = 0x4cf;
+      return 1;
+    case 0x4c1:
+      *out = 0x4c2;
+      return 1;
+    case 0x4c3:
+      *out = 0x4c4;
+      return 1;
+    case 0x4c5:
+      *out = 0x4c6;
+      return 1;
+    case 0x4c7:
+      *out = 0x4c8;
+      return 1;
+    case 0x4c9:
+      *out = 0x4ca;
+      return 1;
+    case 0x4cb:
+      *out = 0x4cc;
+      return 1;
+    case 0x4cd:
+      *out = 0x4ce;
+      return 1;
+    case 0x4d0:
+      *out = 0x4d1;
+      return 1;
+    case 0x4d2:
+      *out = 0x4d3;
+      return 1;
+    case 0x4d4:
+      *out = 0x4d5;
+      return 1;
+    case 0x4d6:
+      *out = 0x4d7;
+      return 1;
+    case 0x4d8:
+      *out = 0x4d9;
+      return 1;
+    case 0x4da:
+      *out = 0x4db;
+      return 1;
+    case 0x4dc:
+      *out = 0x4dd;
+      return 1;
+    case 0x4de:
+      *out = 0x4df;
+      return 1;
+    case 0x4e0:
+      *out = 0x4e1;
+      return 1;
+    case 0x4e2:
+      *out = 0x4e3;
+      return 1;
+    case 0x4e4:
+      *out = 0x4e5;
+      return 1;
+    case 0x4e6:
+      *out = 0x4e7;
+      return 1;
+    case 0x4e8:
+      *out = 0x4e9;
+      return 1;
+    case 0x4ea:
+      *out = 0x4eb;
+      return 1;
+    case 0x4ec:
+      *out = 0x4ed;
+      return 1;
+    case 0x4ee:
+      *out = 0x4ef;
+      return 1;
+    case 0x4f0:
+      *out = 0x4f1;
+      return 1;
+    case 0x4f2:
+      *out = 0x4f3;
+      return 1;
+    case 0x4f4:
+      *out = 0x4f5;
+      return 1;
+    case 0x4f6:
+      *out = 0x4f7;
+      return 1;
+    case 0x4f8:
+      *out = 0x4f9;
+      return 1;
+    case 0x4fa:
+      *out = 0x4fb;
+      return 1;
+    case 0x4fc:
+      *out = 0x4fd;
+      return 1;
+    case 0x4fe:
+      *out = 0x4ff;
+      return 1;
+    case 0x500:
+      *out = 0x501;
+      return 1;
+    case 0x502:
+      *out = 0x503;
+      return 1;
+    case 0x504:
+      *out = 0x505;
+      return 1;
+    case 0x506:
+      *out = 0x507;
+      return 1;
+    case 0x508:
+      *out = 0x509;
+      return 1;
+    case 0x50a:
+      *out = 0x50b;
+      return 1;
+    case 0x50c:
+      *out = 0x50d;
+      return 1;
+    case 0x50e:
+      *out = 0x50f;
+      return 1;
+    case 0x510:
+      *out = 0x511;
+      return 1;
+    case 0x512:
+      *out = 0x513;
+      return 1;
+    case 0x514:
+      *out = 0x515;
+      return 1;
+    case 0x516:
+      *out = 0x517;
+      return 1;
+    case 0x518:
+      *out = 0x519;
+      return 1;
+    case 0x51a:
+      *out = 0x51b;
+      return 1;
+    case 0x51c:
+      *out = 0x51d;
+      return 1;
+    case 0x51e:
+      *out = 0x51f;
+      return 1;
+    case 0x520:
+      *out = 0x521;
+      return 1;
+    case 0x522:
+      *out = 0x523;
+      return 1;
+    case 0x524:
+      *out = 0x525;
+      return 1;
+    case 0x526:
+      *out = 0x527;
+      return 1;
+    case 0x528:
+      *out = 0x529;
+      return 1;
+    case 0x52a:
+      *out = 0x52b;
+      return 1;
+    case 0x52c:
+      *out = 0x52d;
+      return 1;
+    case 0x52e:
+      *out = 0x52f;
+      return 1;
+    case 0x531:
+      *out = 0x561;
+      return 1;
+    case 0x532:
+      *out = 0x562;
+      return 1;
+    case 0x533:
+      *out = 0x563;
+      return 1;
+    case 0x534:
+      *out = 0x564;
+      return 1;
+    case 0x535:
+      *out = 0x565;
+      return 1;
+    case 0x536:
+      *out = 0x566;
+      return 1;
+    case 0x537:
+      *out = 0x567;
+      return 1;
+    case 0x538:
+      *out = 0x568;
+      return 1;
+    case 0x539:
+      *out = 0x569;
+      return 1;
+    case 0x53a:
+      *out = 0x56a;
+      return 1;
+    case 0x53b:
+      *out = 0x56b;
+      return 1;
+    case 0x53c:
+      *out = 0x56c;
+      return 1;
+    case 0x53d:
+      *out = 0x56d;
+      return 1;
+    case 0x53e:
+      *out = 0x56e;
+      return 1;
+    case 0x53f:
+      *out = 0x56f;
+      return 1;
+    case 0x540:
+      *out = 0x570;
+      return 1;
+    case 0x541:
+      *out = 0x571;
+      return 1;
+    case 0x542:
+      *out = 0x572;
+      return 1;
+    case 0x543:
+      *out = 0x573;
+      return 1;
+    case 0x544:
+      *out = 0x574;
+      return 1;
+    case 0x545:
+      *out = 0x575;
+      return 1;
+    case 0x546:
+      *out = 0x576;
+      return 1;
+    case 0x547:
+      *out = 0x577;
+      return 1;
+    case 0x548:
+      *out = 0x578;
+      return 1;
+    case 0x549:
+      *out = 0x579;
+      return 1;
+    case 0x54a:
+      *out = 0x57a;
+      return 1;
+    case 0x54b:
+      *out = 0x57b;
+      return 1;
+    case 0x54c:
+      *out = 0x57c;
+      return 1;
+    case 0x54d:
+      *out = 0x57d;
+      return 1;
+    case 0x54e:
+      *out = 0x57e;
+      return 1;
+    case 0x54f:
+      *out = 0x57f;
+      return 1;
+    case 0x550:
+      *out = 0x580;
+      return 1;
+    case 0x551:
+      *out = 0x581;
+      return 1;
+    case 0x552:
+      *out = 0x582;
+      return 1;
+    case 0x553:
+      *out = 0x583;
+      return 1;
+    case 0x554:
+      *out = 0x584;
+      return 1;
+    case 0x555:
+      *out = 0x585;
+      return 1;
+    case 0x556:
+      *out = 0x586;
+      return 1;
+    case 0x587:
+      out[ 0 ] = 0x565;
+      out[ 1 ] = 0x582;
+      return 2;
+    case 0x10a0:
+      *out = 0x2d00;
+      return 1;
+    case 0x10a1:
+      *out = 0x2d01;
+      return 1;
+    case 0x10a2:
+      *out = 0x2d02;
+      return 1;
+    case 0x10a3:
+      *out = 0x2d03;
+      return 1;
+    case 0x10a4:
+      *out = 0x2d04;
+      return 1;
+    case 0x10a5:
+      *out = 0x2d05;
+      return 1;
+    case 0x10a6:
+      *out = 0x2d06;
+      return 1;
+    case 0x10a7:
+      *out = 0x2d07;
+      return 1;
+    case 0x10a8:
+      *out = 0x2d08;
+      return 1;
+    case 0x10a9:
+      *out = 0x2d09;
+      return 1;
+    case 0x10aa:
+      *out = 0x2d0a;
+      return 1;
+    case 0x10ab:
+      *out = 0x2d0b;
+      return 1;
+    case 0x10ac:
+      *out = 0x2d0c;
+      return 1;
+    case 0x10ad:
+      *out = 0x2d0d;
+      return 1;
+    case 0x10ae:
+      *out = 0x2d0e;
+      return 1;
+    case 0x10af:
+      *out = 0x2d0f;
+      return 1;
+    case 0x10b0:
+      *out = 0x2d10;
+      return 1;
+    case 0x10b1:
+      *out = 0x2d11;
+      return 1;
+    case 0x10b2:
+      *out = 0x2d12;
+      return 1;
+    case 0x10b3:
+      *out = 0x2d13;
+      return 1;
+    case 0x10b4:
+      *out = 0x2d14;
+      return 1;
+    case 0x10b5:
+      *out = 0x2d15;
+      return 1;
+    case 0x10b6:
+      *out = 0x2d16;
+      return 1;
+    case 0x10b7:
+      *out = 0x2d17;
+      return 1;
+    case 0x10b8:
+      *out = 0x2d18;
+      return 1;
+    case 0x10b9:
+      *out = 0x2d19;
+      return 1;
+    case 0x10ba:
+      *out = 0x2d1a;
+      return 1;
+    case 0x10bb:
+      *out = 0x2d1b;
+      return 1;
+    case 0x10bc:
+      *out = 0x2d1c;
+      return 1;
+    case 0x10bd:
+      *out = 0x2d1d;
+      return 1;
+    case 0x10be:
+      *out = 0x2d1e;
+      return 1;
+    case 0x10bf:
+      *out = 0x2d1f;
+      return 1;
+    case 0x10c0:
+      *out = 0x2d20;
+      return 1;
+    case 0x10c1:
+      *out = 0x2d21;
+      return 1;
+    case 0x10c2:
+      *out = 0x2d22;
+      return 1;
+    case 0x10c3:
+      *out = 0x2d23;
+      return 1;
+    case 0x10c4:
+      *out = 0x2d24;
+      return 1;
+    case 0x10c5:
+      *out = 0x2d25;
+      return 1;
+    case 0x10c7:
+      *out = 0x2d27;
+      return 1;
+    case 0x10cd:
+      *out = 0x2d2d;
+      return 1;
+    case 0x13f8:
+      *out = 0x13f0;
+      return 1;
+    case 0x13f9:
+      *out = 0x13f1;
+      return 1;
+    case 0x13fa:
+      *out = 0x13f2;
+      return 1;
+    case 0x13fb:
+      *out = 0x13f3;
+      return 1;
+    case 0x13fc:
+      *out = 0x13f4;
+      return 1;
+    case 0x13fd:
+      *out = 0x13f5;
+      return 1;
+    case 0x1c80:
+      *out = 0x432;
+      return 1;
+    case 0x1c81:
+      *out = 0x434;
+      return 1;
+    case 0x1c82:
+      *out = 0x43e;
+      return 1;
+    case 0x1c83:
+      *out = 0x441;
+      return 1;
+    case 0x1c84:
+      *out = 0x442;
+      return 1;
+    case 0x1c85:
+      *out = 0x442;
+      return 1;
+    case 0x1c86:
+      *out = 0x44a;
+      return 1;
+    case 0x1c87:
+      *out = 0x463;
+      return 1;
+    case 0x1c88:
+      *out = 0xa64b;
+      return 1;
+    case 0x1c90:
+      *out = 0x10d0;
+      return 1;
+    case 0x1c91:
+      *out = 0x10d1;
+      return 1;
+    case 0x1c92:
+      *out = 0x10d2;
+      return 1;
+    case 0x1c93:
+      *out = 0x10d3;
+      return 1;
+    case 0x1c94:
+      *out = 0x10d4;
+      return 1;
+    case 0x1c95:
+      *out = 0x10d5;
+      return 1;
+    case 0x1c96:
+      *out = 0x10d6;
+      return 1;
+    case 0x1c97:
+      *out = 0x10d7;
+      return 1;
+    case 0x1c98:
+      *out = 0x10d8;
+      return 1;
+    case 0x1c99:
+      *out = 0x10d9;
+      return 1;
+    case 0x1c9a:
+      *out = 0x10da;
+      return 1;
+    case 0x1c9b:
+      *out = 0x10db;
+      return 1;
+    case 0x1c9c:
+      *out = 0x10dc;
+      return 1;
+    case 0x1c9d:
+      *out = 0x10dd;
+      return 1;
+    case 0x1c9e:
+      *out = 0x10de;
+      return 1;
+    case 0x1c9f:
+      *out = 0x10df;
+      return 1;
+    case 0x1ca0:
+      *out = 0x10e0;
+      return 1;
+    case 0x1ca1:
+      *out = 0x10e1;
+      return 1;
+    case 0x1ca2:
+      *out = 0x10e2;
+      return 1;
+    case 0x1ca3:
+      *out = 0x10e3;
+      return 1;
+    case 0x1ca4:
+      *out = 0x10e4;
+      return 1;
+    case 0x1ca5:
+      *out = 0x10e5;
+      return 1;
+    case 0x1ca6:
+      *out = 0x10e6;
+      return 1;
+    case 0x1ca7:
+      *out = 0x10e7;
+      return 1;
+    case 0x1ca8:
+      *out = 0x10e8;
+      return 1;
+    case 0x1ca9:
+      *out = 0x10e9;
+      return 1;
+    case 0x1caa:
+      *out = 0x10ea;
+      return 1;
+    case 0x1cab:
+      *out = 0x10eb;
+      return 1;
+    case 0x1cac:
+      *out = 0x10ec;
+      return 1;
+    case 0x1cad:
+      *out = 0x10ed;
+      return 1;
+    case 0x1cae:
+      *out = 0x10ee;
+      return 1;
+    case 0x1caf:
+      *out = 0x10ef;
+      return 1;
+    case 0x1cb0:
+      *out = 0x10f0;
+      return 1;
+    case 0x1cb1:
+      *out = 0x10f1;
+      return 1;
+    case 0x1cb2:
+      *out = 0x10f2;
+      return 1;
+    case 0x1cb3:
+      *out = 0x10f3;
+      return 1;
+    case 0x1cb4:
+      *out = 0x10f4;
+      return 1;
+    case 0x1cb5:
+      *out = 0x10f5;
+      return 1;
+    case 0x1cb6:
+      *out = 0x10f6;
+      return 1;
+    case 0x1cb7:
+      *out = 0x10f7;
+      return 1;
+    case 0x1cb8:
+      *out = 0x10f8;
+      return 1;
+    case 0x1cb9:
+      *out = 0x10f9;
+      return 1;
+    case 0x1cba:
+      *out = 0x10fa;
+      return 1;
+    case 0x1cbd:
+      *out = 0x10fd;
+      return 1;
+    case 0x1cbe:
+      *out = 0x10fe;
+      return 1;
+    case 0x1cbf:
+      *out = 0x10ff;
+      return 1;
+    case 0x1e00:
+      *out = 0x1e01;
+      return 1;
+    case 0x1e02:
+      *out = 0x1e03;
+      return 1;
+    case 0x1e04:
+      *out = 0x1e05;
+      return 1;
+    case 0x1e06:
+      *out = 0x1e07;
+      return 1;
+    case 0x1e08:
+      *out = 0x1e09;
+      return 1;
+    case 0x1e0a:
+      *out = 0x1e0b;
+      return 1;
+    case 0x1e0c:
+      *out = 0x1e0d;
+      return 1;
+    case 0x1e0e:
+      *out = 0x1e0f;
+      return 1;
+    case 0x1e10:
+      *out = 0x1e11;
+      return 1;
+    case 0x1e12:
+      *out = 0x1e13;
+      return 1;
+    case 0x1e14:
+      *out = 0x1e15;
+      return 1;
+    case 0x1e16:
+      *out = 0x1e17;
+      return 1;
+    case 0x1e18:
+      *out = 0x1e19;
+      return 1;
+    case 0x1e1a:
+      *out = 0x1e1b;
+      return 1;
+    case 0x1e1c:
+      *out = 0x1e1d;
+      return 1;
+    case 0x1e1e:
+      *out = 0x1e1f;
+      return 1;
+    case 0x1e20:
+      *out = 0x1e21;
+      return 1;
+    case 0x1e22:
+      *out = 0x1e23;
+      return 1;
+    case 0x1e24:
+      *out = 0x1e25;
+      return 1;
+    case 0x1e26:
+      *out = 0x1e27;
+      return 1;
+    case 0x1e28:
+      *out = 0x1e29;
+      return 1;
+    case 0x1e2a:
+      *out = 0x1e2b;
+      return 1;
+    case 0x1e2c:
+      *out = 0x1e2d;
+      return 1;
+    case 0x1e2e:
+      *out = 0x1e2f;
+      return 1;
+    case 0x1e30:
+      *out = 0x1e31;
+      return 1;
+    case 0x1e32:
+      *out = 0x1e33;
+      return 1;
+    case 0x1e34:
+      *out = 0x1e35;
+      return 1;
+    case 0x1e36:
+      *out = 0x1e37;
+      return 1;
+    case 0x1e38:
+      *out = 0x1e39;
+      return 1;
+    case 0x1e3a:
+      *out = 0x1e3b;
+      return 1;
+    case 0x1e3c:
+      *out = 0x1e3d;
+      return 1;
+    case 0x1e3e:
+      *out = 0x1e3f;
+      return 1;
+    case 0x1e40:
+      *out = 0x1e41;
+      return 1;
+    case 0x1e42:
+      *out = 0x1e43;
+      return 1;
+    case 0x1e44:
+      *out = 0x1e45;
+      return 1;
+    case 0x1e46:
+      *out = 0x1e47;
+      return 1;
+    case 0x1e48:
+      *out = 0x1e49;
+      return 1;
+    case 0x1e4a:
+      *out = 0x1e4b;
+      return 1;
+    case 0x1e4c:
+      *out = 0x1e4d;
+      return 1;
+    case 0x1e4e:
+      *out = 0x1e4f;
+      return 1;
+    case 0x1e50:
+      *out = 0x1e51;
+      return 1;
+    case 0x1e52:
+      *out = 0x1e53;
+      return 1;
+    case 0x1e54:
+      *out = 0x1e55;
+      return 1;
+    case 0x1e56:
+      *out = 0x1e57;
+      return 1;
+    case 0x1e58:
+      *out = 0x1e59;
+      return 1;
+    case 0x1e5a:
+      *out = 0x1e5b;
+      return 1;
+    case 0x1e5c:
+      *out = 0x1e5d;
+      return 1;
+    case 0x1e5e:
+      *out = 0x1e5f;
+      return 1;
+    case 0x1e60:
+      *out = 0x1e61;
+      return 1;
+    case 0x1e62:
+      *out = 0x1e63;
+      return 1;
+    case 0x1e64:
+      *out = 0x1e65;
+      return 1;
+    case 0x1e66:
+      *out = 0x1e67;
+      return 1;
+    case 0x1e68:
+      *out = 0x1e69;
+      return 1;
+    case 0x1e6a:
+      *out = 0x1e6b;
+      return 1;
+    case 0x1e6c:
+      *out = 0x1e6d;
+      return 1;
+    case 0x1e6e:
+      *out = 0x1e6f;
+      return 1;
+    case 0x1e70:
+      *out = 0x1e71;
+      return 1;
+    case 0x1e72:
+      *out = 0x1e73;
+      return 1;
+    case 0x1e74:
+      *out = 0x1e75;
+      return 1;
+    case 0x1e76:
+      *out = 0x1e77;
+      return 1;
+    case 0x1e78:
+      *out = 0x1e79;
+      return 1;
+    case 0x1e7a:
+      *out = 0x1e7b;
+      return 1;
+    case 0x1e7c:
+      *out = 0x1e7d;
+      return 1;
+    case 0x1e7e:
+      *out = 0x1e7f;
+      return 1;
+    case 0x1e80:
+      *out = 0x1e81;
+      return 1;
+    case 0x1e82:
+      *out = 0x1e83;
+      return 1;
+    case 0x1e84:
+      *out = 0x1e85;
+      return 1;
+    case 0x1e86:
+      *out = 0x1e87;
+      return 1;
+    case 0x1e88:
+      *out = 0x1e89;
+      return 1;
+    case 0x1e8a:
+      *out = 0x1e8b;
+      return 1;
+    case 0x1e8c:
+      *out = 0x1e8d;
+      return 1;
+    case 0x1e8e:
+      *out = 0x1e8f;
+      return 1;
+    case 0x1e90:
+      *out = 0x1e91;
+      return 1;
+    case 0x1e92:
+      *out = 0x1e93;
+      return 1;
+    case 0x1e94:
+      *out = 0x1e95;
+      return 1;
+    case 0x1e96:
+      out[ 0 ] = 0x68;
+      out[ 1 ] = 0x331;
+      return 2;
+    case 0x1e97:
+      out[ 0 ] = 0x74;
+      out[ 1 ] = 0x308;
+      return 2;
+    case 0x1e98:
+      out[ 0 ] = 0x77;
+      out[ 1 ] = 0x30a;
+      return 2;
+    case 0x1e99:
+      out[ 0 ] = 0x79;
+      out[ 1 ] = 0x30a;
+      return 2;
+    case 0x1e9a:
+      out[ 0 ] = 0x61;
+      out[ 1 ] = 0x2be;
+      return 2;
+    case 0x1e9b:
+      *out = 0x1e61;
+      return 1;
+    case 0x1e9e:
+      out[ 0 ] = 0x73;
+      out[ 1 ] = 0x73;
+      return 2;
+    case 0x1ea0:
+      *out = 0x1ea1;
+      return 1;
+    case 0x1ea2:
+      *out = 0x1ea3;
+      return 1;
+    case 0x1ea4:
+      *out = 0x1ea5;
+      return 1;
+    case 0x1ea6:
+      *out = 0x1ea7;
+      return 1;
+    case 0x1ea8:
+      *out = 0x1ea9;
+      return 1;
+    case 0x1eaa:
+      *out = 0x1eab;
+      return 1;
+    case 0x1eac:
+      *out = 0x1ead;
+      return 1;
+    case 0x1eae:
+      *out = 0x1eaf;
+      return 1;
+    case 0x1eb0:
+      *out = 0x1eb1;
+      return 1;
+    case 0x1eb2:
+      *out = 0x1eb3;
+      return 1;
+    case 0x1eb4:
+      *out = 0x1eb5;
+      return 1;
+    case 0x1eb6:
+      *out = 0x1eb7;
+      return 1;
+    case 0x1eb8:
+      *out = 0x1eb9;
+      return 1;
+    case 0x1eba:
+      *out = 0x1ebb;
+      return 1;
+    case 0x1ebc:
+      *out = 0x1ebd;
+      return 1;
+    case 0x1ebe:
+      *out = 0x1ebf;
+      return 1;
+    case 0x1ec0:
+      *out = 0x1ec1;
+      return 1;
+    case 0x1ec2:
+      *out = 0x1ec3;
+      return 1;
+    case 0x1ec4:
+      *out = 0x1ec5;
+      return 1;
+    case 0x1ec6:
+      *out = 0x1ec7;
+      return 1;
+    case 0x1ec8:
+      *out = 0x1ec9;
+      return 1;
+    case 0x1eca:
+      *out = 0x1ecb;
+      return 1;
+    case 0x1ecc:
+      *out = 0x1ecd;
+      return 1;
+    case 0x1ece:
+      *out = 0x1ecf;
+      return 1;
+    case 0x1ed0:
+      *out = 0x1ed1;
+      return 1;
+    case 0x1ed2:
+      *out = 0x1ed3;
+      return 1;
+    case 0x1ed4:
+      *out = 0x1ed5;
+      return 1;
+    case 0x1ed6:
+      *out = 0x1ed7;
+      return 1;
+    case 0x1ed8:
+      *out = 0x1ed9;
+      return 1;
+    case 0x1eda:
+      *out = 0x1edb;
+      return 1;
+    case 0x1edc:
+      *out = 0x1edd;
+      return 1;
+    case 0x1ede:
+      *out = 0x1edf;
+      return 1;
+    case 0x1ee0:
+      *out = 0x1ee1;
+      return 1;
+    case 0x1ee2:
+      *out = 0x1ee3;
+      return 1;
+    case 0x1ee4:
+      *out = 0x1ee5;
+      return 1;
+    case 0x1ee6:
+      *out = 0x1ee7;
+      return 1;
+    case 0x1ee8:
+      *out = 0x1ee9;
+      return 1;
+    case 0x1eea:
+      *out = 0x1eeb;
+      return 1;
+    case 0x1eec:
+      *out = 0x1eed;
+      return 1;
+    case 0x1eee:
+      *out = 0x1eef;
+      return 1;
+    case 0x1ef0:
+      *out = 0x1ef1;
+      return 1;
+    case 0x1ef2:
+      *out = 0x1ef3;
+      return 1;
+    case 0x1ef4:
+      *out = 0x1ef5;
+      return 1;
+    case 0x1ef6:
+      *out = 0x1ef7;
+      return 1;
+    case 0x1ef8:
+      *out = 0x1ef9;
+      return 1;
+    case 0x1efa:
+      *out = 0x1efb;
+      return 1;
+    case 0x1efc:
+      *out = 0x1efd;
+      return 1;
+    case 0x1efe:
+      *out = 0x1eff;
+      return 1;
+    case 0x1f08:
+      *out = 0x1f00;
+      return 1;
+    case 0x1f09:
+      *out = 0x1f01;
+      return 1;
+    case 0x1f0a:
+      *out = 0x1f02;
+      return 1;
+    case 0x1f0b:
+      *out = 0x1f03;
+      return 1;
+    case 0x1f0c:
+      *out = 0x1f04;
+      return 1;
+    case 0x1f0d:
+      *out = 0x1f05;
+      return 1;
+    case 0x1f0e:
+      *out = 0x1f06;
+      return 1;
+    case 0x1f0f:
+      *out = 0x1f07;
+      return 1;
+    case 0x1f18:
+      *out = 0x1f10;
+      return 1;
+    case 0x1f19:
+      *out = 0x1f11;
+      return 1;
+    case 0x1f1a:
+      *out = 0x1f12;
+      return 1;
+    case 0x1f1b:
+      *out = 0x1f13;
+      return 1;
+    case 0x1f1c:
+      *out = 0x1f14;
+      return 1;
+    case 0x1f1d:
+      *out = 0x1f15;
+      return 1;
+    case 0x1f28:
+      *out = 0x1f20;
+      return 1;
+    case 0x1f29:
+      *out = 0x1f21;
+      return 1;
+    case 0x1f2a:
+      *out = 0x1f22;
+      return 1;
+    case 0x1f2b:
+      *out = 0x1f23;
+      return 1;
+    case 0x1f2c:
+      *out = 0x1f24;
+      return 1;
+    case 0x1f2d:
+      *out = 0x1f25;
+      return 1;
+    case 0x1f2e:
+      *out = 0x1f26;
+      return 1;
+    case 0x1f2f:
+      *out = 0x1f27;
+      return 1;
+    case 0x1f38:
+      *out = 0x1f30;
+      return 1;
+    case 0x1f39:
+      *out = 0x1f31;
+      return 1;
+    case 0x1f3a:
+      *out = 0x1f32;
+      return 1;
+    case 0x1f3b:
+      *out = 0x1f33;
+      return 1;
+    case 0x1f3c:
+      *out = 0x1f34;
+      return 1;
+    case 0x1f3d:
+      *out = 0x1f35;
+      return 1;
+    case 0x1f3e:
+      *out = 0x1f36;
+      return 1;
+    case 0x1f3f:
+      *out = 0x1f37;
+      return 1;
+    case 0x1f48:
+      *out = 0x1f40;
+      return 1;
+    case 0x1f49:
+      *out = 0x1f41;
+      return 1;
+    case 0x1f4a:
+      *out = 0x1f42;
+      return 1;
+    case 0x1f4b:
+      *out = 0x1f43;
+      return 1;
+    case 0x1f4c:
+      *out = 0x1f44;
+      return 1;
+    case 0x1f4d:
+      *out = 0x1f45;
+      return 1;
+    case 0x1f50:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x313;
+      return 2;
+    case 0x1f52:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x313;
+      out[ 2 ] = 0x300;
+      return 3;
+    case 0x1f54:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x313;
+      out[ 2 ] = 0x301;
+      return 3;
+    case 0x1f56:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x313;
+      out[ 2 ] = 0x342;
+      return 3;
+    case 0x1f59:
+      *out = 0x1f51;
+      return 1;
+    case 0x1f5b:
+      *out = 0x1f53;
+      return 1;
+    case 0x1f5d:
+      *out = 0x1f55;
+      return 1;
+    case 0x1f5f:
+      *out = 0x1f57;
+      return 1;
+    case 0x1f68:
+      *out = 0x1f60;
+      return 1;
+    case 0x1f69:
+      *out = 0x1f61;
+      return 1;
+    case 0x1f6a:
+      *out = 0x1f62;
+      return 1;
+    case 0x1f6b:
+      *out = 0x1f63;
+      return 1;
+    case 0x1f6c:
+      *out = 0x1f64;
+      return 1;
+    case 0x1f6d:
+      *out = 0x1f65;
+      return 1;
+    case 0x1f6e:
+      *out = 0x1f66;
+      return 1;
+    case 0x1f6f:
+      *out = 0x1f67;
+      return 1;
+    case 0x1f80:
+      out[ 0 ] = 0x1f00;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f81:
+      out[ 0 ] = 0x1f01;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f82:
+      out[ 0 ] = 0x1f02;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f83:
+      out[ 0 ] = 0x1f03;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f84:
+      out[ 0 ] = 0x1f04;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f85:
+      out[ 0 ] = 0x1f05;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f86:
+      out[ 0 ] = 0x1f06;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f87:
+      out[ 0 ] = 0x1f07;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f88:
+      out[ 0 ] = 0x1f00;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f89:
+      out[ 0 ] = 0x1f01;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8a:
+      out[ 0 ] = 0x1f02;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8b:
+      out[ 0 ] = 0x1f03;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8c:
+      out[ 0 ] = 0x1f04;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8d:
+      out[ 0 ] = 0x1f05;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8e:
+      out[ 0 ] = 0x1f06;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f8f:
+      out[ 0 ] = 0x1f07;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f90:
+      out[ 0 ] = 0x1f20;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f91:
+      out[ 0 ] = 0x1f21;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f92:
+      out[ 0 ] = 0x1f22;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f93:
+      out[ 0 ] = 0x1f23;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f94:
+      out[ 0 ] = 0x1f24;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f95:
+      out[ 0 ] = 0x1f25;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f96:
+      out[ 0 ] = 0x1f26;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f97:
+      out[ 0 ] = 0x1f27;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f98:
+      out[ 0 ] = 0x1f20;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f99:
+      out[ 0 ] = 0x1f21;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9a:
+      out[ 0 ] = 0x1f22;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9b:
+      out[ 0 ] = 0x1f23;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9c:
+      out[ 0 ] = 0x1f24;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9d:
+      out[ 0 ] = 0x1f25;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9e:
+      out[ 0 ] = 0x1f26;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1f9f:
+      out[ 0 ] = 0x1f27;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa0:
+      out[ 0 ] = 0x1f60;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa1:
+      out[ 0 ] = 0x1f61;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa2:
+      out[ 0 ] = 0x1f62;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa3:
+      out[ 0 ] = 0x1f63;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa4:
+      out[ 0 ] = 0x1f64;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa5:
+      out[ 0 ] = 0x1f65;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa6:
+      out[ 0 ] = 0x1f66;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa7:
+      out[ 0 ] = 0x1f67;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa8:
+      out[ 0 ] = 0x1f60;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fa9:
+      out[ 0 ] = 0x1f61;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1faa:
+      out[ 0 ] = 0x1f62;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fab:
+      out[ 0 ] = 0x1f63;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fac:
+      out[ 0 ] = 0x1f64;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fad:
+      out[ 0 ] = 0x1f65;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fae:
+      out[ 0 ] = 0x1f66;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1faf:
+      out[ 0 ] = 0x1f67;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fb2:
+      out[ 0 ] = 0x1f70;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fb3:
+      out[ 0 ] = 0x3b1;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fb4:
+      out[ 0 ] = 0x3ac;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fb6:
+      out[ 0 ] = 0x3b1;
+      out[ 1 ] = 0x342;
+      return 2;
+    case 0x1fb7:
+      out[ 0 ] = 0x3b1;
+      out[ 1 ] = 0x342;
+      out[ 2 ] = 0x3b9;
+      return 3;
+    case 0x1fb8:
+      *out = 0x1fb0;
+      return 1;
+    case 0x1fb9:
+      *out = 0x1fb1;
+      return 1;
+    case 0x1fba:
+      *out = 0x1f70;
+      return 1;
+    case 0x1fbb:
+      *out = 0x1f71;
+      return 1;
+    case 0x1fbc:
+      out[ 0 ] = 0x3b1;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fbe:
+      *out = 0x3b9;
+      return 1;
+    case 0x1fc2:
+      out[ 0 ] = 0x1f74;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fc3:
+      out[ 0 ] = 0x3b7;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fc4:
+      out[ 0 ] = 0x3ae;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fc6:
+      out[ 0 ] = 0x3b7;
+      out[ 1 ] = 0x342;
+      return 2;
+    case 0x1fc7:
+      out[ 0 ] = 0x3b7;
+      out[ 1 ] = 0x342;
+      out[ 2 ] = 0x3b9;
+      return 3;
+    case 0x1fc8:
+      *out = 0x1f72;
+      return 1;
+    case 0x1fc9:
+      *out = 0x1f73;
+      return 1;
+    case 0x1fca:
+      *out = 0x1f74;
+      return 1;
+    case 0x1fcb:
+      *out = 0x1f75;
+      return 1;
+    case 0x1fcc:
+      out[ 0 ] = 0x3b7;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1fd2:
+      out[ 0 ] = 0x3b9;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x300;
+      return 3;
+    case 0x1fd3:
+      out[ 0 ] = 0x3b9;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x301;
+      return 3;
+    case 0x1fd6:
+      out[ 0 ] = 0x3b9;
+      out[ 1 ] = 0x342;
+      return 2;
+    case 0x1fd7:
+      out[ 0 ] = 0x3b9;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x342;
+      return 3;
+    case 0x1fd8:
+      *out = 0x1fd0;
+      return 1;
+    case 0x1fd9:
+      *out = 0x1fd1;
+      return 1;
+    case 0x1fda:
+      *out = 0x1f76;
+      return 1;
+    case 0x1fdb:
+      *out = 0x1f77;
+      return 1;
+    case 0x1fe2:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x300;
+      return 3;
+    case 0x1fe3:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x301;
+      return 3;
+    case 0x1fe4:
+      out[ 0 ] = 0x3c1;
+      out[ 1 ] = 0x313;
+      return 2;
+    case 0x1fe6:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x342;
+      return 2;
+    case 0x1fe7:
+      out[ 0 ] = 0x3c5;
+      out[ 1 ] = 0x308;
+      out[ 2 ] = 0x342;
+      return 3;
+    case 0x1fe8:
+      *out = 0x1fe0;
+      return 1;
+    case 0x1fe9:
+      *out = 0x1fe1;
+      return 1;
+    case 0x1fea:
+      *out = 0x1f7a;
+      return 1;
+    case 0x1feb:
+      *out = 0x1f7b;
+      return 1;
+    case 0x1fec:
+      *out = 0x1fe5;
+      return 1;
+    case 0x1ff2:
+      out[ 0 ] = 0x1f7c;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1ff3:
+      out[ 0 ] = 0x3c9;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1ff4:
+      out[ 0 ] = 0x3ce;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x1ff6:
+      out[ 0 ] = 0x3c9;
+      out[ 1 ] = 0x342;
+      return 2;
+    case 0x1ff7:
+      out[ 0 ] = 0x3c9;
+      out[ 1 ] = 0x342;
+      out[ 2 ] = 0x3b9;
+      return 3;
+    case 0x1ff8:
+      *out = 0x1f78;
+      return 1;
+    case 0x1ff9:
+      *out = 0x1f79;
+      return 1;
+    case 0x1ffa:
+      *out = 0x1f7c;
+      return 1;
+    case 0x1ffb:
+      *out = 0x1f7d;
+      return 1;
+    case 0x1ffc:
+      out[ 0 ] = 0x3c9;
+      out[ 1 ] = 0x3b9;
+      return 2;
+    case 0x2126:
+      *out = 0x3c9;
+      return 1;
+    case 0x212a:
+      *out = 0x6b;
+      return 1;
+    case 0x212b:
+      *out = 0xe5;
+      return 1;
+    case 0x2132:
+      *out = 0x214e;
+      return 1;
+    case 0x2160:
+      *out = 0x2170;
+      return 1;
+    case 0x2161:
+      *out = 0x2171;
+      return 1;
+    case 0x2162:
+      *out = 0x2172;
+      return 1;
+    case 0x2163:
+      *out = 0x2173;
+      return 1;
+    case 0x2164:
+      *out = 0x2174;
+      return 1;
+    case 0x2165:
+      *out = 0x2175;
+      return 1;
+    case 0x2166:
+      *out = 0x2176;
+      return 1;
+    case 0x2167:
+      *out = 0x2177;
+      return 1;
+    case 0x2168:
+      *out = 0x2178;
+      return 1;
+    case 0x2169:
+      *out = 0x2179;
+      return 1;
+    case 0x216a:
+      *out = 0x217a;
+      return 1;
+    case 0x216b:
+      *out = 0x217b;
+      return 1;
+    case 0x216c:
+      *out = 0x217c;
+      return 1;
+    case 0x216d:
+      *out = 0x217d;
+      return 1;
+    case 0x216e:
+      *out = 0x217e;
+      return 1;
+    case 0x216f:
+      *out = 0x217f;
+      return 1;
+    case 0x2183:
+      *out = 0x2184;
+      return 1;
+    case 0x24b6:
+      *out = 0x24d0;
+      return 1;
+    case 0x24b7:
+      *out = 0x24d1;
+      return 1;
+    case 0x24b8:
+      *out = 0x24d2;
+      return 1;
+    case 0x24b9:
+      *out = 0x24d3;
+      return 1;
+    case 0x24ba:
+      *out = 0x24d4;
+      return 1;
+    case 0x24bb:
+      *out = 0x24d5;
+      return 1;
+    case 0x24bc:
+      *out = 0x24d6;
+      return 1;
+    case 0x24bd:
+      *out = 0x24d7;
+      return 1;
+    case 0x24be:
+      *out = 0x24d8;
+      return 1;
+    case 0x24bf:
+      *out = 0x24d9;
+      return 1;
+    case 0x24c0:
+      *out = 0x24da;
+      return 1;
+    case 0x24c1:
+      *out = 0x24db;
+      return 1;
+    case 0x24c2:
+      *out = 0x24dc;
+      return 1;
+    case 0x24c3:
+      *out = 0x24dd;
+      return 1;
+    case 0x24c4:
+      *out = 0x24de;
+      return 1;
+    case 0x24c5:
+      *out = 0x24df;
+      return 1;
+    case 0x24c6:
+      *out = 0x24e0;
+      return 1;
+    case 0x24c7:
+      *out = 0x24e1;
+      return 1;
+    case 0x24c8:
+      *out = 0x24e2;
+      return 1;
+    case 0x24c9:
+      *out = 0x24e3;
+      return 1;
+    case 0x24ca:
+      *out = 0x24e4;
+      return 1;
+    case 0x24cb:
+      *out = 0x24e5;
+      return 1;
+    case 0x24cc:
+      *out = 0x24e6;
+      return 1;
+    case 0x24cd:
+      *out = 0x24e7;
+      return 1;
+    case 0x24ce:
+      *out = 0x24e8;
+      return 1;
+    case 0x24cf:
+      *out = 0x24e9;
+      return 1;
+    case 0x2c00:
+      *out = 0x2c30;
+      return 1;
+    case 0x2c01:
+      *out = 0x2c31;
+      return 1;
+    case 0x2c02:
+      *out = 0x2c32;
+      return 1;
+    case 0x2c03:
+      *out = 0x2c33;
+      return 1;
+    case 0x2c04:
+      *out = 0x2c34;
+      return 1;
+    case 0x2c05:
+      *out = 0x2c35;
+      return 1;
+    case 0x2c06:
+      *out = 0x2c36;
+      return 1;
+    case 0x2c07:
+      *out = 0x2c37;
+      return 1;
+    case 0x2c08:
+      *out = 0x2c38;
+      return 1;
+    case 0x2c09:
+      *out = 0x2c39;
+      return 1;
+    case 0x2c0a:
+      *out = 0x2c3a;
+      return 1;
+    case 0x2c0b:
+      *out = 0x2c3b;
+      return 1;
+    case 0x2c0c:
+      *out = 0x2c3c;
+      return 1;
+    case 0x2c0d:
+      *out = 0x2c3d;
+      return 1;
+    case 0x2c0e:
+      *out = 0x2c3e;
+      return 1;
+    case 0x2c0f:
+      *out = 0x2c3f;
+      return 1;
+    case 0x2c10:
+      *out = 0x2c40;
+      return 1;
+    case 0x2c11:
+      *out = 0x2c41;
+      return 1;
+    case 0x2c12:
+      *out = 0x2c42;
+      return 1;
+    case 0x2c13:
+      *out = 0x2c43;
+      return 1;
+    case 0x2c14:
+      *out = 0x2c44;
+      return 1;
+    case 0x2c15:
+      *out = 0x2c45;
+      return 1;
+    case 0x2c16:
+      *out = 0x2c46;
+      return 1;
+    case 0x2c17:
+      *out = 0x2c47;
+      return 1;
+    case 0x2c18:
+      *out = 0x2c48;
+      return 1;
+    case 0x2c19:
+      *out = 0x2c49;
+      return 1;
+    case 0x2c1a:
+      *out = 0x2c4a;
+      return 1;
+    case 0x2c1b:
+      *out = 0x2c4b;
+      return 1;
+    case 0x2c1c:
+      *out = 0x2c4c;
+      return 1;
+    case 0x2c1d:
+      *out = 0x2c4d;
+      return 1;
+    case 0x2c1e:
+      *out = 0x2c4e;
+      return 1;
+    case 0x2c1f:
+      *out = 0x2c4f;
+      return 1;
+    case 0x2c20:
+      *out = 0x2c50;
+      return 1;
+    case 0x2c21:
+      *out = 0x2c51;
+      return 1;
+    case 0x2c22:
+      *out = 0x2c52;
+      return 1;
+    case 0x2c23:
+      *out = 0x2c53;
+      return 1;
+    case 0x2c24:
+      *out = 0x2c54;
+      return 1;
+    case 0x2c25:
+      *out = 0x2c55;
+      return 1;
+    case 0x2c26:
+      *out = 0x2c56;
+      return 1;
+    case 0x2c27:
+      *out = 0x2c57;
+      return 1;
+    case 0x2c28:
+      *out = 0x2c58;
+      return 1;
+    case 0x2c29:
+      *out = 0x2c59;
+      return 1;
+    case 0x2c2a:
+      *out = 0x2c5a;
+      return 1;
+    case 0x2c2b:
+      *out = 0x2c5b;
+      return 1;
+    case 0x2c2c:
+      *out = 0x2c5c;
+      return 1;
+    case 0x2c2d:
+      *out = 0x2c5d;
+      return 1;
+    case 0x2c2e:
+      *out = 0x2c5e;
+      return 1;
+    case 0x2c2f:
+      *out = 0x2c5f;
+      return 1;
+    case 0x2c60:
+      *out = 0x2c61;
+      return 1;
+    case 0x2c62:
+      *out = 0x26b;
+      return 1;
+    case 0x2c63:
+      *out = 0x1d7d;
+      return 1;
+    case 0x2c64:
+      *out = 0x27d;
+      return 1;
+    case 0x2c67:
+      *out = 0x2c68;
+      return 1;
+    case 0x2c69:
+      *out = 0x2c6a;
+      return 1;
+    case 0x2c6b:
+      *out = 0x2c6c;
+      return 1;
+    case 0x2c6d:
+      *out = 0x251;
+      return 1;
+    case 0x2c6e:
+      *out = 0x271;
+      return 1;
+    case 0x2c6f:
+      *out = 0x250;
+      return 1;
+    case 0x2c70:
+      *out = 0x252;
+      return 1;
+    case 0x2c72:
+      *out = 0x2c73;
+      return 1;
+    case 0x2c75:
+      *out = 0x2c76;
+      return 1;
+    case 0x2c7e:
+      *out = 0x23f;
+      return 1;
+    case 0x2c7f:
+      *out = 0x240;
+      return 1;
+    case 0x2c80:
+      *out = 0x2c81;
+      return 1;
+    case 0x2c82:
+      *out = 0x2c83;
+      return 1;
+    case 0x2c84:
+      *out = 0x2c85;
+      return 1;
+    case 0x2c86:
+      *out = 0x2c87;
+      return 1;
+    case 0x2c88:
+      *out = 0x2c89;
+      return 1;
+    case 0x2c8a:
+      *out = 0x2c8b;
+      return 1;
+    case 0x2c8c:
+      *out = 0x2c8d;
+      return 1;
+    case 0x2c8e:
+      *out = 0x2c8f;
+      return 1;
+    case 0x2c90:
+      *out = 0x2c91;
+      return 1;
+    case 0x2c92:
+      *out = 0x2c93;
+      return 1;
+    case 0x2c94:
+      *out = 0x2c95;
+      return 1;
+    case 0x2c96:
+      *out = 0x2c97;
+      return 1;
+    case 0x2c98:
+      *out = 0x2c99;
+      return 1;
+    case 0x2c9a:
+      *out = 0x2c9b;
+      return 1;
+    case 0x2c9c:
+      *out = 0x2c9d;
+      return 1;
+    case 0x2c9e:
+      *out = 0x2c9f;
+      return 1;
+    case 0x2ca0:
+      *out = 0x2ca1;
+      return 1;
+    case 0x2ca2:
+      *out = 0x2ca3;
+      return 1;
+    case 0x2ca4:
+      *out = 0x2ca5;
+      return 1;
+    case 0x2ca6:
+      *out = 0x2ca7;
+      return 1;
+    case 0x2ca8:
+      *out = 0x2ca9;
+      return 1;
+    case 0x2caa:
+      *out = 0x2cab;
+      return 1;
+    case 0x2cac:
+      *out = 0x2cad;
+      return 1;
+    case 0x2cae:
+      *out = 0x2caf;
+      return 1;
+    case 0x2cb0:
+      *out = 0x2cb1;
+      return 1;
+    case 0x2cb2:
+      *out = 0x2cb3;
+      return 1;
+    case 0x2cb4:
+      *out = 0x2cb5;
+      return 1;
+    case 0x2cb6:
+      *out = 0x2cb7;
+      return 1;
+    case 0x2cb8:
+      *out = 0x2cb9;
+      return 1;
+    case 0x2cba:
+      *out = 0x2cbb;
+      return 1;
+    case 0x2cbc:
+      *out = 0x2cbd;
+      return 1;
+    case 0x2cbe:
+      *out = 0x2cbf;
+      return 1;
+    case 0x2cc0:
+      *out = 0x2cc1;
+      return 1;
+    case 0x2cc2:
+      *out = 0x2cc3;
+      return 1;
+    case 0x2cc4:
+      *out = 0x2cc5;
+      return 1;
+    case 0x2cc6:
+      *out = 0x2cc7;
+      return 1;
+    case 0x2cc8:
+      *out = 0x2cc9;
+      return 1;
+    case 0x2cca:
+      *out = 0x2ccb;
+      return 1;
+    case 0x2ccc:
+      *out = 0x2ccd;
+      return 1;
+    case 0x2cce:
+      *out = 0x2ccf;
+      return 1;
+    case 0x2cd0:
+      *out = 0x2cd1;
+      return 1;
+    case 0x2cd2:
+      *out = 0x2cd3;
+      return 1;
+    case 0x2cd4:
+      *out = 0x2cd5;
+      return 1;
+    case 0x2cd6:
+      *out = 0x2cd7;
+      return 1;
+    case 0x2cd8:
+      *out = 0x2cd9;
+      return 1;
+    case 0x2cda:
+      *out = 0x2cdb;
+      return 1;
+    case 0x2cdc:
+      *out = 0x2cdd;
+      return 1;
+    case 0x2cde:
+      *out = 0x2cdf;
+      return 1;
+    case 0x2ce0:
+      *out = 0x2ce1;
+      return 1;
+    case 0x2ce2:
+      *out = 0x2ce3;
+      return 1;
+    case 0x2ceb:
+      *out = 0x2cec;
+      return 1;
+    case 0x2ced:
+      *out = 0x2cee;
+      return 1;
+    case 0x2cf2:
+      *out = 0x2cf3;
+      return 1;
+    case 0xa640:
+      *out = 0xa641;
+      return 1;
+    case 0xa642:
+      *out = 0xa643;
+      return 1;
+    case 0xa644:
+      *out = 0xa645;
+      return 1;
+    case 0xa646:
+      *out = 0xa647;
+      return 1;
+    case 0xa648:
+      *out = 0xa649;
+      return 1;
+    case 0xa64a:
+      *out = 0xa64b;
+      return 1;
+    case 0xa64c:
+      *out = 0xa64d;
+      return 1;
+    case 0xa64e:
+      *out = 0xa64f;
+      return 1;
+    case 0xa650:
+      *out = 0xa651;
+      return 1;
+    case 0xa652:
+      *out = 0xa653;
+      return 1;
+    case 0xa654:
+      *out = 0xa655;
+      return 1;
+    case 0xa656:
+      *out = 0xa657;
+      return 1;
+    case 0xa658:
+      *out = 0xa659;
+      return 1;
+    case 0xa65a:
+      *out = 0xa65b;
+      return 1;
+    case 0xa65c:
+      *out = 0xa65d;
+      return 1;
+    case 0xa65e:
+      *out = 0xa65f;
+      return 1;
+    case 0xa660:
+      *out = 0xa661;
+      return 1;
+    case 0xa662:
+      *out = 0xa663;
+      return 1;
+    case 0xa664:
+      *out = 0xa665;
+      return 1;
+    case 0xa666:
+      *out = 0xa667;
+      return 1;
+    case 0xa668:
+      *out = 0xa669;
+      return 1;
+    case 0xa66a:
+      *out = 0xa66b;
+      return 1;
+    case 0xa66c:
+      *out = 0xa66d;
+      return 1;
+    case 0xa680:
+      *out = 0xa681;
+      return 1;
+    case 0xa682:
+      *out = 0xa683;
+      return 1;
+    case 0xa684:
+      *out = 0xa685;
+      return 1;
+    case 0xa686:
+      *out = 0xa687;
+      return 1;
+    case 0xa688:
+      *out = 0xa689;
+      return 1;
+    case 0xa68a:
+      *out = 0xa68b;
+      return 1;
+    case 0xa68c:
+      *out = 0xa68d;
+      return 1;
+    case 0xa68e:
+      *out = 0xa68f;
+      return 1;
+    case 0xa690:
+      *out = 0xa691;
+      return 1;
+    case 0xa692:
+      *out = 0xa693;
+      return 1;
+    case 0xa694:
+      *out = 0xa695;
+      return 1;
+    case 0xa696:
+      *out = 0xa697;
+      return 1;
+    case 0xa698:
+      *out = 0xa699;
+      return 1;
+    case 0xa69a:
+      *out = 0xa69b;
+      return 1;
+    case 0xa722:
+      *out = 0xa723;
+      return 1;
+    case 0xa724:
+      *out = 0xa725;
+      return 1;
+    case 0xa726:
+      *out = 0xa727;
+      return 1;
+    case 0xa728:
+      *out = 0xa729;
+      return 1;
+    case 0xa72a:
+      *out = 0xa72b;
+      return 1;
+    case 0xa72c:
+      *out = 0xa72d;
+      return 1;
+    case 0xa72e:
+      *out = 0xa72f;
+      return 1;
+    case 0xa732:
+      *out = 0xa733;
+      return 1;
+    case 0xa734:
+      *out = 0xa735;
+      return 1;
+    case 0xa736:
+      *out = 0xa737;
+      return 1;
+    case 0xa738:
+      *out = 0xa739;
+      return 1;
+    case 0xa73a:
+      *out = 0xa73b;
+      return 1;
+    case 0xa73c:
+      *out = 0xa73d;
+      return 1;
+    case 0xa73e:
+      *out = 0xa73f;
+      return 1;
+    case 0xa740:
+      *out = 0xa741;
+      return 1;
+    case 0xa742:
+      *out = 0xa743;
+      return 1;
+    case 0xa744:
+      *out = 0xa745;
+      return 1;
+    case 0xa746:
+      *out = 0xa747;
+      return 1;
+    case 0xa748:
+      *out = 0xa749;
+      return 1;
+    case 0xa74a:
+      *out = 0xa74b;
+      return 1;
+    case 0xa74c:
+      *out = 0xa74d;
+      return 1;
+    case 0xa74e:
+      *out = 0xa74f;
+      return 1;
+    case 0xa750:
+      *out = 0xa751;
+      return 1;
+    case 0xa752:
+      *out = 0xa753;
+      return 1;
+    case 0xa754:
+      *out = 0xa755;
+      return 1;
+    case 0xa756:
+      *out = 0xa757;
+      return 1;
+    case 0xa758:
+      *out = 0xa759;
+      return 1;
+    case 0xa75a:
+      *out = 0xa75b;
+      return 1;
+    case 0xa75c:
+      *out = 0xa75d;
+      return 1;
+    case 0xa75e:
+      *out = 0xa75f;
+      return 1;
+    case 0xa760:
+      *out = 0xa761;
+      return 1;
+    case 0xa762:
+      *out = 0xa763;
+      return 1;
+    case 0xa764:
+      *out = 0xa765;
+      return 1;
+    case 0xa766:
+      *out = 0xa767;
+      return 1;
+    case 0xa768:
+      *out = 0xa769;
+      return 1;
+    case 0xa76a:
+      *out = 0xa76b;
+      return 1;
+    case 0xa76c:
+      *out = 0xa76d;
+      return 1;
+    case 0xa76e:
+      *out = 0xa76f;
+      return 1;
+    case 0xa779:
+      *out = 0xa77a;
+      return 1;
+    case 0xa77b:
+      *out = 0xa77c;
+      return 1;
+    case 0xa77d:
+      *out = 0x1d79;
+      return 1;
+    case 0xa77e:
+      *out = 0xa77f;
+      return 1;
+    case 0xa780:
+      *out = 0xa781;
+      return 1;
+    case 0xa782:
+      *out = 0xa783;
+      return 1;
+    case 0xa784:
+      *out = 0xa785;
+      return 1;
+    case 0xa786:
+      *out = 0xa787;
+      return 1;
+    case 0xa78b:
+      *out = 0xa78c;
+      return 1;
+    case 0xa78d:
+      *out = 0x265;
+      return 1;
+    case 0xa790:
+      *out = 0xa791;
+      return 1;
+    case 0xa792:
+      *out = 0xa793;
+      return 1;
+    case 0xa796:
+      *out = 0xa797;
+      return 1;
+    case 0xa798:
+      *out = 0xa799;
+      return 1;
+    case 0xa79a:
+      *out = 0xa79b;
+      return 1;
+    case 0xa79c:
+      *out = 0xa79d;
+      return 1;
+    case 0xa79e:
+      *out = 0xa79f;
+      return 1;
+    case 0xa7a0:
+      *out = 0xa7a1;
+      return 1;
+    case 0xa7a2:
+      *out = 0xa7a3;
+      return 1;
+    case 0xa7a4:
+      *out = 0xa7a5;
+      return 1;
+    case 0xa7a6:
+      *out = 0xa7a7;
+      return 1;
+    case 0xa7a8:
+      *out = 0xa7a9;
+      return 1;
+    case 0xa7aa:
+      *out = 0x266;
+      return 1;
+    case 0xa7ab:
+      *out = 0x25c;
+      return 1;
+    case 0xa7ac:
+      *out = 0x261;
+      return 1;
+    case 0xa7ad:
+      *out = 0x26c;
+      return 1;
+    case 0xa7ae:
+      *out = 0x26a;
+      return 1;
+    case 0xa7b0:
+      *out = 0x29e;
+      return 1;
+    case 0xa7b1:
+      *out = 0x287;
+      return 1;
+    case 0xa7b2:
+      *out = 0x29d;
+      return 1;
+    case 0xa7b3:
+      *out = 0xab53;
+      return 1;
+    case 0xa7b4:
+      *out = 0xa7b5;
+      return 1;
+    case 0xa7b6:
+      *out = 0xa7b7;
+      return 1;
+    case 0xa7b8:
+      *out = 0xa7b9;
+      return 1;
+    case 0xa7ba:
+      *out = 0xa7bb;
+      return 1;
+    case 0xa7bc:
+      *out = 0xa7bd;
+      return 1;
+    case 0xa7be:
+      *out = 0xa7bf;
+      return 1;
+    case 0xa7c0:
+      *out = 0xa7c1;
+      return 1;
+    case 0xa7c2:
+      *out = 0xa7c3;
+      return 1;
+    case 0xa7c4:
+      *out = 0xa794;
+      return 1;
+    case 0xa7c5:
+      *out = 0x282;
+      return 1;
+    case 0xa7c6:
+      *out = 0x1d8e;
+      return 1;
+    case 0xa7c7:
+      *out = 0xa7c8;
+      return 1;
+    case 0xa7c9:
+      *out = 0xa7ca;
+      return 1;
+    case 0xa7d0:
+      *out = 0xa7d1;
+      return 1;
+    case 0xa7d6:
+      *out = 0xa7d7;
+      return 1;
+    case 0xa7d8:
+      *out = 0xa7d9;
+      return 1;
+    case 0xa7f5:
+      *out = 0xa7f6;
+      return 1;
+    case 0xab70:
+      *out = 0x13a0;
+      return 1;
+    case 0xab71:
+      *out = 0x13a1;
+      return 1;
+    case 0xab72:
+      *out = 0x13a2;
+      return 1;
+    case 0xab73:
+      *out = 0x13a3;
+      return 1;
+    case 0xab74:
+      *out = 0x13a4;
+      return 1;
+    case 0xab75:
+      *out = 0x13a5;
+      return 1;
+    case 0xab76:
+      *out = 0x13a6;
+      return 1;
+    case 0xab77:
+      *out = 0x13a7;
+      return 1;
+    case 0xab78:
+      *out = 0x13a8;
+      return 1;
+    case 0xab79:
+      *out = 0x13a9;
+      return 1;
+    case 0xab7a:
+      *out = 0x13aa;
+      return 1;
+    case 0xab7b:
+      *out = 0x13ab;
+      return 1;
+    case 0xab7c:
+      *out = 0x13ac;
+      return 1;
+    case 0xab7d:
+      *out = 0x13ad;
+      return 1;
+    case 0xab7e:
+      *out = 0x13ae;
+      return 1;
+    case 0xab7f:
+      *out = 0x13af;
+      return 1;
+    case 0xab80:
+      *out = 0x13b0;
+      return 1;
+    case 0xab81:
+      *out = 0x13b1;
+      return 1;
+    case 0xab82:
+      *out = 0x13b2;
+      return 1;
+    case 0xab83:
+      *out = 0x13b3;
+      return 1;
+    case 0xab84:
+      *out = 0x13b4;
+      return 1;
+    case 0xab85:
+      *out = 0x13b5;
+      return 1;
+    case 0xab86:
+      *out = 0x13b6;
+      return 1;
+    case 0xab87:
+      *out = 0x13b7;
+      return 1;
+    case 0xab88:
+      *out = 0x13b8;
+      return 1;
+    case 0xab89:
+      *out = 0x13b9;
+      return 1;
+    case 0xab8a:
+      *out = 0x13ba;
+      return 1;
+    case 0xab8b:
+      *out = 0x13bb;
+      return 1;
+    case 0xab8c:
+      *out = 0x13bc;
+      return 1;
+    case 0xab8d:
+      *out = 0x13bd;
+      return 1;
+    case 0xab8e:
+      *out = 0x13be;
+      return 1;
+    case 0xab8f:
+      *out = 0x13bf;
+      return 1;
+    case 0xab90:
+      *out = 0x13c0;
+      return 1;
+    case 0xab91:
+      *out = 0x13c1;
+      return 1;
+    case 0xab92:
+      *out = 0x13c2;
+      return 1;
+    case 0xab93:
+      *out = 0x13c3;
+      return 1;
+    case 0xab94:
+      *out = 0x13c4;
+      return 1;
+    case 0xab95:
+      *out = 0x13c5;
+      return 1;
+    case 0xab96:
+      *out = 0x13c6;
+      return 1;
+    case 0xab97:
+      *out = 0x13c7;
+      return 1;
+    case 0xab98:
+      *out = 0x13c8;
+      return 1;
+    case 0xab99:
+      *out = 0x13c9;
+      return 1;
+    case 0xab9a:
+      *out = 0x13ca;
+      return 1;
+    case 0xab9b:
+      *out = 0x13cb;
+      return 1;
+    case 0xab9c:
+      *out = 0x13cc;
+      return 1;
+    case 0xab9d:
+      *out = 0x13cd;
+      return 1;
+    case 0xab9e:
+      *out = 0x13ce;
+      return 1;
+    case 0xab9f:
+      *out = 0x13cf;
+      return 1;
+    case 0xaba0:
+      *out = 0x13d0;
+      return 1;
+    case 0xaba1:
+      *out = 0x13d1;
+      return 1;
+    case 0xaba2:
+      *out = 0x13d2;
+      return 1;
+    case 0xaba3:
+      *out = 0x13d3;
+      return 1;
+    case 0xaba4:
+      *out = 0x13d4;
+      return 1;
+    case 0xaba5:
+      *out = 0x13d5;
+      return 1;
+    case 0xaba6:
+      *out = 0x13d6;
+      return 1;
+    case 0xaba7:
+      *out = 0x13d7;
+      return 1;
+    case 0xaba8:
+      *out = 0x13d8;
+      return 1;
+    case 0xaba9:
+      *out = 0x13d9;
+      return 1;
+    case 0xabaa:
+      *out = 0x13da;
+      return 1;
+    case 0xabab:
+      *out = 0x13db;
+      return 1;
+    case 0xabac:
+      *out = 0x13dc;
+      return 1;
+    case 0xabad:
+      *out = 0x13dd;
+      return 1;
+    case 0xabae:
+      *out = 0x13de;
+      return 1;
+    case 0xabaf:
+      *out = 0x13df;
+      return 1;
+    case 0xabb0:
+      *out = 0x13e0;
+      return 1;
+    case 0xabb1:
+      *out = 0x13e1;
+      return 1;
+    case 0xabb2:
+      *out = 0x13e2;
+      return 1;
+    case 0xabb3:
+      *out = 0x13e3;
+      return 1;
+    case 0xabb4:
+      *out = 0x13e4;
+      return 1;
+    case 0xabb5:
+      *out = 0x13e5;
+      return 1;
+    case 0xabb6:
+      *out = 0x13e6;
+      return 1;
+    case 0xabb7:
+      *out = 0x13e7;
+      return 1;
+    case 0xabb8:
+      *out = 0x13e8;
+      return 1;
+    case 0xabb9:
+      *out = 0x13e9;
+      return 1;
+    case 0xabba:
+      *out = 0x13ea;
+      return 1;
+    case 0xabbb:
+      *out = 0x13eb;
+      return 1;
+    case 0xabbc:
+      *out = 0x13ec;
+      return 1;
+    case 0xabbd:
+      *out = 0x13ed;
+      return 1;
+    case 0xabbe:
+      *out = 0x13ee;
+      return 1;
+    case 0xabbf:
+      *out = 0x13ef;
+      return 1;
+    case 0xfb00:
+      out[ 0 ] = 0x66;
+      out[ 1 ] = 0x66;
+      return 2;
+    case 0xfb01:
+      out[ 0 ] = 0x66;
+      out[ 1 ] = 0x69;
+      return 2;
+    case 0xfb02:
+      out[ 0 ] = 0x66;
+      out[ 1 ] = 0x6c;
+      return 2;
+    case 0xfb03:
+      out[ 0 ] = 0x66;
+      out[ 1 ] = 0x66;
+      out[ 2 ] = 0x69;
+      return 3;
+    case 0xfb04:
+      out[ 0 ] = 0x66;
+      out[ 1 ] = 0x66;
+      out[ 2 ] = 0x6c;
+      return 3;
+    case 0xfb05:
+      out[ 0 ] = 0x73;
+      out[ 1 ] = 0x74;
+      return 2;
+    case 0xfb06:
+      out[ 0 ] = 0x73;
+      out[ 1 ] = 0x74;
+      return 2;
+    case 0xfb13:
+      out[ 0 ] = 0x574;
+      out[ 1 ] = 0x576;
+      return 2;
+    case 0xfb14:
+      out[ 0 ] = 0x574;
+      out[ 1 ] = 0x565;
+      return 2;
+    case 0xfb15:
+      out[ 0 ] = 0x574;
+      out[ 1 ] = 0x56b;
+      return 2;
+    case 0xfb16:
+      out[ 0 ] = 0x57e;
+      out[ 1 ] = 0x576;
+      return 2;
+    case 0xfb17:
+      out[ 0 ] = 0x574;
+      out[ 1 ] = 0x56d;
+      return 2;
+    case 0xff21:
+      *out = 0xff41;
+      return 1;
+    case 0xff22:
+      *out = 0xff42;
+      return 1;
+    case 0xff23:
+      *out = 0xff43;
+      return 1;
+    case 0xff24:
+      *out = 0xff44;
+      return 1;
+    case 0xff25:
+      *out = 0xff45;
+      return 1;
+    case 0xff26:
+      *out = 0xff46;
+      return 1;
+    case 0xff27:
+      *out = 0xff47;
+      return 1;
+    case 0xff28:
+      *out = 0xff48;
+      return 1;
+    case 0xff29:
+      *out = 0xff49;
+      return 1;
+    case 0xff2a:
+      *out = 0xff4a;
+      return 1;
+    case 0xff2b:
+      *out = 0xff4b;
+      return 1;
+    case 0xff2c:
+      *out = 0xff4c;
+      return 1;
+    case 0xff2d:
+      *out = 0xff4d;
+      return 1;
+    case 0xff2e:
+      *out = 0xff4e;
+      return 1;
+    case 0xff2f:
+      *out = 0xff4f;
+      return 1;
+    case 0xff30:
+      *out = 0xff50;
+      return 1;
+    case 0xff31:
+      *out = 0xff51;
+      return 1;
+    case 0xff32:
+      *out = 0xff52;
+      return 1;
+    case 0xff33:
+      *out = 0xff53;
+      return 1;
+    case 0xff34:
+      *out = 0xff54;
+      return 1;
+    case 0xff35:
+      *out = 0xff55;
+      return 1;
+    case 0xff36:
+      *out = 0xff56;
+      return 1;
+    case 0xff37:
+      *out = 0xff57;
+      return 1;
+    case 0xff38:
+      *out = 0xff58;
+      return 1;
+    case 0xff39:
+      *out = 0xff59;
+      return 1;
+    case 0xff3a:
+      *out = 0xff5a;
+      return 1;
+    case 0x10400:
+      *out = 0x10428;
+      return 1;
+    case 0x10401:
+      *out = 0x10429;
+      return 1;
+    case 0x10402:
+      *out = 0x1042a;
+      return 1;
+    case 0x10403:
+      *out = 0x1042b;
+      return 1;
+    case 0x10404:
+      *out = 0x1042c;
+      return 1;
+    case 0x10405:
+      *out = 0x1042d;
+      return 1;
+    case 0x10406:
+      *out = 0x1042e;
+      return 1;
+    case 0x10407:
+      *out = 0x1042f;
+      return 1;
+    case 0x10408:
+      *out = 0x10430;
+      return 1;
+    case 0x10409:
+      *out = 0x10431;
+      return 1;
+    case 0x1040a:
+      *out = 0x10432;
+      return 1;
+    case 0x1040b:
+      *out = 0x10433;
+      return 1;
+    case 0x1040c:
+      *out = 0x10434;
+      return 1;
+    case 0x1040d:
+      *out = 0x10435;
+      return 1;
+    case 0x1040e:
+      *out = 0x10436;
+      return 1;
+    case 0x1040f:
+      *out = 0x10437;
+      return 1;
+    case 0x10410:
+      *out = 0x10438;
+      return 1;
+    case 0x10411:
+      *out = 0x10439;
+      return 1;
+    case 0x10412:
+      *out = 0x1043a;
+      return 1;
+    case 0x10413:
+      *out = 0x1043b;
+      return 1;
+    case 0x10414:
+      *out = 0x1043c;
+      return 1;
+    case 0x10415:
+      *out = 0x1043d;
+      return 1;
+    case 0x10416:
+      *out = 0x1043e;
+      return 1;
+    case 0x10417:
+      *out = 0x1043f;
+      return 1;
+    case 0x10418:
+      *out = 0x10440;
+      return 1;
+    case 0x10419:
+      *out = 0x10441;
+      return 1;
+    case 0x1041a:
+      *out = 0x10442;
+      return 1;
+    case 0x1041b:
+      *out = 0x10443;
+      return 1;
+    case 0x1041c:
+      *out = 0x10444;
+      return 1;
+    case 0x1041d:
+      *out = 0x10445;
+      return 1;
+    case 0x1041e:
+      *out = 0x10446;
+      return 1;
+    case 0x1041f:
+      *out = 0x10447;
+      return 1;
+    case 0x10420:
+      *out = 0x10448;
+      return 1;
+    case 0x10421:
+      *out = 0x10449;
+      return 1;
+    case 0x10422:
+      *out = 0x1044a;
+      return 1;
+    case 0x10423:
+      *out = 0x1044b;
+      return 1;
+    case 0x10424:
+      *out = 0x1044c;
+      return 1;
+    case 0x10425:
+      *out = 0x1044d;
+      return 1;
+    case 0x10426:
+      *out = 0x1044e;
+      return 1;
+    case 0x10427:
+      *out = 0x1044f;
+      return 1;
+    case 0x104b0:
+      *out = 0x104d8;
+      return 1;
+    case 0x104b1:
+      *out = 0x104d9;
+      return 1;
+    case 0x104b2:
+      *out = 0x104da;
+      return 1;
+    case 0x104b3:
+      *out = 0x104db;
+      return 1;
+    case 0x104b4:
+      *out = 0x104dc;
+      return 1;
+    case 0x104b5:
+      *out = 0x104dd;
+      return 1;
+    case 0x104b6:
+      *out = 0x104de;
+      return 1;
+    case 0x104b7:
+      *out = 0x104df;
+      return 1;
+    case 0x104b8:
+      *out = 0x104e0;
+      return 1;
+    case 0x104b9:
+      *out = 0x104e1;
+      return 1;
+    case 0x104ba:
+      *out = 0x104e2;
+      return 1;
+    case 0x104bb:
+      *out = 0x104e3;
+      return 1;
+    case 0x104bc:
+      *out = 0x104e4;
+      return 1;
+    case 0x104bd:
+      *out = 0x104e5;
+      return 1;
+    case 0x104be:
+      *out = 0x104e6;
+      return 1;
+    case 0x104bf:
+      *out = 0x104e7;
+      return 1;
+    case 0x104c0:
+      *out = 0x104e8;
+      return 1;
+    case 0x104c1:
+      *out = 0x104e9;
+      return 1;
+    case 0x104c2:
+      *out = 0x104ea;
+      return 1;
+    case 0x104c3:
+      *out = 0x104eb;
+      return 1;
+    case 0x104c4:
+      *out = 0x104ec;
+      return 1;
+    case 0x104c5:
+      *out = 0x104ed;
+      return 1;
+    case 0x104c6:
+      *out = 0x104ee;
+      return 1;
+    case 0x104c7:
+      *out = 0x104ef;
+      return 1;
+    case 0x104c8:
+      *out = 0x104f0;
+      return 1;
+    case 0x104c9:
+      *out = 0x104f1;
+      return 1;
+    case 0x104ca:
+      *out = 0x104f2;
+      return 1;
+    case 0x104cb:
+      *out = 0x104f3;
+      return 1;
+    case 0x104cc:
+      *out = 0x104f4;
+      return 1;
+    case 0x104cd:
+      *out = 0x104f5;
+      return 1;
+    case 0x104ce:
+      *out = 0x104f6;
+      return 1;
+    case 0x104cf:
+      *out = 0x104f7;
+      return 1;
+    case 0x104d0:
+      *out = 0x104f8;
+      return 1;
+    case 0x104d1:
+      *out = 0x104f9;
+      return 1;
+    case 0x104d2:
+      *out = 0x104fa;
+      return 1;
+    case 0x104d3:
+      *out = 0x104fb;
+      return 1;
+    case 0x10570:
+      *out = 0x10597;
+      return 1;
+    case 0x10571:
+      *out = 0x10598;
+      return 1;
+    case 0x10572:
+      *out = 0x10599;
+      return 1;
+    case 0x10573:
+      *out = 0x1059a;
+      return 1;
+    case 0x10574:
+      *out = 0x1059b;
+      return 1;
+    case 0x10575:
+      *out = 0x1059c;
+      return 1;
+    case 0x10576:
+      *out = 0x1059d;
+      return 1;
+    case 0x10577:
+      *out = 0x1059e;
+      return 1;
+    case 0x10578:
+      *out = 0x1059f;
+      return 1;
+    case 0x10579:
+      *out = 0x105a0;
+      return 1;
+    case 0x1057a:
+      *out = 0x105a1;
+      return 1;
+    case 0x1057c:
+      *out = 0x105a3;
+      return 1;
+    case 0x1057d:
+      *out = 0x105a4;
+      return 1;
+    case 0x1057e:
+      *out = 0x105a5;
+      return 1;
+    case 0x1057f:
+      *out = 0x105a6;
+      return 1;
+    case 0x10580:
+      *out = 0x105a7;
+      return 1;
+    case 0x10581:
+      *out = 0x105a8;
+      return 1;
+    case 0x10582:
+      *out = 0x105a9;
+      return 1;
+    case 0x10583:
+      *out = 0x105aa;
+      return 1;
+    case 0x10584:
+      *out = 0x105ab;
+      return 1;
+    case 0x10585:
+      *out = 0x105ac;
+      return 1;
+    case 0x10586:
+      *out = 0x105ad;
+      return 1;
+    case 0x10587:
+      *out = 0x105ae;
+      return 1;
+    case 0x10588:
+      *out = 0x105af;
+      return 1;
+    case 0x10589:
+      *out = 0x105b0;
+      return 1;
+    case 0x1058a:
+      *out = 0x105b1;
+      return 1;
+    case 0x1058c:
+      *out = 0x105b3;
+      return 1;
+    case 0x1058d:
+      *out = 0x105b4;
+      return 1;
+    case 0x1058e:
+      *out = 0x105b5;
+      return 1;
+    case 0x1058f:
+      *out = 0x105b6;
+      return 1;
+    case 0x10590:
+      *out = 0x105b7;
+      return 1;
+    case 0x10591:
+      *out = 0x105b8;
+      return 1;
+    case 0x10592:
+      *out = 0x105b9;
+      return 1;
+    case 0x10594:
+      *out = 0x105bb;
+      return 1;
+    case 0x10595:
+      *out = 0x105bc;
+      return 1;
+    case 0x10c80:
+      *out = 0x10cc0;
+      return 1;
+    case 0x10c81:
+      *out = 0x10cc1;
+      return 1;
+    case 0x10c82:
+      *out = 0x10cc2;
+      return 1;
+    case 0x10c83:
+      *out = 0x10cc3;
+      return 1;
+    case 0x10c84:
+      *out = 0x10cc4;
+      return 1;
+    case 0x10c85:
+      *out = 0x10cc5;
+      return 1;
+    case 0x10c86:
+      *out = 0x10cc6;
+      return 1;
+    case 0x10c87:
+      *out = 0x10cc7;
+      return 1;
+    case 0x10c88:
+      *out = 0x10cc8;
+      return 1;
+    case 0x10c89:
+      *out = 0x10cc9;
+      return 1;
+    case 0x10c8a:
+      *out = 0x10cca;
+      return 1;
+    case 0x10c8b:
+      *out = 0x10ccb;
+      return 1;
+    case 0x10c8c:
+      *out = 0x10ccc;
+      return 1;
+    case 0x10c8d:
+      *out = 0x10ccd;
+      return 1;
+    case 0x10c8e:
+      *out = 0x10cce;
+      return 1;
+    case 0x10c8f:
+      *out = 0x10ccf;
+      return 1;
+    case 0x10c90:
+      *out = 0x10cd0;
+      return 1;
+    case 0x10c91:
+      *out = 0x10cd1;
+      return 1;
+    case 0x10c92:
+      *out = 0x10cd2;
+      return 1;
+    case 0x10c93:
+      *out = 0x10cd3;
+      return 1;
+    case 0x10c94:
+      *out = 0x10cd4;
+      return 1;
+    case 0x10c95:
+      *out = 0x10cd5;
+      return 1;
+    case 0x10c96:
+      *out = 0x10cd6;
+      return 1;
+    case 0x10c97:
+      *out = 0x10cd7;
+      return 1;
+    case 0x10c98:
+      *out = 0x10cd8;
+      return 1;
+    case 0x10c99:
+      *out = 0x10cd9;
+      return 1;
+    case 0x10c9a:
+      *out = 0x10cda;
+      return 1;
+    case 0x10c9b:
+      *out = 0x10cdb;
+      return 1;
+    case 0x10c9c:
+      *out = 0x10cdc;
+      return 1;
+    case 0x10c9d:
+      *out = 0x10cdd;
+      return 1;
+    case 0x10c9e:
+      *out = 0x10cde;
+      return 1;
+    case 0x10c9f:
+      *out = 0x10cdf;
+      return 1;
+    case 0x10ca0:
+      *out = 0x10ce0;
+      return 1;
+    case 0x10ca1:
+      *out = 0x10ce1;
+      return 1;
+    case 0x10ca2:
+      *out = 0x10ce2;
+      return 1;
+    case 0x10ca3:
+      *out = 0x10ce3;
+      return 1;
+    case 0x10ca4:
+      *out = 0x10ce4;
+      return 1;
+    case 0x10ca5:
+      *out = 0x10ce5;
+      return 1;
+    case 0x10ca6:
+      *out = 0x10ce6;
+      return 1;
+    case 0x10ca7:
+      *out = 0x10ce7;
+      return 1;
+    case 0x10ca8:
+      *out = 0x10ce8;
+      return 1;
+    case 0x10ca9:
+      *out = 0x10ce9;
+      return 1;
+    case 0x10caa:
+      *out = 0x10cea;
+      return 1;
+    case 0x10cab:
+      *out = 0x10ceb;
+      return 1;
+    case 0x10cac:
+      *out = 0x10cec;
+      return 1;
+    case 0x10cad:
+      *out = 0x10ced;
+      return 1;
+    case 0x10cae:
+      *out = 0x10cee;
+      return 1;
+    case 0x10caf:
+      *out = 0x10cef;
+      return 1;
+    case 0x10cb0:
+      *out = 0x10cf0;
+      return 1;
+    case 0x10cb1:
+      *out = 0x10cf1;
+      return 1;
+    case 0x10cb2:
+      *out = 0x10cf2;
+      return 1;
+    case 0x118a0:
+      *out = 0x118c0;
+      return 1;
+    case 0x118a1:
+      *out = 0x118c1;
+      return 1;
+    case 0x118a2:
+      *out = 0x118c2;
+      return 1;
+    case 0x118a3:
+      *out = 0x118c3;
+      return 1;
+    case 0x118a4:
+      *out = 0x118c4;
+      return 1;
+    case 0x118a5:
+      *out = 0x118c5;
+      return 1;
+    case 0x118a6:
+      *out = 0x118c6;
+      return 1;
+    case 0x118a7:
+      *out = 0x118c7;
+      return 1;
+    case 0x118a8:
+      *out = 0x118c8;
+      return 1;
+    case 0x118a9:
+      *out = 0x118c9;
+      return 1;
+    case 0x118aa:
+      *out = 0x118ca;
+      return 1;
+    case 0x118ab:
+      *out = 0x118cb;
+      return 1;
+    case 0x118ac:
+      *out = 0x118cc;
+      return 1;
+    case 0x118ad:
+      *out = 0x118cd;
+      return 1;
+    case 0x118ae:
+      *out = 0x118ce;
+      return 1;
+    case 0x118af:
+      *out = 0x118cf;
+      return 1;
+    case 0x118b0:
+      *out = 0x118d0;
+      return 1;
+    case 0x118b1:
+      *out = 0x118d1;
+      return 1;
+    case 0x118b2:
+      *out = 0x118d2;
+      return 1;
+    case 0x118b3:
+      *out = 0x118d3;
+      return 1;
+    case 0x118b4:
+      *out = 0x118d4;
+      return 1;
+    case 0x118b5:
+      *out = 0x118d5;
+      return 1;
+    case 0x118b6:
+      *out = 0x118d6;
+      return 1;
+    case 0x118b7:
+      *out = 0x118d7;
+      return 1;
+    case 0x118b8:
+      *out = 0x118d8;
+      return 1;
+    case 0x118b9:
+      *out = 0x118d9;
+      return 1;
+    case 0x118ba:
+      *out = 0x118da;
+      return 1;
+    case 0x118bb:
+      *out = 0x118db;
+      return 1;
+    case 0x118bc:
+      *out = 0x118dc;
+      return 1;
+    case 0x118bd:
+      *out = 0x118dd;
+      return 1;
+    case 0x118be:
+      *out = 0x118de;
+      return 1;
+    case 0x118bf:
+      *out = 0x118df;
+      return 1;
+    case 0x16e40:
+      *out = 0x16e60;
+      return 1;
+    case 0x16e41:
+      *out = 0x16e61;
+      return 1;
+    case 0x16e42:
+      *out = 0x16e62;
+      return 1;
+    case 0x16e43:
+      *out = 0x16e63;
+      return 1;
+    case 0x16e44:
+      *out = 0x16e64;
+      return 1;
+    case 0x16e45:
+      *out = 0x16e65;
+      return 1;
+    case 0x16e46:
+      *out = 0x16e66;
+      return 1;
+    case 0x16e47:
+      *out = 0x16e67;
+      return 1;
+    case 0x16e48:
+      *out = 0x16e68;
+      return 1;
+    case 0x16e49:
+      *out = 0x16e69;
+      return 1;
+    case 0x16e4a:
+      *out = 0x16e6a;
+      return 1;
+    case 0x16e4b:
+      *out = 0x16e6b;
+      return 1;
+    case 0x16e4c:
+      *out = 0x16e6c;
+      return 1;
+    case 0x16e4d:
+      *out = 0x16e6d;
+      return 1;
+    case 0x16e4e:
+      *out = 0x16e6e;
+      return 1;
+    case 0x16e4f:
+      *out = 0x16e6f;
+      return 1;
+    case 0x16e50:
+      *out = 0x16e70;
+      return 1;
+    case 0x16e51:
+      *out = 0x16e71;
+      return 1;
+    case 0x16e52:
+      *out = 0x16e72;
+      return 1;
+    case 0x16e53:
+      *out = 0x16e73;
+      return 1;
+    case 0x16e54:
+      *out = 0x16e74;
+      return 1;
+    case 0x16e55:
+      *out = 0x16e75;
+      return 1;
+    case 0x16e56:
+      *out = 0x16e76;
+      return 1;
+    case 0x16e57:
+      *out = 0x16e77;
+      return 1;
+    case 0x16e58:
+      *out = 0x16e78;
+      return 1;
+    case 0x16e59:
+      *out = 0x16e79;
+      return 1;
+    case 0x16e5a:
+      *out = 0x16e7a;
+      return 1;
+    case 0x16e5b:
+      *out = 0x16e7b;
+      return 1;
+    case 0x16e5c:
+      *out = 0x16e7c;
+      return 1;
+    case 0x16e5d:
+      *out = 0x16e7d;
+      return 1;
+    case 0x16e5e:
+      *out = 0x16e7e;
+      return 1;
+    case 0x16e5f:
+      *out = 0x16e7f;
+      return 1;
+    case 0x1e900:
+      *out = 0x1e922;
+      return 1;
+    case 0x1e901:
+      *out = 0x1e923;
+      return 1;
+    case 0x1e902:
+      *out = 0x1e924;
+      return 1;
+    case 0x1e903:
+      *out = 0x1e925;
+      return 1;
+    case 0x1e904:
+      *out = 0x1e926;
+      return 1;
+    case 0x1e905:
+      *out = 0x1e927;
+      return 1;
+    case 0x1e906:
+      *out = 0x1e928;
+      return 1;
+    case 0x1e907:
+      *out = 0x1e929;
+      return 1;
+    case 0x1e908:
+      *out = 0x1e92a;
+      return 1;
+    case 0x1e909:
+      *out = 0x1e92b;
+      return 1;
+    case 0x1e90a:
+      *out = 0x1e92c;
+      return 1;
+    case 0x1e90b:
+      *out = 0x1e92d;
+      return 1;
+    case 0x1e90c:
+      *out = 0x1e92e;
+      return 1;
+    case 0x1e90d:
+      *out = 0x1e92f;
+      return 1;
+    case 0x1e90e:
+      *out = 0x1e930;
+      return 1;
+    case 0x1e90f:
+      *out = 0x1e931;
+      return 1;
+    case 0x1e910:
+      *out = 0x1e932;
+      return 1;
+    case 0x1e911:
+      *out = 0x1e933;
+      return 1;
+    case 0x1e912:
+      *out = 0x1e934;
+      return 1;
+    case 0x1e913:
+      *out = 0x1e935;
+      return 1;
+    case 0x1e914:
+      *out = 0x1e936;
+      return 1;
+    case 0x1e915:
+      *out = 0x1e937;
+      return 1;
+    case 0x1e916:
+      *out = 0x1e938;
+      return 1;
+    case 0x1e917:
+      *out = 0x1e939;
+      return 1;
+    case 0x1e918:
+      *out = 0x1e93a;
+      return 1;
+    case 0x1e919:
+      *out = 0x1e93b;
+      return 1;
+    case 0x1e91a:
+      *out = 0x1e93c;
+      return 1;
+    case 0x1e91b:
+      *out = 0x1e93d;
+      return 1;
+    case 0x1e91c:
+      *out = 0x1e93e;
+      return 1;
+    case 0x1e91d:
+      *out = 0x1e93f;
+      return 1;
+    case 0x1e91e:
+      *out = 0x1e940;
+      return 1;
+    case 0x1e91f:
+      *out = 0x1e941;
+      return 1;
+    case 0x1e920:
+      *out = 0x1e942;
+      return 1;
+    case 0x1e921:
+      *out = 0x1e943;
+      return 1;
+    default:
+      *out = in;
+      return 1;
   }
 }
 
-wchar foldCaseSimple( wchar in )
+char32_t foldCaseSimple( char32_t in )
 {
-  switch( in )
-  {
-    case 0x41: return 0x61;
-    case 0x42: return 0x62;
-    case 0x43: return 0x63;
-    case 0x44: return 0x64;
-    case 0x45: return 0x65;
-    case 0x46: return 0x66;
-    case 0x47: return 0x67;
-    case 0x48: return 0x68;
-    case 0x49: return 0x69;
-    case 0x4a: return 0x6a;
-    case 0x4b: return 0x6b;
-    case 0x4c: return 0x6c;
-    case 0x4d: return 0x6d;
-    case 0x4e: return 0x6e;
-    case 0x4f: return 0x6f;
-    case 0x50: return 0x70;
-    case 0x51: return 0x71;
-    case 0x52: return 0x72;
-    case 0x53: return 0x73;
-    case 0x54: return 0x74;
-    case 0x55: return 0x75;
-    case 0x56: return 0x76;
-    case 0x57: return 0x77;
-    case 0x58: return 0x78;
-    case 0x59: return 0x79;
-    case 0x5a: return 0x7a;
-    case 0xb5: return 0x3bc;
-    case 0xc0: return 0xe0;
-    case 0xc1: return 0xe1;
-    case 0xc2: return 0xe2;
-    case 0xc3: return 0xe3;
-    case 0xc4: return 0xe4;
-    case 0xc5: return 0xe5;
-    case 0xc6: return 0xe6;
-    case 0xc7: return 0xe7;
-    case 0xc8: return 0xe8;
-    case 0xc9: return 0xe9;
-    case 0xca: return 0xea;
-    case 0xcb: return 0xeb;
-    case 0xcc: return 0xec;
-    case 0xcd: return 0xed;
-    case 0xce: return 0xee;
-    case 0xcf: return 0xef;
-    case 0xd0: return 0xf0;
-    case 0xd1: return 0xf1;
-    case 0xd2: return 0xf2;
-    case 0xd3: return 0xf3;
-    case 0xd4: return 0xf4;
-    case 0xd5: return 0xf5;
-    case 0xd6: return 0xf6;
-    case 0xd8: return 0xf8;
-    case 0xd9: return 0xf9;
-    case 0xda: return 0xfa;
-    case 0xdb: return 0xfb;
-    case 0xdc: return 0xfc;
-    case 0xdd: return 0xfd;
-    case 0xde: return 0xfe;
-    case 0x100: return 0x101;
-    case 0x102: return 0x103;
-    case 0x104: return 0x105;
-    case 0x106: return 0x107;
-    case 0x108: return 0x109;
-    case 0x10a: return 0x10b;
-    case 0x10c: return 0x10d;
-    case 0x10e: return 0x10f;
-    case 0x110: return 0x111;
-    case 0x112: return 0x113;
-    case 0x114: return 0x115;
-    case 0x116: return 0x117;
-    case 0x118: return 0x119;
-    case 0x11a: return 0x11b;
-    case 0x11c: return 0x11d;
-    case 0x11e: return 0x11f;
-    case 0x120: return 0x121;
-    case 0x122: return 0x123;
-    case 0x124: return 0x125;
-    case 0x126: return 0x127;
-    case 0x128: return 0x129;
-    case 0x12a: return 0x12b;
-    case 0x12c: return 0x12d;
-    case 0x12e: return 0x12f;
-    case 0x132: return 0x133;
-    case 0x134: return 0x135;
-    case 0x136: return 0x137;
-    case 0x139: return 0x13a;
-    case 0x13b: return 0x13c;
-    case 0x13d: return 0x13e;
-    case 0x13f: return 0x140;
-    case 0x141: return 0x142;
-    case 0x143: return 0x144;
-    case 0x145: return 0x146;
-    case 0x147: return 0x148;
-    case 0x14a: return 0x14b;
-    case 0x14c: return 0x14d;
-    case 0x14e: return 0x14f;
-    case 0x150: return 0x151;
-    case 0x152: return 0x153;
-    case 0x154: return 0x155;
-    case 0x156: return 0x157;
-    case 0x158: return 0x159;
-    case 0x15a: return 0x15b;
-    case 0x15c: return 0x15d;
-    case 0x15e: return 0x15f;
-    case 0x160: return 0x161;
-    case 0x162: return 0x163;
-    case 0x164: return 0x165;
-    case 0x166: return 0x167;
-    case 0x168: return 0x169;
-    case 0x16a: return 0x16b;
-    case 0x16c: return 0x16d;
-    case 0x16e: return 0x16f;
-    case 0x170: return 0x171;
-    case 0x172: return 0x173;
-    case 0x174: return 0x175;
-    case 0x176: return 0x177;
-    case 0x178: return 0xff;
-    case 0x179: return 0x17a;
-    case 0x17b: return 0x17c;
-    case 0x17d: return 0x17e;
-    case 0x17f: return 0x73;
-    case 0x181: return 0x253;
-    case 0x182: return 0x183;
-    case 0x184: return 0x185;
-    case 0x186: return 0x254;
-    case 0x187: return 0x188;
-    case 0x189: return 0x256;
-    case 0x18a: return 0x257;
-    case 0x18b: return 0x18c;
-    case 0x18e: return 0x1dd;
-    case 0x18f: return 0x259;
-    case 0x190: return 0x25b;
-    case 0x191: return 0x192;
-    case 0x193: return 0x260;
-    case 0x194: return 0x263;
-    case 0x196: return 0x269;
-    case 0x197: return 0x268;
-    case 0x198: return 0x199;
-    case 0x19c: return 0x26f;
-    case 0x19d: return 0x272;
-    case 0x19f: return 0x275;
-    case 0x1a0: return 0x1a1;
-    case 0x1a2: return 0x1a3;
-    case 0x1a4: return 0x1a5;
-    case 0x1a6: return 0x280;
-    case 0x1a7: return 0x1a8;
-    case 0x1a9: return 0x283;
-    case 0x1ac: return 0x1ad;
-    case 0x1ae: return 0x288;
-    case 0x1af: return 0x1b0;
-    case 0x1b1: return 0x28a;
-    case 0x1b2: return 0x28b;
-    case 0x1b3: return 0x1b4;
-    case 0x1b5: return 0x1b6;
-    case 0x1b7: return 0x292;
-    case 0x1b8: return 0x1b9;
-    case 0x1bc: return 0x1bd;
-    case 0x1c4: return 0x1c6;
-    case 0x1c5: return 0x1c6;
-    case 0x1c7: return 0x1c9;
-    case 0x1c8: return 0x1c9;
-    case 0x1ca: return 0x1cc;
-    case 0x1cb: return 0x1cc;
-    case 0x1cd: return 0x1ce;
-    case 0x1cf: return 0x1d0;
-    case 0x1d1: return 0x1d2;
-    case 0x1d3: return 0x1d4;
-    case 0x1d5: return 0x1d6;
-    case 0x1d7: return 0x1d8;
-    case 0x1d9: return 0x1da;
-    case 0x1db: return 0x1dc;
-    case 0x1de: return 0x1df;
-    case 0x1e0: return 0x1e1;
-    case 0x1e2: return 0x1e3;
-    case 0x1e4: return 0x1e5;
-    case 0x1e6: return 0x1e7;
-    case 0x1e8: return 0x1e9;
-    case 0x1ea: return 0x1eb;
-    case 0x1ec: return 0x1ed;
-    case 0x1ee: return 0x1ef;
-    case 0x1f1: return 0x1f3;
-    case 0x1f2: return 0x1f3;
-    case 0x1f4: return 0x1f5;
-    case 0x1f6: return 0x195;
-    case 0x1f7: return 0x1bf;
-    case 0x1f8: return 0x1f9;
-    case 0x1fa: return 0x1fb;
-    case 0x1fc: return 0x1fd;
-    case 0x1fe: return 0x1ff;
-    case 0x200: return 0x201;
-    case 0x202: return 0x203;
-    case 0x204: return 0x205;
-    case 0x206: return 0x207;
-    case 0x208: return 0x209;
-    case 0x20a: return 0x20b;
-    case 0x20c: return 0x20d;
-    case 0x20e: return 0x20f;
-    case 0x210: return 0x211;
-    case 0x212: return 0x213;
-    case 0x214: return 0x215;
-    case 0x216: return 0x217;
-    case 0x218: return 0x219;
-    case 0x21a: return 0x21b;
-    case 0x21c: return 0x21d;
-    case 0x21e: return 0x21f;
-    case 0x220: return 0x19e;
-    case 0x222: return 0x223;
-    case 0x224: return 0x225;
-    case 0x226: return 0x227;
-    case 0x228: return 0x229;
-    case 0x22a: return 0x22b;
-    case 0x22c: return 0x22d;
-    case 0x22e: return 0x22f;
-    case 0x230: return 0x231;
-    case 0x232: return 0x233;
-    case 0x23a: return 0x2c65;
-    case 0x23b: return 0x23c;
-    case 0x23d: return 0x19a;
-    case 0x23e: return 0x2c66;
-    case 0x241: return 0x242;
-    case 0x243: return 0x180;
-    case 0x244: return 0x289;
-    case 0x245: return 0x28c;
-    case 0x246: return 0x247;
-    case 0x248: return 0x249;
-    case 0x24a: return 0x24b;
-    case 0x24c: return 0x24d;
-    case 0x24e: return 0x24f;
-    case 0x345: return 0x3b9;
-    case 0x370: return 0x371;
-    case 0x372: return 0x373;
-    case 0x376: return 0x377;
-    case 0x37f: return 0x3f3;
-    case 0x386: return 0x3ac;
-    case 0x388: return 0x3ad;
-    case 0x389: return 0x3ae;
-    case 0x38a: return 0x3af;
-    case 0x38c: return 0x3cc;
-    case 0x38e: return 0x3cd;
-    case 0x38f: return 0x3ce;
-    case 0x391: return 0x3b1;
-    case 0x392: return 0x3b2;
-    case 0x393: return 0x3b3;
-    case 0x394: return 0x3b4;
-    case 0x395: return 0x3b5;
-    case 0x396: return 0x3b6;
-    case 0x397: return 0x3b7;
-    case 0x398: return 0x3b8;
-    case 0x399: return 0x3b9;
-    case 0x39a: return 0x3ba;
-    case 0x39b: return 0x3bb;
-    case 0x39c: return 0x3bc;
-    case 0x39d: return 0x3bd;
-    case 0x39e: return 0x3be;
-    case 0x39f: return 0x3bf;
-    case 0x3a0: return 0x3c0;
-    case 0x3a1: return 0x3c1;
-    case 0x3a3: return 0x3c3;
-    case 0x3a4: return 0x3c4;
-    case 0x3a5: return 0x3c5;
-    case 0x3a6: return 0x3c6;
-    case 0x3a7: return 0x3c7;
-    case 0x3a8: return 0x3c8;
-    case 0x3a9: return 0x3c9;
-    case 0x3aa: return 0x3ca;
-    case 0x3ab: return 0x3cb;
-    case 0x3c2: return 0x3c3;
-    case 0x3cf: return 0x3d7;
-    case 0x3d0: return 0x3b2;
-    case 0x3d1: return 0x3b8;
-    case 0x3d5: return 0x3c6;
-    case 0x3d6: return 0x3c0;
-    case 0x3d8: return 0x3d9;
-    case 0x3da: return 0x3db;
-    case 0x3dc: return 0x3dd;
-    case 0x3de: return 0x3df;
-    case 0x3e0: return 0x3e1;
-    case 0x3e2: return 0x3e3;
-    case 0x3e4: return 0x3e5;
-    case 0x3e6: return 0x3e7;
-    case 0x3e8: return 0x3e9;
-    case 0x3ea: return 0x3eb;
-    case 0x3ec: return 0x3ed;
-    case 0x3ee: return 0x3ef;
-    case 0x3f0: return 0x3ba;
-    case 0x3f1: return 0x3c1;
-    case 0x3f4: return 0x3b8;
-    case 0x3f5: return 0x3b5;
-    case 0x3f7: return 0x3f8;
-    case 0x3f9: return 0x3f2;
-    case 0x3fa: return 0x3fb;
-    case 0x3fd: return 0x37b;
-    case 0x3fe: return 0x37c;
-    case 0x3ff: return 0x37d;
-    case 0x400: return 0x450;
-    case 0x401: return 0x451;
-    case 0x402: return 0x452;
-    case 0x403: return 0x453;
-    case 0x404: return 0x454;
-    case 0x405: return 0x455;
-    case 0x406: return 0x456;
-    case 0x407: return 0x457;
-    case 0x408: return 0x458;
-    case 0x409: return 0x459;
-    case 0x40a: return 0x45a;
-    case 0x40b: return 0x45b;
-    case 0x40c: return 0x45c;
-    case 0x40d: return 0x45d;
-    case 0x40e: return 0x45e;
-    case 0x40f: return 0x45f;
-    case 0x410: return 0x430;
-    case 0x411: return 0x431;
-    case 0x412: return 0x432;
-    case 0x413: return 0x433;
-    case 0x414: return 0x434;
-    case 0x415: return 0x435;
-    case 0x416: return 0x436;
-    case 0x417: return 0x437;
-    case 0x418: return 0x438;
-    case 0x419: return 0x439;
-    case 0x41a: return 0x43a;
-    case 0x41b: return 0x43b;
-    case 0x41c: return 0x43c;
-    case 0x41d: return 0x43d;
-    case 0x41e: return 0x43e;
-    case 0x41f: return 0x43f;
-    case 0x420: return 0x440;
-    case 0x421: return 0x441;
-    case 0x422: return 0x442;
-    case 0x423: return 0x443;
-    case 0x424: return 0x444;
-    case 0x425: return 0x445;
-    case 0x426: return 0x446;
-    case 0x427: return 0x447;
-    case 0x428: return 0x448;
-    case 0x429: return 0x449;
-    case 0x42a: return 0x44a;
-    case 0x42b: return 0x44b;
-    case 0x42c: return 0x44c;
-    case 0x42d: return 0x44d;
-    case 0x42e: return 0x44e;
-    case 0x42f: return 0x44f;
-    case 0x460: return 0x461;
-    case 0x462: return 0x463;
-    case 0x464: return 0x465;
-    case 0x466: return 0x467;
-    case 0x468: return 0x469;
-    case 0x46a: return 0x46b;
-    case 0x46c: return 0x46d;
-    case 0x46e: return 0x46f;
-    case 0x470: return 0x471;
-    case 0x472: return 0x473;
-    case 0x474: return 0x475;
-    case 0x476: return 0x477;
-    case 0x478: return 0x479;
-    case 0x47a: return 0x47b;
-    case 0x47c: return 0x47d;
-    case 0x47e: return 0x47f;
-    case 0x480: return 0x481;
-    case 0x48a: return 0x48b;
-    case 0x48c: return 0x48d;
-    case 0x48e: return 0x48f;
-    case 0x490: return 0x491;
-    case 0x492: return 0x493;
-    case 0x494: return 0x495;
-    case 0x496: return 0x497;
-    case 0x498: return 0x499;
-    case 0x49a: return 0x49b;
-    case 0x49c: return 0x49d;
-    case 0x49e: return 0x49f;
-    case 0x4a0: return 0x4a1;
-    case 0x4a2: return 0x4a3;
-    case 0x4a4: return 0x4a5;
-    case 0x4a6: return 0x4a7;
-    case 0x4a8: return 0x4a9;
-    case 0x4aa: return 0x4ab;
-    case 0x4ac: return 0x4ad;
-    case 0x4ae: return 0x4af;
-    case 0x4b0: return 0x4b1;
-    case 0x4b2: return 0x4b3;
-    case 0x4b4: return 0x4b5;
-    case 0x4b6: return 0x4b7;
-    case 0x4b8: return 0x4b9;
-    case 0x4ba: return 0x4bb;
-    case 0x4bc: return 0x4bd;
-    case 0x4be: return 0x4bf;
-    case 0x4c0: return 0x4cf;
-    case 0x4c1: return 0x4c2;
-    case 0x4c3: return 0x4c4;
-    case 0x4c5: return 0x4c6;
-    case 0x4c7: return 0x4c8;
-    case 0x4c9: return 0x4ca;
-    case 0x4cb: return 0x4cc;
-    case 0x4cd: return 0x4ce;
-    case 0x4d0: return 0x4d1;
-    case 0x4d2: return 0x4d3;
-    case 0x4d4: return 0x4d5;
-    case 0x4d6: return 0x4d7;
-    case 0x4d8: return 0x4d9;
-    case 0x4da: return 0x4db;
-    case 0x4dc: return 0x4dd;
-    case 0x4de: return 0x4df;
-    case 0x4e0: return 0x4e1;
-    case 0x4e2: return 0x4e3;
-    case 0x4e4: return 0x4e5;
-    case 0x4e6: return 0x4e7;
-    case 0x4e8: return 0x4e9;
-    case 0x4ea: return 0x4eb;
-    case 0x4ec: return 0x4ed;
-    case 0x4ee: return 0x4ef;
-    case 0x4f0: return 0x4f1;
-    case 0x4f2: return 0x4f3;
-    case 0x4f4: return 0x4f5;
-    case 0x4f6: return 0x4f7;
-    case 0x4f8: return 0x4f9;
-    case 0x4fa: return 0x4fb;
-    case 0x4fc: return 0x4fd;
-    case 0x4fe: return 0x4ff;
-    case 0x500: return 0x501;
-    case 0x502: return 0x503;
-    case 0x504: return 0x505;
-    case 0x506: return 0x507;
-    case 0x508: return 0x509;
-    case 0x50a: return 0x50b;
-    case 0x50c: return 0x50d;
-    case 0x50e: return 0x50f;
-    case 0x510: return 0x511;
-    case 0x512: return 0x513;
-    case 0x514: return 0x515;
-    case 0x516: return 0x517;
-    case 0x518: return 0x519;
-    case 0x51a: return 0x51b;
-    case 0x51c: return 0x51d;
-    case 0x51e: return 0x51f;
-    case 0x520: return 0x521;
-    case 0x522: return 0x523;
-    case 0x524: return 0x525;
-    case 0x526: return 0x527;
-    case 0x528: return 0x529;
-    case 0x52a: return 0x52b;
-    case 0x52c: return 0x52d;
-    case 0x52e: return 0x52f;
-    case 0x531: return 0x561;
-    case 0x532: return 0x562;
-    case 0x533: return 0x563;
-    case 0x534: return 0x564;
-    case 0x535: return 0x565;
-    case 0x536: return 0x566;
-    case 0x537: return 0x567;
-    case 0x538: return 0x568;
-    case 0x539: return 0x569;
-    case 0x53a: return 0x56a;
-    case 0x53b: return 0x56b;
-    case 0x53c: return 0x56c;
-    case 0x53d: return 0x56d;
-    case 0x53e: return 0x56e;
-    case 0x53f: return 0x56f;
-    case 0x540: return 0x570;
-    case 0x541: return 0x571;
-    case 0x542: return 0x572;
-    case 0x543: return 0x573;
-    case 0x544: return 0x574;
-    case 0x545: return 0x575;
-    case 0x546: return 0x576;
-    case 0x547: return 0x577;
-    case 0x548: return 0x578;
-    case 0x549: return 0x579;
-    case 0x54a: return 0x57a;
-    case 0x54b: return 0x57b;
-    case 0x54c: return 0x57c;
-    case 0x54d: return 0x57d;
-    case 0x54e: return 0x57e;
-    case 0x54f: return 0x57f;
-    case 0x550: return 0x580;
-    case 0x551: return 0x581;
-    case 0x552: return 0x582;
-    case 0x553: return 0x583;
-    case 0x554: return 0x584;
-    case 0x555: return 0x585;
-    case 0x556: return 0x586;
-    case 0x10a0: return 0x2d00;
-    case 0x10a1: return 0x2d01;
-    case 0x10a2: return 0x2d02;
-    case 0x10a3: return 0x2d03;
-    case 0x10a4: return 0x2d04;
-    case 0x10a5: return 0x2d05;
-    case 0x10a6: return 0x2d06;
-    case 0x10a7: return 0x2d07;
-    case 0x10a8: return 0x2d08;
-    case 0x10a9: return 0x2d09;
-    case 0x10aa: return 0x2d0a;
-    case 0x10ab: return 0x2d0b;
-    case 0x10ac: return 0x2d0c;
-    case 0x10ad: return 0x2d0d;
-    case 0x10ae: return 0x2d0e;
-    case 0x10af: return 0x2d0f;
-    case 0x10b0: return 0x2d10;
-    case 0x10b1: return 0x2d11;
-    case 0x10b2: return 0x2d12;
-    case 0x10b3: return 0x2d13;
-    case 0x10b4: return 0x2d14;
-    case 0x10b5: return 0x2d15;
-    case 0x10b6: return 0x2d16;
-    case 0x10b7: return 0x2d17;
-    case 0x10b8: return 0x2d18;
-    case 0x10b9: return 0x2d19;
-    case 0x10ba: return 0x2d1a;
-    case 0x10bb: return 0x2d1b;
-    case 0x10bc: return 0x2d1c;
-    case 0x10bd: return 0x2d1d;
-    case 0x10be: return 0x2d1e;
-    case 0x10bf: return 0x2d1f;
-    case 0x10c0: return 0x2d20;
-    case 0x10c1: return 0x2d21;
-    case 0x10c2: return 0x2d22;
-    case 0x10c3: return 0x2d23;
-    case 0x10c4: return 0x2d24;
-    case 0x10c5: return 0x2d25;
-    case 0x10c7: return 0x2d27;
-    case 0x10cd: return 0x2d2d;
-    case 0x13f8: return 0x13f0;
-    case 0x13f9: return 0x13f1;
-    case 0x13fa: return 0x13f2;
-    case 0x13fb: return 0x13f3;
-    case 0x13fc: return 0x13f4;
-    case 0x13fd: return 0x13f5;
-    case 0x1c80: return 0x432;
-    case 0x1c81: return 0x434;
-    case 0x1c82: return 0x43e;
-    case 0x1c83: return 0x441;
-    case 0x1c84: return 0x442;
-    case 0x1c85: return 0x442;
-    case 0x1c86: return 0x44a;
-    case 0x1c87: return 0x463;
-    case 0x1c88: return 0xa64b;
-    case 0x1c90: return 0x10d0;
-    case 0x1c91: return 0x10d1;
-    case 0x1c92: return 0x10d2;
-    case 0x1c93: return 0x10d3;
-    case 0x1c94: return 0x10d4;
-    case 0x1c95: return 0x10d5;
-    case 0x1c96: return 0x10d6;
-    case 0x1c97: return 0x10d7;
-    case 0x1c98: return 0x10d8;
-    case 0x1c99: return 0x10d9;
-    case 0x1c9a: return 0x10da;
-    case 0x1c9b: return 0x10db;
-    case 0x1c9c: return 0x10dc;
-    case 0x1c9d: return 0x10dd;
-    case 0x1c9e: return 0x10de;
-    case 0x1c9f: return 0x10df;
-    case 0x1ca0: return 0x10e0;
-    case 0x1ca1: return 0x10e1;
-    case 0x1ca2: return 0x10e2;
-    case 0x1ca3: return 0x10e3;
-    case 0x1ca4: return 0x10e4;
-    case 0x1ca5: return 0x10e5;
-    case 0x1ca6: return 0x10e6;
-    case 0x1ca7: return 0x10e7;
-    case 0x1ca8: return 0x10e8;
-    case 0x1ca9: return 0x10e9;
-    case 0x1caa: return 0x10ea;
-    case 0x1cab: return 0x10eb;
-    case 0x1cac: return 0x10ec;
-    case 0x1cad: return 0x10ed;
-    case 0x1cae: return 0x10ee;
-    case 0x1caf: return 0x10ef;
-    case 0x1cb0: return 0x10f0;
-    case 0x1cb1: return 0x10f1;
-    case 0x1cb2: return 0x10f2;
-    case 0x1cb3: return 0x10f3;
-    case 0x1cb4: return 0x10f4;
-    case 0x1cb5: return 0x10f5;
-    case 0x1cb6: return 0x10f6;
-    case 0x1cb7: return 0x10f7;
-    case 0x1cb8: return 0x10f8;
-    case 0x1cb9: return 0x10f9;
-    case 0x1cba: return 0x10fa;
-    case 0x1cbd: return 0x10fd;
-    case 0x1cbe: return 0x10fe;
-    case 0x1cbf: return 0x10ff;
-    case 0x1e00: return 0x1e01;
-    case 0x1e02: return 0x1e03;
-    case 0x1e04: return 0x1e05;
-    case 0x1e06: return 0x1e07;
-    case 0x1e08: return 0x1e09;
-    case 0x1e0a: return 0x1e0b;
-    case 0x1e0c: return 0x1e0d;
-    case 0x1e0e: return 0x1e0f;
-    case 0x1e10: return 0x1e11;
-    case 0x1e12: return 0x1e13;
-    case 0x1e14: return 0x1e15;
-    case 0x1e16: return 0x1e17;
-    case 0x1e18: return 0x1e19;
-    case 0x1e1a: return 0x1e1b;
-    case 0x1e1c: return 0x1e1d;
-    case 0x1e1e: return 0x1e1f;
-    case 0x1e20: return 0x1e21;
-    case 0x1e22: return 0x1e23;
-    case 0x1e24: return 0x1e25;
-    case 0x1e26: return 0x1e27;
-    case 0x1e28: return 0x1e29;
-    case 0x1e2a: return 0x1e2b;
-    case 0x1e2c: return 0x1e2d;
-    case 0x1e2e: return 0x1e2f;
-    case 0x1e30: return 0x1e31;
-    case 0x1e32: return 0x1e33;
-    case 0x1e34: return 0x1e35;
-    case 0x1e36: return 0x1e37;
-    case 0x1e38: return 0x1e39;
-    case 0x1e3a: return 0x1e3b;
-    case 0x1e3c: return 0x1e3d;
-    case 0x1e3e: return 0x1e3f;
-    case 0x1e40: return 0x1e41;
-    case 0x1e42: return 0x1e43;
-    case 0x1e44: return 0x1e45;
-    case 0x1e46: return 0x1e47;
-    case 0x1e48: return 0x1e49;
-    case 0x1e4a: return 0x1e4b;
-    case 0x1e4c: return 0x1e4d;
-    case 0x1e4e: return 0x1e4f;
-    case 0x1e50: return 0x1e51;
-    case 0x1e52: return 0x1e53;
-    case 0x1e54: return 0x1e55;
-    case 0x1e56: return 0x1e57;
-    case 0x1e58: return 0x1e59;
-    case 0x1e5a: return 0x1e5b;
-    case 0x1e5c: return 0x1e5d;
-    case 0x1e5e: return 0x1e5f;
-    case 0x1e60: return 0x1e61;
-    case 0x1e62: return 0x1e63;
-    case 0x1e64: return 0x1e65;
-    case 0x1e66: return 0x1e67;
-    case 0x1e68: return 0x1e69;
-    case 0x1e6a: return 0x1e6b;
-    case 0x1e6c: return 0x1e6d;
-    case 0x1e6e: return 0x1e6f;
-    case 0x1e70: return 0x1e71;
-    case 0x1e72: return 0x1e73;
-    case 0x1e74: return 0x1e75;
-    case 0x1e76: return 0x1e77;
-    case 0x1e78: return 0x1e79;
-    case 0x1e7a: return 0x1e7b;
-    case 0x1e7c: return 0x1e7d;
-    case 0x1e7e: return 0x1e7f;
-    case 0x1e80: return 0x1e81;
-    case 0x1e82: return 0x1e83;
-    case 0x1e84: return 0x1e85;
-    case 0x1e86: return 0x1e87;
-    case 0x1e88: return 0x1e89;
-    case 0x1e8a: return 0x1e8b;
-    case 0x1e8c: return 0x1e8d;
-    case 0x1e8e: return 0x1e8f;
-    case 0x1e90: return 0x1e91;
-    case 0x1e92: return 0x1e93;
-    case 0x1e94: return 0x1e95;
-    case 0x1e9b: return 0x1e61;
-    case 0x1e9e: return 0xdf;
-    case 0x1ea0: return 0x1ea1;
-    case 0x1ea2: return 0x1ea3;
-    case 0x1ea4: return 0x1ea5;
-    case 0x1ea6: return 0x1ea7;
-    case 0x1ea8: return 0x1ea9;
-    case 0x1eaa: return 0x1eab;
-    case 0x1eac: return 0x1ead;
-    case 0x1eae: return 0x1eaf;
-    case 0x1eb0: return 0x1eb1;
-    case 0x1eb2: return 0x1eb3;
-    case 0x1eb4: return 0x1eb5;
-    case 0x1eb6: return 0x1eb7;
-    case 0x1eb8: return 0x1eb9;
-    case 0x1eba: return 0x1ebb;
-    case 0x1ebc: return 0x1ebd;
-    case 0x1ebe: return 0x1ebf;
-    case 0x1ec0: return 0x1ec1;
-    case 0x1ec2: return 0x1ec3;
-    case 0x1ec4: return 0x1ec5;
-    case 0x1ec6: return 0x1ec7;
-    case 0x1ec8: return 0x1ec9;
-    case 0x1eca: return 0x1ecb;
-    case 0x1ecc: return 0x1ecd;
-    case 0x1ece: return 0x1ecf;
-    case 0x1ed0: return 0x1ed1;
-    case 0x1ed2: return 0x1ed3;
-    case 0x1ed4: return 0x1ed5;
-    case 0x1ed6: return 0x1ed7;
-    case 0x1ed8: return 0x1ed9;
-    case 0x1eda: return 0x1edb;
-    case 0x1edc: return 0x1edd;
-    case 0x1ede: return 0x1edf;
-    case 0x1ee0: return 0x1ee1;
-    case 0x1ee2: return 0x1ee3;
-    case 0x1ee4: return 0x1ee5;
-    case 0x1ee6: return 0x1ee7;
-    case 0x1ee8: return 0x1ee9;
-    case 0x1eea: return 0x1eeb;
-    case 0x1eec: return 0x1eed;
-    case 0x1eee: return 0x1eef;
-    case 0x1ef0: return 0x1ef1;
-    case 0x1ef2: return 0x1ef3;
-    case 0x1ef4: return 0x1ef5;
-    case 0x1ef6: return 0x1ef7;
-    case 0x1ef8: return 0x1ef9;
-    case 0x1efa: return 0x1efb;
-    case 0x1efc: return 0x1efd;
-    case 0x1efe: return 0x1eff;
-    case 0x1f08: return 0x1f00;
-    case 0x1f09: return 0x1f01;
-    case 0x1f0a: return 0x1f02;
-    case 0x1f0b: return 0x1f03;
-    case 0x1f0c: return 0x1f04;
-    case 0x1f0d: return 0x1f05;
-    case 0x1f0e: return 0x1f06;
-    case 0x1f0f: return 0x1f07;
-    case 0x1f18: return 0x1f10;
-    case 0x1f19: return 0x1f11;
-    case 0x1f1a: return 0x1f12;
-    case 0x1f1b: return 0x1f13;
-    case 0x1f1c: return 0x1f14;
-    case 0x1f1d: return 0x1f15;
-    case 0x1f28: return 0x1f20;
-    case 0x1f29: return 0x1f21;
-    case 0x1f2a: return 0x1f22;
-    case 0x1f2b: return 0x1f23;
-    case 0x1f2c: return 0x1f24;
-    case 0x1f2d: return 0x1f25;
-    case 0x1f2e: return 0x1f26;
-    case 0x1f2f: return 0x1f27;
-    case 0x1f38: return 0x1f30;
-    case 0x1f39: return 0x1f31;
-    case 0x1f3a: return 0x1f32;
-    case 0x1f3b: return 0x1f33;
-    case 0x1f3c: return 0x1f34;
-    case 0x1f3d: return 0x1f35;
-    case 0x1f3e: return 0x1f36;
-    case 0x1f3f: return 0x1f37;
-    case 0x1f48: return 0x1f40;
-    case 0x1f49: return 0x1f41;
-    case 0x1f4a: return 0x1f42;
-    case 0x1f4b: return 0x1f43;
-    case 0x1f4c: return 0x1f44;
-    case 0x1f4d: return 0x1f45;
-    case 0x1f59: return 0x1f51;
-    case 0x1f5b: return 0x1f53;
-    case 0x1f5d: return 0x1f55;
-    case 0x1f5f: return 0x1f57;
-    case 0x1f68: return 0x1f60;
-    case 0x1f69: return 0x1f61;
-    case 0x1f6a: return 0x1f62;
-    case 0x1f6b: return 0x1f63;
-    case 0x1f6c: return 0x1f64;
-    case 0x1f6d: return 0x1f65;
-    case 0x1f6e: return 0x1f66;
-    case 0x1f6f: return 0x1f67;
-    case 0x1f88: return 0x1f80;
-    case 0x1f89: return 0x1f81;
-    case 0x1f8a: return 0x1f82;
-    case 0x1f8b: return 0x1f83;
-    case 0x1f8c: return 0x1f84;
-    case 0x1f8d: return 0x1f85;
-    case 0x1f8e: return 0x1f86;
-    case 0x1f8f: return 0x1f87;
-    case 0x1f98: return 0x1f90;
-    case 0x1f99: return 0x1f91;
-    case 0x1f9a: return 0x1f92;
-    case 0x1f9b: return 0x1f93;
-    case 0x1f9c: return 0x1f94;
-    case 0x1f9d: return 0x1f95;
-    case 0x1f9e: return 0x1f96;
-    case 0x1f9f: return 0x1f97;
-    case 0x1fa8: return 0x1fa0;
-    case 0x1fa9: return 0x1fa1;
-    case 0x1faa: return 0x1fa2;
-    case 0x1fab: return 0x1fa3;
-    case 0x1fac: return 0x1fa4;
-    case 0x1fad: return 0x1fa5;
-    case 0x1fae: return 0x1fa6;
-    case 0x1faf: return 0x1fa7;
-    case 0x1fb8: return 0x1fb0;
-    case 0x1fb9: return 0x1fb1;
-    case 0x1fba: return 0x1f70;
-    case 0x1fbb: return 0x1f71;
-    case 0x1fbc: return 0x1fb3;
-    case 0x1fbe: return 0x3b9;
-    case 0x1fc8: return 0x1f72;
-    case 0x1fc9: return 0x1f73;
-    case 0x1fca: return 0x1f74;
-    case 0x1fcb: return 0x1f75;
-    case 0x1fcc: return 0x1fc3;
-    case 0x1fd8: return 0x1fd0;
-    case 0x1fd9: return 0x1fd1;
-    case 0x1fda: return 0x1f76;
-    case 0x1fdb: return 0x1f77;
-    case 0x1fe8: return 0x1fe0;
-    case 0x1fe9: return 0x1fe1;
-    case 0x1fea: return 0x1f7a;
-    case 0x1feb: return 0x1f7b;
-    case 0x1fec: return 0x1fe5;
-    case 0x1ff8: return 0x1f78;
-    case 0x1ff9: return 0x1f79;
-    case 0x1ffa: return 0x1f7c;
-    case 0x1ffb: return 0x1f7d;
-    case 0x1ffc: return 0x1ff3;
-    case 0x2126: return 0x3c9;
-    case 0x212a: return 0x6b;
-    case 0x212b: return 0xe5;
-    case 0x2132: return 0x214e;
-    case 0x2160: return 0x2170;
-    case 0x2161: return 0x2171;
-    case 0x2162: return 0x2172;
-    case 0x2163: return 0x2173;
-    case 0x2164: return 0x2174;
-    case 0x2165: return 0x2175;
-    case 0x2166: return 0x2176;
-    case 0x2167: return 0x2177;
-    case 0x2168: return 0x2178;
-    case 0x2169: return 0x2179;
-    case 0x216a: return 0x217a;
-    case 0x216b: return 0x217b;
-    case 0x216c: return 0x217c;
-    case 0x216d: return 0x217d;
-    case 0x216e: return 0x217e;
-    case 0x216f: return 0x217f;
-    case 0x2183: return 0x2184;
-    case 0x24b6: return 0x24d0;
-    case 0x24b7: return 0x24d1;
-    case 0x24b8: return 0x24d2;
-    case 0x24b9: return 0x24d3;
-    case 0x24ba: return 0x24d4;
-    case 0x24bb: return 0x24d5;
-    case 0x24bc: return 0x24d6;
-    case 0x24bd: return 0x24d7;
-    case 0x24be: return 0x24d8;
-    case 0x24bf: return 0x24d9;
-    case 0x24c0: return 0x24da;
-    case 0x24c1: return 0x24db;
-    case 0x24c2: return 0x24dc;
-    case 0x24c3: return 0x24dd;
-    case 0x24c4: return 0x24de;
-    case 0x24c5: return 0x24df;
-    case 0x24c6: return 0x24e0;
-    case 0x24c7: return 0x24e1;
-    case 0x24c8: return 0x24e2;
-    case 0x24c9: return 0x24e3;
-    case 0x24ca: return 0x24e4;
-    case 0x24cb: return 0x24e5;
-    case 0x24cc: return 0x24e6;
-    case 0x24cd: return 0x24e7;
-    case 0x24ce: return 0x24e8;
-    case 0x24cf: return 0x24e9;
-    case 0x2c00: return 0x2c30;
-    case 0x2c01: return 0x2c31;
-    case 0x2c02: return 0x2c32;
-    case 0x2c03: return 0x2c33;
-    case 0x2c04: return 0x2c34;
-    case 0x2c05: return 0x2c35;
-    case 0x2c06: return 0x2c36;
-    case 0x2c07: return 0x2c37;
-    case 0x2c08: return 0x2c38;
-    case 0x2c09: return 0x2c39;
-    case 0x2c0a: return 0x2c3a;
-    case 0x2c0b: return 0x2c3b;
-    case 0x2c0c: return 0x2c3c;
-    case 0x2c0d: return 0x2c3d;
-    case 0x2c0e: return 0x2c3e;
-    case 0x2c0f: return 0x2c3f;
-    case 0x2c10: return 0x2c40;
-    case 0x2c11: return 0x2c41;
-    case 0x2c12: return 0x2c42;
-    case 0x2c13: return 0x2c43;
-    case 0x2c14: return 0x2c44;
-    case 0x2c15: return 0x2c45;
-    case 0x2c16: return 0x2c46;
-    case 0x2c17: return 0x2c47;
-    case 0x2c18: return 0x2c48;
-    case 0x2c19: return 0x2c49;
-    case 0x2c1a: return 0x2c4a;
-    case 0x2c1b: return 0x2c4b;
-    case 0x2c1c: return 0x2c4c;
-    case 0x2c1d: return 0x2c4d;
-    case 0x2c1e: return 0x2c4e;
-    case 0x2c1f: return 0x2c4f;
-    case 0x2c20: return 0x2c50;
-    case 0x2c21: return 0x2c51;
-    case 0x2c22: return 0x2c52;
-    case 0x2c23: return 0x2c53;
-    case 0x2c24: return 0x2c54;
-    case 0x2c25: return 0x2c55;
-    case 0x2c26: return 0x2c56;
-    case 0x2c27: return 0x2c57;
-    case 0x2c28: return 0x2c58;
-    case 0x2c29: return 0x2c59;
-    case 0x2c2a: return 0x2c5a;
-    case 0x2c2b: return 0x2c5b;
-    case 0x2c2c: return 0x2c5c;
-    case 0x2c2d: return 0x2c5d;
-    case 0x2c2e: return 0x2c5e;
-    case 0x2c2f: return 0x2c5f;
-    case 0x2c60: return 0x2c61;
-    case 0x2c62: return 0x26b;
-    case 0x2c63: return 0x1d7d;
-    case 0x2c64: return 0x27d;
-    case 0x2c67: return 0x2c68;
-    case 0x2c69: return 0x2c6a;
-    case 0x2c6b: return 0x2c6c;
-    case 0x2c6d: return 0x251;
-    case 0x2c6e: return 0x271;
-    case 0x2c6f: return 0x250;
-    case 0x2c70: return 0x252;
-    case 0x2c72: return 0x2c73;
-    case 0x2c75: return 0x2c76;
-    case 0x2c7e: return 0x23f;
-    case 0x2c7f: return 0x240;
-    case 0x2c80: return 0x2c81;
-    case 0x2c82: return 0x2c83;
-    case 0x2c84: return 0x2c85;
-    case 0x2c86: return 0x2c87;
-    case 0x2c88: return 0x2c89;
-    case 0x2c8a: return 0x2c8b;
-    case 0x2c8c: return 0x2c8d;
-    case 0x2c8e: return 0x2c8f;
-    case 0x2c90: return 0x2c91;
-    case 0x2c92: return 0x2c93;
-    case 0x2c94: return 0x2c95;
-    case 0x2c96: return 0x2c97;
-    case 0x2c98: return 0x2c99;
-    case 0x2c9a: return 0x2c9b;
-    case 0x2c9c: return 0x2c9d;
-    case 0x2c9e: return 0x2c9f;
-    case 0x2ca0: return 0x2ca1;
-    case 0x2ca2: return 0x2ca3;
-    case 0x2ca4: return 0x2ca5;
-    case 0x2ca6: return 0x2ca7;
-    case 0x2ca8: return 0x2ca9;
-    case 0x2caa: return 0x2cab;
-    case 0x2cac: return 0x2cad;
-    case 0x2cae: return 0x2caf;
-    case 0x2cb0: return 0x2cb1;
-    case 0x2cb2: return 0x2cb3;
-    case 0x2cb4: return 0x2cb5;
-    case 0x2cb6: return 0x2cb7;
-    case 0x2cb8: return 0x2cb9;
-    case 0x2cba: return 0x2cbb;
-    case 0x2cbc: return 0x2cbd;
-    case 0x2cbe: return 0x2cbf;
-    case 0x2cc0: return 0x2cc1;
-    case 0x2cc2: return 0x2cc3;
-    case 0x2cc4: return 0x2cc5;
-    case 0x2cc6: return 0x2cc7;
-    case 0x2cc8: return 0x2cc9;
-    case 0x2cca: return 0x2ccb;
-    case 0x2ccc: return 0x2ccd;
-    case 0x2cce: return 0x2ccf;
-    case 0x2cd0: return 0x2cd1;
-    case 0x2cd2: return 0x2cd3;
-    case 0x2cd4: return 0x2cd5;
-    case 0x2cd6: return 0x2cd7;
-    case 0x2cd8: return 0x2cd9;
-    case 0x2cda: return 0x2cdb;
-    case 0x2cdc: return 0x2cdd;
-    case 0x2cde: return 0x2cdf;
-    case 0x2ce0: return 0x2ce1;
-    case 0x2ce2: return 0x2ce3;
-    case 0x2ceb: return 0x2cec;
-    case 0x2ced: return 0x2cee;
-    case 0x2cf2: return 0x2cf3;
-    case 0xa640: return 0xa641;
-    case 0xa642: return 0xa643;
-    case 0xa644: return 0xa645;
-    case 0xa646: return 0xa647;
-    case 0xa648: return 0xa649;
-    case 0xa64a: return 0xa64b;
-    case 0xa64c: return 0xa64d;
-    case 0xa64e: return 0xa64f;
-    case 0xa650: return 0xa651;
-    case 0xa652: return 0xa653;
-    case 0xa654: return 0xa655;
-    case 0xa656: return 0xa657;
-    case 0xa658: return 0xa659;
-    case 0xa65a: return 0xa65b;
-    case 0xa65c: return 0xa65d;
-    case 0xa65e: return 0xa65f;
-    case 0xa660: return 0xa661;
-    case 0xa662: return 0xa663;
-    case 0xa664: return 0xa665;
-    case 0xa666: return 0xa667;
-    case 0xa668: return 0xa669;
-    case 0xa66a: return 0xa66b;
-    case 0xa66c: return 0xa66d;
-    case 0xa680: return 0xa681;
-    case 0xa682: return 0xa683;
-    case 0xa684: return 0xa685;
-    case 0xa686: return 0xa687;
-    case 0xa688: return 0xa689;
-    case 0xa68a: return 0xa68b;
-    case 0xa68c: return 0xa68d;
-    case 0xa68e: return 0xa68f;
-    case 0xa690: return 0xa691;
-    case 0xa692: return 0xa693;
-    case 0xa694: return 0xa695;
-    case 0xa696: return 0xa697;
-    case 0xa698: return 0xa699;
-    case 0xa69a: return 0xa69b;
-    case 0xa722: return 0xa723;
-    case 0xa724: return 0xa725;
-    case 0xa726: return 0xa727;
-    case 0xa728: return 0xa729;
-    case 0xa72a: return 0xa72b;
-    case 0xa72c: return 0xa72d;
-    case 0xa72e: return 0xa72f;
-    case 0xa732: return 0xa733;
-    case 0xa734: return 0xa735;
-    case 0xa736: return 0xa737;
-    case 0xa738: return 0xa739;
-    case 0xa73a: return 0xa73b;
-    case 0xa73c: return 0xa73d;
-    case 0xa73e: return 0xa73f;
-    case 0xa740: return 0xa741;
-    case 0xa742: return 0xa743;
-    case 0xa744: return 0xa745;
-    case 0xa746: return 0xa747;
-    case 0xa748: return 0xa749;
-    case 0xa74a: return 0xa74b;
-    case 0xa74c: return 0xa74d;
-    case 0xa74e: return 0xa74f;
-    case 0xa750: return 0xa751;
-    case 0xa752: return 0xa753;
-    case 0xa754: return 0xa755;
-    case 0xa756: return 0xa757;
-    case 0xa758: return 0xa759;
-    case 0xa75a: return 0xa75b;
-    case 0xa75c: return 0xa75d;
-    case 0xa75e: return 0xa75f;
-    case 0xa760: return 0xa761;
-    case 0xa762: return 0xa763;
-    case 0xa764: return 0xa765;
-    case 0xa766: return 0xa767;
-    case 0xa768: return 0xa769;
-    case 0xa76a: return 0xa76b;
-    case 0xa76c: return 0xa76d;
-    case 0xa76e: return 0xa76f;
-    case 0xa779: return 0xa77a;
-    case 0xa77b: return 0xa77c;
-    case 0xa77d: return 0x1d79;
-    case 0xa77e: return 0xa77f;
-    case 0xa780: return 0xa781;
-    case 0xa782: return 0xa783;
-    case 0xa784: return 0xa785;
-    case 0xa786: return 0xa787;
-    case 0xa78b: return 0xa78c;
-    case 0xa78d: return 0x265;
-    case 0xa790: return 0xa791;
-    case 0xa792: return 0xa793;
-    case 0xa796: return 0xa797;
-    case 0xa798: return 0xa799;
-    case 0xa79a: return 0xa79b;
-    case 0xa79c: return 0xa79d;
-    case 0xa79e: return 0xa79f;
-    case 0xa7a0: return 0xa7a1;
-    case 0xa7a2: return 0xa7a3;
-    case 0xa7a4: return 0xa7a5;
-    case 0xa7a6: return 0xa7a7;
-    case 0xa7a8: return 0xa7a9;
-    case 0xa7aa: return 0x266;
-    case 0xa7ab: return 0x25c;
-    case 0xa7ac: return 0x261;
-    case 0xa7ad: return 0x26c;
-    case 0xa7ae: return 0x26a;
-    case 0xa7b0: return 0x29e;
-    case 0xa7b1: return 0x287;
-    case 0xa7b2: return 0x29d;
-    case 0xa7b3: return 0xab53;
-    case 0xa7b4: return 0xa7b5;
-    case 0xa7b6: return 0xa7b7;
-    case 0xa7b8: return 0xa7b9;
-    case 0xa7ba: return 0xa7bb;
-    case 0xa7bc: return 0xa7bd;
-    case 0xa7be: return 0xa7bf;
-    case 0xa7c0: return 0xa7c1;
-    case 0xa7c2: return 0xa7c3;
-    case 0xa7c4: return 0xa794;
-    case 0xa7c5: return 0x282;
-    case 0xa7c6: return 0x1d8e;
-    case 0xa7c7: return 0xa7c8;
-    case 0xa7c9: return 0xa7ca;
-    case 0xa7d0: return 0xa7d1;
-    case 0xa7d6: return 0xa7d7;
-    case 0xa7d8: return 0xa7d9;
-    case 0xa7f5: return 0xa7f6;
-    case 0xab70: return 0x13a0;
-    case 0xab71: return 0x13a1;
-    case 0xab72: return 0x13a2;
-    case 0xab73: return 0x13a3;
-    case 0xab74: return 0x13a4;
-    case 0xab75: return 0x13a5;
-    case 0xab76: return 0x13a6;
-    case 0xab77: return 0x13a7;
-    case 0xab78: return 0x13a8;
-    case 0xab79: return 0x13a9;
-    case 0xab7a: return 0x13aa;
-    case 0xab7b: return 0x13ab;
-    case 0xab7c: return 0x13ac;
-    case 0xab7d: return 0x13ad;
-    case 0xab7e: return 0x13ae;
-    case 0xab7f: return 0x13af;
-    case 0xab80: return 0x13b0;
-    case 0xab81: return 0x13b1;
-    case 0xab82: return 0x13b2;
-    case 0xab83: return 0x13b3;
-    case 0xab84: return 0x13b4;
-    case 0xab85: return 0x13b5;
-    case 0xab86: return 0x13b6;
-    case 0xab87: return 0x13b7;
-    case 0xab88: return 0x13b8;
-    case 0xab89: return 0x13b9;
-    case 0xab8a: return 0x13ba;
-    case 0xab8b: return 0x13bb;
-    case 0xab8c: return 0x13bc;
-    case 0xab8d: return 0x13bd;
-    case 0xab8e: return 0x13be;
-    case 0xab8f: return 0x13bf;
-    case 0xab90: return 0x13c0;
-    case 0xab91: return 0x13c1;
-    case 0xab92: return 0x13c2;
-    case 0xab93: return 0x13c3;
-    case 0xab94: return 0x13c4;
-    case 0xab95: return 0x13c5;
-    case 0xab96: return 0x13c6;
-    case 0xab97: return 0x13c7;
-    case 0xab98: return 0x13c8;
-    case 0xab99: return 0x13c9;
-    case 0xab9a: return 0x13ca;
-    case 0xab9b: return 0x13cb;
-    case 0xab9c: return 0x13cc;
-    case 0xab9d: return 0x13cd;
-    case 0xab9e: return 0x13ce;
-    case 0xab9f: return 0x13cf;
-    case 0xaba0: return 0x13d0;
-    case 0xaba1: return 0x13d1;
-    case 0xaba2: return 0x13d2;
-    case 0xaba3: return 0x13d3;
-    case 0xaba4: return 0x13d4;
-    case 0xaba5: return 0x13d5;
-    case 0xaba6: return 0x13d6;
-    case 0xaba7: return 0x13d7;
-    case 0xaba8: return 0x13d8;
-    case 0xaba9: return 0x13d9;
-    case 0xabaa: return 0x13da;
-    case 0xabab: return 0x13db;
-    case 0xabac: return 0x13dc;
-    case 0xabad: return 0x13dd;
-    case 0xabae: return 0x13de;
-    case 0xabaf: return 0x13df;
-    case 0xabb0: return 0x13e0;
-    case 0xabb1: return 0x13e1;
-    case 0xabb2: return 0x13e2;
-    case 0xabb3: return 0x13e3;
-    case 0xabb4: return 0x13e4;
-    case 0xabb5: return 0x13e5;
-    case 0xabb6: return 0x13e6;
-    case 0xabb7: return 0x13e7;
-    case 0xabb8: return 0x13e8;
-    case 0xabb9: return 0x13e9;
-    case 0xabba: return 0x13ea;
-    case 0xabbb: return 0x13eb;
-    case 0xabbc: return 0x13ec;
-    case 0xabbd: return 0x13ed;
-    case 0xabbe: return 0x13ee;
-    case 0xabbf: return 0x13ef;
-    case 0xff21: return 0xff41;
-    case 0xff22: return 0xff42;
-    case 0xff23: return 0xff43;
-    case 0xff24: return 0xff44;
-    case 0xff25: return 0xff45;
-    case 0xff26: return 0xff46;
-    case 0xff27: return 0xff47;
-    case 0xff28: return 0xff48;
-    case 0xff29: return 0xff49;
-    case 0xff2a: return 0xff4a;
-    case 0xff2b: return 0xff4b;
-    case 0xff2c: return 0xff4c;
-    case 0xff2d: return 0xff4d;
-    case 0xff2e: return 0xff4e;
-    case 0xff2f: return 0xff4f;
-    case 0xff30: return 0xff50;
-    case 0xff31: return 0xff51;
-    case 0xff32: return 0xff52;
-    case 0xff33: return 0xff53;
-    case 0xff34: return 0xff54;
-    case 0xff35: return 0xff55;
-    case 0xff36: return 0xff56;
-    case 0xff37: return 0xff57;
-    case 0xff38: return 0xff58;
-    case 0xff39: return 0xff59;
-    case 0xff3a: return 0xff5a;
-    case 0x10400: return 0x10428;
-    case 0x10401: return 0x10429;
-    case 0x10402: return 0x1042a;
-    case 0x10403: return 0x1042b;
-    case 0x10404: return 0x1042c;
-    case 0x10405: return 0x1042d;
-    case 0x10406: return 0x1042e;
-    case 0x10407: return 0x1042f;
-    case 0x10408: return 0x10430;
-    case 0x10409: return 0x10431;
-    case 0x1040a: return 0x10432;
-    case 0x1040b: return 0x10433;
-    case 0x1040c: return 0x10434;
-    case 0x1040d: return 0x10435;
-    case 0x1040e: return 0x10436;
-    case 0x1040f: return 0x10437;
-    case 0x10410: return 0x10438;
-    case 0x10411: return 0x10439;
-    case 0x10412: return 0x1043a;
-    case 0x10413: return 0x1043b;
-    case 0x10414: return 0x1043c;
-    case 0x10415: return 0x1043d;
-    case 0x10416: return 0x1043e;
-    case 0x10417: return 0x1043f;
-    case 0x10418: return 0x10440;
-    case 0x10419: return 0x10441;
-    case 0x1041a: return 0x10442;
-    case 0x1041b: return 0x10443;
-    case 0x1041c: return 0x10444;
-    case 0x1041d: return 0x10445;
-    case 0x1041e: return 0x10446;
-    case 0x1041f: return 0x10447;
-    case 0x10420: return 0x10448;
-    case 0x10421: return 0x10449;
-    case 0x10422: return 0x1044a;
-    case 0x10423: return 0x1044b;
-    case 0x10424: return 0x1044c;
-    case 0x10425: return 0x1044d;
-    case 0x10426: return 0x1044e;
-    case 0x10427: return 0x1044f;
-    case 0x104b0: return 0x104d8;
-    case 0x104b1: return 0x104d9;
-    case 0x104b2: return 0x104da;
-    case 0x104b3: return 0x104db;
-    case 0x104b4: return 0x104dc;
-    case 0x104b5: return 0x104dd;
-    case 0x104b6: return 0x104de;
-    case 0x104b7: return 0x104df;
-    case 0x104b8: return 0x104e0;
-    case 0x104b9: return 0x104e1;
-    case 0x104ba: return 0x104e2;
-    case 0x104bb: return 0x104e3;
-    case 0x104bc: return 0x104e4;
-    case 0x104bd: return 0x104e5;
-    case 0x104be: return 0x104e6;
-    case 0x104bf: return 0x104e7;
-    case 0x104c0: return 0x104e8;
-    case 0x104c1: return 0x104e9;
-    case 0x104c2: return 0x104ea;
-    case 0x104c3: return 0x104eb;
-    case 0x104c4: return 0x104ec;
-    case 0x104c5: return 0x104ed;
-    case 0x104c6: return 0x104ee;
-    case 0x104c7: return 0x104ef;
-    case 0x104c8: return 0x104f0;
-    case 0x104c9: return 0x104f1;
-    case 0x104ca: return 0x104f2;
-    case 0x104cb: return 0x104f3;
-    case 0x104cc: return 0x104f4;
-    case 0x104cd: return 0x104f5;
-    case 0x104ce: return 0x104f6;
-    case 0x104cf: return 0x104f7;
-    case 0x104d0: return 0x104f8;
-    case 0x104d1: return 0x104f9;
-    case 0x104d2: return 0x104fa;
-    case 0x104d3: return 0x104fb;
-    case 0x10570: return 0x10597;
-    case 0x10571: return 0x10598;
-    case 0x10572: return 0x10599;
-    case 0x10573: return 0x1059a;
-    case 0x10574: return 0x1059b;
-    case 0x10575: return 0x1059c;
-    case 0x10576: return 0x1059d;
-    case 0x10577: return 0x1059e;
-    case 0x10578: return 0x1059f;
-    case 0x10579: return 0x105a0;
-    case 0x1057a: return 0x105a1;
-    case 0x1057c: return 0x105a3;
-    case 0x1057d: return 0x105a4;
-    case 0x1057e: return 0x105a5;
-    case 0x1057f: return 0x105a6;
-    case 0x10580: return 0x105a7;
-    case 0x10581: return 0x105a8;
-    case 0x10582: return 0x105a9;
-    case 0x10583: return 0x105aa;
-    case 0x10584: return 0x105ab;
-    case 0x10585: return 0x105ac;
-    case 0x10586: return 0x105ad;
-    case 0x10587: return 0x105ae;
-    case 0x10588: return 0x105af;
-    case 0x10589: return 0x105b0;
-    case 0x1058a: return 0x105b1;
-    case 0x1058c: return 0x105b3;
-    case 0x1058d: return 0x105b4;
-    case 0x1058e: return 0x105b5;
-    case 0x1058f: return 0x105b6;
-    case 0x10590: return 0x105b7;
-    case 0x10591: return 0x105b8;
-    case 0x10592: return 0x105b9;
-    case 0x10594: return 0x105bb;
-    case 0x10595: return 0x105bc;
-    case 0x10c80: return 0x10cc0;
-    case 0x10c81: return 0x10cc1;
-    case 0x10c82: return 0x10cc2;
-    case 0x10c83: return 0x10cc3;
-    case 0x10c84: return 0x10cc4;
-    case 0x10c85: return 0x10cc5;
-    case 0x10c86: return 0x10cc6;
-    case 0x10c87: return 0x10cc7;
-    case 0x10c88: return 0x10cc8;
-    case 0x10c89: return 0x10cc9;
-    case 0x10c8a: return 0x10cca;
-    case 0x10c8b: return 0x10ccb;
-    case 0x10c8c: return 0x10ccc;
-    case 0x10c8d: return 0x10ccd;
-    case 0x10c8e: return 0x10cce;
-    case 0x10c8f: return 0x10ccf;
-    case 0x10c90: return 0x10cd0;
-    case 0x10c91: return 0x10cd1;
-    case 0x10c92: return 0x10cd2;
-    case 0x10c93: return 0x10cd3;
-    case 0x10c94: return 0x10cd4;
-    case 0x10c95: return 0x10cd5;
-    case 0x10c96: return 0x10cd6;
-    case 0x10c97: return 0x10cd7;
-    case 0x10c98: return 0x10cd8;
-    case 0x10c99: return 0x10cd9;
-    case 0x10c9a: return 0x10cda;
-    case 0x10c9b: return 0x10cdb;
-    case 0x10c9c: return 0x10cdc;
-    case 0x10c9d: return 0x10cdd;
-    case 0x10c9e: return 0x10cde;
-    case 0x10c9f: return 0x10cdf;
-    case 0x10ca0: return 0x10ce0;
-    case 0x10ca1: return 0x10ce1;
-    case 0x10ca2: return 0x10ce2;
-    case 0x10ca3: return 0x10ce3;
-    case 0x10ca4: return 0x10ce4;
-    case 0x10ca5: return 0x10ce5;
-    case 0x10ca6: return 0x10ce6;
-    case 0x10ca7: return 0x10ce7;
-    case 0x10ca8: return 0x10ce8;
-    case 0x10ca9: return 0x10ce9;
-    case 0x10caa: return 0x10cea;
-    case 0x10cab: return 0x10ceb;
-    case 0x10cac: return 0x10cec;
-    case 0x10cad: return 0x10ced;
-    case 0x10cae: return 0x10cee;
-    case 0x10caf: return 0x10cef;
-    case 0x10cb0: return 0x10cf0;
-    case 0x10cb1: return 0x10cf1;
-    case 0x10cb2: return 0x10cf2;
-    case 0x118a0: return 0x118c0;
-    case 0x118a1: return 0x118c1;
-    case 0x118a2: return 0x118c2;
-    case 0x118a3: return 0x118c3;
-    case 0x118a4: return 0x118c4;
-    case 0x118a5: return 0x118c5;
-    case 0x118a6: return 0x118c6;
-    case 0x118a7: return 0x118c7;
-    case 0x118a8: return 0x118c8;
-    case 0x118a9: return 0x118c9;
-    case 0x118aa: return 0x118ca;
-    case 0x118ab: return 0x118cb;
-    case 0x118ac: return 0x118cc;
-    case 0x118ad: return 0x118cd;
-    case 0x118ae: return 0x118ce;
-    case 0x118af: return 0x118cf;
-    case 0x118b0: return 0x118d0;
-    case 0x118b1: return 0x118d1;
-    case 0x118b2: return 0x118d2;
-    case 0x118b3: return 0x118d3;
-    case 0x118b4: return 0x118d4;
-    case 0x118b5: return 0x118d5;
-    case 0x118b6: return 0x118d6;
-    case 0x118b7: return 0x118d7;
-    case 0x118b8: return 0x118d8;
-    case 0x118b9: return 0x118d9;
-    case 0x118ba: return 0x118da;
-    case 0x118bb: return 0x118db;
-    case 0x118bc: return 0x118dc;
-    case 0x118bd: return 0x118dd;
-    case 0x118be: return 0x118de;
-    case 0x118bf: return 0x118df;
-    case 0x16e40: return 0x16e60;
-    case 0x16e41: return 0x16e61;
-    case 0x16e42: return 0x16e62;
-    case 0x16e43: return 0x16e63;
-    case 0x16e44: return 0x16e64;
-    case 0x16e45: return 0x16e65;
-    case 0x16e46: return 0x16e66;
-    case 0x16e47: return 0x16e67;
-    case 0x16e48: return 0x16e68;
-    case 0x16e49: return 0x16e69;
-    case 0x16e4a: return 0x16e6a;
-    case 0x16e4b: return 0x16e6b;
-    case 0x16e4c: return 0x16e6c;
-    case 0x16e4d: return 0x16e6d;
-    case 0x16e4e: return 0x16e6e;
-    case 0x16e4f: return 0x16e6f;
-    case 0x16e50: return 0x16e70;
-    case 0x16e51: return 0x16e71;
-    case 0x16e52: return 0x16e72;
-    case 0x16e53: return 0x16e73;
-    case 0x16e54: return 0x16e74;
-    case 0x16e55: return 0x16e75;
-    case 0x16e56: return 0x16e76;
-    case 0x16e57: return 0x16e77;
-    case 0x16e58: return 0x16e78;
-    case 0x16e59: return 0x16e79;
-    case 0x16e5a: return 0x16e7a;
-    case 0x16e5b: return 0x16e7b;
-    case 0x16e5c: return 0x16e7c;
-    case 0x16e5d: return 0x16e7d;
-    case 0x16e5e: return 0x16e7e;
-    case 0x16e5f: return 0x16e7f;
-    case 0x1e900: return 0x1e922;
-    case 0x1e901: return 0x1e923;
-    case 0x1e902: return 0x1e924;
-    case 0x1e903: return 0x1e925;
-    case 0x1e904: return 0x1e926;
-    case 0x1e905: return 0x1e927;
-    case 0x1e906: return 0x1e928;
-    case 0x1e907: return 0x1e929;
-    case 0x1e908: return 0x1e92a;
-    case 0x1e909: return 0x1e92b;
-    case 0x1e90a: return 0x1e92c;
-    case 0x1e90b: return 0x1e92d;
-    case 0x1e90c: return 0x1e92e;
-    case 0x1e90d: return 0x1e92f;
-    case 0x1e90e: return 0x1e930;
-    case 0x1e90f: return 0x1e931;
-    case 0x1e910: return 0x1e932;
-    case 0x1e911: return 0x1e933;
-    case 0x1e912: return 0x1e934;
-    case 0x1e913: return 0x1e935;
-    case 0x1e914: return 0x1e936;
-    case 0x1e915: return 0x1e937;
-    case 0x1e916: return 0x1e938;
-    case 0x1e917: return 0x1e939;
-    case 0x1e918: return 0x1e93a;
-    case 0x1e919: return 0x1e93b;
-    case 0x1e91a: return 0x1e93c;
-    case 0x1e91b: return 0x1e93d;
-    case 0x1e91c: return 0x1e93e;
-    case 0x1e91d: return 0x1e93f;
-    case 0x1e91e: return 0x1e940;
-    case 0x1e91f: return 0x1e941;
-    case 0x1e920: return 0x1e942;
-    case 0x1e921: return 0x1e943;
-    default: return in;
+  switch ( in ) {
+    case 0x41:
+      return 0x61;
+    case 0x42:
+      return 0x62;
+    case 0x43:
+      return 0x63;
+    case 0x44:
+      return 0x64;
+    case 0x45:
+      return 0x65;
+    case 0x46:
+      return 0x66;
+    case 0x47:
+      return 0x67;
+    case 0x48:
+      return 0x68;
+    case 0x49:
+      return 0x69;
+    case 0x4a:
+      return 0x6a;
+    case 0x4b:
+      return 0x6b;
+    case 0x4c:
+      return 0x6c;
+    case 0x4d:
+      return 0x6d;
+    case 0x4e:
+      return 0x6e;
+    case 0x4f:
+      return 0x6f;
+    case 0x50:
+      return 0x70;
+    case 0x51:
+      return 0x71;
+    case 0x52:
+      return 0x72;
+    case 0x53:
+      return 0x73;
+    case 0x54:
+      return 0x74;
+    case 0x55:
+      return 0x75;
+    case 0x56:
+      return 0x76;
+    case 0x57:
+      return 0x77;
+    case 0x58:
+      return 0x78;
+    case 0x59:
+      return 0x79;
+    case 0x5a:
+      return 0x7a;
+    case 0xb5:
+      return 0x3bc;
+    case 0xc0:
+      return 0xe0;
+    case 0xc1:
+      return 0xe1;
+    case 0xc2:
+      return 0xe2;
+    case 0xc3:
+      return 0xe3;
+    case 0xc4:
+      return 0xe4;
+    case 0xc5:
+      return 0xe5;
+    case 0xc6:
+      return 0xe6;
+    case 0xc7:
+      return 0xe7;
+    case 0xc8:
+      return 0xe8;
+    case 0xc9:
+      return 0xe9;
+    case 0xca:
+      return 0xea;
+    case 0xcb:
+      return 0xeb;
+    case 0xcc:
+      return 0xec;
+    case 0xcd:
+      return 0xed;
+    case 0xce:
+      return 0xee;
+    case 0xcf:
+      return 0xef;
+    case 0xd0:
+      return 0xf0;
+    case 0xd1:
+      return 0xf1;
+    case 0xd2:
+      return 0xf2;
+    case 0xd3:
+      return 0xf3;
+    case 0xd4:
+      return 0xf4;
+    case 0xd5:
+      return 0xf5;
+    case 0xd6:
+      return 0xf6;
+    case 0xd8:
+      return 0xf8;
+    case 0xd9:
+      return 0xf9;
+    case 0xda:
+      return 0xfa;
+    case 0xdb:
+      return 0xfb;
+    case 0xdc:
+      return 0xfc;
+    case 0xdd:
+      return 0xfd;
+    case 0xde:
+      return 0xfe;
+    case 0x100:
+      return 0x101;
+    case 0x102:
+      return 0x103;
+    case 0x104:
+      return 0x105;
+    case 0x106:
+      return 0x107;
+    case 0x108:
+      return 0x109;
+    case 0x10a:
+      return 0x10b;
+    case 0x10c:
+      return 0x10d;
+    case 0x10e:
+      return 0x10f;
+    case 0x110:
+      return 0x111;
+    case 0x112:
+      return 0x113;
+    case 0x114:
+      return 0x115;
+    case 0x116:
+      return 0x117;
+    case 0x118:
+      return 0x119;
+    case 0x11a:
+      return 0x11b;
+    case 0x11c:
+      return 0x11d;
+    case 0x11e:
+      return 0x11f;
+    case 0x120:
+      return 0x121;
+    case 0x122:
+      return 0x123;
+    case 0x124:
+      return 0x125;
+    case 0x126:
+      return 0x127;
+    case 0x128:
+      return 0x129;
+    case 0x12a:
+      return 0x12b;
+    case 0x12c:
+      return 0x12d;
+    case 0x12e:
+      return 0x12f;
+    case 0x132:
+      return 0x133;
+    case 0x134:
+      return 0x135;
+    case 0x136:
+      return 0x137;
+    case 0x139:
+      return 0x13a;
+    case 0x13b:
+      return 0x13c;
+    case 0x13d:
+      return 0x13e;
+    case 0x13f:
+      return 0x140;
+    case 0x141:
+      return 0x142;
+    case 0x143:
+      return 0x144;
+    case 0x145:
+      return 0x146;
+    case 0x147:
+      return 0x148;
+    case 0x14a:
+      return 0x14b;
+    case 0x14c:
+      return 0x14d;
+    case 0x14e:
+      return 0x14f;
+    case 0x150:
+      return 0x151;
+    case 0x152:
+      return 0x153;
+    case 0x154:
+      return 0x155;
+    case 0x156:
+      return 0x157;
+    case 0x158:
+      return 0x159;
+    case 0x15a:
+      return 0x15b;
+    case 0x15c:
+      return 0x15d;
+    case 0x15e:
+      return 0x15f;
+    case 0x160:
+      return 0x161;
+    case 0x162:
+      return 0x163;
+    case 0x164:
+      return 0x165;
+    case 0x166:
+      return 0x167;
+    case 0x168:
+      return 0x169;
+    case 0x16a:
+      return 0x16b;
+    case 0x16c:
+      return 0x16d;
+    case 0x16e:
+      return 0x16f;
+    case 0x170:
+      return 0x171;
+    case 0x172:
+      return 0x173;
+    case 0x174:
+      return 0x175;
+    case 0x176:
+      return 0x177;
+    case 0x178:
+      return 0xff;
+    case 0x179:
+      return 0x17a;
+    case 0x17b:
+      return 0x17c;
+    case 0x17d:
+      return 0x17e;
+    case 0x17f:
+      return 0x73;
+    case 0x181:
+      return 0x253;
+    case 0x182:
+      return 0x183;
+    case 0x184:
+      return 0x185;
+    case 0x186:
+      return 0x254;
+    case 0x187:
+      return 0x188;
+    case 0x189:
+      return 0x256;
+    case 0x18a:
+      return 0x257;
+    case 0x18b:
+      return 0x18c;
+    case 0x18e:
+      return 0x1dd;
+    case 0x18f:
+      return 0x259;
+    case 0x190:
+      return 0x25b;
+    case 0x191:
+      return 0x192;
+    case 0x193:
+      return 0x260;
+    case 0x194:
+      return 0x263;
+    case 0x196:
+      return 0x269;
+    case 0x197:
+      return 0x268;
+    case 0x198:
+      return 0x199;
+    case 0x19c:
+      return 0x26f;
+    case 0x19d:
+      return 0x272;
+    case 0x19f:
+      return 0x275;
+    case 0x1a0:
+      return 0x1a1;
+    case 0x1a2:
+      return 0x1a3;
+    case 0x1a4:
+      return 0x1a5;
+    case 0x1a6:
+      return 0x280;
+    case 0x1a7:
+      return 0x1a8;
+    case 0x1a9:
+      return 0x283;
+    case 0x1ac:
+      return 0x1ad;
+    case 0x1ae:
+      return 0x288;
+    case 0x1af:
+      return 0x1b0;
+    case 0x1b1:
+      return 0x28a;
+    case 0x1b2:
+      return 0x28b;
+    case 0x1b3:
+      return 0x1b4;
+    case 0x1b5:
+      return 0x1b6;
+    case 0x1b7:
+      return 0x292;
+    case 0x1b8:
+      return 0x1b9;
+    case 0x1bc:
+      return 0x1bd;
+    case 0x1c4:
+      return 0x1c6;
+    case 0x1c5:
+      return 0x1c6;
+    case 0x1c7:
+      return 0x1c9;
+    case 0x1c8:
+      return 0x1c9;
+    case 0x1ca:
+      return 0x1cc;
+    case 0x1cb:
+      return 0x1cc;
+    case 0x1cd:
+      return 0x1ce;
+    case 0x1cf:
+      return 0x1d0;
+    case 0x1d1:
+      return 0x1d2;
+    case 0x1d3:
+      return 0x1d4;
+    case 0x1d5:
+      return 0x1d6;
+    case 0x1d7:
+      return 0x1d8;
+    case 0x1d9:
+      return 0x1da;
+    case 0x1db:
+      return 0x1dc;
+    case 0x1de:
+      return 0x1df;
+    case 0x1e0:
+      return 0x1e1;
+    case 0x1e2:
+      return 0x1e3;
+    case 0x1e4:
+      return 0x1e5;
+    case 0x1e6:
+      return 0x1e7;
+    case 0x1e8:
+      return 0x1e9;
+    case 0x1ea:
+      return 0x1eb;
+    case 0x1ec:
+      return 0x1ed;
+    case 0x1ee:
+      return 0x1ef;
+    case 0x1f1:
+      return 0x1f3;
+    case 0x1f2:
+      return 0x1f3;
+    case 0x1f4:
+      return 0x1f5;
+    case 0x1f6:
+      return 0x195;
+    case 0x1f7:
+      return 0x1bf;
+    case 0x1f8:
+      return 0x1f9;
+    case 0x1fa:
+      return 0x1fb;
+    case 0x1fc:
+      return 0x1fd;
+    case 0x1fe:
+      return 0x1ff;
+    case 0x200:
+      return 0x201;
+    case 0x202:
+      return 0x203;
+    case 0x204:
+      return 0x205;
+    case 0x206:
+      return 0x207;
+    case 0x208:
+      return 0x209;
+    case 0x20a:
+      return 0x20b;
+    case 0x20c:
+      return 0x20d;
+    case 0x20e:
+      return 0x20f;
+    case 0x210:
+      return 0x211;
+    case 0x212:
+      return 0x213;
+    case 0x214:
+      return 0x215;
+    case 0x216:
+      return 0x217;
+    case 0x218:
+      return 0x219;
+    case 0x21a:
+      return 0x21b;
+    case 0x21c:
+      return 0x21d;
+    case 0x21e:
+      return 0x21f;
+    case 0x220:
+      return 0x19e;
+    case 0x222:
+      return 0x223;
+    case 0x224:
+      return 0x225;
+    case 0x226:
+      return 0x227;
+    case 0x228:
+      return 0x229;
+    case 0x22a:
+      return 0x22b;
+    case 0x22c:
+      return 0x22d;
+    case 0x22e:
+      return 0x22f;
+    case 0x230:
+      return 0x231;
+    case 0x232:
+      return 0x233;
+    case 0x23a:
+      return 0x2c65;
+    case 0x23b:
+      return 0x23c;
+    case 0x23d:
+      return 0x19a;
+    case 0x23e:
+      return 0x2c66;
+    case 0x241:
+      return 0x242;
+    case 0x243:
+      return 0x180;
+    case 0x244:
+      return 0x289;
+    case 0x245:
+      return 0x28c;
+    case 0x246:
+      return 0x247;
+    case 0x248:
+      return 0x249;
+    case 0x24a:
+      return 0x24b;
+    case 0x24c:
+      return 0x24d;
+    case 0x24e:
+      return 0x24f;
+    case 0x345:
+      return 0x3b9;
+    case 0x370:
+      return 0x371;
+    case 0x372:
+      return 0x373;
+    case 0x376:
+      return 0x377;
+    case 0x37f:
+      return 0x3f3;
+    case 0x386:
+      return 0x3ac;
+    case 0x388:
+      return 0x3ad;
+    case 0x389:
+      return 0x3ae;
+    case 0x38a:
+      return 0x3af;
+    case 0x38c:
+      return 0x3cc;
+    case 0x38e:
+      return 0x3cd;
+    case 0x38f:
+      return 0x3ce;
+    case 0x391:
+      return 0x3b1;
+    case 0x392:
+      return 0x3b2;
+    case 0x393:
+      return 0x3b3;
+    case 0x394:
+      return 0x3b4;
+    case 0x395:
+      return 0x3b5;
+    case 0x396:
+      return 0x3b6;
+    case 0x397:
+      return 0x3b7;
+    case 0x398:
+      return 0x3b8;
+    case 0x399:
+      return 0x3b9;
+    case 0x39a:
+      return 0x3ba;
+    case 0x39b:
+      return 0x3bb;
+    case 0x39c:
+      return 0x3bc;
+    case 0x39d:
+      return 0x3bd;
+    case 0x39e:
+      return 0x3be;
+    case 0x39f:
+      return 0x3bf;
+    case 0x3a0:
+      return 0x3c0;
+    case 0x3a1:
+      return 0x3c1;
+    case 0x3a3:
+      return 0x3c3;
+    case 0x3a4:
+      return 0x3c4;
+    case 0x3a5:
+      return 0x3c5;
+    case 0x3a6:
+      return 0x3c6;
+    case 0x3a7:
+      return 0x3c7;
+    case 0x3a8:
+      return 0x3c8;
+    case 0x3a9:
+      return 0x3c9;
+    case 0x3aa:
+      return 0x3ca;
+    case 0x3ab:
+      return 0x3cb;
+    case 0x3c2:
+      return 0x3c3;
+    case 0x3cf:
+      return 0x3d7;
+    case 0x3d0:
+      return 0x3b2;
+    case 0x3d1:
+      return 0x3b8;
+    case 0x3d5:
+      return 0x3c6;
+    case 0x3d6:
+      return 0x3c0;
+    case 0x3d8:
+      return 0x3d9;
+    case 0x3da:
+      return 0x3db;
+    case 0x3dc:
+      return 0x3dd;
+    case 0x3de:
+      return 0x3df;
+    case 0x3e0:
+      return 0x3e1;
+    case 0x3e2:
+      return 0x3e3;
+    case 0x3e4:
+      return 0x3e5;
+    case 0x3e6:
+      return 0x3e7;
+    case 0x3e8:
+      return 0x3e9;
+    case 0x3ea:
+      return 0x3eb;
+    case 0x3ec:
+      return 0x3ed;
+    case 0x3ee:
+      return 0x3ef;
+    case 0x3f0:
+      return 0x3ba;
+    case 0x3f1:
+      return 0x3c1;
+    case 0x3f4:
+      return 0x3b8;
+    case 0x3f5:
+      return 0x3b5;
+    case 0x3f7:
+      return 0x3f8;
+    case 0x3f9:
+      return 0x3f2;
+    case 0x3fa:
+      return 0x3fb;
+    case 0x3fd:
+      return 0x37b;
+    case 0x3fe:
+      return 0x37c;
+    case 0x3ff:
+      return 0x37d;
+    case 0x400:
+      return 0x450;
+    case 0x401:
+      return 0x451;
+    case 0x402:
+      return 0x452;
+    case 0x403:
+      return 0x453;
+    case 0x404:
+      return 0x454;
+    case 0x405:
+      return 0x455;
+    case 0x406:
+      return 0x456;
+    case 0x407:
+      return 0x457;
+    case 0x408:
+      return 0x458;
+    case 0x409:
+      return 0x459;
+    case 0x40a:
+      return 0x45a;
+    case 0x40b:
+      return 0x45b;
+    case 0x40c:
+      return 0x45c;
+    case 0x40d:
+      return 0x45d;
+    case 0x40e:
+      return 0x45e;
+    case 0x40f:
+      return 0x45f;
+    case 0x410:
+      return 0x430;
+    case 0x411:
+      return 0x431;
+    case 0x412:
+      return 0x432;
+    case 0x413:
+      return 0x433;
+    case 0x414:
+      return 0x434;
+    case 0x415:
+      return 0x435;
+    case 0x416:
+      return 0x436;
+    case 0x417:
+      return 0x437;
+    case 0x418:
+      return 0x438;
+    case 0x419:
+      return 0x439;
+    case 0x41a:
+      return 0x43a;
+    case 0x41b:
+      return 0x43b;
+    case 0x41c:
+      return 0x43c;
+    case 0x41d:
+      return 0x43d;
+    case 0x41e:
+      return 0x43e;
+    case 0x41f:
+      return 0x43f;
+    case 0x420:
+      return 0x440;
+    case 0x421:
+      return 0x441;
+    case 0x422:
+      return 0x442;
+    case 0x423:
+      return 0x443;
+    case 0x424:
+      return 0x444;
+    case 0x425:
+      return 0x445;
+    case 0x426:
+      return 0x446;
+    case 0x427:
+      return 0x447;
+    case 0x428:
+      return 0x448;
+    case 0x429:
+      return 0x449;
+    case 0x42a:
+      return 0x44a;
+    case 0x42b:
+      return 0x44b;
+    case 0x42c:
+      return 0x44c;
+    case 0x42d:
+      return 0x44d;
+    case 0x42e:
+      return 0x44e;
+    case 0x42f:
+      return 0x44f;
+    case 0x460:
+      return 0x461;
+    case 0x462:
+      return 0x463;
+    case 0x464:
+      return 0x465;
+    case 0x466:
+      return 0x467;
+    case 0x468:
+      return 0x469;
+    case 0x46a:
+      return 0x46b;
+    case 0x46c:
+      return 0x46d;
+    case 0x46e:
+      return 0x46f;
+    case 0x470:
+      return 0x471;
+    case 0x472:
+      return 0x473;
+    case 0x474:
+      return 0x475;
+    case 0x476:
+      return 0x477;
+    case 0x478:
+      return 0x479;
+    case 0x47a:
+      return 0x47b;
+    case 0x47c:
+      return 0x47d;
+    case 0x47e:
+      return 0x47f;
+    case 0x480:
+      return 0x481;
+    case 0x48a:
+      return 0x48b;
+    case 0x48c:
+      return 0x48d;
+    case 0x48e:
+      return 0x48f;
+    case 0x490:
+      return 0x491;
+    case 0x492:
+      return 0x493;
+    case 0x494:
+      return 0x495;
+    case 0x496:
+      return 0x497;
+    case 0x498:
+      return 0x499;
+    case 0x49a:
+      return 0x49b;
+    case 0x49c:
+      return 0x49d;
+    case 0x49e:
+      return 0x49f;
+    case 0x4a0:
+      return 0x4a1;
+    case 0x4a2:
+      return 0x4a3;
+    case 0x4a4:
+      return 0x4a5;
+    case 0x4a6:
+      return 0x4a7;
+    case 0x4a8:
+      return 0x4a9;
+    case 0x4aa:
+      return 0x4ab;
+    case 0x4ac:
+      return 0x4ad;
+    case 0x4ae:
+      return 0x4af;
+    case 0x4b0:
+      return 0x4b1;
+    case 0x4b2:
+      return 0x4b3;
+    case 0x4b4:
+      return 0x4b5;
+    case 0x4b6:
+      return 0x4b7;
+    case 0x4b8:
+      return 0x4b9;
+    case 0x4ba:
+      return 0x4bb;
+    case 0x4bc:
+      return 0x4bd;
+    case 0x4be:
+      return 0x4bf;
+    case 0x4c0:
+      return 0x4cf;
+    case 0x4c1:
+      return 0x4c2;
+    case 0x4c3:
+      return 0x4c4;
+    case 0x4c5:
+      return 0x4c6;
+    case 0x4c7:
+      return 0x4c8;
+    case 0x4c9:
+      return 0x4ca;
+    case 0x4cb:
+      return 0x4cc;
+    case 0x4cd:
+      return 0x4ce;
+    case 0x4d0:
+      return 0x4d1;
+    case 0x4d2:
+      return 0x4d3;
+    case 0x4d4:
+      return 0x4d5;
+    case 0x4d6:
+      return 0x4d7;
+    case 0x4d8:
+      return 0x4d9;
+    case 0x4da:
+      return 0x4db;
+    case 0x4dc:
+      return 0x4dd;
+    case 0x4de:
+      return 0x4df;
+    case 0x4e0:
+      return 0x4e1;
+    case 0x4e2:
+      return 0x4e3;
+    case 0x4e4:
+      return 0x4e5;
+    case 0x4e6:
+      return 0x4e7;
+    case 0x4e8:
+      return 0x4e9;
+    case 0x4ea:
+      return 0x4eb;
+    case 0x4ec:
+      return 0x4ed;
+    case 0x4ee:
+      return 0x4ef;
+    case 0x4f0:
+      return 0x4f1;
+    case 0x4f2:
+      return 0x4f3;
+    case 0x4f4:
+      return 0x4f5;
+    case 0x4f6:
+      return 0x4f7;
+    case 0x4f8:
+      return 0x4f9;
+    case 0x4fa:
+      return 0x4fb;
+    case 0x4fc:
+      return 0x4fd;
+    case 0x4fe:
+      return 0x4ff;
+    case 0x500:
+      return 0x501;
+    case 0x502:
+      return 0x503;
+    case 0x504:
+      return 0x505;
+    case 0x506:
+      return 0x507;
+    case 0x508:
+      return 0x509;
+    case 0x50a:
+      return 0x50b;
+    case 0x50c:
+      return 0x50d;
+    case 0x50e:
+      return 0x50f;
+    case 0x510:
+      return 0x511;
+    case 0x512:
+      return 0x513;
+    case 0x514:
+      return 0x515;
+    case 0x516:
+      return 0x517;
+    case 0x518:
+      return 0x519;
+    case 0x51a:
+      return 0x51b;
+    case 0x51c:
+      return 0x51d;
+    case 0x51e:
+      return 0x51f;
+    case 0x520:
+      return 0x521;
+    case 0x522:
+      return 0x523;
+    case 0x524:
+      return 0x525;
+    case 0x526:
+      return 0x527;
+    case 0x528:
+      return 0x529;
+    case 0x52a:
+      return 0x52b;
+    case 0x52c:
+      return 0x52d;
+    case 0x52e:
+      return 0x52f;
+    case 0x531:
+      return 0x561;
+    case 0x532:
+      return 0x562;
+    case 0x533:
+      return 0x563;
+    case 0x534:
+      return 0x564;
+    case 0x535:
+      return 0x565;
+    case 0x536:
+      return 0x566;
+    case 0x537:
+      return 0x567;
+    case 0x538:
+      return 0x568;
+    case 0x539:
+      return 0x569;
+    case 0x53a:
+      return 0x56a;
+    case 0x53b:
+      return 0x56b;
+    case 0x53c:
+      return 0x56c;
+    case 0x53d:
+      return 0x56d;
+    case 0x53e:
+      return 0x56e;
+    case 0x53f:
+      return 0x56f;
+    case 0x540:
+      return 0x570;
+    case 0x541:
+      return 0x571;
+    case 0x542:
+      return 0x572;
+    case 0x543:
+      return 0x573;
+    case 0x544:
+      return 0x574;
+    case 0x545:
+      return 0x575;
+    case 0x546:
+      return 0x576;
+    case 0x547:
+      return 0x577;
+    case 0x548:
+      return 0x578;
+    case 0x549:
+      return 0x579;
+    case 0x54a:
+      return 0x57a;
+    case 0x54b:
+      return 0x57b;
+    case 0x54c:
+      return 0x57c;
+    case 0x54d:
+      return 0x57d;
+    case 0x54e:
+      return 0x57e;
+    case 0x54f:
+      return 0x57f;
+    case 0x550:
+      return 0x580;
+    case 0x551:
+      return 0x581;
+    case 0x552:
+      return 0x582;
+    case 0x553:
+      return 0x583;
+    case 0x554:
+      return 0x584;
+    case 0x555:
+      return 0x585;
+    case 0x556:
+      return 0x586;
+    case 0x10a0:
+      return 0x2d00;
+    case 0x10a1:
+      return 0x2d01;
+    case 0x10a2:
+      return 0x2d02;
+    case 0x10a3:
+      return 0x2d03;
+    case 0x10a4:
+      return 0x2d04;
+    case 0x10a5:
+      return 0x2d05;
+    case 0x10a6:
+      return 0x2d06;
+    case 0x10a7:
+      return 0x2d07;
+    case 0x10a8:
+      return 0x2d08;
+    case 0x10a9:
+      return 0x2d09;
+    case 0x10aa:
+      return 0x2d0a;
+    case 0x10ab:
+      return 0x2d0b;
+    case 0x10ac:
+      return 0x2d0c;
+    case 0x10ad:
+      return 0x2d0d;
+    case 0x10ae:
+      return 0x2d0e;
+    case 0x10af:
+      return 0x2d0f;
+    case 0x10b0:
+      return 0x2d10;
+    case 0x10b1:
+      return 0x2d11;
+    case 0x10b2:
+      return 0x2d12;
+    case 0x10b3:
+      return 0x2d13;
+    case 0x10b4:
+      return 0x2d14;
+    case 0x10b5:
+      return 0x2d15;
+    case 0x10b6:
+      return 0x2d16;
+    case 0x10b7:
+      return 0x2d17;
+    case 0x10b8:
+      return 0x2d18;
+    case 0x10b9:
+      return 0x2d19;
+    case 0x10ba:
+      return 0x2d1a;
+    case 0x10bb:
+      return 0x2d1b;
+    case 0x10bc:
+      return 0x2d1c;
+    case 0x10bd:
+      return 0x2d1d;
+    case 0x10be:
+      return 0x2d1e;
+    case 0x10bf:
+      return 0x2d1f;
+    case 0x10c0:
+      return 0x2d20;
+    case 0x10c1:
+      return 0x2d21;
+    case 0x10c2:
+      return 0x2d22;
+    case 0x10c3:
+      return 0x2d23;
+    case 0x10c4:
+      return 0x2d24;
+    case 0x10c5:
+      return 0x2d25;
+    case 0x10c7:
+      return 0x2d27;
+    case 0x10cd:
+      return 0x2d2d;
+    case 0x13f8:
+      return 0x13f0;
+    case 0x13f9:
+      return 0x13f1;
+    case 0x13fa:
+      return 0x13f2;
+    case 0x13fb:
+      return 0x13f3;
+    case 0x13fc:
+      return 0x13f4;
+    case 0x13fd:
+      return 0x13f5;
+    case 0x1c80:
+      return 0x432;
+    case 0x1c81:
+      return 0x434;
+    case 0x1c82:
+      return 0x43e;
+    case 0x1c83:
+      return 0x441;
+    case 0x1c84:
+      return 0x442;
+    case 0x1c85:
+      return 0x442;
+    case 0x1c86:
+      return 0x44a;
+    case 0x1c87:
+      return 0x463;
+    case 0x1c88:
+      return 0xa64b;
+    case 0x1c90:
+      return 0x10d0;
+    case 0x1c91:
+      return 0x10d1;
+    case 0x1c92:
+      return 0x10d2;
+    case 0x1c93:
+      return 0x10d3;
+    case 0x1c94:
+      return 0x10d4;
+    case 0x1c95:
+      return 0x10d5;
+    case 0x1c96:
+      return 0x10d6;
+    case 0x1c97:
+      return 0x10d7;
+    case 0x1c98:
+      return 0x10d8;
+    case 0x1c99:
+      return 0x10d9;
+    case 0x1c9a:
+      return 0x10da;
+    case 0x1c9b:
+      return 0x10db;
+    case 0x1c9c:
+      return 0x10dc;
+    case 0x1c9d:
+      return 0x10dd;
+    case 0x1c9e:
+      return 0x10de;
+    case 0x1c9f:
+      return 0x10df;
+    case 0x1ca0:
+      return 0x10e0;
+    case 0x1ca1:
+      return 0x10e1;
+    case 0x1ca2:
+      return 0x10e2;
+    case 0x1ca3:
+      return 0x10e3;
+    case 0x1ca4:
+      return 0x10e4;
+    case 0x1ca5:
+      return 0x10e5;
+    case 0x1ca6:
+      return 0x10e6;
+    case 0x1ca7:
+      return 0x10e7;
+    case 0x1ca8:
+      return 0x10e8;
+    case 0x1ca9:
+      return 0x10e9;
+    case 0x1caa:
+      return 0x10ea;
+    case 0x1cab:
+      return 0x10eb;
+    case 0x1cac:
+      return 0x10ec;
+    case 0x1cad:
+      return 0x10ed;
+    case 0x1cae:
+      return 0x10ee;
+    case 0x1caf:
+      return 0x10ef;
+    case 0x1cb0:
+      return 0x10f0;
+    case 0x1cb1:
+      return 0x10f1;
+    case 0x1cb2:
+      return 0x10f2;
+    case 0x1cb3:
+      return 0x10f3;
+    case 0x1cb4:
+      return 0x10f4;
+    case 0x1cb5:
+      return 0x10f5;
+    case 0x1cb6:
+      return 0x10f6;
+    case 0x1cb7:
+      return 0x10f7;
+    case 0x1cb8:
+      return 0x10f8;
+    case 0x1cb9:
+      return 0x10f9;
+    case 0x1cba:
+      return 0x10fa;
+    case 0x1cbd:
+      return 0x10fd;
+    case 0x1cbe:
+      return 0x10fe;
+    case 0x1cbf:
+      return 0x10ff;
+    case 0x1e00:
+      return 0x1e01;
+    case 0x1e02:
+      return 0x1e03;
+    case 0x1e04:
+      return 0x1e05;
+    case 0x1e06:
+      return 0x1e07;
+    case 0x1e08:
+      return 0x1e09;
+    case 0x1e0a:
+      return 0x1e0b;
+    case 0x1e0c:
+      return 0x1e0d;
+    case 0x1e0e:
+      return 0x1e0f;
+    case 0x1e10:
+      return 0x1e11;
+    case 0x1e12:
+      return 0x1e13;
+    case 0x1e14:
+      return 0x1e15;
+    case 0x1e16:
+      return 0x1e17;
+    case 0x1e18:
+      return 0x1e19;
+    case 0x1e1a:
+      return 0x1e1b;
+    case 0x1e1c:
+      return 0x1e1d;
+    case 0x1e1e:
+      return 0x1e1f;
+    case 0x1e20:
+      return 0x1e21;
+    case 0x1e22:
+      return 0x1e23;
+    case 0x1e24:
+      return 0x1e25;
+    case 0x1e26:
+      return 0x1e27;
+    case 0x1e28:
+      return 0x1e29;
+    case 0x1e2a:
+      return 0x1e2b;
+    case 0x1e2c:
+      return 0x1e2d;
+    case 0x1e2e:
+      return 0x1e2f;
+    case 0x1e30:
+      return 0x1e31;
+    case 0x1e32:
+      return 0x1e33;
+    case 0x1e34:
+      return 0x1e35;
+    case 0x1e36:
+      return 0x1e37;
+    case 0x1e38:
+      return 0x1e39;
+    case 0x1e3a:
+      return 0x1e3b;
+    case 0x1e3c:
+      return 0x1e3d;
+    case 0x1e3e:
+      return 0x1e3f;
+    case 0x1e40:
+      return 0x1e41;
+    case 0x1e42:
+      return 0x1e43;
+    case 0x1e44:
+      return 0x1e45;
+    case 0x1e46:
+      return 0x1e47;
+    case 0x1e48:
+      return 0x1e49;
+    case 0x1e4a:
+      return 0x1e4b;
+    case 0x1e4c:
+      return 0x1e4d;
+    case 0x1e4e:
+      return 0x1e4f;
+    case 0x1e50:
+      return 0x1e51;
+    case 0x1e52:
+      return 0x1e53;
+    case 0x1e54:
+      return 0x1e55;
+    case 0x1e56:
+      return 0x1e57;
+    case 0x1e58:
+      return 0x1e59;
+    case 0x1e5a:
+      return 0x1e5b;
+    case 0x1e5c:
+      return 0x1e5d;
+    case 0x1e5e:
+      return 0x1e5f;
+    case 0x1e60:
+      return 0x1e61;
+    case 0x1e62:
+      return 0x1e63;
+    case 0x1e64:
+      return 0x1e65;
+    case 0x1e66:
+      return 0x1e67;
+    case 0x1e68:
+      return 0x1e69;
+    case 0x1e6a:
+      return 0x1e6b;
+    case 0x1e6c:
+      return 0x1e6d;
+    case 0x1e6e:
+      return 0x1e6f;
+    case 0x1e70:
+      return 0x1e71;
+    case 0x1e72:
+      return 0x1e73;
+    case 0x1e74:
+      return 0x1e75;
+    case 0x1e76:
+      return 0x1e77;
+    case 0x1e78:
+      return 0x1e79;
+    case 0x1e7a:
+      return 0x1e7b;
+    case 0x1e7c:
+      return 0x1e7d;
+    case 0x1e7e:
+      return 0x1e7f;
+    case 0x1e80:
+      return 0x1e81;
+    case 0x1e82:
+      return 0x1e83;
+    case 0x1e84:
+      return 0x1e85;
+    case 0x1e86:
+      return 0x1e87;
+    case 0x1e88:
+      return 0x1e89;
+    case 0x1e8a:
+      return 0x1e8b;
+    case 0x1e8c:
+      return 0x1e8d;
+    case 0x1e8e:
+      return 0x1e8f;
+    case 0x1e90:
+      return 0x1e91;
+    case 0x1e92:
+      return 0x1e93;
+    case 0x1e94:
+      return 0x1e95;
+    case 0x1e9b:
+      return 0x1e61;
+    case 0x1e9e:
+      return 0xdf;
+    case 0x1ea0:
+      return 0x1ea1;
+    case 0x1ea2:
+      return 0x1ea3;
+    case 0x1ea4:
+      return 0x1ea5;
+    case 0x1ea6:
+      return 0x1ea7;
+    case 0x1ea8:
+      return 0x1ea9;
+    case 0x1eaa:
+      return 0x1eab;
+    case 0x1eac:
+      return 0x1ead;
+    case 0x1eae:
+      return 0x1eaf;
+    case 0x1eb0:
+      return 0x1eb1;
+    case 0x1eb2:
+      return 0x1eb3;
+    case 0x1eb4:
+      return 0x1eb5;
+    case 0x1eb6:
+      return 0x1eb7;
+    case 0x1eb8:
+      return 0x1eb9;
+    case 0x1eba:
+      return 0x1ebb;
+    case 0x1ebc:
+      return 0x1ebd;
+    case 0x1ebe:
+      return 0x1ebf;
+    case 0x1ec0:
+      return 0x1ec1;
+    case 0x1ec2:
+      return 0x1ec3;
+    case 0x1ec4:
+      return 0x1ec5;
+    case 0x1ec6:
+      return 0x1ec7;
+    case 0x1ec8:
+      return 0x1ec9;
+    case 0x1eca:
+      return 0x1ecb;
+    case 0x1ecc:
+      return 0x1ecd;
+    case 0x1ece:
+      return 0x1ecf;
+    case 0x1ed0:
+      return 0x1ed1;
+    case 0x1ed2:
+      return 0x1ed3;
+    case 0x1ed4:
+      return 0x1ed5;
+    case 0x1ed6:
+      return 0x1ed7;
+    case 0x1ed8:
+      return 0x1ed9;
+    case 0x1eda:
+      return 0x1edb;
+    case 0x1edc:
+      return 0x1edd;
+    case 0x1ede:
+      return 0x1edf;
+    case 0x1ee0:
+      return 0x1ee1;
+    case 0x1ee2:
+      return 0x1ee3;
+    case 0x1ee4:
+      return 0x1ee5;
+    case 0x1ee6:
+      return 0x1ee7;
+    case 0x1ee8:
+      return 0x1ee9;
+    case 0x1eea:
+      return 0x1eeb;
+    case 0x1eec:
+      return 0x1eed;
+    case 0x1eee:
+      return 0x1eef;
+    case 0x1ef0:
+      return 0x1ef1;
+    case 0x1ef2:
+      return 0x1ef3;
+    case 0x1ef4:
+      return 0x1ef5;
+    case 0x1ef6:
+      return 0x1ef7;
+    case 0x1ef8:
+      return 0x1ef9;
+    case 0x1efa:
+      return 0x1efb;
+    case 0x1efc:
+      return 0x1efd;
+    case 0x1efe:
+      return 0x1eff;
+    case 0x1f08:
+      return 0x1f00;
+    case 0x1f09:
+      return 0x1f01;
+    case 0x1f0a:
+      return 0x1f02;
+    case 0x1f0b:
+      return 0x1f03;
+    case 0x1f0c:
+      return 0x1f04;
+    case 0x1f0d:
+      return 0x1f05;
+    case 0x1f0e:
+      return 0x1f06;
+    case 0x1f0f:
+      return 0x1f07;
+    case 0x1f18:
+      return 0x1f10;
+    case 0x1f19:
+      return 0x1f11;
+    case 0x1f1a:
+      return 0x1f12;
+    case 0x1f1b:
+      return 0x1f13;
+    case 0x1f1c:
+      return 0x1f14;
+    case 0x1f1d:
+      return 0x1f15;
+    case 0x1f28:
+      return 0x1f20;
+    case 0x1f29:
+      return 0x1f21;
+    case 0x1f2a:
+      return 0x1f22;
+    case 0x1f2b:
+      return 0x1f23;
+    case 0x1f2c:
+      return 0x1f24;
+    case 0x1f2d:
+      return 0x1f25;
+    case 0x1f2e:
+      return 0x1f26;
+    case 0x1f2f:
+      return 0x1f27;
+    case 0x1f38:
+      return 0x1f30;
+    case 0x1f39:
+      return 0x1f31;
+    case 0x1f3a:
+      return 0x1f32;
+    case 0x1f3b:
+      return 0x1f33;
+    case 0x1f3c:
+      return 0x1f34;
+    case 0x1f3d:
+      return 0x1f35;
+    case 0x1f3e:
+      return 0x1f36;
+    case 0x1f3f:
+      return 0x1f37;
+    case 0x1f48:
+      return 0x1f40;
+    case 0x1f49:
+      return 0x1f41;
+    case 0x1f4a:
+      return 0x1f42;
+    case 0x1f4b:
+      return 0x1f43;
+    case 0x1f4c:
+      return 0x1f44;
+    case 0x1f4d:
+      return 0x1f45;
+    case 0x1f59:
+      return 0x1f51;
+    case 0x1f5b:
+      return 0x1f53;
+    case 0x1f5d:
+      return 0x1f55;
+    case 0x1f5f:
+      return 0x1f57;
+    case 0x1f68:
+      return 0x1f60;
+    case 0x1f69:
+      return 0x1f61;
+    case 0x1f6a:
+      return 0x1f62;
+    case 0x1f6b:
+      return 0x1f63;
+    case 0x1f6c:
+      return 0x1f64;
+    case 0x1f6d:
+      return 0x1f65;
+    case 0x1f6e:
+      return 0x1f66;
+    case 0x1f6f:
+      return 0x1f67;
+    case 0x1f88:
+      return 0x1f80;
+    case 0x1f89:
+      return 0x1f81;
+    case 0x1f8a:
+      return 0x1f82;
+    case 0x1f8b:
+      return 0x1f83;
+    case 0x1f8c:
+      return 0x1f84;
+    case 0x1f8d:
+      return 0x1f85;
+    case 0x1f8e:
+      return 0x1f86;
+    case 0x1f8f:
+      return 0x1f87;
+    case 0x1f98:
+      return 0x1f90;
+    case 0x1f99:
+      return 0x1f91;
+    case 0x1f9a:
+      return 0x1f92;
+    case 0x1f9b:
+      return 0x1f93;
+    case 0x1f9c:
+      return 0x1f94;
+    case 0x1f9d:
+      return 0x1f95;
+    case 0x1f9e:
+      return 0x1f96;
+    case 0x1f9f:
+      return 0x1f97;
+    case 0x1fa8:
+      return 0x1fa0;
+    case 0x1fa9:
+      return 0x1fa1;
+    case 0x1faa:
+      return 0x1fa2;
+    case 0x1fab:
+      return 0x1fa3;
+    case 0x1fac:
+      return 0x1fa4;
+    case 0x1fad:
+      return 0x1fa5;
+    case 0x1fae:
+      return 0x1fa6;
+    case 0x1faf:
+      return 0x1fa7;
+    case 0x1fb8:
+      return 0x1fb0;
+    case 0x1fb9:
+      return 0x1fb1;
+    case 0x1fba:
+      return 0x1f70;
+    case 0x1fbb:
+      return 0x1f71;
+    case 0x1fbc:
+      return 0x1fb3;
+    case 0x1fbe:
+      return 0x3b9;
+    case 0x1fc8:
+      return 0x1f72;
+    case 0x1fc9:
+      return 0x1f73;
+    case 0x1fca:
+      return 0x1f74;
+    case 0x1fcb:
+      return 0x1f75;
+    case 0x1fcc:
+      return 0x1fc3;
+    case 0x1fd8:
+      return 0x1fd0;
+    case 0x1fd9:
+      return 0x1fd1;
+    case 0x1fda:
+      return 0x1f76;
+    case 0x1fdb:
+      return 0x1f77;
+    case 0x1fe8:
+      return 0x1fe0;
+    case 0x1fe9:
+      return 0x1fe1;
+    case 0x1fea:
+      return 0x1f7a;
+    case 0x1feb:
+      return 0x1f7b;
+    case 0x1fec:
+      return 0x1fe5;
+    case 0x1ff8:
+      return 0x1f78;
+    case 0x1ff9:
+      return 0x1f79;
+    case 0x1ffa:
+      return 0x1f7c;
+    case 0x1ffb:
+      return 0x1f7d;
+    case 0x1ffc:
+      return 0x1ff3;
+    case 0x2126:
+      return 0x3c9;
+    case 0x212a:
+      return 0x6b;
+    case 0x212b:
+      return 0xe5;
+    case 0x2132:
+      return 0x214e;
+    case 0x2160:
+      return 0x2170;
+    case 0x2161:
+      return 0x2171;
+    case 0x2162:
+      return 0x2172;
+    case 0x2163:
+      return 0x2173;
+    case 0x2164:
+      return 0x2174;
+    case 0x2165:
+      return 0x2175;
+    case 0x2166:
+      return 0x2176;
+    case 0x2167:
+      return 0x2177;
+    case 0x2168:
+      return 0x2178;
+    case 0x2169:
+      return 0x2179;
+    case 0x216a:
+      return 0x217a;
+    case 0x216b:
+      return 0x217b;
+    case 0x216c:
+      return 0x217c;
+    case 0x216d:
+      return 0x217d;
+    case 0x216e:
+      return 0x217e;
+    case 0x216f:
+      return 0x217f;
+    case 0x2183:
+      return 0x2184;
+    case 0x24b6:
+      return 0x24d0;
+    case 0x24b7:
+      return 0x24d1;
+    case 0x24b8:
+      return 0x24d2;
+    case 0x24b9:
+      return 0x24d3;
+    case 0x24ba:
+      return 0x24d4;
+    case 0x24bb:
+      return 0x24d5;
+    case 0x24bc:
+      return 0x24d6;
+    case 0x24bd:
+      return 0x24d7;
+    case 0x24be:
+      return 0x24d8;
+    case 0x24bf:
+      return 0x24d9;
+    case 0x24c0:
+      return 0x24da;
+    case 0x24c1:
+      return 0x24db;
+    case 0x24c2:
+      return 0x24dc;
+    case 0x24c3:
+      return 0x24dd;
+    case 0x24c4:
+      return 0x24de;
+    case 0x24c5:
+      return 0x24df;
+    case 0x24c6:
+      return 0x24e0;
+    case 0x24c7:
+      return 0x24e1;
+    case 0x24c8:
+      return 0x24e2;
+    case 0x24c9:
+      return 0x24e3;
+    case 0x24ca:
+      return 0x24e4;
+    case 0x24cb:
+      return 0x24e5;
+    case 0x24cc:
+      return 0x24e6;
+    case 0x24cd:
+      return 0x24e7;
+    case 0x24ce:
+      return 0x24e8;
+    case 0x24cf:
+      return 0x24e9;
+    case 0x2c00:
+      return 0x2c30;
+    case 0x2c01:
+      return 0x2c31;
+    case 0x2c02:
+      return 0x2c32;
+    case 0x2c03:
+      return 0x2c33;
+    case 0x2c04:
+      return 0x2c34;
+    case 0x2c05:
+      return 0x2c35;
+    case 0x2c06:
+      return 0x2c36;
+    case 0x2c07:
+      return 0x2c37;
+    case 0x2c08:
+      return 0x2c38;
+    case 0x2c09:
+      return 0x2c39;
+    case 0x2c0a:
+      return 0x2c3a;
+    case 0x2c0b:
+      return 0x2c3b;
+    case 0x2c0c:
+      return 0x2c3c;
+    case 0x2c0d:
+      return 0x2c3d;
+    case 0x2c0e:
+      return 0x2c3e;
+    case 0x2c0f:
+      return 0x2c3f;
+    case 0x2c10:
+      return 0x2c40;
+    case 0x2c11:
+      return 0x2c41;
+    case 0x2c12:
+      return 0x2c42;
+    case 0x2c13:
+      return 0x2c43;
+    case 0x2c14:
+      return 0x2c44;
+    case 0x2c15:
+      return 0x2c45;
+    case 0x2c16:
+      return 0x2c46;
+    case 0x2c17:
+      return 0x2c47;
+    case 0x2c18:
+      return 0x2c48;
+    case 0x2c19:
+      return 0x2c49;
+    case 0x2c1a:
+      return 0x2c4a;
+    case 0x2c1b:
+      return 0x2c4b;
+    case 0x2c1c:
+      return 0x2c4c;
+    case 0x2c1d:
+      return 0x2c4d;
+    case 0x2c1e:
+      return 0x2c4e;
+    case 0x2c1f:
+      return 0x2c4f;
+    case 0x2c20:
+      return 0x2c50;
+    case 0x2c21:
+      return 0x2c51;
+    case 0x2c22:
+      return 0x2c52;
+    case 0x2c23:
+      return 0x2c53;
+    case 0x2c24:
+      return 0x2c54;
+    case 0x2c25:
+      return 0x2c55;
+    case 0x2c26:
+      return 0x2c56;
+    case 0x2c27:
+      return 0x2c57;
+    case 0x2c28:
+      return 0x2c58;
+    case 0x2c29:
+      return 0x2c59;
+    case 0x2c2a:
+      return 0x2c5a;
+    case 0x2c2b:
+      return 0x2c5b;
+    case 0x2c2c:
+      return 0x2c5c;
+    case 0x2c2d:
+      return 0x2c5d;
+    case 0x2c2e:
+      return 0x2c5e;
+    case 0x2c2f:
+      return 0x2c5f;
+    case 0x2c60:
+      return 0x2c61;
+    case 0x2c62:
+      return 0x26b;
+    case 0x2c63:
+      return 0x1d7d;
+    case 0x2c64:
+      return 0x27d;
+    case 0x2c67:
+      return 0x2c68;
+    case 0x2c69:
+      return 0x2c6a;
+    case 0x2c6b:
+      return 0x2c6c;
+    case 0x2c6d:
+      return 0x251;
+    case 0x2c6e:
+      return 0x271;
+    case 0x2c6f:
+      return 0x250;
+    case 0x2c70:
+      return 0x252;
+    case 0x2c72:
+      return 0x2c73;
+    case 0x2c75:
+      return 0x2c76;
+    case 0x2c7e:
+      return 0x23f;
+    case 0x2c7f:
+      return 0x240;
+    case 0x2c80:
+      return 0x2c81;
+    case 0x2c82:
+      return 0x2c83;
+    case 0x2c84:
+      return 0x2c85;
+    case 0x2c86:
+      return 0x2c87;
+    case 0x2c88:
+      return 0x2c89;
+    case 0x2c8a:
+      return 0x2c8b;
+    case 0x2c8c:
+      return 0x2c8d;
+    case 0x2c8e:
+      return 0x2c8f;
+    case 0x2c90:
+      return 0x2c91;
+    case 0x2c92:
+      return 0x2c93;
+    case 0x2c94:
+      return 0x2c95;
+    case 0x2c96:
+      return 0x2c97;
+    case 0x2c98:
+      return 0x2c99;
+    case 0x2c9a:
+      return 0x2c9b;
+    case 0x2c9c:
+      return 0x2c9d;
+    case 0x2c9e:
+      return 0x2c9f;
+    case 0x2ca0:
+      return 0x2ca1;
+    case 0x2ca2:
+      return 0x2ca3;
+    case 0x2ca4:
+      return 0x2ca5;
+    case 0x2ca6:
+      return 0x2ca7;
+    case 0x2ca8:
+      return 0x2ca9;
+    case 0x2caa:
+      return 0x2cab;
+    case 0x2cac:
+      return 0x2cad;
+    case 0x2cae:
+      return 0x2caf;
+    case 0x2cb0:
+      return 0x2cb1;
+    case 0x2cb2:
+      return 0x2cb3;
+    case 0x2cb4:
+      return 0x2cb5;
+    case 0x2cb6:
+      return 0x2cb7;
+    case 0x2cb8:
+      return 0x2cb9;
+    case 0x2cba:
+      return 0x2cbb;
+    case 0x2cbc:
+      return 0x2cbd;
+    case 0x2cbe:
+      return 0x2cbf;
+    case 0x2cc0:
+      return 0x2cc1;
+    case 0x2cc2:
+      return 0x2cc3;
+    case 0x2cc4:
+      return 0x2cc5;
+    case 0x2cc6:
+      return 0x2cc7;
+    case 0x2cc8:
+      return 0x2cc9;
+    case 0x2cca:
+      return 0x2ccb;
+    case 0x2ccc:
+      return 0x2ccd;
+    case 0x2cce:
+      return 0x2ccf;
+    case 0x2cd0:
+      return 0x2cd1;
+    case 0x2cd2:
+      return 0x2cd3;
+    case 0x2cd4:
+      return 0x2cd5;
+    case 0x2cd6:
+      return 0x2cd7;
+    case 0x2cd8:
+      return 0x2cd9;
+    case 0x2cda:
+      return 0x2cdb;
+    case 0x2cdc:
+      return 0x2cdd;
+    case 0x2cde:
+      return 0x2cdf;
+    case 0x2ce0:
+      return 0x2ce1;
+    case 0x2ce2:
+      return 0x2ce3;
+    case 0x2ceb:
+      return 0x2cec;
+    case 0x2ced:
+      return 0x2cee;
+    case 0x2cf2:
+      return 0x2cf3;
+    case 0xa640:
+      return 0xa641;
+    case 0xa642:
+      return 0xa643;
+    case 0xa644:
+      return 0xa645;
+    case 0xa646:
+      return 0xa647;
+    case 0xa648:
+      return 0xa649;
+    case 0xa64a:
+      return 0xa64b;
+    case 0xa64c:
+      return 0xa64d;
+    case 0xa64e:
+      return 0xa64f;
+    case 0xa650:
+      return 0xa651;
+    case 0xa652:
+      return 0xa653;
+    case 0xa654:
+      return 0xa655;
+    case 0xa656:
+      return 0xa657;
+    case 0xa658:
+      return 0xa659;
+    case 0xa65a:
+      return 0xa65b;
+    case 0xa65c:
+      return 0xa65d;
+    case 0xa65e:
+      return 0xa65f;
+    case 0xa660:
+      return 0xa661;
+    case 0xa662:
+      return 0xa663;
+    case 0xa664:
+      return 0xa665;
+    case 0xa666:
+      return 0xa667;
+    case 0xa668:
+      return 0xa669;
+    case 0xa66a:
+      return 0xa66b;
+    case 0xa66c:
+      return 0xa66d;
+    case 0xa680:
+      return 0xa681;
+    case 0xa682:
+      return 0xa683;
+    case 0xa684:
+      return 0xa685;
+    case 0xa686:
+      return 0xa687;
+    case 0xa688:
+      return 0xa689;
+    case 0xa68a:
+      return 0xa68b;
+    case 0xa68c:
+      return 0xa68d;
+    case 0xa68e:
+      return 0xa68f;
+    case 0xa690:
+      return 0xa691;
+    case 0xa692:
+      return 0xa693;
+    case 0xa694:
+      return 0xa695;
+    case 0xa696:
+      return 0xa697;
+    case 0xa698:
+      return 0xa699;
+    case 0xa69a:
+      return 0xa69b;
+    case 0xa722:
+      return 0xa723;
+    case 0xa724:
+      return 0xa725;
+    case 0xa726:
+      return 0xa727;
+    case 0xa728:
+      return 0xa729;
+    case 0xa72a:
+      return 0xa72b;
+    case 0xa72c:
+      return 0xa72d;
+    case 0xa72e:
+      return 0xa72f;
+    case 0xa732:
+      return 0xa733;
+    case 0xa734:
+      return 0xa735;
+    case 0xa736:
+      return 0xa737;
+    case 0xa738:
+      return 0xa739;
+    case 0xa73a:
+      return 0xa73b;
+    case 0xa73c:
+      return 0xa73d;
+    case 0xa73e:
+      return 0xa73f;
+    case 0xa740:
+      return 0xa741;
+    case 0xa742:
+      return 0xa743;
+    case 0xa744:
+      return 0xa745;
+    case 0xa746:
+      return 0xa747;
+    case 0xa748:
+      return 0xa749;
+    case 0xa74a:
+      return 0xa74b;
+    case 0xa74c:
+      return 0xa74d;
+    case 0xa74e:
+      return 0xa74f;
+    case 0xa750:
+      return 0xa751;
+    case 0xa752:
+      return 0xa753;
+    case 0xa754:
+      return 0xa755;
+    case 0xa756:
+      return 0xa757;
+    case 0xa758:
+      return 0xa759;
+    case 0xa75a:
+      return 0xa75b;
+    case 0xa75c:
+      return 0xa75d;
+    case 0xa75e:
+      return 0xa75f;
+    case 0xa760:
+      return 0xa761;
+    case 0xa762:
+      return 0xa763;
+    case 0xa764:
+      return 0xa765;
+    case 0xa766:
+      return 0xa767;
+    case 0xa768:
+      return 0xa769;
+    case 0xa76a:
+      return 0xa76b;
+    case 0xa76c:
+      return 0xa76d;
+    case 0xa76e:
+      return 0xa76f;
+    case 0xa779:
+      return 0xa77a;
+    case 0xa77b:
+      return 0xa77c;
+    case 0xa77d:
+      return 0x1d79;
+    case 0xa77e:
+      return 0xa77f;
+    case 0xa780:
+      return 0xa781;
+    case 0xa782:
+      return 0xa783;
+    case 0xa784:
+      return 0xa785;
+    case 0xa786:
+      return 0xa787;
+    case 0xa78b:
+      return 0xa78c;
+    case 0xa78d:
+      return 0x265;
+    case 0xa790:
+      return 0xa791;
+    case 0xa792:
+      return 0xa793;
+    case 0xa796:
+      return 0xa797;
+    case 0xa798:
+      return 0xa799;
+    case 0xa79a:
+      return 0xa79b;
+    case 0xa79c:
+      return 0xa79d;
+    case 0xa79e:
+      return 0xa79f;
+    case 0xa7a0:
+      return 0xa7a1;
+    case 0xa7a2:
+      return 0xa7a3;
+    case 0xa7a4:
+      return 0xa7a5;
+    case 0xa7a6:
+      return 0xa7a7;
+    case 0xa7a8:
+      return 0xa7a9;
+    case 0xa7aa:
+      return 0x266;
+    case 0xa7ab:
+      return 0x25c;
+    case 0xa7ac:
+      return 0x261;
+    case 0xa7ad:
+      return 0x26c;
+    case 0xa7ae:
+      return 0x26a;
+    case 0xa7b0:
+      return 0x29e;
+    case 0xa7b1:
+      return 0x287;
+    case 0xa7b2:
+      return 0x29d;
+    case 0xa7b3:
+      return 0xab53;
+    case 0xa7b4:
+      return 0xa7b5;
+    case 0xa7b6:
+      return 0xa7b7;
+    case 0xa7b8:
+      return 0xa7b9;
+    case 0xa7ba:
+      return 0xa7bb;
+    case 0xa7bc:
+      return 0xa7bd;
+    case 0xa7be:
+      return 0xa7bf;
+    case 0xa7c0:
+      return 0xa7c1;
+    case 0xa7c2:
+      return 0xa7c3;
+    case 0xa7c4:
+      return 0xa794;
+    case 0xa7c5:
+      return 0x282;
+    case 0xa7c6:
+      return 0x1d8e;
+    case 0xa7c7:
+      return 0xa7c8;
+    case 0xa7c9:
+      return 0xa7ca;
+    case 0xa7d0:
+      return 0xa7d1;
+    case 0xa7d6:
+      return 0xa7d7;
+    case 0xa7d8:
+      return 0xa7d9;
+    case 0xa7f5:
+      return 0xa7f6;
+    case 0xab70:
+      return 0x13a0;
+    case 0xab71:
+      return 0x13a1;
+    case 0xab72:
+      return 0x13a2;
+    case 0xab73:
+      return 0x13a3;
+    case 0xab74:
+      return 0x13a4;
+    case 0xab75:
+      return 0x13a5;
+    case 0xab76:
+      return 0x13a6;
+    case 0xab77:
+      return 0x13a7;
+    case 0xab78:
+      return 0x13a8;
+    case 0xab79:
+      return 0x13a9;
+    case 0xab7a:
+      return 0x13aa;
+    case 0xab7b:
+      return 0x13ab;
+    case 0xab7c:
+      return 0x13ac;
+    case 0xab7d:
+      return 0x13ad;
+    case 0xab7e:
+      return 0x13ae;
+    case 0xab7f:
+      return 0x13af;
+    case 0xab80:
+      return 0x13b0;
+    case 0xab81:
+      return 0x13b1;
+    case 0xab82:
+      return 0x13b2;
+    case 0xab83:
+      return 0x13b3;
+    case 0xab84:
+      return 0x13b4;
+    case 0xab85:
+      return 0x13b5;
+    case 0xab86:
+      return 0x13b6;
+    case 0xab87:
+      return 0x13b7;
+    case 0xab88:
+      return 0x13b8;
+    case 0xab89:
+      return 0x13b9;
+    case 0xab8a:
+      return 0x13ba;
+    case 0xab8b:
+      return 0x13bb;
+    case 0xab8c:
+      return 0x13bc;
+    case 0xab8d:
+      return 0x13bd;
+    case 0xab8e:
+      return 0x13be;
+    case 0xab8f:
+      return 0x13bf;
+    case 0xab90:
+      return 0x13c0;
+    case 0xab91:
+      return 0x13c1;
+    case 0xab92:
+      return 0x13c2;
+    case 0xab93:
+      return 0x13c3;
+    case 0xab94:
+      return 0x13c4;
+    case 0xab95:
+      return 0x13c5;
+    case 0xab96:
+      return 0x13c6;
+    case 0xab97:
+      return 0x13c7;
+    case 0xab98:
+      return 0x13c8;
+    case 0xab99:
+      return 0x13c9;
+    case 0xab9a:
+      return 0x13ca;
+    case 0xab9b:
+      return 0x13cb;
+    case 0xab9c:
+      return 0x13cc;
+    case 0xab9d:
+      return 0x13cd;
+    case 0xab9e:
+      return 0x13ce;
+    case 0xab9f:
+      return 0x13cf;
+    case 0xaba0:
+      return 0x13d0;
+    case 0xaba1:
+      return 0x13d1;
+    case 0xaba2:
+      return 0x13d2;
+    case 0xaba3:
+      return 0x13d3;
+    case 0xaba4:
+      return 0x13d4;
+    case 0xaba5:
+      return 0x13d5;
+    case 0xaba6:
+      return 0x13d6;
+    case 0xaba7:
+      return 0x13d7;
+    case 0xaba8:
+      return 0x13d8;
+    case 0xaba9:
+      return 0x13d9;
+    case 0xabaa:
+      return 0x13da;
+    case 0xabab:
+      return 0x13db;
+    case 0xabac:
+      return 0x13dc;
+    case 0xabad:
+      return 0x13dd;
+    case 0xabae:
+      return 0x13de;
+    case 0xabaf:
+      return 0x13df;
+    case 0xabb0:
+      return 0x13e0;
+    case 0xabb1:
+      return 0x13e1;
+    case 0xabb2:
+      return 0x13e2;
+    case 0xabb3:
+      return 0x13e3;
+    case 0xabb4:
+      return 0x13e4;
+    case 0xabb5:
+      return 0x13e5;
+    case 0xabb6:
+      return 0x13e6;
+    case 0xabb7:
+      return 0x13e7;
+    case 0xabb8:
+      return 0x13e8;
+    case 0xabb9:
+      return 0x13e9;
+    case 0xabba:
+      return 0x13ea;
+    case 0xabbb:
+      return 0x13eb;
+    case 0xabbc:
+      return 0x13ec;
+    case 0xabbd:
+      return 0x13ed;
+    case 0xabbe:
+      return 0x13ee;
+    case 0xabbf:
+      return 0x13ef;
+    case 0xff21:
+      return 0xff41;
+    case 0xff22:
+      return 0xff42;
+    case 0xff23:
+      return 0xff43;
+    case 0xff24:
+      return 0xff44;
+    case 0xff25:
+      return 0xff45;
+    case 0xff26:
+      return 0xff46;
+    case 0xff27:
+      return 0xff47;
+    case 0xff28:
+      return 0xff48;
+    case 0xff29:
+      return 0xff49;
+    case 0xff2a:
+      return 0xff4a;
+    case 0xff2b:
+      return 0xff4b;
+    case 0xff2c:
+      return 0xff4c;
+    case 0xff2d:
+      return 0xff4d;
+    case 0xff2e:
+      return 0xff4e;
+    case 0xff2f:
+      return 0xff4f;
+    case 0xff30:
+      return 0xff50;
+    case 0xff31:
+      return 0xff51;
+    case 0xff32:
+      return 0xff52;
+    case 0xff33:
+      return 0xff53;
+    case 0xff34:
+      return 0xff54;
+    case 0xff35:
+      return 0xff55;
+    case 0xff36:
+      return 0xff56;
+    case 0xff37:
+      return 0xff57;
+    case 0xff38:
+      return 0xff58;
+    case 0xff39:
+      return 0xff59;
+    case 0xff3a:
+      return 0xff5a;
+    case 0x10400:
+      return 0x10428;
+    case 0x10401:
+      return 0x10429;
+    case 0x10402:
+      return 0x1042a;
+    case 0x10403:
+      return 0x1042b;
+    case 0x10404:
+      return 0x1042c;
+    case 0x10405:
+      return 0x1042d;
+    case 0x10406:
+      return 0x1042e;
+    case 0x10407:
+      return 0x1042f;
+    case 0x10408:
+      return 0x10430;
+    case 0x10409:
+      return 0x10431;
+    case 0x1040a:
+      return 0x10432;
+    case 0x1040b:
+      return 0x10433;
+    case 0x1040c:
+      return 0x10434;
+    case 0x1040d:
+      return 0x10435;
+    case 0x1040e:
+      return 0x10436;
+    case 0x1040f:
+      return 0x10437;
+    case 0x10410:
+      return 0x10438;
+    case 0x10411:
+      return 0x10439;
+    case 0x10412:
+      return 0x1043a;
+    case 0x10413:
+      return 0x1043b;
+    case 0x10414:
+      return 0x1043c;
+    case 0x10415:
+      return 0x1043d;
+    case 0x10416:
+      return 0x1043e;
+    case 0x10417:
+      return 0x1043f;
+    case 0x10418:
+      return 0x10440;
+    case 0x10419:
+      return 0x10441;
+    case 0x1041a:
+      return 0x10442;
+    case 0x1041b:
+      return 0x10443;
+    case 0x1041c:
+      return 0x10444;
+    case 0x1041d:
+      return 0x10445;
+    case 0x1041e:
+      return 0x10446;
+    case 0x1041f:
+      return 0x10447;
+    case 0x10420:
+      return 0x10448;
+    case 0x10421:
+      return 0x10449;
+    case 0x10422:
+      return 0x1044a;
+    case 0x10423:
+      return 0x1044b;
+    case 0x10424:
+      return 0x1044c;
+    case 0x10425:
+      return 0x1044d;
+    case 0x10426:
+      return 0x1044e;
+    case 0x10427:
+      return 0x1044f;
+    case 0x104b0:
+      return 0x104d8;
+    case 0x104b1:
+      return 0x104d9;
+    case 0x104b2:
+      return 0x104da;
+    case 0x104b3:
+      return 0x104db;
+    case 0x104b4:
+      return 0x104dc;
+    case 0x104b5:
+      return 0x104dd;
+    case 0x104b6:
+      return 0x104de;
+    case 0x104b7:
+      return 0x104df;
+    case 0x104b8:
+      return 0x104e0;
+    case 0x104b9:
+      return 0x104e1;
+    case 0x104ba:
+      return 0x104e2;
+    case 0x104bb:
+      return 0x104e3;
+    case 0x104bc:
+      return 0x104e4;
+    case 0x104bd:
+      return 0x104e5;
+    case 0x104be:
+      return 0x104e6;
+    case 0x104bf:
+      return 0x104e7;
+    case 0x104c0:
+      return 0x104e8;
+    case 0x104c1:
+      return 0x104e9;
+    case 0x104c2:
+      return 0x104ea;
+    case 0x104c3:
+      return 0x104eb;
+    case 0x104c4:
+      return 0x104ec;
+    case 0x104c5:
+      return 0x104ed;
+    case 0x104c6:
+      return 0x104ee;
+    case 0x104c7:
+      return 0x104ef;
+    case 0x104c8:
+      return 0x104f0;
+    case 0x104c9:
+      return 0x104f1;
+    case 0x104ca:
+      return 0x104f2;
+    case 0x104cb:
+      return 0x104f3;
+    case 0x104cc:
+      return 0x104f4;
+    case 0x104cd:
+      return 0x104f5;
+    case 0x104ce:
+      return 0x104f6;
+    case 0x104cf:
+      return 0x104f7;
+    case 0x104d0:
+      return 0x104f8;
+    case 0x104d1:
+      return 0x104f9;
+    case 0x104d2:
+      return 0x104fa;
+    case 0x104d3:
+      return 0x104fb;
+    case 0x10570:
+      return 0x10597;
+    case 0x10571:
+      return 0x10598;
+    case 0x10572:
+      return 0x10599;
+    case 0x10573:
+      return 0x1059a;
+    case 0x10574:
+      return 0x1059b;
+    case 0x10575:
+      return 0x1059c;
+    case 0x10576:
+      return 0x1059d;
+    case 0x10577:
+      return 0x1059e;
+    case 0x10578:
+      return 0x1059f;
+    case 0x10579:
+      return 0x105a0;
+    case 0x1057a:
+      return 0x105a1;
+    case 0x1057c:
+      return 0x105a3;
+    case 0x1057d:
+      return 0x105a4;
+    case 0x1057e:
+      return 0x105a5;
+    case 0x1057f:
+      return 0x105a6;
+    case 0x10580:
+      return 0x105a7;
+    case 0x10581:
+      return 0x105a8;
+    case 0x10582:
+      return 0x105a9;
+    case 0x10583:
+      return 0x105aa;
+    case 0x10584:
+      return 0x105ab;
+    case 0x10585:
+      return 0x105ac;
+    case 0x10586:
+      return 0x105ad;
+    case 0x10587:
+      return 0x105ae;
+    case 0x10588:
+      return 0x105af;
+    case 0x10589:
+      return 0x105b0;
+    case 0x1058a:
+      return 0x105b1;
+    case 0x1058c:
+      return 0x105b3;
+    case 0x1058d:
+      return 0x105b4;
+    case 0x1058e:
+      return 0x105b5;
+    case 0x1058f:
+      return 0x105b6;
+    case 0x10590:
+      return 0x105b7;
+    case 0x10591:
+      return 0x105b8;
+    case 0x10592:
+      return 0x105b9;
+    case 0x10594:
+      return 0x105bb;
+    case 0x10595:
+      return 0x105bc;
+    case 0x10c80:
+      return 0x10cc0;
+    case 0x10c81:
+      return 0x10cc1;
+    case 0x10c82:
+      return 0x10cc2;
+    case 0x10c83:
+      return 0x10cc3;
+    case 0x10c84:
+      return 0x10cc4;
+    case 0x10c85:
+      return 0x10cc5;
+    case 0x10c86:
+      return 0x10cc6;
+    case 0x10c87:
+      return 0x10cc7;
+    case 0x10c88:
+      return 0x10cc8;
+    case 0x10c89:
+      return 0x10cc9;
+    case 0x10c8a:
+      return 0x10cca;
+    case 0x10c8b:
+      return 0x10ccb;
+    case 0x10c8c:
+      return 0x10ccc;
+    case 0x10c8d:
+      return 0x10ccd;
+    case 0x10c8e:
+      return 0x10cce;
+    case 0x10c8f:
+      return 0x10ccf;
+    case 0x10c90:
+      return 0x10cd0;
+    case 0x10c91:
+      return 0x10cd1;
+    case 0x10c92:
+      return 0x10cd2;
+    case 0x10c93:
+      return 0x10cd3;
+    case 0x10c94:
+      return 0x10cd4;
+    case 0x10c95:
+      return 0x10cd5;
+    case 0x10c96:
+      return 0x10cd6;
+    case 0x10c97:
+      return 0x10cd7;
+    case 0x10c98:
+      return 0x10cd8;
+    case 0x10c99:
+      return 0x10cd9;
+    case 0x10c9a:
+      return 0x10cda;
+    case 0x10c9b:
+      return 0x10cdb;
+    case 0x10c9c:
+      return 0x10cdc;
+    case 0x10c9d:
+      return 0x10cdd;
+    case 0x10c9e:
+      return 0x10cde;
+    case 0x10c9f:
+      return 0x10cdf;
+    case 0x10ca0:
+      return 0x10ce0;
+    case 0x10ca1:
+      return 0x10ce1;
+    case 0x10ca2:
+      return 0x10ce2;
+    case 0x10ca3:
+      return 0x10ce3;
+    case 0x10ca4:
+      return 0x10ce4;
+    case 0x10ca5:
+      return 0x10ce5;
+    case 0x10ca6:
+      return 0x10ce6;
+    case 0x10ca7:
+      return 0x10ce7;
+    case 0x10ca8:
+      return 0x10ce8;
+    case 0x10ca9:
+      return 0x10ce9;
+    case 0x10caa:
+      return 0x10cea;
+    case 0x10cab:
+      return 0x10ceb;
+    case 0x10cac:
+      return 0x10cec;
+    case 0x10cad:
+      return 0x10ced;
+    case 0x10cae:
+      return 0x10cee;
+    case 0x10caf:
+      return 0x10cef;
+    case 0x10cb0:
+      return 0x10cf0;
+    case 0x10cb1:
+      return 0x10cf1;
+    case 0x10cb2:
+      return 0x10cf2;
+    case 0x118a0:
+      return 0x118c0;
+    case 0x118a1:
+      return 0x118c1;
+    case 0x118a2:
+      return 0x118c2;
+    case 0x118a3:
+      return 0x118c3;
+    case 0x118a4:
+      return 0x118c4;
+    case 0x118a5:
+      return 0x118c5;
+    case 0x118a6:
+      return 0x118c6;
+    case 0x118a7:
+      return 0x118c7;
+    case 0x118a8:
+      return 0x118c8;
+    case 0x118a9:
+      return 0x118c9;
+    case 0x118aa:
+      return 0x118ca;
+    case 0x118ab:
+      return 0x118cb;
+    case 0x118ac:
+      return 0x118cc;
+    case 0x118ad:
+      return 0x118cd;
+    case 0x118ae:
+      return 0x118ce;
+    case 0x118af:
+      return 0x118cf;
+    case 0x118b0:
+      return 0x118d0;
+    case 0x118b1:
+      return 0x118d1;
+    case 0x118b2:
+      return 0x118d2;
+    case 0x118b3:
+      return 0x118d3;
+    case 0x118b4:
+      return 0x118d4;
+    case 0x118b5:
+      return 0x118d5;
+    case 0x118b6:
+      return 0x118d6;
+    case 0x118b7:
+      return 0x118d7;
+    case 0x118b8:
+      return 0x118d8;
+    case 0x118b9:
+      return 0x118d9;
+    case 0x118ba:
+      return 0x118da;
+    case 0x118bb:
+      return 0x118db;
+    case 0x118bc:
+      return 0x118dc;
+    case 0x118bd:
+      return 0x118dd;
+    case 0x118be:
+      return 0x118de;
+    case 0x118bf:
+      return 0x118df;
+    case 0x16e40:
+      return 0x16e60;
+    case 0x16e41:
+      return 0x16e61;
+    case 0x16e42:
+      return 0x16e62;
+    case 0x16e43:
+      return 0x16e63;
+    case 0x16e44:
+      return 0x16e64;
+    case 0x16e45:
+      return 0x16e65;
+    case 0x16e46:
+      return 0x16e66;
+    case 0x16e47:
+      return 0x16e67;
+    case 0x16e48:
+      return 0x16e68;
+    case 0x16e49:
+      return 0x16e69;
+    case 0x16e4a:
+      return 0x16e6a;
+    case 0x16e4b:
+      return 0x16e6b;
+    case 0x16e4c:
+      return 0x16e6c;
+    case 0x16e4d:
+      return 0x16e6d;
+    case 0x16e4e:
+      return 0x16e6e;
+    case 0x16e4f:
+      return 0x16e6f;
+    case 0x16e50:
+      return 0x16e70;
+    case 0x16e51:
+      return 0x16e71;
+    case 0x16e52:
+      return 0x16e72;
+    case 0x16e53:
+      return 0x16e73;
+    case 0x16e54:
+      return 0x16e74;
+    case 0x16e55:
+      return 0x16e75;
+    case 0x16e56:
+      return 0x16e76;
+    case 0x16e57:
+      return 0x16e77;
+    case 0x16e58:
+      return 0x16e78;
+    case 0x16e59:
+      return 0x16e79;
+    case 0x16e5a:
+      return 0x16e7a;
+    case 0x16e5b:
+      return 0x16e7b;
+    case 0x16e5c:
+      return 0x16e7c;
+    case 0x16e5d:
+      return 0x16e7d;
+    case 0x16e5e:
+      return 0x16e7e;
+    case 0x16e5f:
+      return 0x16e7f;
+    case 0x1e900:
+      return 0x1e922;
+    case 0x1e901:
+      return 0x1e923;
+    case 0x1e902:
+      return 0x1e924;
+    case 0x1e903:
+      return 0x1e925;
+    case 0x1e904:
+      return 0x1e926;
+    case 0x1e905:
+      return 0x1e927;
+    case 0x1e906:
+      return 0x1e928;
+    case 0x1e907:
+      return 0x1e929;
+    case 0x1e908:
+      return 0x1e92a;
+    case 0x1e909:
+      return 0x1e92b;
+    case 0x1e90a:
+      return 0x1e92c;
+    case 0x1e90b:
+      return 0x1e92d;
+    case 0x1e90c:
+      return 0x1e92e;
+    case 0x1e90d:
+      return 0x1e92f;
+    case 0x1e90e:
+      return 0x1e930;
+    case 0x1e90f:
+      return 0x1e931;
+    case 0x1e910:
+      return 0x1e932;
+    case 0x1e911:
+      return 0x1e933;
+    case 0x1e912:
+      return 0x1e934;
+    case 0x1e913:
+      return 0x1e935;
+    case 0x1e914:
+      return 0x1e936;
+    case 0x1e915:
+      return 0x1e937;
+    case 0x1e916:
+      return 0x1e938;
+    case 0x1e917:
+      return 0x1e939;
+    case 0x1e918:
+      return 0x1e93a;
+    case 0x1e919:
+      return 0x1e93b;
+    case 0x1e91a:
+      return 0x1e93c;
+    case 0x1e91b:
+      return 0x1e93d;
+    case 0x1e91c:
+      return 0x1e93e;
+    case 0x1e91d:
+      return 0x1e93f;
+    case 0x1e91e:
+      return 0x1e940;
+    case 0x1e91f:
+      return 0x1e941;
+    case 0x1e920:
+      return 0x1e942;
+    case 0x1e921:
+      return 0x1e943;
+    default:
+      return in;
   }
 }
diff --git a/src/common/sptr.hh b/src/common/sptr.hh
index 5da8fe16..bb325e71 100644
--- a/src/common/sptr.hh
+++ b/src/common/sptr.hh
@@ -6,7 +6,6 @@
 
 #include <memory>
 // A shorthand for std::shared_ptr
-template <class T>
-using sptr = std::shared_ptr<T>;
+template< class T >
+using sptr = std::shared_ptr< T >;
 #endif
-
diff --git a/src/common/ufile.cc b/src/common/ufile.cc
index c78079ee..4ad9e70b 100644
--- a/src/common/ufile.cc
+++ b/src/common/ufile.cc
@@ -1,41 +1,41 @@
 #ifdef __WIN32
 
-#include <stdio.h>
-#include <io.h>
-#include <fcntl.h>
-#include <windows.h>
+  #include <stdio.h>
+  #include <io.h>
+  #include <fcntl.h>
+  #include <windows.h>
 
-#include "ufile.hh"
+  #include "ufile.hh"
 
-FILE *gd_fopen( const char *filename, const char *mode)
+FILE * gd_fopen( const char * filename, const char * mode )
 {
-    wchar_t wname[16384], wmode[32];
+  wchar_t wname[ 16384 ], wmode[ 32 ];
 
-    if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
-        return NULL;
-    if( MultiByteToWideChar( CP_UTF8, 0, mode, -1, wmode, 32 ) == 0 )
-        return NULL;
-    return _wfopen( wname, wmode );
+  if ( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
+    return NULL;
+  if ( MultiByteToWideChar( CP_UTF8, 0, mode, -1, wmode, 32 ) == 0 )
+    return NULL;
+  return _wfopen( wname, wmode );
 }
 
-int gd_open( const char *filename)
+int gd_open( const char * filename )
 {
-    wchar_t wname[16384];
+  wchar_t wname[ 16384 ];
 
-    if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
-        return -1;
-    return _wopen( wname, _O_RDONLY | _O_BINARY );
+  if ( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
+    return -1;
+  return _wopen( wname, _O_RDONLY | _O_BINARY );
 }
 
-gzFile gd_gzopen( const char *filename )
+gzFile gd_gzopen( const char * filename )
 {
-    int id = gd_open( filename );
-    if( id == -1 )
-        return NULL;
-    gzFile f = gzdopen( id, "rb");
-    if( f == NULL )
-        _close( id );
-    return f;
+  int id = gd_open( filename );
+  if ( id == -1 )
+    return NULL;
+  gzFile f = gzdopen( id, "rb" );
+  if ( f == NULL )
+    _close( id );
+  return f;
 }
 
 #endif
diff --git a/src/common/ufile.hh b/src/common/ufile.hh
index a7a9d3d4..0acee8bf 100644
--- a/src/common/ufile.hh
+++ b/src/common/ufile.hh
@@ -3,29 +3,28 @@
 
 #ifdef __WIN32
 
-#include "zlib.h"
+  #include "zlib.h"
 
-// eliminate some VC++ warnings
-#ifdef _MSC_VER
-#define fileno _fileno
-#endif
+  // eliminate some VC++ warnings
+  #ifdef _MSC_VER
+    #define fileno _fileno
+  #endif
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+  #ifdef __cplusplus
+extern "C" {
+  #endif
 
-FILE *gd_fopen( const char *filename, const char *mode );
-int gd_open( const char *filename );
-gzFile gd_gzopen( const char *filename );
+FILE * gd_fopen( const char * filename, const char * mode );
+int gd_open( const char * filename );
+gzFile gd_gzopen( const char * filename );
 
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
+  #ifdef __cplusplus
+} /* end extern "C" */
+  #endif
 
 #else
-#define gd_fopen fopen
-#define gd_gzopen( filename )  gzopen( filename, "rb" )
+  #define gd_fopen              fopen
+  #define gd_gzopen( filename ) gzopen( filename, "rb" )
 #endif
 
 #endif // UFILE_HH
diff --git a/src/common/utf8.cc b/src/common/utf8.cc
index ea641408..8cf9c4ab 100644
--- a/src/common/utf8.cc
+++ b/src/common/utf8.cc
@@ -4,32 +4,28 @@
 #include "utf8.hh"
 #include <vector>
 #include <algorithm>
+#include <QByteArray>
+#include <QString>
 
 namespace Utf8 {
 
 size_t encode( wchar const * in, size_t inSize, char * out_ )
 {
-  unsigned char * out = (unsigned char *) out_;
+  unsigned char * out = (unsigned char *)out_;
 
-  while( inSize-- )
-  {
+  while ( inSize-- ) {
     if ( *in < 0x80 )
       *out++ = *in++;
-    else
-    if ( *in < 0x800 )
-    {
+    else if ( *in < 0x800 ) {
       *out++ = 0xC0 | ( *in >> 6 );
       *out++ = 0x80 | ( *in++ & 0x3F );
     }
-    else
-    if ( *in < 0x10000 )
-    {
+    else if ( *in < 0x10000 ) {
       *out++ = 0xE0 | ( *in >> 12 );
       *out++ = 0x80 | ( ( *in >> 6 ) & 0x3F );
       *out++ = 0x80 | ( *in++ & 0x3F );
     }
-    else
-    {
+    else {
       *out++ = 0xF0 | ( *in >> 18 );
       *out++ = 0x80 | ( ( *in >> 12 ) & 0x3F );
       *out++ = 0x80 | ( ( *in >> 6 ) & 0x3F );
@@ -37,26 +33,21 @@ size_t encode( wchar const * in, size_t inSize, char * out_ )
     }
   }
 
-  return out - (unsigned char *) out_;
+  return out - (unsigned char *)out_;
 }
 
 long decode( char const * in_, size_t inSize, wchar * out_ )
 {
-  unsigned char const * in = (unsigned char const *) in_;
-  wchar * out = out_;
+  unsigned char const * in = (unsigned char const *)in_;
+  wchar * out              = out_;
 
-  while( inSize-- )
-  {
+  while ( inSize-- ) {
     wchar result;
 
-    if ( *in & 0x80 )
-    {
-      if ( *in & 0x40 )
-      {
-        if ( *in & 0x20 )
-        {
-          if ( *in & 0x10 )
-          {
+    if ( *in & 0x80 ) {
+      if ( *in & 0x40 ) {
+        if ( *in & 0x20 ) {
+          if ( *in & 0x10 ) {
             // Four-byte sequence
             if ( *in & 8 )
               // This can't be
@@ -67,7 +58,7 @@ long decode( char const * in_, size_t inSize, wchar * out_ )
 
             inSize -= 3;
 
-            result = ( (wchar )*in++ & 7 ) << 18;
+            result = ( (wchar)*in++ & 7 ) << 18;
 
             if ( ( *in & 0xC0 ) != 0x80 )
               return -1;
@@ -81,8 +72,7 @@ long decode( char const * in_, size_t inSize, wchar * out_ )
               return -1;
             result |= (wchar)*in++ & 0x3F;
           }
-          else
-          {
+          else {
             // Three-byte sequence
 
             if ( inSize < 2 )
@@ -90,7 +80,7 @@ long decode( char const * in_, size_t inSize, wchar * out_ )
 
             inSize -= 2;
 
-            result = ( (wchar )*in++ & 0xF ) << 12;
+            result = ( (wchar)*in++ & 0xF ) << 12;
 
             if ( ( *in & 0xC0 ) != 0x80 )
               return -1;
@@ -101,23 +91,21 @@ long decode( char const * in_, size_t inSize, wchar * out_ )
             result |= (wchar)*in++ & 0x3F;
           }
         }
-        else
-        {
+        else {
           // Two-byte sequence
           if ( !inSize )
             return -1;
 
           --inSize;
 
-          result = ( (wchar )*in++ & 0x1F ) << 6;
+          result = ( (wchar)*in++ & 0x1F ) << 6;
 
           if ( ( *in & 0xC0 ) != 0x80 )
             return -1;
           result |= (wchar)*in++ & 0x3F;
         }
       }
-      else
-      {
+      else {
         // This char is from the middle of encoding, it can't be leading
         return -1;
       }
@@ -139,18 +127,17 @@ string encode( wstring const & in ) noexcept
 
   std::vector< char > buffer( in.size() * 4 );
 
-  return string( &buffer.front(),
-                 encode( in.data(), in.size(), &buffer.front() ) );
+  return string( &buffer.front(), encode( in.data(), in.size(), &buffer.front() ) );
 }
 
-wstring decode( string const & in ) 
+wstring decode( string const & in )
 {
   if ( in.empty() )
     return {};
 
   std::vector< wchar > buffer( in.size() );
 
-  long result = decode( in.data(),  in.size(), &buffer.front() );
+  long result = decode( in.data(), in.size(), &buffer.front() );
 
   if ( result < 0 )
     throw exCantDecode( in );
@@ -160,8 +147,7 @@ wstring decode( string const & in )
 
 bool isspace( int c )
 {
-  switch( c )
-  {
+  switch ( c ) {
     case ' ':
     case '\f':
     case '\n':
@@ -176,62 +162,95 @@ bool isspace( int c )
 }
 
 //get the first line in string s1. -1 if not found
-int findFirstLinePosition( char* s1,int s1length, const char* s2,int s2length)
+int findFirstLinePosition( char * s1, int s1length, const char * s2, int s2length )
 {
-    char* pos = std::search(s1,s1+s1length, s2, s2+s2length);
+  char * pos = std::search( s1, s1 + s1length, s2, s2 + s2length );
 
-    if (pos == s1 + s1length)
-        return pos-s1;
+  if ( pos == s1 + s1length )
+    return pos - s1;
 
-    //the line size.
-    return pos- s1+ s2length;
+  //the line size.
+  return pos - s1 + s2length;
 }
 
-char const* getEncodingNameFor(Encoding e)
+char const * getEncodingNameFor( Encoding e )
 {
-    switch (e)
-    {
+  switch ( e ) {
+    case Utf32LE:
+      return "UTF-32LE";
+    case Utf32BE:
+      return "UTF-32BE";
     case Utf16LE:
-        return "UTF-16LE";
+      return "UTF-16LE";
     case Utf16BE:
-        return "UTF-16BE";
+      return "UTF-16BE";
     case Windows1252:
-        return "WINDOWS-1252";
+      return "WINDOWS-1252";
     case Windows1251:
-        return "WINDOWS-1251";
+      return "WINDOWS-1251";
     case Utf8:
-        return "UTF-8";
+      return "UTF-8";
     case Windows1250:
+      return "WINDOWS-1250";
     default:
-        return "WINDOWS-1250";
-    }
+      return "UTF-8";
+  }
 }
 
-LineFeed initLineFeed(Encoding e)
+Encoding getEncodingForName( const QByteArray & _name )
 {
-    LineFeed lf;
-	switch (e)
-	{
-	case Utf8::Utf16LE:
-        lf.lineFeed= new char[2]{ 0x0A,0 };
-        lf.length = 2;
-		break;
-	case Utf8::Utf16BE:
-        lf.lineFeed = new char[2]{ 0,0x0A };
-        lf.length = 2;
-		break;
-	case Utf8::Windows1252:
-
-	case Utf8::Windows1251:
-
-	case Utf8::Utf8:
-
-	case Utf8::Windows1250:
-	default:
-        lf.length = 1;
-        lf.lineFeed = new char[1]{ 0x0A };
-	}
-    return lf;
+  const auto name = _name.toUpper();
+  if ( name == "UTF-32LE" )
+    return Utf32LE;
+  if ( name == "UTF-32BE" )
+    return Utf32BE;
+  if ( name == "UTF-16LE" )
+    return Utf16LE;
+  if ( name == "UTF-16BE" )
+    return Utf16BE;
+  if ( name == "WINDOWS-1252" )
+    return Windows1252;
+  if ( name == "WINDOWS-1251" )
+    return Windows1251;
+  if ( name == "UTF-8" )
+    return Utf8;
+  if ( name == "WINDOWS-1250" )
+    return Windows1250;
+  return Utf8;
 }
 
+LineFeed initLineFeed( const Encoding e )
+{
+  LineFeed lf{};
+  switch ( e ) {
+    case Utf8::Utf32LE:
+      lf.lineFeed = new char[ 4 ]{ 0x0A, 0, 0, 0 };
+      lf.length   = 4;
+      break;
+    case Utf8::Utf32BE:
+      lf.lineFeed = new char[ 4 ]{ 0, 0, 0, 0x0A };
+      lf.length   = 4;
+      break;
+    case Utf8::Utf16LE:
+      lf.lineFeed = new char[ 2 ]{ 0x0A, 0 };
+      lf.length   = 2;
+      break;
+    case Utf8::Utf16BE:
+      lf.lineFeed = new char[ 2 ]{ 0, 0x0A };
+      lf.length   = 2;
+      break;
+    case Utf8::Windows1252:
+
+    case Utf8::Windows1251:
+
+    case Utf8::Utf8:
+
+    case Utf8::Windows1250:
+    default:
+      lf.length   = 1;
+      lf.lineFeed = new char[ 1 ]{ 0x0A };
+  }
+  return lf;
 }
+
+} // namespace Utf8
diff --git a/src/common/utf8.hh b/src/common/utf8.hh
index 75f96503..824f9971 100644
--- a/src/common/utf8.hh
+++ b/src/common/utf8.hh
@@ -4,6 +4,7 @@
 #define __UTF8_HH_INCLUDED__
 
 #include <cstdio>
+#include <QByteArray>
 #include <string>
 #include "ex.hh"
 #include "wstring.hh"
@@ -15,14 +16,15 @@
 namespace Utf8 {
 
 // Those are possible encodings for .dsl files
-enum Encoding
-{
+enum Encoding {
   Utf16LE,
   Utf16BE,
   Windows1252,
   Windows1251,
   Windows1250,
-  Utf8 // This is an extension. Detected solely by the UTF8 BOM.
+  Utf8, // This is an extension. Detected solely by the UTF8 BOM.
+  Utf32BE,
+  Utf32LE,
 };
 
 using std::string;
@@ -45,7 +47,7 @@ long decode( char const * in, size_t inSize, wchar * out );
 
 /// Versions for non time-critical code.
 string encode( wstring const & ) noexcept;
-wstring decode( string const & ) ;
+wstring decode( string const & );
 
 /// Since the standard isspace() is locale-specific, we need something
 /// that would never mess up our utf8 input. The stock one worked fine under
@@ -53,17 +55,17 @@ wstring decode( string const & ) ;
 bool isspace( int c );
 
 //get the first line in string s1. -1 if not found
-int findFirstLinePosition( char* s1,int s1length, const char* s2,int s2length);
-char const* getEncodingNameFor(Encoding e);
+int findFirstLinePosition( char * s1, int s1length, const char * s2, int s2length );
+char const * getEncodingNameFor( Encoding e );
+Encoding getEncodingForName( const QByteArray & name );
 
 struct LineFeed
 {
-	int length;
-	char* lineFeed;
-
+  int length;
+  char * lineFeed;
 };
 
-LineFeed initLineFeed(Encoding e);
-}
+LineFeed initLineFeed( Encoding e );
+} // namespace Utf8
 
 #endif
diff --git a/src/common/utils.cc b/src/common/utils.cc
index 337e9d3d..1aa945c7 100644
--- a/src/common/utils.cc
+++ b/src/common/utils.cc
@@ -10,24 +10,24 @@ std::string c_string( const QString & str )
 {
   return std::string( str.toUtf8().constData() );
 }
-}
+} // namespace Utils
 
-QString Utils::Path::combine(const QString& path1, const QString& path2)
+QString Utils::Path::combine( const QString & path1, const QString & path2 )
 {
-  return QDir::cleanPath(path1 + QDir::separator() + path2);
+  return QDir::cleanPath( path1 + QDir::separator() + path2 );
 }
 
 QString Utils::Url::getSchemeAndHost( QUrl const & url )
 {
-  auto _url = url.url();
-  auto index = _url.indexOf("://");
-  auto hostEndIndex = _url.indexOf("/",index+3);
-  return _url.mid(0,hostEndIndex);
+  auto _url         = url.url();
+  auto index        = _url.indexOf( "://" );
+  auto hostEndIndex = _url.indexOf( "/", index + 3 );
+  return _url.mid( 0, hostEndIndex );
 }
 
-void Utils::Widget::setNoResultColor(QWidget * widget, bool noResult)
+void Utils::Widget::setNoResultColor( QWidget * widget, bool noResult )
 {
-  if( noResult ) {
+  if ( noResult ) {
     QPalette pal( widget->palette() );
     //    #febb7d
     QRgb rgb = 0xfebb7d;
@@ -68,4 +68,4 @@ std::string basename( std::string const & str )
   return std::string( str, x + 1 );
 }
 
-} // namespace FsEncoding
+} // namespace Utils::Fs
diff --git a/src/common/utils.hh b/src/common/utils.hh
index 70b1d28a..7de3d8e9 100644
--- a/src/common/utils.hh
+++ b/src/common/utils.hh
@@ -14,13 +14,10 @@
 #include <QWidget>
 #include "filetype.hh"
 
-namespace Utils
-{
+namespace Utils {
 inline bool isCJKChar( ushort ch )
 {
-  if( ( ch >= 0x3400 && ch <= 0x9FFF )
-      || ( ch >= 0xF900 && ch <= 0xFAFF )
-      || ( ch >= 0xD800 && ch <= 0xDFFF ) )
+  if ( ( ch >= 0x3400 && ch <= 0x9FFF ) || ( ch >= 0xF900 && ch <= 0xFAFF ) || ( ch >= 0xD800 && ch <= 0xDFFF ) )
     return true;
 
   return false;
@@ -28,11 +25,12 @@ inline bool isCJKChar( ushort ch )
 /**
  * remove right end space
  */
-inline QString rstrip(const QString &str) {
+inline QString rstrip( const QString & str )
+{
   int n = str.size() - 1;
-  for (; n >= 0; --n) {
-    if (!str.at(n).isSpace()) {
-      return str.left(n + 1);
+  for ( ; n >= 0; --n ) {
+    if ( !str.at( n ).isSpace() ) {
+      return str.left( n + 1 );
     }
   }
   return {};
@@ -50,22 +48,18 @@ inline QString trimNonChar( const QString & str )
 {
   QString remain;
   int n = str.size() - 1;
-  for( ; n >= 0; --n )
-  {
+  for ( ; n >= 0; --n ) {
     auto c = str.at( n );
-    if( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct()&& !c.isNull() )
-    {
+    if ( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct() && !c.isNull() ) {
       remain = str.left( n + 1 );
       break;
     }
   }
 
   n = 0;
-  for( ; n < remain.size(); n++ )
-  {
+  for ( ; n < remain.size(); n++ ) {
     auto c = remain.at( n );
-    if( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct() )
-    {
+    if ( !c.isSpace() && !c.isSymbol() && !c.isNonCharacter() && !c.isPunct() ) {
       return remain.mid( n );
     }
   }
@@ -79,38 +73,39 @@ inline QString trimNonChar( const QString & str )
  * @param str
  * @return
  */
-inline QString rstripnull(const QString &str) {
+inline QString rstripnull( const QString & str )
+{
   int n = str.size() - 1;
-  for (; n >= 0; --n) {
-    auto c = str.at(n);
-    if (!c.isSpace()&&!c.isNull()) {
-      return str.left(n + 1);
+  for ( ; n >= 0; --n ) {
+    auto c = str.at( n );
+    if ( !c.isSpace() && !c.isNull() ) {
+      return str.left( n + 1 );
     }
   }
   return "";
 }
 
-inline bool isExternalLink(QUrl const &url) {
-  return url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp" || url.scheme() == "mailto" ||
-         url.scheme() == "file" || url.toString().startsWith( "//" );
+inline bool isExternalLink( QUrl const & url )
+{
+  return url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp" || url.scheme() == "mailto"
+    || url.scheme() == "file" || url.toString().startsWith( "//" );
 }
 
-inline bool isHtmlResources(QUrl const &url) {
-  auto fileName = url.fileName();
+inline bool isHtmlResources( QUrl const & url )
+{
+  auto fileName   = url.fileName();
   qsizetype index = fileName.lastIndexOf( "." );
   QStringList extensions{ ".css", ".woff", ".woff2", ".ttf", ".otf", ".bmp", ".jpg",  ".png", ".gif", ".tif",
                           ".wav", ".ogg",  ".oga",   ".mp3", ".mp4", ".aac", ".flac", ".mid", ".wv",  ".ape" };
 
-  if( index > -1 )
-  {
+  if ( index > -1 ) {
     auto ext = fileName.mid( index );
-    if( extensions.contains( ext, Qt::CaseInsensitive ) )
+    if ( extensions.contains( ext, Qt::CaseInsensitive ) )
       return true;
   }
   // some url has the form like  https://xxxx/audio?file=***.mp3&a=1 etc links.
-  for( QString extension : extensions )
-  {
-    if( url.url().contains( extension, Qt::CaseInsensitive ) )
+  for ( QString extension : extensions ) {
+    if ( url.url().contains( extension, Qt::CaseInsensitive ) )
       return true;
   }
   return false;
@@ -122,12 +117,10 @@ inline QString escape( QString const & plain )
 }
 
 // should ignore key event.
-inline bool ignoreKeyEvent(QKeyEvent *keyEvent) {
-  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_Escape)
+inline bool ignoreKeyEvent( QKeyEvent * keyEvent )
+{
+  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_Escape )
     return true;
   return false;
 }
@@ -140,25 +133,22 @@ inline QString json2String( const QJsonObject & json )
 inline QStringList repeat( const QString str, const int times )
 {
   QStringList list;
-  for( int i = 0; i < times; i++ )
-  {
+  for ( int i = 0; i < times; i++ ) {
     list << str;
   }
   return list;
 }
 
-namespace AtomicInt
-{
+namespace AtomicInt {
 
 inline int loadAcquire( QAtomicInt const & ref )
 {
   return ref.loadAcquire();
 }
 
-}
+} // namespace AtomicInt
 
-namespace Url
-{
+namespace Url {
 
 // This wrapper is created due to behavior change of the setPath() method
 // See: https://bugreports.qt-project.org/browse/QTBUG-27728
@@ -228,38 +218,31 @@ inline std::pair< bool, QString > getQueryWord( QUrl const & url )
 {
   QString word;
   bool validScheme = false;
-  if( url.scheme().compare( "gdlookup" ) == 0 )
-  {
+  if ( url.scheme().compare( "gdlookup" ) == 0 ) {
     validScheme = true;
-    if( hasQueryItem( url, "word" ) )
-    {
+    if ( hasQueryItem( url, "word" ) ) {
       word = queryItemValue( url, "word" );
     }
-    else
-    {
+    else {
       word = url.path().mid( 1 );
     }
   }
-  if( url.scheme().compare( "bword" ) == 0 || url.scheme().compare( "entry" ) == 0 )
-  {
+  if ( url.scheme().compare( "bword" ) == 0 || url.scheme().compare( "entry" ) == 0 ) {
     validScheme = true;
 
     auto path = url.path();
     // url like this , bword:word  or bword://localhost/word
-    if( !path.isEmpty() )
-    {
+    if ( !path.isEmpty() ) {
       //url,bword://localhost/word
-      if( path.startsWith( "/" ) )
+      if ( path.startsWith( "/" ) )
         word = path.mid( 1 );
       else
         word = path;
     }
-    else
-    {
+    else {
       // url looks like this, bword://word,or bword://localhost
       auto host = url.host();
-      if( host != "localhost" )
-      {
+      if ( host != "localhost" ) {
         word = host;
       }
     }
@@ -272,7 +255,7 @@ inline bool isAudioUrl( QUrl const & url )
   // Note: we check for forvo sound links explicitly, as they don't have extensions
 
   return ( url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "gdau" )
-         && ( Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
+    && ( Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
 }
 
 /// Uses some heuristics to chop off the first domain name from the host name,
@@ -283,16 +266,15 @@ inline QString getHostBase( QString const & host )
 
   int left = domains.size();
 
-       // Skip last <=3-letter domain name
+  // Skip last <=3-letter domain name
   if ( left && domains[ left - 1 ].size() <= 3 )
     --left;
 
-       // Skip another <=3-letter domain name
+  // Skip another <=3-letter domain name
   if ( left && domains[ left - 1 ].size() <= 3 )
     --left;
 
-  if ( left > 1 )
-  {
+  if ( left > 1 ) {
     // We've got something like www.foobar.co.uk -- we can chop off the first
     // domain
 
@@ -311,20 +293,20 @@ inline QString getHostBaseFromUrl( QUrl const & url )
 
 QString getSchemeAndHost( QUrl const & url );
 
+} // namespace Url
+
+namespace Path {
+QString combine( const QString & path1, const QString & path2 );
 }
 
-namespace Path{
-QString combine(const QString& path1, const QString& path2);
-}
-
-namespace Widget{
-void setNoResultColor(QWidget * widget, bool noResult);
+namespace Widget {
+void setNoResultColor( QWidget * widget, bool noResult );
 }
 
 namespace Html {
 // See Issue #271: A mechanism to clean-up invalid HTML cards.
 std::string getHtmlCleaner();
-}
+} // namespace Html
 
 /// Utilities to convert a wide string or an utf8 string to the local 8bit
 /// encoding of the file system, and to do other manipulations on the file
@@ -339,7 +321,7 @@ char separator();
 /// Returns the name part of the given filename.
 string basename( string const & );
 
-}
+} // namespace Fs
 
 } // namespace Utils
 
diff --git a/src/common/wildcard.cc b/src/common/wildcard.cc
index 236783fd..624e5f9b 100644
--- a/src/common/wildcard.cc
+++ b/src/common/wildcard.cc
@@ -16,5 +16,4 @@ QString wildcardsToRegexp( const QString & wc_str )
 #else
   return QRegularExpression::wildcardToRegularExpression( wc_str, QRegularExpression::UnanchoredWildcardConversion );
 #endif
-  
 }
diff --git a/src/common/wstring.hh b/src/common/wstring.hh
index d47d2e6f..1cf47f40 100644
--- a/src/common/wstring.hh
+++ b/src/common/wstring.hh
@@ -44,10 +44,9 @@
 ///
 /// Now we have a better built-in type as char32_t and std::u32string
 
-namespace gd
-{
-   typedef char32_t wchar;
-   typedef std::u32string wstring;
-}
+namespace gd {
+typedef char32_t wchar;
+typedef std::u32string wstring;
+} // namespace gd
 
 #endif
diff --git a/src/common/wstring_qt.cc b/src/common/wstring_qt.cc
index 26e9834b..b44b2d93 100644
--- a/src/common/wstring_qt.cc
+++ b/src/common/wstring_qt.cc
@@ -1,41 +1,39 @@
 #include "wstring_qt.hh"
 #include <QVector>
 
-namespace gd
+namespace gd {
+wstring toWString( QString const & in )
 {
-  wstring toWString( QString const & in )
-  {
-    return in.toStdU32String();
-  }
-
-  // When convert non-BMP characters to wstring,the ending char maybe \0 .This method remove the tailing \0 from the wstring
-  // as \0 is sensitive in the index.  This method will be only used with index related operations like store/query.
-  wstring removeTrailingZero( wstring const & v )
-  {
-    int n = v.size();
-    while ( n > 0 && v[ n - 1 ] == 0 )
-      n--;
-    return wstring( v.data(), n );
-  }
-
-  wstring removeTrailingZero( QString const & in )
-  {
-    QVector< unsigned int > v = in.toUcs4();
-
-    int n = v.size();
-    while ( n > 0 && v[ n - 1 ] == 0 )
-      n--;
-    if ( n != v.size() )
-      v.resize( n );
-
-    return wstring( (const wchar *)v.constData(), v.size() );
-  }
-
-  wstring normalize( const wstring & str )
-  {
-    return toWString( QString::fromStdU32String( str ).normalized( QString::NormalizationForm_C ) );
-  }
-
-
-
+  return in.toStdU32String();
 }
+
+// When convert non-BMP characters to wstring,the ending char maybe \0 .This method remove the tailing \0 from the wstring
+// as \0 is sensitive in the index.  This method will be only used with index related operations like store/query.
+wstring removeTrailingZero( wstring const & v )
+{
+  int n = v.size();
+  while ( n > 0 && v[ n - 1 ] == 0 )
+    n--;
+  return wstring( v.data(), n );
+}
+
+wstring removeTrailingZero( QString const & in )
+{
+  QVector< unsigned int > v = in.toUcs4();
+
+  int n = v.size();
+  while ( n > 0 && v[ n - 1 ] == 0 )
+    n--;
+  if ( n != v.size() )
+    v.resize( n );
+
+  return wstring( (const wchar *)v.constData(), v.size() );
+}
+
+wstring normalize( const wstring & str )
+{
+  return toWString( QString::fromStdU32String( str ).normalized( QString::NormalizationForm_C ) );
+}
+
+
+} // namespace gd
diff --git a/src/common/wstring_qt.hh b/src/common/wstring_qt.hh
index 1082469a..094ee239 100644
--- a/src/common/wstring_qt.hh
+++ b/src/common/wstring_qt.hh
@@ -15,6 +15,6 @@ wstring toWString( QString const & );
 wstring removeTrailingZero( wstring const & v );
 wstring removeTrailingZero( QString const & in );
 wstring normalize( wstring const & );
-}
+} // namespace gd
 
 #endif
diff --git a/src/config.cc b/src/config.cc
index 64c560a8..6843b5d6 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -6,6 +6,8 @@
 #include <QDir>
 #include <QFile>
 #include <QtXml>
+#include <QApplication>
+#include <QStyle>
 #include "gddebug.hh"
 
 #ifdef Q_OS_WIN32
@@ -20,85 +22,90 @@
 #include <QStandardPaths>
 
 #if defined( HAVE_X11 )
-// Whether XDG Base Directory specification might be followed.
-// Only Qt5 builds are supported, as Qt4 doesn't provide all functions needed
-// to get XDG Base Directory compliant locations.
-#define XDG_BASE_DIRECTORY_COMPLIANCE
+  // Whether XDG Base Directory specification might be followed.
+  // Only Qt5 builds are supported, as Qt4 doesn't provide all functions needed
+  // to get XDG Base Directory compliant locations.
+  #define XDG_BASE_DIRECTORY_COMPLIANCE
 #endif
 
 namespace Config {
 
-namespace
-{
+namespace {
 #ifdef XDG_BASE_DIRECTORY_COMPLIANCE
-  const char xdgSubdirName[] = "goldendict";
+const char xdgSubdirName[] = "goldendict";
 
-  QDir getDataDir()
-  {
-    QDir dir = QStandardPaths::writableLocation( QStandardPaths::GenericDataLocation );
-    dir.mkpath( xdgSubdirName );
-    if ( !dir.cd( xdgSubdirName ) )
-      throw exCantUseDataDir();
+QDir getDataDir()
+{
+  QDir dir = QStandardPaths::writableLocation( QStandardPaths::GenericDataLocation );
+  dir.mkpath( xdgSubdirName );
+  if ( !dir.cd( xdgSubdirName ) )
+    throw exCantUseDataDir();
 
-    return dir;
-  }
+  return dir;
+}
 #endif
 
-  QString portableHomeDirPath()
-  {
-    return QCoreApplication::applicationDirPath() + "/portable";
-  }
-
-  QDir getHomeDir()
-  {
-    if ( isPortableVersion() )
-      return QDir( portableHomeDirPath() );
-
-    QDir result;
-
-    result = QDir::home();
-    #ifdef Q_OS_WIN32
-      if ( result.cd( "Application Data/GoldenDict" ) )
-        return result;
-      char const * pathInHome = "GoldenDict";
-      result = QDir::fromNativeSeparators( QString::fromWCharArray( _wgetenv( L"APPDATA" ) ) );
-    #else
-      char const * pathInHome = ".goldendict";
-      #ifdef XDG_BASE_DIRECTORY_COMPLIANCE
-        // check if an old config dir is present, otherwise use standards-compliant location
-        if ( !result.exists( pathInHome ) )
-        {
-          result.setPath( QStandardPaths::writableLocation( QStandardPaths::ConfigLocation ) );
-          pathInHome = xdgSubdirName;
-        }
-      #endif
-    #endif
-
-    result.mkpath( pathInHome );
-
-    if ( !result.cd( pathInHome ) )
-      throw exCantUseHomeDir();
-
-    return result;
-  }
-
+QString portableHomeDirPath()
+{
+  return QCoreApplication::applicationDirPath() + "/portable";
 }
 
-ProxyServer::ProxyServer(): enabled( false ), useSystemProxy( false ), type( Socks5 ), port( 3128 )
+QDir getHomeDir()
+{
+  if ( isPortableVersion() )
+    return QDir( portableHomeDirPath() );
+
+  QDir result;
+
+  result = QDir::home();
+#ifdef Q_OS_WIN32
+  if ( result.cd( "Application Data/GoldenDict" ) )
+    return result;
+  char const * pathInHome = "GoldenDict";
+  result                  = QDir::fromNativeSeparators( QString::fromWCharArray( _wgetenv( L"APPDATA" ) ) );
+#else
+  char const * pathInHome = ".goldendict";
+  #ifdef XDG_BASE_DIRECTORY_COMPLIANCE
+  // check if an old config dir is present, otherwise use standards-compliant location
+  if ( !result.exists( pathInHome ) ) {
+    result.setPath( QStandardPaths::writableLocation( QStandardPaths::ConfigLocation ) );
+    pathInHome = xdgSubdirName;
+  }
+  #endif
+#endif
+
+  result.mkpath( pathInHome );
+
+  if ( !result.cd( pathInHome ) )
+    throw exCantUseHomeDir();
+
+  return result;
+}
+
+} // namespace
+
+ProxyServer::ProxyServer():
+  enabled( false ),
+  useSystemProxy( false ),
+  type( Socks5 ),
+  port( 3128 )
 {
 }
 
 AnkiConnectServer::AnkiConnectServer():
-    enabled( false ),
-    host("127.0.0.1"),
-    port( 8765 ),
-    word("word"),
-    text("selected_text"),
-    sentence("marked_sentence")
+  enabled( false ),
+  host( "127.0.0.1" ),
+  port( 8765 ),
+  word( "word" ),
+  text( "selected_text" ),
+  sentence( "marked_sentence" )
 {
 }
 
-HotKey::HotKey(): modifiers( 0 ), key1( 0 ), key2( 0 )
+HotKey::HotKey():
+  modifiers( 0 ),
+  key1( 0 ),
+  key2( 0 )
 {
 }
 
@@ -116,7 +123,7 @@ HotKey::HotKey( QKeySequence const & seq ):
 
 QKeySequence HotKey::toKeySequence() const
 {
-  int v2 = key2 ? ( key2 | modifiers ): 0;
+  int v2 = key2 ? ( key2 | modifiers ) : 0;
 
   return QKeySequence( key1 | modifiers, v2 );
 }
@@ -173,12 +180,12 @@ bool InternalPlayerBackend::isQtmultimedia() const
 
 ScanPopupWindowFlags spwfFromInt( int id )
 {
-  if( id == SPWF_Popup )
+  if ( id == SPWF_Popup )
     return SPWF_Popup;
-  if( id == SPWF_Tool )
+  if ( id == SPWF_Tool )
     return SPWF_Tool;
 
-  if( id != SPWF_default )
+  if ( id != SPWF_default )
     gdWarning( "Invalid ScanPopup unpinned window flags: %d\n", id );
   return SPWF_default;
 }
@@ -201,14 +208,14 @@ QString Preferences::sanitizeInputPhrase( QString const & inputWord ) const
   }
 
   // Simplify whitespaces and remove soft hyphens (0xAD);
-  return Folding::trimWhitespace(  result.simplified() );
+  return Folding::trimWhitespace( result.simplified() );
 }
 
 Preferences::Preferences():
   newTabsOpenAfterCurrentOne( false ),
   newTabsOpenInBackground( true ),
   hideSingleTab( false ),
-  mruTabOrder ( false ),
+  mruTabOrder( false ),
   hideMenubar( false ),
   enableTrayIcon( true ),
   startToTray( false ),
@@ -219,9 +226,9 @@ Preferences::Preferences():
   autoScrollToTargetArticle( true ),
   escKeyHidesMainWindow( false ),
   darkMode( false ),
-  darkReaderMode ( false ),
-  alwaysOnTop ( false ),
-  searchInDock ( false ),
+  darkReaderMode( false ),
+  alwaysOnTop( false ),
+  searchInDock( false ),
 // on macOS, register hotkeys will override system shortcuts, disabled for now to avoid troubles.
 #ifdef Q_OS_MACOS
   enableMainWindowHotkey( false ),
@@ -242,9 +249,10 @@ Preferences::Preferences():
 #ifdef HAVE_X11
   // Enable both Clipboard and Selection by default so that X users can enjoy full
   // power and disable optionally.
-  trackClipboardScan ( true ),
-  trackSelectionScan ( true ),
+  trackClipboardScan( true ),
+  trackSelectionScan( true ),
   showScanFlag( false ),
+  selectionChangeDelayTimer( 500 ),
 #endif
   pronounceOnLoadMain( false ),
   pronounceOnLoadPopup( false ),
@@ -271,6 +279,9 @@ Preferences::Preferences():
   maxDictionaryRefsInContextMenu( 20 ),
   synonymSearchEnabled( true ),
   stripClipboard( false ),
+#if !defined( Q_OS_WIN )
+  interfaceStyle( "Default" ),
+#endif
   raiseWindowOnSearch( true )
 {
 }
@@ -295,17 +306,17 @@ Romaji::Romaji():
 
 Group * Class::getGroup( unsigned id )
 {
-  for( int x = 0; x < groups.size(); x++ )
-    if( groups.at( x ).id == id )
-      return &groups[ x ];
+  for ( auto & group : groups )
+    if ( group.id == id )
+      return &group;
   return 0;
 }
 
 Group const * Class::getGroup( unsigned id ) const
 {
-  for( int x = 0; x < groups.size(); x++ )
-    if( groups.at( x ).id == id )
-      return &groups.at( x );
+  for ( const auto & group : groups )
+    if ( group.id == id )
+      return &group;
   return 0;
 }
 
@@ -320,16 +331,29 @@ MediaWikis makeDefaultMediaWikis( bool enable )
 {
   MediaWikis mw;
 
-  mw.push_back( MediaWiki( "ae6f89aac7151829681b85f035d54e48", "English Wikipedia", "https://en.wikipedia.org/w", enable, "" ) );
-  mw.push_back( MediaWiki( "affcf9678e7bfe701c9b071f97eccba3", "English Wiktionary", "https://en.wiktionary.org/w", enable, ""  ) );
-  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", "https://de.wikipedia.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "21c64bca5ec10ba17ff19f3066bc962a", "German Wiktionary", "https://de.wiktionary.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "96957cb2ad73a20c7a1d561fc83c253a", "Portuguese Wikipedia", "https://pt.wikipedia.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "ed4c3929196afdd93cc08b9a903aad6a", "Portuguese Wiktionary", "https://pt.wiktionary.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "f3b4ec8531e52ddf5b10d21e4577a7a2", "Greek Wikipedia", "https://el.wikipedia.org/w", false, "" ) );
-  mw.push_back( MediaWiki( "5d45232075d06e002dea72fe3e137da1", "Greek Wiktionary", "https://el.wiktionary.org/w", false, "" ) );
+  mw.push_back(
+    MediaWiki( "ae6f89aac7151829681b85f035d54e48", "English Wikipedia", "https://en.wikipedia.org/w", enable, "" ) );
+  mw.push_back(
+    MediaWiki( "affcf9678e7bfe701c9b071f97eccba3", "English Wiktionary", "https://en.wiktionary.org/w", enable, "" ) );
+  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", "https://de.wikipedia.org/w", false, "" ) );
+  mw.push_back(
+    MediaWiki( "21c64bca5ec10ba17ff19f3066bc962a", "German Wiktionary", "https://de.wiktionary.org/w", false, "" ) );
+  mw.push_back(
+    MediaWiki( "96957cb2ad73a20c7a1d561fc83c253a", "Portuguese Wikipedia", "https://pt.wikipedia.org/w", false, "" ) );
+  mw.push_back( MediaWiki( "ed4c3929196afdd93cc08b9a903aad6a",
+                           "Portuguese Wiktionary",
+                           "https://pt.wiktionary.org/w",
+                           false,
+                           "" ) );
+  mw.push_back(
+    MediaWiki( "f3b4ec8531e52ddf5b10d21e4577a7a2", "Greek Wikipedia", "https://el.wikipedia.org/w", false, "" ) );
+  mw.push_back(
+    MediaWiki( "5d45232075d06e002dea72fe3e137da1", "Greek Wiktionary", "https://el.wiktionary.org/w", false, "" ) );
 
   return mw;
 }
@@ -338,10 +362,30 @@ WebSites makeDefaultWebSites()
 {
   WebSites ws;
 
-  ws.push_back( WebSite( "b88cb2898e634c6638df618528284c2d", "Google En-En (Oxford)", "https://www.google.com/search?q=define:%GDWORD%&hl=en", false, "", true ) );
-  ws.push_back( WebSite( "f376365a0de651fd7505e7e5e683aa45", "Urban Dictionary", "https://www.urbandictionary.com/define.php?term=%GDWORD%", false, "", true ) );
-  ws.push_back( WebSite( "324ca0306187df7511b26d3847f4b07c", "Multitran (En-Ru)", "https://www.multitran.com/m.exe?s=%GDWORD%&l1=1&l2=2", false, "", true ) );
-  ws.push_back( WebSite( "379a0ce02a34747d642cb0d7de1b2882", "Merriam-Webster (En)", "https://www.merriam-webster.com/dictionary/%GDWORD%", false, "", true ) );
+  ws.push_back( WebSite( "b88cb2898e634c6638df618528284c2d",
+                         "Google En-En (Oxford)",
+                         "https://www.google.com/search?q=define:%GDWORD%&hl=en",
+                         false,
+                         "",
+                         true ) );
+  ws.push_back( WebSite( "f376365a0de651fd7505e7e5e683aa45",
+                         "Urban Dictionary",
+                         "https://www.urbandictionary.com/define.php?term=%GDWORD%",
+                         false,
+                         "",
+                         true ) );
+  ws.push_back( WebSite( "324ca0306187df7511b26d3847f4b07c",
+                         "Multitran (En-Ru)",
+                         "https://www.multitran.com/m.exe?s=%GDWORD%&l1=1&l2=2",
+                         false,
+                         "",
+                         true ) );
+  ws.push_back( WebSite( "379a0ce02a34747d642cb0d7de1b2882",
+                         "Merriam-Webster (En)",
+                         "https://www.merriam-webster.com/dictionary/%GDWORD%",
+                         false,
+                         "",
+                         true ) );
 
   return ws;
 }
@@ -359,9 +403,16 @@ Programs makeDefaultPrograms()
 
   // The following list doesn't make a lot of sense under Windows
 #ifndef Q_OS_WIN
-  programs.push_back( Program( false, Program::Audio, "428b4c2b905ef568a43d9a16f59559b0", "Festival", "festival --tts", "" ) );
-  programs.push_back( Program( false, Program::Audio, "2cf8b3a60f27e1ac812de0b57c148340", "Espeak", "espeak %GDWORD%", "" ) );
-  programs.push_back( Program( false, Program::Html, "4f898f7582596cea518c6b0bfdceb8b3", "Manpages", "man -a --html=/bin/cat %GDWORD%", "" ) );
+  programs.push_back(
+    Program( false, Program::Audio, "428b4c2b905ef568a43d9a16f59559b0", "Festival", "festival --tts", "" ) );
+  programs.push_back(
+    Program( false, Program::Audio, "2cf8b3a60f27e1ac812de0b57c148340", "Espeak", "espeak %GDWORD%", "" ) );
+  programs.push_back( Program( false,
+                               Program::Html,
+                               "4f898f7582596cea518c6b0bfdceb8b3",
+                               "Manpages",
+                               "man -a --html=/bin/cat %GDWORD%",
+                               "" ) );
 #endif
 
   return programs;
@@ -375,8 +426,7 @@ void applyBoolOption( bool & option, QDomNode const & node )
 
   if ( value == "1" )
     option = true;
-  else
-  if ( value == "0" )
+  else if ( value == "0" )
     option = false;
 }
 
@@ -387,10 +437,10 @@ Group loadGroup( QDomElement grp, unsigned * nextId = 0 )
   if ( grp.hasAttribute( "id" ) )
     g.id = grp.attribute( "id" ).toUInt();
   else
-    g.id = nextId ? (*nextId)++ : 0;
+    g.id = nextId ? ( *nextId )++ : 0;
 
-  g.name = grp.attribute( "name" );
-  g.icon = grp.attribute( "icon" );
+  g.name            = grp.attribute( "name" );
+  g.icon            = grp.attribute( "icon" );
   g.favoritesFolder = grp.attribute( "favoritesFolder" );
 
   if ( !grp.attribute( "iconData" ).isEmpty() )
@@ -401,66 +451,60 @@ Group loadGroup( QDomElement grp, unsigned * nextId = 0 )
 
   QDomNodeList dicts = grp.elementsByTagName( "dictionary" );
 
-  for( int y = 0; y < dicts.length(); ++y )
-    g.dictionaries.push_back( DictionaryRef( dicts.item( y ).toElement().text(),
-                                             dicts.item( y ).toElement().attribute( "name" ) ) );
+  for ( int y = 0; y < dicts.length(); ++y )
+    g.dictionaries.push_back(
+      DictionaryRef( dicts.item( y ).toElement().text(), dicts.item( y ).toElement().attribute( "name" ) ) );
 
   QDomNode muted = grp.namedItem( "mutedDictionaries" );
-  dicts = muted.toElement().elementsByTagName( "mutedDictionary" );
-  for( int x = 0; x < dicts.length(); ++x )
+  dicts          = muted.toElement().elementsByTagName( "mutedDictionary" );
+  for ( int x = 0; x < dicts.length(); ++x )
     g.mutedDictionaries.insert( dicts.item( x ).toElement().text() );
 
   dicts = muted.toElement().elementsByTagName( "popupMutedDictionary" );
-  for( int x = 0; x < dicts.length(); ++x )
+  for ( int x = 0; x < dicts.length(); ++x )
     g.popupMutedDictionaries.insert( dicts.item( x ).toElement().text() );
 
   return g;
 }
 
-MutedDictionaries loadMutedDictionaries( QDomNode mutedDictionaries )
+MutedDictionaries loadMutedDictionaries( const QDomNode & mutedDictionaries )
 {
   MutedDictionaries result;
 
-  if ( !mutedDictionaries.isNull() )
-  {
-    QDomNodeList nl = mutedDictionaries.toElement().
-                        elementsByTagName( "mutedDictionary" );
+  if ( !mutedDictionaries.isNull() ) {
+    QDomNodeList nl = mutedDictionaries.toElement().elementsByTagName( "mutedDictionary" );
 
-    for( int x = 0; x < nl.length(); ++x )
+    for ( int x = 0; x < nl.length(); ++x )
       result.insert( nl.item( x ).toElement().text() );
   }
 
   return result;
 }
 
-void saveMutedDictionaries( QDomDocument & dd, QDomElement & muted,
-                            MutedDictionaries const & mutedDictionaries )
+void saveMutedDictionaries( QDomDocument & dd, QDomElement & muted, MutedDictionaries const & mutedDictionaries )
 {
-  for( MutedDictionaries::const_iterator i = mutedDictionaries.begin();
-       i != mutedDictionaries.end(); ++i )
-  {
+  for ( const auto & mutedDictionarie : mutedDictionaries ) {
     QDomElement dict = dd.createElement( "mutedDictionary" );
     muted.appendChild( dict );
 
-    QDomText value = dd.createTextNode( *i );
+    QDomText value = dd.createTextNode( mutedDictionarie );
     dict.appendChild( value );
   }
 }
 
-}
+} // namespace
 
-Class load() 
+Class load()
 {
-  QString configName  = getConfigFileName();
+  QString configName = getConfigFileName();
 
   bool loadFromTemplate = false;
 
-  if ( !QFile::exists( configName ) )
-  {
+  if ( !QFile::exists( configName ) ) {
     // Make the default config, save it and return it
     Class c;
 
-    #ifdef Q_OS_LINUX
+#ifdef Q_OS_LINUX
     if ( QDir( "/usr/share/stardict/dic" ).exists() )
       c.paths.push_back( Path( "/usr/share/stardict/dic", true ) );
 
@@ -479,61 +523,29 @@ Class load()
     if ( QDir( "/usr/share/myspell/dicts" ).exists() )
       c.hunspell.dictionariesPath = "/usr/share/myspell/dicts";
 
-    #endif
+#endif
 
-    #ifdef Q_OS_WIN32
 
-    // get path to Program Files
-    wchar_t buf[ MAX_PATH ];
-    SHGetFolderPathW( NULL, CSIDL_PROGRAM_FILES, NULL, 0, buf );
-    QString pathToProgramFiles = QString::fromWCharArray( buf );
-    if ( pathToProgramFiles.isEmpty() )
-      pathToProgramFiles = "C:\\Program Files";
-
-    if ( QDir( pathToProgramFiles + "\\StarDict\\dic" ).exists() )
-      c.paths.push_back( Path( pathToProgramFiles + "\\StarDict\\dic", true ) );
-
-    if ( QDir( pathToProgramFiles + "\\StarDict\\WyabdcRealPeopleTTS" ).exists() )
-      c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\StarDict\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) );
-    else
-    if ( QDir( pathToProgramFiles + "\\WyabdcRealPeopleTTS" ).exists() )
-      c.soundDirs.push_back( SoundDir( pathToProgramFiles + "\\WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) );
-
-    // #### "C:/Program Files" is bad! will not work for German Windows etc.
-    // #### should be replaced to system path
-
-//    if ( QDir( "C:/Program Files/StarDict/dic" ).exists() )
-//      c.paths.push_back( Path( "C:/Program Files/StarDict/dic", true ) );
-//
-//    if ( QDir( "C:/Program Files/StarDict/WyabdcRealPeopleTTS" ).exists() )
-//      c.soundDirs.push_back( SoundDir( "C:/Program Files/StarDict/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) );
-//    else
-//    if ( QDir( "C:/Program Files/WyabdcRealPeopleTTS" ).exists() )
-//      c.soundDirs.push_back( SoundDir( "C:/Program Files/WyabdcRealPeopleTTS", "WyabdcRealPeopleTTS" ) );
-
-    #endif
-
-    #ifndef Q_OS_WIN32
+#ifndef Q_OS_WIN32
     c.preferences.audioPlaybackProgram = "mplayer";
-    #endif
+#endif
 
     QString possibleMorphologyPath = getProgramDataDir() + "/content/morphology";
 
     if ( QDir( possibleMorphologyPath ).exists() )
       c.hunspell.dictionariesPath = possibleMorphologyPath;
 
-    c.mediawikis = makeDefaultMediaWikis( true );
-    c.webSites = makeDefaultWebSites();
+    c.mediawikis  = makeDefaultMediaWikis( true );
+    c.webSites    = makeDefaultWebSites();
     c.dictServers = makeDefaultDictServers();
-    c.programs = makeDefaultPrograms();
+    c.programs    = makeDefaultPrograms();
 
     // Check if we have a template config file. If we do, load it instead
 
-    configName = getProgramDataDir() + "/content/defconfig";
+    configName       = getProgramDataDir() + "/content/defconfig";
     loadFromTemplate = QFile( configName ).exists();
 
-    if ( !loadFromTemplate )
-    {
+    if ( !loadFromTemplate ) {
       save( c );
 
       return c;
@@ -552,17 +564,14 @@ Class load()
   QString errorStr;
   int errorLine, errorColumn;
 
-  if ( !loadFromTemplate )
-  {
+  if ( !loadFromTemplate ) {
     // Load the config as usual
-    if ( !dd.setContent( &configFile, false, &errorStr, &errorLine, &errorColumn  ) )
-    {
-      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
-        throw exMalformedConfigFile();
+    if ( !dd.setContent( &configFile, false, &errorStr, &errorLine, &errorColumn ) ) {
+      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
+      throw exMalformedConfigFile();
     }
   }
-  else
-  {
+  else {
     // We need to replace all %PROGRAMDIR% with the program data dir
     QByteArray data = configFile.readAll();
 
@@ -570,10 +579,9 @@ Class load()
 
     QBuffer bufferedData( &data );
 
-    if ( !dd.setContent( &bufferedData, false, &errorStr, &errorLine, &errorColumn  ) )
-    {
-      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(),  errorLine,  errorColumn );
-        throw exMalformedConfigFile();
+    if ( !dd.setContent( &bufferedData, false, &errorStr, &errorLine, &errorColumn ) ) {
+      GD_DPRINTF( "Error: %s at %d,%d\n", errorStr.toLocal8Bit().constData(), errorLine, errorColumn );
+      throw exMalformedConfigFile();
     }
   }
 
@@ -585,27 +593,23 @@ Class load()
 
   QDomNode paths = root.namedItem( "paths" );
 
-  if ( !paths.isNull() )
-  {
+  if ( !paths.isNull() ) {
     QDomNodeList nl = paths.toElement().elementsByTagName( "path" );
 
-    for( int x = 0; x < nl.length(); ++x )
+    for ( int x = 0; x < nl.length(); ++x )
       c.paths.push_back(
-        Path( nl.item( x ).toElement().text(),
-              nl.item( x ).toElement().attribute( "recursive" ) == "1" ) );
+        Path( nl.item( x ).toElement().text(), nl.item( x ).toElement().attribute( "recursive" ) == "1" ) );
   }
 
   QDomNode soundDirs = root.namedItem( "sounddirs" );
 
-  if ( !soundDirs.isNull() )
-  {
+  if ( !soundDirs.isNull() ) {
     QDomNodeList nl = soundDirs.toElement().elementsByTagName( "sounddir" );
 
-    for( int x = 0; x < nl.length(); ++x )
-      c.soundDirs.push_back(
-        SoundDir( nl.item( x ).toElement().text(),
-                  nl.item( x ).toElement().attribute( "name" ),
-                  nl.item( x ).toElement().attribute( "icon" ) ) );
+    for ( int x = 0; x < nl.length(); ++x )
+      c.soundDirs.push_back( SoundDir( nl.item( x ).toElement().text(),
+                                       nl.item( x ).toElement().attribute( "name" ),
+                                       nl.item( x ).toElement().attribute( "icon" ) ) );
   }
 
   QDomNode dictionaryOrder = root.namedItem( "dictionaryOrder" );
@@ -620,14 +624,12 @@ Class load()
 
   QDomNode groups = root.namedItem( "groups" );
 
-  if ( !groups.isNull() )
-  {
+  if ( !groups.isNull() ) {
     c.groups.nextId = groups.toElement().attribute( "nextId", "1" ).toUInt();
 
     QDomNodeList nl = groups.toElement().elementsByTagName( "group" );
 
-    for( int x = 0; x < nl.length(); ++x )
-    {
+    for ( int x = 0; x < nl.length(); ++x ) {
       QDomElement grp = nl.item( x ).toElement();
 
       c.groups.push_back( loadGroup( grp, &c.groups.nextId ) );
@@ -636,20 +638,18 @@ Class load()
 
   QDomNode hunspell = root.namedItem( "hunspell" );
 
-  if ( !hunspell.isNull() )
-  {
+  if ( !hunspell.isNull() ) {
     c.hunspell.dictionariesPath = hunspell.toElement().attribute( "dictionariesPath" );
 
     QDomNodeList nl = hunspell.toElement().elementsByTagName( "enabled" );
 
-    for( int x = 0; x < nl.length(); ++x )
+    for ( int x = 0; x < nl.length(); ++x )
       c.hunspell.enabledDictionaries.push_back( nl.item( x ).toElement().text() );
   }
 
   QDomNode transliteration = root.namedItem( "transliteration" );
 
-  if ( !transliteration.isNull() )
-  {
+  if ( !transliteration.isNull() ) {
     applyBoolOption( c.transliteration.enableRussianTransliteration,
                      transliteration.namedItem( "enableRussianTransliteration" ) );
 
@@ -665,19 +665,20 @@ Class load()
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
     QDomNode chinese = transliteration.namedItem( "chinese" );
 
-    if ( !chinese.isNull() )
-    {
+    if ( !chinese.isNull() ) {
       applyBoolOption( c.transliteration.chinese.enable, chinese.namedItem( "enable" ) );
-      applyBoolOption( c.transliteration.chinese.enableSCToTWConversion, chinese.namedItem( "enableSCToTWConversion" ) );
-      applyBoolOption( c.transliteration.chinese.enableSCToHKConversion, chinese.namedItem( "enableSCToHKConversion" ) );
-      applyBoolOption( c.transliteration.chinese.enableTCToSCConversion, chinese.namedItem( "enableTCToSCConversion" ) );
+      applyBoolOption( c.transliteration.chinese.enableSCToTWConversion,
+                       chinese.namedItem( "enableSCToTWConversion" ) );
+      applyBoolOption( c.transliteration.chinese.enableSCToHKConversion,
+                       chinese.namedItem( "enableSCToHKConversion" ) );
+      applyBoolOption( c.transliteration.chinese.enableTCToSCConversion,
+                       chinese.namedItem( "enableTCToSCConversion" ) );
     }
 #endif
 
     QDomNode romaji = transliteration.namedItem( "romaji" );
 
-    if ( !romaji.isNull() )
-    {
+    if ( !romaji.isNull() ) {
       applyBoolOption( c.transliteration.romaji.enable, romaji.namedItem( "enable" ) );
       applyBoolOption( c.transliteration.romaji.enableHepburn, romaji.namedItem( "enableHepburn" ) );
       applyBoolOption( c.transliteration.romaji.enableNihonShiki, romaji.namedItem( "enableNihonShiki" ) );
@@ -688,29 +689,26 @@ Class load()
 
     QDomNode customtrans = transliteration.namedItem( "customtrans" );
 
-    if ( !customtrans.isNull() )
-    {
+    if ( !customtrans.isNull() ) {
       applyBoolOption( c.transliteration.customTrans.enable, customtrans.namedItem( "enable" ) );
-      c.transliteration.customTrans.context = customtrans.namedItem( "context" ).toElement().text() ;
+      c.transliteration.customTrans.context = customtrans.namedItem( "context" ).toElement().text();
     }
   }
 
-  QDomNode lingua = root.namedItem("lingua");
+  QDomNode lingua = root.namedItem( "lingua" );
 
-  if(!lingua.isNull()){
-    applyBoolOption(c.lingua.enable,lingua.namedItem("enable"));
-    c.lingua.languageCodes = lingua.namedItem("languageCodes").toElement().text();
+  if ( !lingua.isNull() ) {
+    applyBoolOption( c.lingua.enable, lingua.namedItem( "enable" ) );
+    c.lingua.languageCodes = lingua.namedItem( "languageCodes" ).toElement().text();
   }
 
 
   QDomNode forvo = root.namedItem( "forvo" );
 
-  if ( !forvo.isNull() )
-  {
-    applyBoolOption( c.forvo.enable,
-                     forvo.namedItem( "enable" ) );
+  if ( !forvo.isNull() ) {
+    applyBoolOption( c.forvo.enable, forvo.namedItem( "enable" ) );
 
-    c.forvo.apiKey = forvo.namedItem( "apiKey" ).toElement().text();
+    c.forvo.apiKey        = forvo.namedItem( "apiKey" ).toElement().text();
     c.forvo.languageCodes = forvo.namedItem( "languageCodes" ).toElement().text();
   }
   else
@@ -718,54 +716,48 @@ Class load()
 
   QDomNode programs = root.namedItem( "programs" );
 
-  if ( !programs.isNull() )
-  {
+  if ( !programs.isNull() ) {
     QDomNodeList nl = programs.toElement().elementsByTagName( "program" );
 
-    for( int x = 0; x < nl.length(); ++x )
-    {
+    for ( int x = 0; x < nl.length(); ++x ) {
       QDomElement pr = nl.item( x ).toElement();
 
       Program p;
 
-      p.id = pr.attribute( "id" );
-      p.name = pr.attribute( "name" );
-      p.commandLine = pr.attribute( "commandLine" );
-      p.enabled = ( pr.attribute( "enabled" ) == "1" );
-      p.type = (Program::Type)( pr.attribute( "type" ).toInt() );
+      p.id           = pr.attribute( "id" );
+      p.name         = pr.attribute( "name" );
+      p.commandLine  = pr.attribute( "commandLine" );
+      p.enabled      = ( pr.attribute( "enabled" ) == "1" );
+      p.type         = ( Program::Type )( pr.attribute( "type" ).toInt() );
       p.iconFilename = pr.attribute( "icon" );
 
       c.programs.push_back( p );
     }
   }
-  else
-  {
+  else {
     c.programs = makeDefaultPrograms();
   }
 
   QDomNode mws = root.namedItem( "mediawikis" );
 
-  if ( !mws.isNull() )
-  {
+  if ( !mws.isNull() ) {
     QDomNodeList nl = mws.toElement().elementsByTagName( "mediawiki" );
 
-    for( int x = 0; x < nl.length(); ++x )
-    {
+    for ( int x = 0; x < nl.length(); ++x ) {
       QDomElement mw = nl.item( x ).toElement();
 
       MediaWiki w;
 
-      w.id = mw.attribute( "id" );
-      w.name = mw.attribute( "name" );
-      w.url = mw.attribute( "url" );
+      w.id      = mw.attribute( "id" );
+      w.name    = mw.attribute( "name" );
+      w.url     = mw.attribute( "url" );
       w.enabled = ( mw.attribute( "enabled" ) == "1" );
-      w.icon = mw.attribute( "icon" );
+      w.icon    = mw.attribute( "icon" );
 
       c.mediawikis.push_back( w );
     }
   }
-  else
-  {
+  else {
     // When upgrading, populate the list with some choices, but don't enable
     // anything.
     c.mediawikis = makeDefaultMediaWikis( false );
@@ -773,68 +765,61 @@ Class load()
 
   QDomNode wss = root.namedItem( "websites" );
 
-  if ( !wss.isNull() )
-  {
+  if ( !wss.isNull() ) {
     QDomNodeList nl = wss.toElement().elementsByTagName( "website" );
 
-    for( int x = 0; x < nl.length(); ++x )
-    {
+    for ( int x = 0; x < nl.length(); ++x ) {
       QDomElement ws = nl.item( x ).toElement();
 
       WebSite w;
 
-      w.id = ws.attribute( "id" );
-      w.name = ws.attribute( "name" );
-      w.url = ws.attribute( "url" );
-      w.enabled = ( ws.attribute( "enabled" ) == "1" );
-      w.iconFilename = ws.attribute( "icon" );
+      w.id            = ws.attribute( "id" );
+      w.name          = ws.attribute( "name" );
+      w.url           = ws.attribute( "url" );
+      w.enabled       = ( ws.attribute( "enabled" ) == "1" );
+      w.iconFilename  = ws.attribute( "icon" );
       w.inside_iframe = ( ws.attribute( "inside_iframe", "1" ) == "1" );
 
       c.webSites.push_back( w );
     }
   }
-  else
-  {
+  else {
     // Upgrading
     c.webSites = makeDefaultWebSites();
   }
 
   QDomNode dss = root.namedItem( "dictservers" );
 
-  if ( !dss.isNull() )
-  {
+  if ( !dss.isNull() ) {
     QDomNodeList nl = dss.toElement().elementsByTagName( "server" );
 
-    for( int x = 0; x < nl.length(); ++x )
-    {
+    for ( int 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.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
-  {
+  else {
     // Upgrading
     c.dictServers = makeDefaultDictServers();
   }
 
   QDomNode ves = root.namedItem( "voiceEngines" );
 
-  if ( !ves.isNull() )
-  {
+  if ( !ves.isNull() ) {
     QDomNodeList nl = ves.toElement().elementsByTagName( "voiceEngine" );
 
-    for( int x = 0; x < nl.length(); ++x ) {
+    for ( int x = 0; x < nl.length(); ++x ) {
       QDomElement ve = nl.item( x ).toElement();
       VoiceEngine v;
 
@@ -856,47 +841,58 @@ Class load()
     }
   }
 
-  c.mutedDictionaries = loadMutedDictionaries( root.namedItem( "mutedDictionaries" ) );
+  c.mutedDictionaries      = loadMutedDictionaries( root.namedItem( "mutedDictionaries" ) );
   c.popupMutedDictionaries = loadMutedDictionaries( root.namedItem( "popupMutedDictionaries" ) );
 
   QDomNode preferences = root.namedItem( "preferences" );
 
-  if ( !preferences.isNull() )
-  {
+  if ( !preferences.isNull() ) {
     c.preferences.interfaceLanguage = preferences.namedItem( "interfaceLanguage" ).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" );
+    c.preferences.displayStyle      = preferences.namedItem( "displayStyle" ).toElement().text();
+#if !defined( Q_OS_WIN )
+    c.preferences.interfaceStyle = preferences.namedItem( "interfaceStyle" ).toElement().text();
+#endif
+    c.preferences.newTabsOpenAfterCurrentOne =
+      ( preferences.namedItem( "newTabsOpenAfterCurrentOne" ).toElement().text() == "1" );
+    c.preferences.newTabsOpenInBackground =
+      ( preferences.namedItem( "newTabsOpenInBackground" ).toElement().text() == "1" );
     c.preferences.hideSingleTab = ( preferences.namedItem( "hideSingleTab" ).toElement().text() == "1" );
-    c.preferences.mruTabOrder = ( preferences.namedItem( "mruTabOrder" ).toElement().text() == "1" );
-    c.preferences.hideMenubar = ( preferences.namedItem( "hideMenubar" ).toElement().text() == "1" );
-    c.preferences.enableTrayIcon = ( preferences.namedItem( "enableTrayIcon" ).toElement().text() == "1" );
-    c.preferences.startToTray = ( preferences.namedItem( "startToTray" ).toElement().text() == "1" );
-    c.preferences.closeToTray = ( preferences.namedItem( "closeToTray" ).toElement().text() == "1" );
-    c.preferences.autoStart = ( preferences.namedItem( "autoStart" ).toElement().text() == "1" );
-    c.preferences.alwaysOnTop = ( preferences.namedItem( "alwaysOnTop" ).toElement().text() == "1" );
-    c.preferences.searchInDock = ( preferences.namedItem( "searchInDock" ).toElement().text() == "1" );
+    c.preferences.mruTabOrder   = ( preferences.namedItem( "mruTabOrder" ).toElement().text() == "1" );
+    c.preferences.hideMenubar   = ( preferences.namedItem( "hideMenubar" ).toElement().text() == "1" );
 
-    if ( !preferences.namedItem( "webFontFamily" ).isNull() )
-      c.preferences.webFontFamily = preferences.namedItem( "webFontFamily" ).toElement().text();
+    c.preferences.enableTrayIcon = ( preferences.namedItem( "enableTrayIcon" ).toElement().text() == "1" );
+    c.preferences.startToTray    = ( preferences.namedItem( "startToTray" ).toElement().text() == "1" );
+    c.preferences.closeToTray    = ( preferences.namedItem( "closeToTray" ).toElement().text() == "1" );
+    c.preferences.autoStart      = ( preferences.namedItem( "autoStart" ).toElement().text() == "1" );
+    c.preferences.alwaysOnTop    = ( preferences.namedItem( "alwaysOnTop" ).toElement().text() == "1" );
+    c.preferences.searchInDock   = ( preferences.namedItem( "searchInDock" ).toElement().text() == "1" );
+
+    if ( !preferences.namedItem( "customFonts" ).isNull() ) {
+      CustomFonts fonts         = CustomFonts::fromElement( preferences.namedItem( "customFonts" ).toElement() );
+      c.preferences.customFonts = fonts;
+    }
 
     if ( !preferences.namedItem( "doubleClickTranslates" ).isNull() )
-      c.preferences.doubleClickTranslates = ( preferences.namedItem( "doubleClickTranslates" ).toElement().text() == "1" );
+      c.preferences.doubleClickTranslates =
+        ( preferences.namedItem( "doubleClickTranslates" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "selectWordBySingleClick" ).isNull() )
-      c.preferences.selectWordBySingleClick = ( preferences.namedItem( "selectWordBySingleClick" ).toElement().text() == "1" );
+      c.preferences.selectWordBySingleClick =
+        ( preferences.namedItem( "selectWordBySingleClick" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "autoScrollToTargetArticle" ).isNull() )
-      c.preferences.autoScrollToTargetArticle = ( preferences.namedItem( "autoScrollToTargetArticle" ).toElement().text() == "1" );
+      c.preferences.autoScrollToTargetArticle =
+        ( preferences.namedItem( "autoScrollToTargetArticle" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "escKeyHidesMainWindow" ).isNull() )
-      c.preferences.escKeyHidesMainWindow = ( preferences.namedItem( "escKeyHidesMainWindow" ).toElement().text() == "1" );
+      c.preferences.escKeyHidesMainWindow =
+        ( preferences.namedItem( "escKeyHidesMainWindow" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "darkMode" ).isNull() )
       c.preferences.darkMode = ( preferences.namedItem( "darkMode" ).toElement().text() == "1" );
 
-    if ( !preferences.namedItem("darkReaderMode").isNull())
-      c.preferences.darkReaderMode = (preferences.namedItem("darkReaderMode").toElement().text() == "1");
+    if ( !preferences.namedItem( "darkReaderMode" ).isNull() )
+      c.preferences.darkReaderMode = ( preferences.namedItem( "darkReaderMode" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "zoomFactor" ).isNull() )
       c.preferences.zoomFactor = preferences.namedItem( "zoomFactor" ).toElement().text().toDouble();
@@ -909,18 +905,22 @@ Class load()
 
     applyBoolOption( c.preferences.enableMainWindowHotkey, preferences.namedItem( "enableMainWindowHotkey" ) );
     if ( !preferences.namedItem( "mainWindowHotkey" ).isNull() )
-      c.preferences.mainWindowHotkey = QKeySequence::fromString( preferences.namedItem( "mainWindowHotkey" ).toElement().text() );
+      c.preferences.mainWindowHotkey =
+        QKeySequence::fromString( preferences.namedItem( "mainWindowHotkey" ).toElement().text() );
     applyBoolOption( c.preferences.enableClipboardHotkey, preferences.namedItem( "enableClipboardHotkey" ) );
     if ( !preferences.namedItem( "clipboardHotkey" ).isNull() )
-      c.preferences.clipboardHotkey = QKeySequence::fromString( preferences.namedItem( "clipboardHotkey" ).toElement().text() );
+      c.preferences.clipboardHotkey =
+        QKeySequence::fromString( preferences.namedItem( "clipboardHotkey" ).toElement().text() );
 
     c.preferences.startWithScanPopupOn = ( preferences.namedItem( "startWithScanPopupOn" ).toElement().text() == "1" );
-    c.preferences.enableScanPopupModifiers = ( preferences.namedItem( "enableScanPopupModifiers" ).toElement().text() == "1" );
+    c.preferences.enableScanPopupModifiers =
+      ( preferences.namedItem( "enableScanPopupModifiers" ).toElement().text() == "1" );
     c.preferences.scanPopupModifiers = ( preferences.namedItem( "scanPopupModifiers" ).toElement().text().toULong() );
-    c.preferences.ignoreOwnClipboardChanges = ( preferences.namedItem( "ignoreOwnClipboardChanges" ).toElement().text() == "1" );
+    c.preferences.ignoreOwnClipboardChanges =
+      ( preferences.namedItem( "ignoreOwnClipboardChanges" ).toElement().text() == "1" );
     c.preferences.scanToMainWindow = ( preferences.namedItem( "scanToMainWindow" ).toElement().text() == "1" );
     c.preferences.ignoreDiacritics = ( preferences.namedItem( "ignoreDiacritics" ).toElement().text() == "1" );
-    if( !preferences.namedItem( "ignorePunctuation" ).isNull() )
+    if ( !preferences.namedItem( "ignorePunctuation" ).isNull() )
       c.preferences.ignorePunctuation = ( preferences.namedItem( "ignorePunctuation" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "sessionCollapse" ).isNull() ) {
@@ -928,16 +928,17 @@ Class load()
     }
 
 #ifdef HAVE_X11
-    c.preferences.trackClipboardScan= ( preferences.namedItem( "trackClipboardScan" ).toElement().text() == "1" );
-    c.preferences.trackSelectionScan= ( preferences.namedItem( "trackSelectionScan" ).toElement().text() == "1" );
-    c.preferences.showScanFlag= ( preferences.namedItem( "showScanFlag" ).toElement().text() == "1" );
+    c.preferences.trackClipboardScan = ( preferences.namedItem( "trackClipboardScan" ).toElement().text() == "1" );
+    c.preferences.trackSelectionScan = ( preferences.namedItem( "trackSelectionScan" ).toElement().text() == "1" );
+    c.preferences.showScanFlag       = ( preferences.namedItem( "showScanFlag" ).toElement().text() == "1" );
+    c.preferences.selectionChangeDelayTimer =
+      preferences.namedItem( "selectionChangeDelayTimer" ).toElement().text().toInt();
 #endif
 
-    c.preferences.pronounceOnLoadMain = ( preferences.namedItem( "pronounceOnLoadMain" ).toElement().text() == "1" );
+    c.preferences.pronounceOnLoadMain  = ( preferences.namedItem( "pronounceOnLoadMain" ).toElement().text() == "1" );
     c.preferences.pronounceOnLoadPopup = ( preferences.namedItem( "pronounceOnLoadPopup" ).toElement().text() == "1" );
 
-    if ( InternalPlayerBackend::anyAvailable() )
-    {
+    if ( InternalPlayerBackend::anyAvailable() ) {
       if ( !preferences.namedItem( "useInternalPlayer" ).isNull() )
         c.preferences.useInternalPlayer = ( preferences.namedItem( "useInternalPlayer" ).toElement().text() == "1" );
     }
@@ -945,7 +946,8 @@ Class load()
       c.preferences.useInternalPlayer = false;
 
     if ( !preferences.namedItem( "internalPlayerBackend" ).isNull() )
-      c.preferences.internalPlayerBackend.setUiName( preferences.namedItem( "internalPlayerBackend" ).toElement().text() );
+      c.preferences.internalPlayerBackend.setUiName(
+        preferences.namedItem( "internalPlayerBackend" ).toElement().text() );
 
     if ( !preferences.namedItem( "audioPlaybackProgram" ).isNull() )
       c.preferences.audioPlaybackProgram = preferences.namedItem( "audioPlaybackProgram" ).toElement().text();
@@ -954,31 +956,29 @@ Class load()
 
     QDomNode proxy = preferences.namedItem( "proxyserver" );
 
-    if ( !proxy.isNull() )
-    {
-      c.preferences.proxyServer.enabled = ( proxy.toElement().attribute( "enabled" ) == "1" );
+    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.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.systemProxyUser     = proxy.namedItem( "systemProxyUser" ).toElement().text();
       c.preferences.proxyServer.systemProxyPassword = proxy.namedItem( "systemProxyPassword" ).toElement().text();
     }
 
     QDomNode ankiConnectServer = preferences.namedItem( "ankiConnectServer" );
 
-    if ( !ankiConnectServer.isNull() )
-    {
+    if ( !ankiConnectServer.isNull() ) {
       c.preferences.ankiConnectServer.enabled = ( ankiConnectServer.toElement().attribute( "enabled" ) == "1" );
-      c.preferences.ankiConnectServer.host = ankiConnectServer.namedItem( "host" ).toElement().text();
+      c.preferences.ankiConnectServer.host    = ankiConnectServer.namedItem( "host" ).toElement().text();
       c.preferences.ankiConnectServer.port    = ankiConnectServer.namedItem( "port" ).toElement().text().toInt();
-      c.preferences.ankiConnectServer.deck = ankiConnectServer.namedItem( "deck" ).toElement().text();
-      c.preferences.ankiConnectServer.model = ankiConnectServer.namedItem( "model" ).toElement().text();
+      c.preferences.ankiConnectServer.deck    = ankiConnectServer.namedItem( "deck" ).toElement().text();
+      c.preferences.ankiConnectServer.model   = ankiConnectServer.namedItem( "model" ).toElement().text();
 
-      c.preferences.ankiConnectServer.word = ankiConnectServer.namedItem( "word" ).toElement().text();
-      c.preferences.ankiConnectServer.text = ankiConnectServer.namedItem( "text" ).toElement().text();
+      c.preferences.ankiConnectServer.word     = ankiConnectServer.namedItem( "word" ).toElement().text();
+      c.preferences.ankiConnectServer.text     = ankiConnectServer.namedItem( "text" ).toElement().text();
       c.preferences.ankiConnectServer.sentence = ankiConnectServer.namedItem( "sentence" ).toElement().text();
     }
 
@@ -986,37 +986,43 @@ Class load()
       c.preferences.checkForNewReleases = ( preferences.namedItem( "checkForNewReleases" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "disallowContentFromOtherSites" ).isNull() )
-      c.preferences.disallowContentFromOtherSites = ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
+      c.preferences.disallowContentFromOtherSites =
+        ( preferences.namedItem( "disallowContentFromOtherSites" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "hideGoldenDictHeader" ).isNull() )
-      c.preferences.hideGoldenDictHeader = ( preferences.namedItem( "hideGoldenDictHeader" ).toElement().text() == "1" );
+      c.preferences.hideGoldenDictHeader =
+        ( preferences.namedItem( "hideGoldenDictHeader" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "maxNetworkCacheSize" ).isNull() )
       c.preferences.maxNetworkCacheSize = preferences.namedItem( "maxNetworkCacheSize" ).toElement().text().toInt();
 
     if ( !preferences.namedItem( "clearNetworkCacheOnExit" ).isNull() )
-      c.preferences.clearNetworkCacheOnExit = ( preferences.namedItem( "clearNetworkCacheOnExit" ).toElement().text() == "1" );
+      c.preferences.clearNetworkCacheOnExit =
+        ( preferences.namedItem( "clearNetworkCacheOnExit" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "maxStringsInHistory" ).isNull() )
-      c.preferences.maxStringsInHistory = preferences.namedItem( "maxStringsInHistory" ).toElement().text().toUInt() ;
+      c.preferences.maxStringsInHistory = preferences.namedItem( "maxStringsInHistory" ).toElement().text().toUInt();
 
     if ( !preferences.namedItem( "storeHistory" ).isNull() )
-      c.preferences.storeHistory = preferences.namedItem( "storeHistory" ).toElement().text().toUInt() ;
+      c.preferences.storeHistory = preferences.namedItem( "storeHistory" ).toElement().text().toUInt();
 
     if ( !preferences.namedItem( "alwaysExpandOptionalParts" ).isNull() )
-      c.preferences.alwaysExpandOptionalParts = preferences.namedItem( "alwaysExpandOptionalParts" ).toElement().text().toUInt() ;
+      c.preferences.alwaysExpandOptionalParts =
+        preferences.namedItem( "alwaysExpandOptionalParts" ).toElement().text().toUInt();
 
     if ( !preferences.namedItem( "addonStyle" ).isNull() )
       c.preferences.addonStyle = preferences.namedItem( "addonStyle" ).toElement().text();
 
     if ( !preferences.namedItem( "historyStoreInterval" ).isNull() )
-      c.preferences.historyStoreInterval = preferences.namedItem( "historyStoreInterval" ).toElement().text().toUInt() ;
+      c.preferences.historyStoreInterval = preferences.namedItem( "historyStoreInterval" ).toElement().text().toUInt();
 
     if ( !preferences.namedItem( "favoritesStoreInterval" ).isNull() )
-      c.preferences.favoritesStoreInterval = preferences.namedItem( "favoritesStoreInterval" ).toElement().text().toUInt() ;
+      c.preferences.favoritesStoreInterval =
+        preferences.namedItem( "favoritesStoreInterval" ).toElement().text().toUInt();
 
     if ( !preferences.namedItem( "confirmFavoritesDeletion" ).isNull() )
-      c.preferences.confirmFavoritesDeletion = ( preferences.namedItem( "confirmFavoritesDeletion" ).toElement().text() == "1" );
+      c.preferences.confirmFavoritesDeletion =
+        ( preferences.namedItem( "confirmFavoritesDeletion" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "collapseBigArticles" ).isNull() )
       c.preferences.collapseBigArticles = ( preferences.namedItem( "collapseBigArticles" ).toElement().text() == "1" );
@@ -1025,46 +1031,56 @@ Class load()
       c.preferences.articleSizeLimit = preferences.namedItem( "articleSizeLimit" ).toElement().text().toInt();
 
     if ( !preferences.namedItem( "limitInputPhraseLength" ).isNull() )
-      c.preferences.limitInputPhraseLength = ( preferences.namedItem( "limitInputPhraseLength" ).toElement().text() == "1" );
+      c.preferences.limitInputPhraseLength =
+        ( preferences.namedItem( "limitInputPhraseLength" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "inputPhraseLengthLimit" ).isNull() )
-      c.preferences.inputPhraseLengthLimit = preferences.namedItem( "inputPhraseLengthLimit" ).toElement().text().toInt();
+      c.preferences.inputPhraseLengthLimit =
+        preferences.namedItem( "inputPhraseLengthLimit" ).toElement().text().toInt();
 
     if ( !preferences.namedItem( "maxDictionaryRefsInContextMenu" ).isNull() )
-      c.preferences.maxDictionaryRefsInContextMenu = preferences.namedItem( "maxDictionaryRefsInContextMenu" ).toElement().text().toUShort();
+      c.preferences.maxDictionaryRefsInContextMenu =
+        preferences.namedItem( "maxDictionaryRefsInContextMenu" ).toElement().text().toUShort();
 
     if ( !preferences.namedItem( "synonymSearchEnabled" ).isNull() )
-      c.preferences.synonymSearchEnabled = ( preferences.namedItem( "synonymSearchEnabled" ).toElement().text() == "1" );
+      c.preferences.synonymSearchEnabled =
+        ( preferences.namedItem( "synonymSearchEnabled" ).toElement().text() == "1" );
 
     if ( !preferences.namedItem( "stripClipboard" ).isNull() )
       c.preferences.stripClipboard = ( preferences.namedItem( "stripClipboard" ).toElement().text() == "1" );
 
-    if( !preferences.namedItem( "raiseWindowOnSearch" ).isNull() )
+    if ( !preferences.namedItem( "raiseWindowOnSearch" ).isNull() )
       c.preferences.raiseWindowOnSearch = ( preferences.namedItem( "raiseWindowOnSearch" ).toElement().text() == "1" );
 
     QDomNode fts = preferences.namedItem( "fullTextSearch" );
 
-    if ( !fts.isNull() )
-    {
+    if ( !fts.isNull() ) {
       if ( !fts.namedItem( "searchMode" ).isNull() )
         c.preferences.fts.searchMode = fts.namedItem( "searchMode" ).toElement().text().toInt();
 
       if ( !fts.namedItem( "dialogGeometry" ).isNull() )
-        c.preferences.fts.dialogGeometry = QByteArray::fromBase64( fts.namedItem( "dialogGeometry" ).toElement().text().toLatin1() );
+        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( "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( "enablePosition" ).isNull() ) {
+        c.preferences.fts.enablePosition = ( fts.namedItem( "enablePosition" ).toElement().text() == "1" );
+      }
+
       if ( !fts.namedItem( "maxDictionarySize" ).isNull() )
         c.preferences.fts.maxDictionarySize = fts.namedItem( "maxDictionarySize" ).toElement().text().toUInt();
-    }
 
+      if ( !fts.namedItem( "parallelThreads" ).isNull() )
+        c.preferences.fts.parallelThreads = fts.namedItem( "parallelThreads" ).toElement().text().toUInt();
+    }
   }
 
-  c.lastMainGroupId = root.namedItem( "lastMainGroupId" ).toElement().text().toUInt();
+  c.lastMainGroupId  = root.namedItem( "lastMainGroupId" ).toElement().text().toUInt();
   c.lastPopupGroupId = root.namedItem( "lastPopupGroupId" ).toElement().text().toUInt();
 
   QDomNode popupWindowState = root.namedItem( "popupWindowState" );
@@ -1091,16 +1107,6 @@ Class load()
   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() );
-
   QDomNode dictInfoGeometry = root.namedItem( "dictInfoGeometry" );
 
   if ( !dictInfoGeometry.isNull() )
@@ -1119,8 +1125,7 @@ Class load()
   QDomNode timeForNewReleaseCheck = root.namedItem( "timeForNewReleaseCheck" );
 
   if ( !timeForNewReleaseCheck.isNull() )
-    c.timeForNewReleaseCheck = QDateTime::fromString( timeForNewReleaseCheck.toElement().text(),
-                                                      Qt::ISODate );
+    c.timeForNewReleaseCheck = QDateTime::fromString( timeForNewReleaseCheck.toElement().text(), Qt::ISODate );
 
   c.skippedRelease = root.namedItem( "skippedRelease" ).toElement().text();
 
@@ -1143,8 +1148,7 @@ Class load()
   if ( !root.namedItem( "maxPictureWidth" ).isNull() )
     c.maxPictureWidth = root.namedItem( "maxPictureWidth" ).toElement().text().toInt();
 
-  if ( !root.namedItem( "maxHeadwordSize" ).isNull() )
-  {
+  if ( !root.namedItem( "maxHeadwordSize" ).isNull() ) {
     unsigned int value = root.namedItem( "maxHeadwordSize" ).toElement().text().toUInt();
     if ( value != 0 ) // 0 is invalid value for our purposes
     {
@@ -1157,8 +1161,7 @@ Class load()
 
   QDomNode headwordsDialog = root.namedItem( "headwordsDialog" );
 
-  if ( !headwordsDialog.isNull() )
-  {
+  if ( !headwordsDialog.isNull() ) {
     if ( !headwordsDialog.namedItem( "searchMode" ).isNull() )
       c.headwordsDialog.searchMode = headwordsDialog.namedItem( "searchMode" ).toElement().text().toInt();
 
@@ -1172,7 +1175,8 @@ Class load()
       c.headwordsDialog.headwordsExportPath = headwordsDialog.namedItem( "headwordsExportPath" ).toElement().text();
 
     if ( !headwordsDialog.namedItem( "headwordsDialogGeometry" ).isNull() )
-      c.headwordsDialog.headwordsDialogGeometry = QByteArray::fromBase64( headwordsDialog.namedItem( "headwordsDialogGeometry" ).toElement().text().toLatin1() );
+      c.headwordsDialog.headwordsDialogGeometry =
+        QByteArray::fromBase64( headwordsDialog.namedItem( "headwordsDialogGeometry" ).toElement().text().toLatin1() );
   }
 
   return c;
@@ -1195,15 +1199,13 @@ void saveGroup( Group const & data, QDomElement & group )
 
   group.setAttributeNode( name );
 
-  if( data.favoritesFolder.size() )
-  {
+  if ( data.favoritesFolder.size() ) {
     QDomAttr folder = dd.createAttribute( "favoritesFolder" );
     folder.setValue( data.favoritesFolder );
     group.setAttributeNode( folder );
   }
 
-  if ( data.icon.size() )
-  {
+  if ( data.icon.size() ) {
     QDomAttr icon = dd.createAttribute( "icon" );
 
     icon.setValue( data.icon );
@@ -1211,8 +1213,7 @@ void saveGroup( Group const & data, QDomElement & group )
     group.setAttributeNode( icon );
   }
 
-  if ( data.iconData.size() )
-  {
+  if ( data.iconData.size() ) {
     QDomAttr iconData = dd.createAttribute( "iconData" );
 
     iconData.setValue( QString::fromLatin1( data.iconData.toBase64() ) );
@@ -1220,28 +1221,26 @@ void saveGroup( Group const & data, QDomElement & group )
     group.setAttributeNode( iconData );
   }
 
-  if ( !data.shortcut.isEmpty() )
-  {
+  if ( !data.shortcut.isEmpty() ) {
     QDomAttr shortcut = dd.createAttribute( "shortcut" );
 
-    shortcut.setValue(  data.shortcut.toString() );
+    shortcut.setValue( data.shortcut.toString() );
 
     group.setAttributeNode( shortcut );
   }
 
-  for( QVector< DictionaryRef >::const_iterator j = data.dictionaries.begin(); j != data.dictionaries.end(); ++j )
-  {
+  for ( const auto & dictionarie : data.dictionaries ) {
     QDomElement dictionary = dd.createElement( "dictionary" );
 
     group.appendChild( dictionary );
 
-    QDomText value = dd.createTextNode( j->id );
+    QDomText value = dd.createTextNode( dictionarie.id );
 
     dictionary.appendChild( value );
 
     QDomAttr name = dd.createAttribute( "name" );
 
-    name.setValue( j->name );
+    name.setValue( dictionarie.name );
 
     dictionary.setAttributeNode( name );
   }
@@ -1249,30 +1248,26 @@ void saveGroup( Group const & data, QDomElement & group )
   QDomElement muted = dd.createElement( "mutedDictionaries" );
   group.appendChild( muted );
 
-  for( MutedDictionaries::const_iterator i = data.mutedDictionaries.begin();
-       i != data.mutedDictionaries.end(); ++i )
-  {
+  for ( const auto & mutedDictionarie : data.mutedDictionaries ) {
     QDomElement dict = dd.createElement( "mutedDictionary" );
     muted.appendChild( dict );
 
-    QDomText value = dd.createTextNode( *i );
+    QDomText value = dd.createTextNode( mutedDictionarie );
     dict.appendChild( value );
   }
 
-  for( MutedDictionaries::const_iterator i = data.popupMutedDictionaries.begin();
-       i != data.popupMutedDictionaries.end(); ++i )
-  {
+  for ( const auto & popupMutedDictionarie : data.popupMutedDictionaries ) {
     QDomElement dict = dd.createElement( "popupMutedDictionary" );
     muted.appendChild( dict );
 
-    QDomText value = dd.createTextNode( *i );
+    QDomText value = dd.createTextNode( popupMutedDictionarie );
     dict.appendChild( value );
   }
 }
 
-}
+} // namespace
 
-void save( Class const & c ) 
+void save( Class const & c )
 {
   QFile configFile( getConfigFileName() + ".tmp" );
 
@@ -1288,16 +1283,15 @@ void save( Class const & c )
     QDomElement paths = dd.createElement( "paths" );
     root.appendChild( paths );
 
-    for( Paths::const_iterator i = c.paths.begin(); i != c.paths.end(); ++i )
-    {
+    for ( const auto & i : c.paths ) {
       QDomElement path = dd.createElement( "path" );
       paths.appendChild( path );
 
       QDomAttr recursive = dd.createAttribute( "recursive" );
-      recursive.setValue( i->recursive ? "1" : "0" );
+      recursive.setValue( i.recursive ? "1" : "0" );
       path.setAttributeNode( recursive );
 
-      QDomText value = dd.createTextNode( i->path );
+      QDomText value = dd.createTextNode( i.path );
 
       path.appendChild( value );
     }
@@ -1307,20 +1301,19 @@ void save( Class const & c )
     QDomElement soundDirs = dd.createElement( "sounddirs" );
     root.appendChild( soundDirs );
 
-    for( SoundDirs::const_iterator i = c.soundDirs.begin(); i != c.soundDirs.end(); ++i )
-    {
+    for ( const auto & i : c.soundDirs ) {
       QDomElement soundDir = dd.createElement( "sounddir" );
       soundDirs.appendChild( soundDir );
 
       QDomAttr name = dd.createAttribute( "name" );
-      name.setValue( i->name );
+      name.setValue( i.name );
       soundDir.setAttributeNode( name );
 
       QDomAttr icon = dd.createAttribute( "icon" );
-      icon.setValue( i->iconFilename );
+      icon.setValue( i.iconFilename );
       soundDir.setAttributeNode( icon );
 
-      QDomText value = dd.createTextNode( i->path );
+      QDomText value = dd.createTextNode( i.path );
 
       soundDir.appendChild( value );
     }
@@ -1346,26 +1339,24 @@ void save( Class const & c )
     nextId.setValue( QString::number( c.groups.nextId ) );
     groups.setAttributeNode( nextId );
 
-    for( Groups::const_iterator i = c.groups.begin(); i != c.groups.end(); ++i )
-    {
+    for ( const auto & i : c.groups ) {
       QDomElement group = dd.createElement( "group" );
       groups.appendChild( group );
 
-      saveGroup( *i, group );
+      saveGroup( i, group );
     }
   }
 
   {
     QDomElement hunspell = dd.createElement( "hunspell" );
-    QDomAttr path = dd.createAttribute( "dictionariesPath" );
+    QDomAttr path        = dd.createAttribute( "dictionariesPath" );
     path.setValue( c.hunspell.dictionariesPath );
     hunspell.setAttributeNode( path );
     root.appendChild( hunspell );
 
-    for( int x = 0; x < c.hunspell.enabledDictionaries.size(); ++x )
-    {
+    for ( const auto & enabledDictionarie : c.hunspell.enabledDictionaries ) {
       QDomElement en = dd.createElement( "enabled" );
-      QDomText value = dd.createTextNode( c.hunspell.enabledDictionaries.at( x ) );
+      QDomText value = dd.createTextNode( enabledDictionarie );
 
       en.appendChild( value );
       hunspell.appendChild( en );
@@ -1379,25 +1370,25 @@ void save( Class const & c )
     root.appendChild( transliteration );
 
     QDomElement opt = dd.createElement( "enableRussianTransliteration" );
-    opt.appendChild( dd.createTextNode( c.transliteration.enableRussianTransliteration ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.enableRussianTransliteration ? "1" : "0" ) );
     transliteration.appendChild( opt );
 
     // German translit
 
     opt = dd.createElement( "enableGermanTransliteration" );
-    opt.appendChild( dd.createTextNode( c.transliteration.enableGermanTransliteration ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.enableGermanTransliteration ? "1" : "0" ) );
     transliteration.appendChild( opt );
 
     // Greek translit
 
     opt = dd.createElement( "enableGreekTransliteration" );
-    opt.appendChild( dd.createTextNode( c.transliteration.enableGreekTransliteration ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.enableGreekTransliteration ? "1" : "0" ) );
     transliteration.appendChild( opt );
 
     // Belarusian translit
 
     opt = dd.createElement( "enableBelarusianTransliteration" );
-    opt.appendChild( dd.createTextNode( c.transliteration.enableBelarusianTransliteration ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.enableBelarusianTransliteration ? "1" : "0" ) );
     transliteration.appendChild( opt );
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
@@ -1407,19 +1398,19 @@ void save( Class const & c )
     transliteration.appendChild( chinese );
 
     opt = dd.createElement( "enable" );
-    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enable ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enable ? "1" : "0" ) );
     chinese.appendChild( opt );
 
     opt = dd.createElement( "enableSCToTWConversion" );
-    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableSCToTWConversion ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableSCToTWConversion ? "1" : "0" ) );
     chinese.appendChild( opt );
 
     opt = dd.createElement( "enableSCToHKConversion" );
-    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableSCToHKConversion ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableSCToHKConversion ? "1" : "0" ) );
     chinese.appendChild( opt );
 
     opt = dd.createElement( "enableTCToSCConversion" );
-    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableTCToSCConversion ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.chinese.enableTCToSCConversion ? "1" : "0" ) );
     chinese.appendChild( opt );
 #endif
 
@@ -1429,27 +1420,27 @@ void save( Class const & c )
     transliteration.appendChild( romaji );
 
     opt = dd.createElement( "enable" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enable ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enable ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     opt = dd.createElement( "enableHepburn" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableHepburn ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableHepburn ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     opt = dd.createElement( "enableNihonShiki" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableNihonShiki ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableNihonShiki ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     opt = dd.createElement( "enableKunreiShiki" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableKunreiShiki ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableKunreiShiki ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     opt = dd.createElement( "enableHiragana" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableHiragana ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableHiragana ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     opt = dd.createElement( "enableKatakana" );
-    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableKatakana ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.romaji.enableKatakana ? "1" : "0" ) );
     romaji.appendChild( opt );
 
     //custom transliteration
@@ -1457,7 +1448,7 @@ void save( Class const & c )
     transliteration.appendChild( customtrans );
 
     opt = dd.createElement( "enable" );
-    opt.appendChild( dd.createTextNode( c.transliteration.customTrans.enable ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.transliteration.customTrans.enable ? "1" : "0" ) );
     customtrans.appendChild( opt );
 
     opt = dd.createElement( "context" );
@@ -1468,17 +1459,16 @@ void save( Class const & c )
   {
     // Lingua
 
-    QDomElement lingua = dd.createElement("lingua");
-    root.appendChild(lingua);
+    QDomElement lingua = dd.createElement( "lingua" );
+    root.appendChild( lingua );
 
-    QDomElement opt = dd.createElement("enable");
-    opt.appendChild(dd.createTextNode(c.lingua.enable?"1":"0"));
-    lingua.appendChild(opt);
+    QDomElement opt = dd.createElement( "enable" );
+    opt.appendChild( dd.createTextNode( c.lingua.enable ? "1" : "0" ) );
+    lingua.appendChild( opt );
 
     opt = dd.createElement( "languageCodes" );
     opt.appendChild( dd.createTextNode( c.lingua.languageCodes ) );
     lingua.appendChild( opt );
-
   }
 
   {
@@ -1488,7 +1478,7 @@ void save( Class const & c )
     root.appendChild( forvo );
 
     QDomElement opt = dd.createElement( "enable" );
-    opt.appendChild( dd.createTextNode( c.forvo.enable ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.forvo.enable ? "1" : "0" ) );
     forvo.appendChild( opt );
 
     opt = dd.createElement( "apiKey" );
@@ -1504,29 +1494,28 @@ void save( Class const & c )
     QDomElement mws = dd.createElement( "mediawikis" );
     root.appendChild( mws );
 
-    for( MediaWikis::const_iterator i = c.mediawikis.begin(); i != c.mediawikis.end(); ++i )
-    {
+    for ( const auto & mediawiki : c.mediawikis ) {
       QDomElement mw = dd.createElement( "mediawiki" );
       mws.appendChild( mw );
 
       QDomAttr id = dd.createAttribute( "id" );
-      id.setValue( i->id );
+      id.setValue( mediawiki.id );
       mw.setAttributeNode( id );
 
       QDomAttr name = dd.createAttribute( "name" );
-      name.setValue( i->name );
+      name.setValue( mediawiki.name );
       mw.setAttributeNode( name );
 
       QDomAttr url = dd.createAttribute( "url" );
-      url.setValue( i->url );
+      url.setValue( mediawiki.url );
       mw.setAttributeNode( url );
 
       QDomAttr enabled = dd.createAttribute( "enabled" );
-      enabled.setValue( i->enabled ? "1" : "0" );
+      enabled.setValue( mediawiki.enabled ? "1" : "0" );
       mw.setAttributeNode( enabled );
 
       QDomAttr icon = dd.createAttribute( "icon" );
-      icon.setValue( i->icon );
+      icon.setValue( mediawiki.icon );
       mw.setAttributeNode( icon );
     }
   }
@@ -1535,33 +1524,32 @@ void save( Class const & c )
     QDomElement wss = dd.createElement( "websites" );
     root.appendChild( wss );
 
-    for( WebSites::const_iterator i = c.webSites.begin(); i != c.webSites.end(); ++i )
-    {
+    for ( const auto & webSite : c.webSites ) {
       QDomElement ws = dd.createElement( "website" );
       wss.appendChild( ws );
 
       QDomAttr id = dd.createAttribute( "id" );
-      id.setValue( i->id );
+      id.setValue( webSite.id );
       ws.setAttributeNode( id );
 
       QDomAttr name = dd.createAttribute( "name" );
-      name.setValue( i->name );
+      name.setValue( webSite.name );
       ws.setAttributeNode( name );
 
       QDomAttr url = dd.createAttribute( "url" );
-      url.setValue( i->url );
+      url.setValue( webSite.url );
       ws.setAttributeNode( url );
 
       QDomAttr enabled = dd.createAttribute( "enabled" );
-      enabled.setValue( i->enabled ? "1" : "0" );
+      enabled.setValue( webSite.enabled ? "1" : "0" );
       ws.setAttributeNode( enabled );
 
       QDomAttr icon = dd.createAttribute( "icon" );
-      icon.setValue( i->iconFilename );
+      icon.setValue( webSite.iconFilename );
       ws.setAttributeNode( icon );
 
       QDomAttr inside_iframe = dd.createAttribute( "inside_iframe" );
-      inside_iframe.setValue( i->inside_iframe ? "1" : "0" );
+      inside_iframe.setValue( webSite.inside_iframe ? "1" : "0" );
       ws.setAttributeNode( inside_iframe );
     }
   }
@@ -1570,37 +1558,36 @@ void save( Class const & c )
     QDomElement dss = dd.createElement( "dictservers" );
     root.appendChild( dss );
 
-    for( DictServers::const_iterator i = c.dictServers.begin(); i != c.dictServers.end(); ++i )
-    {
+    for ( const auto & dictServer : c.dictServers ) {
       QDomElement ds = dd.createElement( "server" );
       dss.appendChild( ds );
 
       QDomAttr id = dd.createAttribute( "id" );
-      id.setValue( i->id );
+      id.setValue( dictServer.id );
       ds.setAttributeNode( id );
 
       QDomAttr name = dd.createAttribute( "name" );
-      name.setValue( i->name );
+      name.setValue( dictServer.name );
       ds.setAttributeNode( name );
 
       QDomAttr url = dd.createAttribute( "url" );
-      url.setValue( i->url );
+      url.setValue( dictServer.url );
       ds.setAttributeNode( url );
 
       QDomAttr enabled = dd.createAttribute( "enabled" );
-      enabled.setValue( i->enabled ? "1" : "0" );
+      enabled.setValue( dictServer.enabled ? "1" : "0" );
       ds.setAttributeNode( enabled );
 
       QDomAttr databases = dd.createAttribute( "databases" );
-      databases.setValue( i->databases );
+      databases.setValue( dictServer.databases );
       ds.setAttributeNode( databases );
 
       QDomAttr strategies = dd.createAttribute( "strategies" );
-      strategies.setValue( i->strategies );
+      strategies.setValue( dictServer.strategies );
       ds.setAttributeNode( strategies );
 
       QDomAttr icon = dd.createAttribute( "icon" );
-      icon.setValue( i->iconFilename );
+      icon.setValue( dictServer.iconFilename );
       ds.setAttributeNode( icon );
     }
   }
@@ -1609,33 +1596,32 @@ void save( Class const & c )
     QDomElement programs = dd.createElement( "programs" );
     root.appendChild( programs );
 
-    for( Programs::const_iterator i = c.programs.begin(); i != c.programs.end(); ++i )
-    {
+    for ( const auto & program : c.programs ) {
       QDomElement p = dd.createElement( "program" );
       programs.appendChild( p );
 
       QDomAttr id = dd.createAttribute( "id" );
-      id.setValue( i->id );
+      id.setValue( program.id );
       p.setAttributeNode( id );
 
       QDomAttr name = dd.createAttribute( "name" );
-      name.setValue( i->name );
+      name.setValue( program.name );
       p.setAttributeNode( name );
 
       QDomAttr commandLine = dd.createAttribute( "commandLine" );
-      commandLine.setValue( i->commandLine );
+      commandLine.setValue( program.commandLine );
       p.setAttributeNode( commandLine );
 
       QDomAttr enabled = dd.createAttribute( "enabled" );
-      enabled.setValue( i->enabled ? "1" : "0" );
+      enabled.setValue( program.enabled ? "1" : "0" );
       p.setAttributeNode( enabled );
 
       QDomAttr type = dd.createAttribute( "type" );
-      type.setValue( QString::number( i->type ) );
+      type.setValue( QString::number( program.type ) );
       p.setAttributeNode( type );
 
       QDomAttr icon = dd.createAttribute( "icon" );
-      icon.setValue( i->iconFilename );
+      icon.setValue( program.iconFilename );
       p.setAttributeNode( icon );
     }
   }
@@ -1644,7 +1630,7 @@ void save( Class const & c )
     QDomNode ves = dd.createElement( "voiceEngines" );
     root.appendChild( ves );
 
-    for( const auto & voiceEngine : c.voiceEngines ) {
+    for ( const auto & voiceEngine : c.voiceEngines ) {
       QDomElement v = dd.createElement( "voiceEngine" );
       ves.appendChild( v );
 
@@ -1702,72 +1688,78 @@ void save( Class const & c )
     opt.appendChild( dd.createTextNode( c.preferences.interfaceLanguage ) );
     preferences.appendChild( opt );
 
-    opt = dd.createElement( "webFontFamily" );
-    opt.appendChild( dd.createTextNode( c.preferences.webFontFamily ) );
-    preferences.appendChild( opt );
+    opt             = dd.createElement( "customFonts" );
+    auto customFont = c.preferences.customFonts.toElement( dd );
+    preferences.appendChild( customFont );
 
     opt = dd.createElement( "displayStyle" );
     opt.appendChild( dd.createTextNode( c.preferences.displayStyle ) );
     preferences.appendChild( opt );
 
+#if !defined( Q_OS_WIN )
+    opt = dd.createElement( "interfaceStyle" );
+    opt.appendChild( dd.createTextNode( c.preferences.interfaceStyle ) );
+    preferences.appendChild( opt );
+#endif
+
     opt = dd.createElement( "newTabsOpenAfterCurrentOne" );
-    opt.appendChild( dd.createTextNode( c.preferences.newTabsOpenAfterCurrentOne ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.newTabsOpenAfterCurrentOne ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "newTabsOpenInBackground" );
-    opt.appendChild( dd.createTextNode( c.preferences.newTabsOpenInBackground ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.newTabsOpenInBackground ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "hideSingleTab" );
-    opt.appendChild( dd.createTextNode( c.preferences.hideSingleTab ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.hideSingleTab ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "mruTabOrder" );
-    opt.appendChild( dd.createTextNode( c.preferences.mruTabOrder ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.mruTabOrder ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "hideMenubar" );
-    opt.appendChild( dd.createTextNode( c.preferences.hideMenubar ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.hideMenubar ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "enableTrayIcon" );
-    opt.appendChild( dd.createTextNode( c.preferences.enableTrayIcon ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.enableTrayIcon ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "startToTray" );
-    opt.appendChild( dd.createTextNode( c.preferences.startToTray ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.startToTray ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "closeToTray" );
-    opt.appendChild( dd.createTextNode( c.preferences.closeToTray ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.closeToTray ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "autoStart" );
-    opt.appendChild( dd.createTextNode( c.preferences.autoStart ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.autoStart ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "doubleClickTranslates" );
-    opt.appendChild( dd.createTextNode( c.preferences.doubleClickTranslates ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.doubleClickTranslates ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "selectWordBySingleClick" );
-    opt.appendChild( dd.createTextNode( c.preferences.selectWordBySingleClick ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.selectWordBySingleClick ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "autoScrollToTargetArticle" );
-    opt.appendChild( dd.createTextNode( c.preferences.autoScrollToTargetArticle ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.autoScrollToTargetArticle ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "escKeyHidesMainWindow" );
-    opt.appendChild( dd.createTextNode( c.preferences.escKeyHidesMainWindow ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.escKeyHidesMainWindow ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "darkMode" );
-    opt.appendChild( dd.createTextNode( c.preferences.darkMode ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.darkMode ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "darkReaderMode" );
-    opt.appendChild( dd.createTextNode( c.preferences.darkReaderMode ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.darkReaderMode ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "zoomFactor" );
@@ -1783,7 +1775,7 @@ void save( Class const & c )
     preferences.appendChild( opt );
 
     opt = dd.createElement( "enableMainWindowHotkey" );
-    opt.appendChild( dd.createTextNode( c.preferences.enableMainWindowHotkey ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.enableMainWindowHotkey ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "mainWindowHotkey" );
@@ -1791,7 +1783,7 @@ void save( Class const & c )
     preferences.appendChild( opt );
 
     opt = dd.createElement( "enableClipboardHotkey" );
-    opt.appendChild( dd.createTextNode( c.preferences.enableClipboardHotkey ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.enableClipboardHotkey ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "clipboardHotkey" );
@@ -1799,11 +1791,11 @@ void save( Class const & c )
     preferences.appendChild( opt );
 
     opt = dd.createElement( "startWithScanPopupOn" );
-    opt.appendChild( dd.createTextNode( c.preferences.startWithScanPopupOn ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.startWithScanPopupOn ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "enableScanPopupModifiers" );
-    opt.appendChild( dd.createTextNode( c.preferences.enableScanPopupModifiers ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.enableScanPopupModifiers ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "scanPopupModifiers" );
@@ -1811,19 +1803,19 @@ void save( Class const & c )
     preferences.appendChild( opt );
 
     opt = dd.createElement( "ignoreOwnClipboardChanges" );
-    opt.appendChild( dd.createTextNode( c.preferences.ignoreOwnClipboardChanges ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.ignoreOwnClipboardChanges ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "scanToMainWindow" );
-    opt.appendChild( dd.createTextNode( c.preferences.scanToMainWindow ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.scanToMainWindow ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "ignoreDiacritics" );
-    opt.appendChild( dd.createTextNode( c.preferences.ignoreDiacritics ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.ignoreDiacritics ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "ignorePunctuation" );
-    opt.appendChild( dd.createTextNode( c.preferences.ignorePunctuation ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.ignorePunctuation ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "sessionCollapse" );
@@ -1832,16 +1824,21 @@ void save( Class const & c )
 
 #ifdef HAVE_X11
     opt = dd.createElement( "trackClipboardScan" );
-    opt.appendChild( dd.createTextNode( c.preferences.trackClipboardScan ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.trackClipboardScan ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "trackSelectionScan" );
-    opt.appendChild( dd.createTextNode( c.preferences.trackSelectionScan ? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.trackSelectionScan ? "1" : "0" ) );
     preferences.appendChild( opt );
 
     opt = dd.createElement( "showScanFlag" );
-    opt.appendChild( dd.createTextNode( c.preferences.showScanFlag? "1":"0" ) );
+    opt.appendChild( dd.createTextNode( c.preferences.showScanFlag ? "1" : "0" ) );
     preferences.appendChild( opt );
+
+    opt = dd.createElement( "selectionChangeDelayTimer" );
+    opt.appendChild( dd.createTextNode( QString::number( c.preferences.selectionChangeDelayTimer ) ) );
+    preferences.appendChild( opt );
+
 #endif
 
     opt = dd.createElement( "pronounceOnLoadMain" );
@@ -2051,11 +2048,18 @@ void save( Class const & c )
       opt.appendChild( dd.createTextNode( c.preferences.fts.enabled ? "1" : "0" ) );
       hd.appendChild( opt );
 
+      opt = dd.createElement( "enablePosition" );
+      opt.appendChild( dd.createTextNode( c.preferences.fts.enablePosition ? "1" : "0" ) );
+      hd.appendChild( opt );
+
       opt = dd.createElement( "maxDictionarySize" );
       opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.maxDictionarySize ) ) );
       hd.appendChild( opt );
-    }
 
+      opt = dd.createElement( "parallelThreads" );
+      opt.appendChild( dd.createTextNode( QString::number( c.preferences.fts.parallelThreads ) ) );
+      hd.appendChild( opt );
+    }
   }
 
   {
@@ -2091,14 +2095,6 @@ void save( Class const & c )
     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 );
-
     opt = dd.createElement( "dictInfoGeometry" );
     opt.appendChild( dd.createTextNode( QString::fromLatin1( c.dictInfoGeometry.toBase64() ) ) );
     root.appendChild( opt );
@@ -2127,25 +2123,22 @@ void save( Class const & c )
     opt.appendChild( dd.createTextNode( c.usingSmallIconsInToolbars ? "1" : "0" ) );
     root.appendChild( opt );
 
-    if( !c.historyExportPath.isEmpty() )
-    {
-        opt = dd.createElement( "historyExportPath" );
-        opt.appendChild( dd.createTextNode( c.historyExportPath ) );
-        root.appendChild( opt );
+    if ( !c.historyExportPath.isEmpty() ) {
+      opt = dd.createElement( "historyExportPath" );
+      opt.appendChild( dd.createTextNode( c.historyExportPath ) );
+      root.appendChild( opt );
     }
 
-    if( !c.resourceSavePath.isEmpty() )
-    {
-        opt = dd.createElement( "resourceSavePath" );
-        opt.appendChild( dd.createTextNode( c.resourceSavePath ) );
-        root.appendChild( opt );
+    if ( !c.resourceSavePath.isEmpty() ) {
+      opt = dd.createElement( "resourceSavePath" );
+      opt.appendChild( dd.createTextNode( c.resourceSavePath ) );
+      root.appendChild( opt );
     }
 
-    if( !c.articleSavePath.isEmpty() )
-    {
-        opt = dd.createElement( "articleSavePath" );
-        opt.appendChild( dd.createTextNode( c.articleSavePath ) );
-        root.appendChild( opt );
+    if ( !c.articleSavePath.isEmpty() ) {
+      opt = dd.createElement( "articleSavePath" );
+      opt.appendChild( dd.createTextNode( c.articleSavePath ) );
+      root.appendChild( opt );
     }
 
     opt = dd.createElement( "editDictionaryCommandLine" );
@@ -2205,20 +2198,19 @@ QString getConfigFileName()
   return getHomeDir().absoluteFilePath( "config" );
 }
 
-QString getConfigDir() 
+QString getConfigDir()
 {
   return getHomeDir().path() + QDir::separator();
 }
 
-QString getIndexDir() 
+QString getIndexDir()
 {
   QDir result = getHomeDir();
 
 #ifdef XDG_BASE_DIRECTORY_COMPLIANCE
   // store index in XDG_CACHE_HOME in non-portable version
   // *and* when an old index directory in GoldenDict home doesn't exist
-  if ( !isPortableVersion() && !result.exists( "index" ) )
-  {
+  if ( !isPortableVersion() && !result.exists( "index" ) ) {
     result.setPath( getCacheDir() );
   }
 #endif
@@ -2231,20 +2223,19 @@ QString getIndexDir()
   return result.path() + QDir::separator();
 }
 
-QString getPidFileName() 
+QString getPidFileName()
 {
   return getHomeDir().filePath( "pid" );
 }
 
-QString getHistoryFileName() 
+QString getHistoryFileName()
 {
   QString homeHistoryPath = getHomeDir().filePath( "history" );
 
 #ifdef XDG_BASE_DIRECTORY_COMPLIANCE
   // use separate data dir for history, if it is not already stored alongside
   // configuration in non-portable mode
-  if ( !isPortableVersion() && !QFile::exists( homeHistoryPath ) )
-  {
+  if ( !isPortableVersion() && !QFile::exists( homeHistoryPath ) ) {
     return getDataDir().filePath( "history" );
   }
 #endif
@@ -2252,22 +2243,33 @@ QString getHistoryFileName()
   return homeHistoryPath;
 }
 
-QString getFavoritiesFileName() 
+QString getFavoritiesFileName()
 {
   return getHomeDir().filePath( "favorites" );
 }
 
-QString getUserCssFileName() 
+QString getUserCssFileName()
 {
   return getHomeDir().filePath( "article-style.css" );
 }
 
-QString getUserCssPrintFileName() 
+std::optional< std::string > getUserJsFileName()
+{
+  QString userJsPath = getHomeDir().filePath( "article-script.js" );
+  if ( QFileInfo::exists( userJsPath ) ) {
+    return userJsPath.toStdString();
+  }
+  else {
+    return std::nullopt;
+  }
+}
+
+QString getUserCssPrintFileName()
 {
   return getHomeDir().filePath( "article-style-print.css" );
 }
 
-QString getUserQtCssFileName() 
+QString getUserQtCssFileName()
 {
   return getHomeDir().filePath( "qt-style.css" );
 }
@@ -2276,12 +2278,12 @@ QString getProgramDataDir() noexcept
 {
   if ( isPortableVersion() )
     return QCoreApplication::applicationDirPath();
-
-  #ifdef PROGRAM_DATA_DIR
+    // TODO: rewrite this in QStandardPaths::AppDataLocation
+#ifdef PROGRAM_DATA_DIR
   return PROGRAM_DATA_DIR;
-  #else
+#else
   return QCoreApplication::applicationDirPath();
-  #endif
+#endif
 }
 
 QString getLocDir() noexcept
@@ -2303,20 +2305,20 @@ QString getHelpDir() noexcept
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
 QString getOpenCCDir() noexcept
 {
-#if defined( Q_OS_WIN )
+  #if defined( Q_OS_WIN )
   if ( QDir( "opencc" ).exists() )
     return "opencc";
   else
     return QCoreApplication::applicationDirPath() + "/opencc";
-#elif defined( Q_OS_MAC )
+  #elif defined( Q_OS_MAC )
   QString path = QCoreApplication::applicationDirPath() + "/opencc";
   if ( QDir( path ).exists() )
     return path;
 
   return QString();
-#else
+  #else
   return QString();
-#endif
+  #endif
 }
 #endif
 
@@ -2326,8 +2328,10 @@ bool isPortableVersion() noexcept
   {
     bool isPortable;
 
-    IsPortable(): isPortable( QFileInfo( portableHomeDirPath() ).isDir() )
-    {}
+    IsPortable():
+      isPortable( QFileInfo( portableHomeDirPath() ).isDir() )
+    {
+    }
   };
 
   static IsPortable p;
@@ -2366,10 +2370,12 @@ QString getStylesDir()
 QString getCacheDir() noexcept
 {
   return isPortableVersion() ? portableHomeDirPath() + "/cache"
-  #ifdef HAVE_X11
-                             : QStandardPaths::writableLocation( QStandardPaths::GenericCacheLocation ) + "/goldendict";
-  #else
-                             : QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
-  #endif
-}
+#ifdef HAVE_X11
+                               :
+                               QStandardPaths::writableLocation( QStandardPaths::GenericCacheLocation ) + "/goldendict";
+#else
+                               :
+                               QStandardPaths::writableLocation( QStandardPaths::CacheLocation );
+#endif
 }
+} // namespace Config
diff --git a/src/config.hh b/src/config.hh
index 469d74a6..7680e50c 100644
--- a/src/config.hh
+++ b/src/config.hh
@@ -13,7 +13,10 @@
 #include <QSet>
 #include <QMetaType>
 #include "ex.hh"
+#include <QDomDocument>
 #include <QLocale>
+#include <optional>
+#include <QThread>
 
 /// GoldenDict's configuration
 namespace Config {
@@ -22,7 +25,7 @@ namespace Config {
 typedef QSet< QString > MutedDictionaries;
 
 #ifdef Q_OS_WIN
-#pragma pack(push,4)
+  #pragma pack( push, 4 )
 #endif
 
 /// A path where to search for the dictionaries
@@ -31,12 +34,20 @@ struct Path
   QString path;
   bool recursive;
 
-  Path(): recursive( false ) {}
+  Path():
+    recursive( false )
+  {
+  }
   Path( QString const & path_, bool recursive_ ):
-    path( path_ ), recursive( recursive_ ) {}
+    path( path_ ),
+    recursive( recursive_ )
+  {
+  }
 
-  bool operator == ( Path const & other ) const
-  { return path == other.path && recursive == other.recursive; }
+  bool operator==( Path const & other ) const
+  {
+    return path == other.path && recursive == other.recursive;
+  }
 };
 
 /// A list of paths where to search for the dictionaries
@@ -49,15 +60,19 @@ struct SoundDir
   QString path, name;
   QString iconFilename;
 
-  SoundDir()
-  {}
+  SoundDir() {}
 
   SoundDir( QString const & path_, QString const & name_, QString iconFilename_ = "" ):
-    path( path_ ), name( name_ ), iconFilename( iconFilename_ )
-  {}
+    path( path_ ),
+    name( name_ ),
+    iconFilename( iconFilename_ )
+  {
+  }
 
-  bool operator == ( SoundDir const & other ) const
-  { return path == other.path && name == other.name && iconFilename == other.iconFilename; }
+  bool operator==( SoundDir const & other ) const
+  {
+    return path == other.path && name == other.name && iconFilename == other.iconFilename;
+  }
 };
 
 /// A list of SoundDirs
@@ -65,17 +80,21 @@ typedef QVector< SoundDir > SoundDirs;
 
 struct DictionaryRef
 {
-  QString id; // Dictionrary id, which is usually an md5 hash
+  QString id;   // Dictionrary id, which is usually an md5 hash
   QString name; // Dictionary name, used to recover when its id changes
 
-  DictionaryRef()
-  {}
+  DictionaryRef() {}
 
   DictionaryRef( QString const & id_, QString const & name_ ):
-    id( id_ ), name( name_ ) {}
+    id( id_ ),
+    name( name_ )
+  {
+  }
 
-  bool operator == ( DictionaryRef const & other ) const
-  { return id == other.id && name == other.name; }
+  bool operator==( DictionaryRef const & other ) const
+  {
+    return id == other.id && name == other.name;
+  }
 };
 
 /// A dictionary group
@@ -87,21 +106,26 @@ struct Group
   QKeySequence shortcut;
   QString favoritesFolder;
   QVector< DictionaryRef > dictionaries;
-  Config::MutedDictionaries mutedDictionaries; // Disabled via dictionary bar
+  Config::MutedDictionaries mutedDictionaries;      // Disabled via dictionary bar
   Config::MutedDictionaries popupMutedDictionaries; // Disabled via dictionary bar in popup
 
-  Group(): id( 0 ) {}
+  Group():
+    id( 0 )
+  {
+  }
 
-  bool operator == ( Group const & other ) const
-  { return id == other.id && name == other.name && icon == other.icon &&
-           favoritesFolder == other.favoritesFolder &&
-           dictionaries == other.dictionaries && shortcut == other.shortcut &&
-           mutedDictionaries == other.mutedDictionaries &&
-           popupMutedDictionaries == other.popupMutedDictionaries &&
-           iconData == other.iconData; }
+  bool operator==( Group const & other ) const
+  {
+    return id == other.id && name == other.name && icon == other.icon && favoritesFolder == other.favoritesFolder
+      && dictionaries == other.dictionaries && shortcut == other.shortcut
+      && mutedDictionaries == other.mutedDictionaries && popupMutedDictionaries == other.popupMutedDictionaries
+      && iconData == other.iconData;
+  }
 
-  bool operator != ( Group const & other ) const
-  { return ! operator == ( other ); }
+  bool operator!=( Group const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 /// All the groups
@@ -109,8 +133,10 @@ struct Groups: public QVector< Group >
 {
   unsigned nextId; // Id to use to create the group next time
 
-  Groups(): nextId( 1 )
-  {}
+  Groups():
+    nextId( 1 )
+  {
+  }
 };
 
 /// Proxy server configuration
@@ -119,8 +145,7 @@ struct ProxyServer
   bool enabled;
   bool useSystemProxy;
 
-  enum Type
-  {
+  enum Type {
     Socks5 = 0,
     HttpConnect,
     HttpGet
@@ -175,7 +200,10 @@ struct FullTextSearch
   int searchMode;
   bool enabled;
 
+  bool enablePosition = false;
+
   quint32 maxDictionarySize;
+  quint32 parallelThreads = QThread::idealThreadCount() / 3 + 1;
   QByteArray dialogGeometry;
   QString disabledTypes;
 
@@ -183,7 +211,58 @@ struct FullTextSearch
     searchMode( 0 ),
     enabled( true ),
     maxDictionarySize( 0 )
-  {}
+  {
+  }
+};
+
+struct CustomFonts
+{
+  QString standard;
+  QString serif;
+  QString sansSerif;
+  QString monospace;
+
+  bool operator==( CustomFonts const & other ) const
+  {
+    return standard == other.standard && serif == other.serif && sansSerif == other.sansSerif
+      && monospace == other.monospace;
+  }
+
+  bool operator!=( CustomFonts const & other ) const
+  {
+    return !operator==( other );
+  }
+
+  QDomElement toElement( QDomDocument dd ) const
+  {
+    QDomElement proxy = dd.createElement( "customFonts" );
+
+    QDomAttr standard_attr = dd.createAttribute( "standard" );
+    standard_attr.setValue( this->standard );
+    proxy.setAttributeNode( standard_attr );
+
+    QDomAttr serif_attr = dd.createAttribute( "serif" );
+    serif_attr.setValue( this->serif );
+    proxy.setAttributeNode( serif_attr );
+
+    QDomAttr sans_attr = dd.createAttribute( "sans-serif" );
+    sans_attr.setValue( this->sansSerif );
+    proxy.setAttributeNode( sans_attr );
+    QDomAttr mono_attr = dd.createAttribute( "monospace" );
+    mono_attr.setValue( this->monospace );
+    proxy.setAttributeNode( mono_attr );
+    return proxy;
+  }
+
+  static CustomFonts fromElement( QDomElement proxy )
+  {
+    CustomFonts c;
+    c.standard  = proxy.attribute( "standard" );
+    c.serif     = proxy.attribute( "serif" );
+    c.sansSerif = proxy.attribute( "sans-serif" );
+    c.monospace = proxy.attribute( "monospace" );
+    return c;
+  }
 };
 
 /// This class encapsulates supported backend preprocessor logic,
@@ -204,30 +283,44 @@ public:
   bool isQtmultimedia() const;
 
   QString const & uiName() const
-  { return name; }
+  {
+    return name;
+  }
 
   void setUiName( QString const & name_ )
-  { name = name_; }
+  {
+    name = name_;
+  }
 
-  bool operator == ( InternalPlayerBackend const & other ) const
-  { return name == other.name; }
+  bool operator==( InternalPlayerBackend const & other ) const
+  {
+    return name == other.name;
+  }
 
-  bool operator != ( InternalPlayerBackend const & other ) const
-  { return ! operator == ( other ); }
+  bool operator!=( InternalPlayerBackend const & other ) const
+  {
+    return !operator==( other );
+  }
 
 private:
 #ifdef MAKE_FFMPEG_PLAYER
   static InternalPlayerBackend ffmpeg()
-  { return InternalPlayerBackend( "FFmpeg" ); }
+  {
+    return InternalPlayerBackend( "FFmpeg" );
+  }
 #endif
 
 #ifdef MAKE_QTMULTIMEDIA_PLAYER
   static InternalPlayerBackend qtmultimedia()
-  { return InternalPlayerBackend( "Qt Multimedia" ); }
+  {
+    return InternalPlayerBackend( "Qt Multimedia" );
+  }
 #endif
 
-  explicit InternalPlayerBackend( QString const & name_ ) : name( name_ )
-  {}
+  explicit InternalPlayerBackend( QString const & name_ ):
+    name( name_ )
+  {
+  }
 
   QString name;
 };
@@ -241,8 +334,7 @@ private:
   #define ENABLE_SPWF_CUSTOMIZATION
 #endif
 
-enum ScanPopupWindowFlags
-{
+enum ScanPopupWindowFlags {
   SPWF_default = 0,
   SPWF_Popup,
   SPWF_Tool
@@ -253,8 +345,8 @@ ScanPopupWindowFlags spwfFromInt( int id );
 struct Preferences
 {
   QString interfaceLanguage; // Empty value corresponds to system default
-  QString displayStyle; // Empty value corresponds to the default one
-  QString webFontFamily; // Empty value corresponds to the default one
+
+  CustomFonts customFonts;
   bool newTabsOpenAfterCurrentOne;
   bool newTabsOpenInBackground;
   bool hideSingleTab;
@@ -268,8 +360,6 @@ struct Preferences
   bool selectWordBySingleClick;
   bool autoScrollToTargetArticle;
   bool escKeyHidesMainWindow;
-  bool darkMode;
-  bool darkReaderMode;
   bool alwaysOnTop;
 
   /// An old UI mode when tranlateLine and wordList
@@ -295,6 +385,7 @@ struct Preferences
   bool trackClipboardScan;
   bool trackSelectionScan;
   bool showScanFlag;
+  int selectionChangeDelayTimer;
 #endif
 
   // Whether the word should be pronounced on page load, in main window/popup
@@ -338,10 +429,21 @@ struct Preferences
   bool stripClipboard;
   bool raiseWindowOnSearch;
 
-  QString addonStyle;
-
   FullTextSearch fts;
 
+  // Appearances
+
+  bool darkMode;
+  bool darkReaderMode;
+  QString addonStyle;
+  QString displayStyle; // Article Display style (Which also affect interface style on windows)
+
+#if !defined( Q_OS_WIN )
+  // QApplication style https://doc.qt.io/qt-6/qapplication.html#setStyle
+  // In addition to Qt's styles, "Default" is added as default.
+  QString interfaceStyle;
+#endif
+
   Preferences();
 };
 
@@ -352,16 +454,24 @@ struct MediaWiki
   bool enabled;
   QString icon;
 
-  MediaWiki(): enabled( false )
-  {}
+  MediaWiki():
+    enabled( false )
+  {
+  }
 
-  MediaWiki( QString const & id_, QString const & name_, QString const & url_,
-             bool enabled_, QString const & icon_ ):
-    id( id_ ), name( name_ ), url( url_ ), enabled( enabled_ ), icon( icon_ ) {}
+  MediaWiki( QString const & id_, QString const & name_, QString const & url_, bool enabled_, QString const & icon_ ):
+    id( id_ ),
+    name( name_ ),
+    url( url_ ),
+    enabled( enabled_ ),
+    icon( icon_ )
+  {
+  }
 
-  bool operator == ( MediaWiki const & other ) const
-  { return id == other.id && name == other.name && url == other.url &&
-           enabled == other.enabled && icon == other.icon ; }
+  bool operator==( MediaWiki const & other ) const
+  {
+    return id == other.id && name == other.name && url == other.url && enabled == other.enabled && icon == other.icon;
+  }
 };
 
 /// Any website which can be queried though a simple template substitution
@@ -372,18 +482,31 @@ struct WebSite
   QString iconFilename;
   bool inside_iframe;
 
-  WebSite(): enabled( false )
-  {}
+  WebSite():
+    enabled( false )
+  {
+  }
 
-  WebSite( QString const & id_, QString const & name_, QString const & url_,
-           bool enabled_, QString const & iconFilename_, bool inside_iframe_ ):
-    id( id_ ), name( name_ ), url( url_ ), enabled( enabled_ ), iconFilename( iconFilename_ ),
-    inside_iframe( inside_iframe_ ) {}
+  WebSite( QString const & id_,
+           QString const & name_,
+           QString const & url_,
+           bool enabled_,
+           QString const & iconFilename_,
+           bool inside_iframe_ ):
+    id( id_ ),
+    name( name_ ),
+    url( url_ ),
+    enabled( enabled_ ),
+    iconFilename( iconFilename_ ),
+    inside_iframe( inside_iframe_ )
+  {
+  }
 
-  bool operator == ( WebSite const & other ) const
-  { return id == other.id && name == other.name && url == other.url &&
-           enabled == other.enabled && iconFilename == other.iconFilename &&
-           inside_iframe == other.inside_iframe; }
+  bool operator==( WebSite const & other ) const
+  {
+    return id == other.id && name == other.name && url == other.url && enabled == other.enabled
+      && iconFilename == other.iconFilename && inside_iframe == other.inside_iframe;
+  }
 };
 
 /// All the WebSites
@@ -398,20 +521,33 @@ struct DictServer
   QString strategies;
   QString iconFilename;
 
-  DictServer(): enabled( false )
-  {}
+  DictServer():
+    enabled( false )
+  {
+  }
 
-  DictServer( QString const & id_, QString const & name_, QString const & url_,
-              bool enabled_, QString const & databases_, QString const & strategies_,
+  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_ )  {}
+    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; }
+  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
@@ -426,12 +562,15 @@ struct Hunspell
 
   Dictionaries enabledDictionaries;
 
-  bool operator == ( Hunspell const & other ) const
-  { return dictionariesPath == other.dictionariesPath &&
-    enabledDictionaries == other.enabledDictionaries; }
+  bool operator==( Hunspell const & other ) const
+  {
+    return dictionariesPath == other.dictionariesPath && enabledDictionaries == other.enabledDictionaries;
+  }
 
-  bool operator != ( Hunspell const & other ) const
-  { return ! operator == ( other ); }
+  bool operator!=( Hunspell const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 /// All the MediaWikis
@@ -449,15 +588,17 @@ struct Chinese
 
   Chinese();
 
-  bool operator == ( Chinese const & other ) const
-  { return enable == other.enable &&
-           enableSCToTWConversion == other.enableSCToTWConversion &&
-           enableSCToHKConversion == other.enableSCToHKConversion &&
-           enableTCToSCConversion == other.enableTCToSCConversion; }
-
-  bool operator != ( Chinese const & other ) const
-  { return ! operator == ( other ); }
+  bool operator==( Chinese const & other ) const
+  {
+    return enable == other.enable && enableSCToTWConversion == other.enableSCToTWConversion
+      && enableSCToHKConversion == other.enableSCToHKConversion
+      && enableTCToSCConversion == other.enableTCToSCConversion;
+  }
 
+  bool operator!=( Chinese const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 
@@ -491,17 +632,17 @@ struct Romaji
 
   Romaji();
 
-  bool operator == ( Romaji const & other ) const
-  { return enable == other.enable &&
-           enableHepburn == other.enableHepburn &&
-           enableNihonShiki == other.enableNihonShiki &&
-           enableKunreiShiki == other.enableKunreiShiki &&
-           enableHiragana == other.enableHiragana &&
-           enableKatakana == other.enableKatakana; }
-
-  bool operator != ( Romaji const & other ) const
-  { return ! operator == ( other ); }
+  bool operator==( Romaji const & other ) const
+  {
+    return enable == other.enable && enableHepburn == other.enableHepburn && enableNihonShiki == other.enableNihonShiki
+      && enableKunreiShiki == other.enableKunreiShiki && enableHiragana == other.enableHiragana
+      && enableKatakana == other.enableKatakana;
+  }
 
+  bool operator!=( Romaji const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 struct Transliteration
@@ -522,23 +663,25 @@ struct Transliteration
     return enableRussianTransliteration == other.enableRussianTransliteration
       && enableGermanTransliteration == other.enableGermanTransliteration
       && enableGreekTransliteration == other.enableGreekTransliteration
-      && enableBelarusianTransliteration == other.enableBelarusianTransliteration
-      && customTrans == other.customTrans &&
+      && enableBelarusianTransliteration == other.enableBelarusianTransliteration && customTrans == other.customTrans &&
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
       chinese == other.chinese &&
 #endif
       romaji == other.romaji;
   }
 
-  bool operator != ( Transliteration const & other ) const
-  { return ! operator == ( other ); }
+  bool operator!=( Transliteration const & other ) const
+  {
+    return !operator==( other );
+  }
 
   Transliteration():
-      enableRussianTransliteration( false ),
-      enableGermanTransliteration( false ),
-      enableGreekTransliteration( false ),
-      enableBelarusianTransliteration( false )
-  {}
+    enableRussianTransliteration( false ),
+    enableGermanTransliteration( false ),
+    enableGreekTransliteration( false ),
+    enableBelarusianTransliteration( false )
+  {
+  }
 };
 
 struct Lingua
@@ -546,14 +689,15 @@ struct Lingua
   bool enable;
   QString languageCodes;
 
-  bool operator == ( Lingua const & other ) const
-  { return enable == other.enable &&
-      languageCodes == other.languageCodes;
+  bool operator==( Lingua const & other ) const
+  {
+    return enable == other.enable && languageCodes == other.languageCodes;
   }
 
-  bool operator != ( Lingua const & other ) const
-  { return ! operator == ( other ); }
-
+  bool operator!=( Lingua const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 struct Forvo
@@ -562,24 +706,26 @@ struct Forvo
   QString apiKey;
   QString languageCodes;
 
-  Forvo(): enable( false )
-  {}
-
-  bool operator == ( Forvo const & other ) const
-  { return enable == other.enable &&
-           apiKey == other.apiKey &&
-           languageCodes == other.languageCodes;
+  Forvo():
+    enable( false )
+  {
   }
 
-  bool operator != ( Forvo const & other ) const
-  { return ! operator == ( other ); }
+  bool operator==( Forvo const & other ) const
+  {
+    return enable == other.enable && apiKey == other.apiKey && languageCodes == other.languageCodes;
+  }
+
+  bool operator!=( Forvo const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 struct Program
 {
   bool enabled;
-  enum Type
-  {
+  enum Type {
     Audio,
     PlainText,
     Html,
@@ -589,24 +735,36 @@ struct Program
   QString id, name, commandLine;
   QString iconFilename;
 
-  Program(): enabled( false )
-  {}
-
-  Program( bool enabled_, Type type_, QString const & id_,
-          QString const & name_, QString const & commandLine_, QString const & iconFilename_ ):
-    enabled( enabled_ ), type( type_ ), id( id_ ), name( name_ ),
-    commandLine( commandLine_ ), iconFilename( iconFilename_ ) {}
-
-  bool operator == ( Program const & other ) const
-  { return enabled == other.enabled &&
-           type == other.type &&
-           name == other.name &&
-           commandLine == other.commandLine &&
-           iconFilename == other.iconFilename;
+  Program():
+    enabled( false )
+  {
   }
 
-  bool operator != ( Program const & other ) const
-  { return ! operator == ( other ); }
+  Program( bool enabled_,
+           Type type_,
+           QString const & id_,
+           QString const & name_,
+           QString const & commandLine_,
+           QString const & iconFilename_ ):
+    enabled( enabled_ ),
+    type( type_ ),
+    id( id_ ),
+    name( name_ ),
+    commandLine( commandLine_ ),
+    iconFilename( iconFilename_ )
+  {
+  }
+
+  bool operator==( Program const & other ) const
+  {
+    return enabled == other.enabled && type == other.type && name == other.name && commandLine == other.commandLine
+      && iconFilename == other.iconFilename;
+  }
+
+  bool operator!=( Program const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
 typedef QVector< Program > Programs;
@@ -638,20 +796,23 @@ struct VoiceEngine
     locale( locale_ ),
     volume( volume_ ),
     rate( rate_ )
-  {}
+  {
+  }
 
-  bool operator == ( VoiceEngine const & other ) const
+  bool operator==( VoiceEngine const & other ) const
   {
     return enabled == other.enabled && engine_name == other.engine_name && name == other.name
       && voice_name == other.voice_name && locale == other.locale && iconFilename == other.iconFilename
       && volume == other.volume && rate == other.rate;
   }
 
-  bool operator != ( VoiceEngine const & other ) const
-    { return ! operator == ( other ); }
+  bool operator!=( VoiceEngine const & other ) const
+  {
+    return !operator==( other );
+  }
 };
 
-typedef QVector< VoiceEngine> VoiceEngines;
+typedef QVector< VoiceEngine > VoiceEngines;
 
 struct HeadwordsDialog
 {
@@ -661,10 +822,12 @@ struct HeadwordsDialog
   QString headwordsExportPath;
   QByteArray headwordsDialogGeometry;
 
-  HeadwordsDialog() :
-    searchMode( 0 ), matchCase( false )
-    , autoApply( false )
-  {}
+  HeadwordsDialog():
+    searchMode( 0 ),
+    matchCase( false ),
+    autoApply( false )
+  {
+  }
 };
 
 struct Class
@@ -685,32 +848,30 @@ struct Class
   Programs programs;
   VoiceEngines voiceEngines;
 
-  unsigned lastMainGroupId; // Last used group in main window
+  unsigned lastMainGroupId;  // Last used group in main window
   unsigned lastPopupGroupId; // Last used group in popup window
 
-  QByteArray popupWindowState; // Binary state saved by QMainWindow
-  QByteArray popupWindowGeometry; // Geometry saved by QMainWindow
-  QByteArray dictInfoGeometry; // Geometry of "Dictionary info" window
-  QByteArray inspectorGeometry; // Geometry of WebKit inspector window
+  QByteArray popupWindowState;           // Binary state saved by QMainWindow
+  QByteArray popupWindowGeometry;        // Geometry saved by QMainWindow
+  QByteArray dictInfoGeometry;           // Geometry of "Dictionary info" window
+  QByteArray inspectorGeometry;          // Geometry of WebKit inspector window
   QByteArray dictionariesDialogGeometry; // Geometry of Dictionaries dialog
-  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
   QString articleSavePath;   // Path to save articles
 
-  bool pinPopupWindow; // Last pin status
+  bool pinPopupWindow;         // Last pin status
   bool popupWindowAlwaysOnTop; // Last status of pinned popup window
 
-  QByteArray mainWindowState; // Binary state saved by QMainWindow
+  QByteArray mainWindowState;    // Binary state saved by QMainWindow
   QByteArray mainWindowGeometry; // Geometry saved by QMainWindow
 
-  MutedDictionaries mutedDictionaries; // Disabled via dictionary bar
+  MutedDictionaries mutedDictionaries;      // Disabled via dictionary bar
   MutedDictionaries popupMutedDictionaries; // Disabled via dictionary bar in popup
 
-  QDateTime timeForNewReleaseCheck; // Only effective if
-                                    // preferences.checkForNewReleases is set
+  QDateTime timeForNewReleaseCheck; // Last time when the release was checked.
+
   QString skippedRelease; // Empty by default
 
   bool showingDictBarNames;
@@ -744,10 +905,11 @@ struct Class
   Group const * getGroup( unsigned id ) const;
   //disable tts dictionary. does not need to save to persistent file
   bool notts = false;
+  bool resetState;
 };
 
 #ifdef Q_OS_WIN
-#pragma pack(pop)
+  #pragma pack( pop )
 #endif
 
 /// Configuration-specific events. Some parts of the program need to react
@@ -783,38 +945,41 @@ DEF_EX( exCantWriteConfigFile, "Can't write the configuration file", exError )
 DEF_EX( exMalformedConfigFile, "The configuration file is malformed", exError )
 
 /// Loads the configuration, or creates the default one if none is present
-Class load() ;
+Class load();
 
 /// Saves the configuration
-void save( Class const & ) ;
+void save( Class const & );
 
 /// Returns the configuration file name.
 QString getConfigFileName();
 
 /// Returns the main configuration directory.
-QString getConfigDir() ;
+QString getConfigDir();
 
 /// Returns the index directory, where the indices are to be stored.
-QString getIndexDir() ;
+QString getIndexDir();
 
 /// Returns the filename of a .pid file which should store current pid of
 /// the process.
-QString getPidFileName() ;
+QString getPidFileName();
 
 /// Returns the filename of a history file which stores search history.
-QString getHistoryFileName() ;
+QString getHistoryFileName();
 
 /// Returns the filename of a favorities file.
-QString getFavoritiesFileName() ;
+QString getFavoritiesFileName();
 
-/// Returns the user .css file name.
-QString getUserCssFileName() ;
+/// Returns the user .css file name (article-style.css).
+QString getUserCssFileName();
+
+/// Returns the user .js file name (article-script.js).
+std::optional< std::string > getUserJsFileName();
 
 /// Returns the user .css file name used for printing only.
-QString getUserCssPrintFileName() ;
+QString getUserCssPrintFileName();
 
 /// Returns the user .css file name for the Qt interface customization.
-QString getUserQtCssFileName() ;
+QString getUserQtCssFileName();
 
 /// Returns the program's data dir. Under Linux that would be something like
 /// /usr/share/apps/goldendict, under Windows C:/Program Files/GoldenDict.
@@ -849,6 +1014,6 @@ QString getStylesDir();
 /// Returns the directory where user-specific non-essential (cached) data should be written.
 QString getCacheDir() noexcept;
 
-}
+} // namespace Config
 
 #endif
diff --git a/src/decompress.cc b/src/decompress.cc
index 9e348317..35295b6b 100644
--- a/src/decompress.cc
+++ b/src/decompress.cc
@@ -3,41 +3,38 @@
 #include "bzlib.h"
 
 #ifdef MAKE_ZIM_SUPPORT
-#include "lzma.h"
-#include "zstd.h"
+  #include "lzma.h"
 #endif
 
 #define CHUNK_SIZE 2048
 
 QByteArray zlibDecompress( const char * bufptr, unsigned length )
 {
-z_stream zs;
-char buf[CHUNK_SIZE];
-QByteArray str;
-int res;
-    memset( &zs, 0, sizeof(zs) );
-    zs.next_in = (Bytef *)bufptr;
-    zs.avail_in = length;
-    while( 1 )
-    {
-        res = inflateInit( &zs );
-        if( res != Z_OK )
-            break;
-        while( res != Z_STREAM_END )
-        {
-            zs.next_out = (Bytef *)buf;
-            zs.avail_out = CHUNK_SIZE;
-            res = inflate( &zs, Z_SYNC_FLUSH );
-            str.append( buf, CHUNK_SIZE - zs.avail_out );
-            if( res != Z_OK && res != Z_STREAM_END )
-                 break;
-        }
+  z_stream zs;
+  char buf[ CHUNK_SIZE ];
+  QByteArray str;
+  int res;
+  memset( &zs, 0, sizeof( zs ) );
+  zs.next_in  = (Bytef *)bufptr;
+  zs.avail_in = length;
+  while ( 1 ) {
+    res = inflateInit( &zs );
+    if ( res != Z_OK )
+      break;
+    while ( res != Z_STREAM_END ) {
+      zs.next_out  = (Bytef *)buf;
+      zs.avail_out = CHUNK_SIZE;
+      res          = inflate( &zs, Z_SYNC_FLUSH );
+      str.append( buf, CHUNK_SIZE - zs.avail_out );
+      if ( res != Z_OK && res != Z_STREAM_END )
         break;
     }
-    inflateEnd( &zs );
-    if( res != Z_STREAM_END )
-        str.clear();
-    return str;
+    break;
+  }
+  inflateEnd( &zs );
+  if ( res != Z_STREAM_END )
+    str.clear();
+  return str;
 }
 
 string decompressZlib( const char * bufptr, unsigned length )
@@ -48,83 +45,77 @@ string decompressZlib( const char * bufptr, unsigned length )
 
 string decompressBzip2( const char * bufptr, unsigned length )
 {
-bz_stream zs;
-char buf[CHUNK_SIZE];
-string str;
-int res;
-    memset( &zs, 0, sizeof(zs) );
-    zs.next_in = (char *)bufptr;
-    zs.avail_in = length;
-    zs.total_in_lo32 = length;
-    while( 1 )
-    {
-        res = BZ2_bzDecompressInit( &zs, 0, 0 );
-        if( res != BZ_OK )
-            break;
-        while( res != BZ_STREAM_END )
-        {
-            zs.next_out = buf;
-            zs.avail_out = CHUNK_SIZE;
-            zs.total_out_lo32 = length;
-            res = BZ2_bzDecompress( &zs );
-            str.append( buf, CHUNK_SIZE - zs.avail_out );
-            if( res != BZ_OK && res != BZ_STREAM_END )
-                break;
-        }
+  bz_stream zs;
+  char buf[ CHUNK_SIZE ];
+  string str;
+  int res;
+  memset( &zs, 0, sizeof( zs ) );
+  zs.next_in       = (char *)bufptr;
+  zs.avail_in      = length;
+  zs.total_in_lo32 = length;
+  while ( 1 ) {
+    res = BZ2_bzDecompressInit( &zs, 0, 0 );
+    if ( res != BZ_OK )
+      break;
+    while ( res != BZ_STREAM_END ) {
+      zs.next_out       = buf;
+      zs.avail_out      = CHUNK_SIZE;
+      zs.total_out_lo32 = length;
+      res               = BZ2_bzDecompress( &zs );
+      str.append( buf, CHUNK_SIZE - zs.avail_out );
+      if ( res != BZ_OK && res != BZ_STREAM_END )
         break;
     }
-    BZ2_bzDecompressEnd( &zs );
-    if( res != BZ_STREAM_END )
-        str.clear();
-    return str;
+    break;
+  }
+  BZ2_bzDecompressEnd( &zs );
+  if ( res != BZ_STREAM_END )
+    str.clear();
+  return str;
 }
 
 #ifdef MAKE_ZIM_SUPPORT
 
-string decompressLzma2( const char * bufptr, unsigned length,
-                        bool raw_decoder )
+string decompressLzma2( const char * bufptr, unsigned length, bool raw_decoder )
 {
-string str;
-lzma_ret res;
-char buf[CHUNK_SIZE];
+  string str;
+  lzma_ret res;
+  char buf[ CHUNK_SIZE ];
 
   lzma_stream strm = LZMA_STREAM_INIT;
-  strm.next_in = reinterpret_cast< const uint8_t * >( bufptr );
-  strm.avail_in = length;
+  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);
+  if ( raw_decoder ) {
+    lzma_lzma_preset( &opt, LZMA_PRESET_DEFAULT );
 
-    filters[ 0 ].id = LZMA_FILTER_LZMA2;
+    filters[ 0 ].id      = LZMA_FILTER_LZMA2;
     filters[ 0 ].options = &opt;
-    filters[ 1 ].id = LZMA_VLI_UNKNOWN;
+    filters[ 1 ].id      = LZMA_VLI_UNKNOWN;
   }
 
-  while( 1 )
-  {
-    if( raw_decoder )
+  while ( 1 ) {
+    if ( raw_decoder )
       res = lzma_raw_decoder( &strm, filters );
     else
       res = lzma_stream_decoder( &strm, UINT64_MAX, 0 );
 
-    if( res != LZMA_OK )
+    if ( res != LZMA_OK )
       break;
 
-    while ( res != LZMA_STREAM_END )
-    {
-      strm.next_out = reinterpret_cast< uint8_t * >( buf );
+    while ( res != LZMA_STREAM_END ) {
+      strm.next_out  = reinterpret_cast< uint8_t * >( buf );
       strm.avail_out = CHUNK_SIZE;
-      res = lzma_code( &strm, LZMA_RUN );
+      res            = lzma_code( &strm, LZMA_RUN );
       str.append( buf, CHUNK_SIZE - strm.avail_out );
-      if( res != LZMA_OK && res != LZMA_STREAM_END )
+      if ( res != LZMA_OK && res != LZMA_STREAM_END )
         break;
     }
     lzma_end( &strm );
-    if( res != LZMA_STREAM_END )
+    if ( res != LZMA_STREAM_END )
       str.clear();
 
     break;
@@ -132,46 +123,4 @@ char buf[CHUNK_SIZE];
   return str;
 }
 
-string decompressZstd( const char *bufptr, unsigned length )
-{
-  string str;
-  char buf[CHUNK_SIZE];
-  size_t res;
-//  string err;
-  ZSTD_DStream *zds;
-  ZSTD_inBuffer in_buf = { bufptr, length, 0 };
-  ZSTD_outBuffer out_buf = { buf, CHUNK_SIZE, 0 };
-
-  zds = ZSTD_createDStream();
-  if( !zds )
-    return str;
-
-  res = ZSTD_initDStream( zds );
-  if( ZSTD_isError( res ) )
-  {
-//    err = string( ZSTD_getErrorName( res ) );
-    ZSTD_freeDStream( zds );
-    return str;
-  }
-
-  do
-  {
-    out_buf.pos = 0;
-    res = ZSTD_decompressStream( zds, &out_buf, &in_buf );
-    if( ZSTD_isError( res ) )
-    {
-//      err = string( ZSTD_getErrorName( res ) );
-      ZSTD_freeDStream( zds );
-      return string();
-    }
-
-    str.append( buf, out_buf.pos );
-  }
-  while( out_buf.pos >= out_buf.size );
-
-  ZSTD_freeDStream( zds );
-
-  return str;
-}
-
 #endif
diff --git a/src/decompress.hh b/src/decompress.hh
index c57593ff..994b3b91 100644
--- a/src/decompress.hh
+++ b/src/decompress.hh
@@ -14,10 +14,7 @@ string decompressBzip2( const char * bufptr, unsigned length );
 
 #ifdef MAKE_ZIM_SUPPORT
 
-string decompressLzma2( const char * bufptr, unsigned length,
-                        bool raw_decoder = false );
-
-string decompressZstd( const char * bufptr, unsigned length );
+string decompressLzma2( const char * bufptr, unsigned length, bool raw_decoder = false );
 
 #endif
 
diff --git a/src/delegate.cc b/src/delegate.cc
index d1b5cd8d..f7c3a579 100644
--- a/src/delegate.cc
+++ b/src/delegate.cc
@@ -2,28 +2,28 @@
 
 #include "delegate.hh"
 
-WordListItemDelegate::WordListItemDelegate(  QAbstractItemDelegate * delegate  ) :
-QStyledItemDelegate()
+WordListItemDelegate::WordListItemDelegate( QAbstractItemDelegate * delegate ):
+  QStyledItemDelegate()
 {
   mainDelegate = static_cast< QStyledItemDelegate * >( delegate );
 }
 
-void WordListItemDelegate::paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const
+void WordListItemDelegate::paint( QPainter * painter,
+                                  const QStyleOptionViewItem & option,
+                                  const QModelIndex & index ) const
 {
   QStyleOptionViewItem opt4 = option;
 
   QStyleOptionViewItem opt = option;
   initStyleOption( &opt4, index );
-  if( opt4.text.isRightToLeft() )
-  {
+  if ( opt4.text.isRightToLeft() ) {
     opt.direction = Qt::RightToLeft;
-    if( opt4.textElideMode != Qt::ElideNone )
+    if ( opt4.textElideMode != Qt::ElideNone )
       opt.textElideMode = Qt::ElideLeft;
   }
-  else
-  {
+  else {
     opt.direction = Qt::LeftToRight;
-    if( opt4.textElideMode != Qt::ElideNone )
+    if ( opt4.textElideMode != Qt::ElideNone )
       opt.textElideMode = Qt::ElideRight;
   }
   mainDelegate->paint( painter, opt, index );
diff --git a/src/delegate.hh b/src/delegate.hh
index 080bdfbb..62b044ca 100644
--- a/src/delegate.hh
+++ b/src/delegate.hh
@@ -4,7 +4,7 @@
 #include <QAbstractItemDelegate>
 #include <QStyledItemDelegate>
 
-class WordListItemDelegate : public QStyledItemDelegate
+class WordListItemDelegate: public QStyledItemDelegate
 {
 public:
   explicit WordListItemDelegate( QAbstractItemDelegate * delegate );
@@ -15,4 +15,3 @@ private:
 };
 
 #endif
-
diff --git a/src/dict/aard.cc b/src/dict/aard.cc
index 37ab597a..aacbd652 100644
--- a/src/dict/aard.cc
+++ b/src/dict/aard.cc
@@ -17,7 +17,7 @@
 #include <string>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QString>
@@ -47,7 +47,6 @@ using BtreeIndexing::IndexInfo;
 namespace {
 
 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 )
 
@@ -56,64 +55,63 @@ DEF_EX_STR( exSuddenEndOfFile, "Sudden end of file", Dictionary::Ex )
 /// AAR file header
 struct AAR_header
 {
-    char signature[4];
-    char checksum[40];
-    quint16 version;
-    char uuid[16];
-    quint16 volume;
-    quint16 totalVolumes;
-    quint32 metaLength;
-    quint32 wordsCount;
-    quint32 articleOffset;
-    char indexItemFormat[4];
-    char keyLengthFormat[2];
-    char articleLengthFormat[2];
+  char signature[ 4 ];
+  char checksum[ 40 ];
+  quint16 version;
+  char uuid[ 16 ];
+  quint16 volume;
+  quint16 totalVolumes;
+  quint32 metaLength;
+  quint32 wordsCount;
+  quint32 articleOffset;
+  char indexItemFormat[ 4 ];
+  char keyLengthFormat[ 2 ];
+  char articleLengthFormat[ 2 ];
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
 struct IndexElement
 {
-    quint32 wordOffset;
-    quint32 articleOffset;
+  quint32 wordOffset;
+  quint32 articleOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
 struct IndexElement64
 {
-    quint32 wordOffset;
-    quint64 articleOffset;
+  quint32 wordOffset;
+  quint64 articleOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
-enum
-{
-  Signature = 0x58524141, // AARX on little-endian, XRAA on big-endian
+enum {
+  Signature            = 0x58524141, // AARX on little-endian, XRAA on big-endian
   CurrentFormatVersion = 4 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  quint32 signature; // First comes the signature, AARX
-  quint32 formatVersion; // File format version (CurrentFormatVersion)
-  quint32 chunksOffset; // The offset to chunks' storage
+  quint32 signature;             // First comes the signature, AARX
+  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 langFrom;  // Source language
-  quint32 langTo;    // Target language
+  quint32 langFrom; // Source language
+  quint32 langTo;   // Target language
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -125,207 +123,196 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
-void readJSONValue( string const & source, string & str, string::size_type & pos)
+void readJSONValue( string const & source, string & str, string::size_type & pos )
 {
-    int level = 1;
-    char endChar;
-    str.push_back( source[pos] );
-    if( source[pos] == '{')
-        endChar = '}';
-    else if( source[pos] == '[' )
-        endChar = ']';
-    else if( source[pos] == '\"' )
-    {
-        str.clear();
-        endChar = '\"';
-    }
-    else
-        endChar = ',';
+  int level = 1;
+  char endChar;
+  str.push_back( source[ pos ] );
+  if ( source[ pos ] == '{' )
+    endChar = '}';
+  else if ( source[ pos ] == '[' )
+    endChar = ']';
+  else if ( source[ pos ] == '\"' ) {
+    str.clear();
+    endChar = '\"';
+  }
+  else
+    endChar = ',';
 
-    pos++;
-    char ch = 0;
-    char lastCh = 0;
-    while( !( ch == endChar && lastCh != '\\' && level == 0 )
-           && pos < source.size() )
-    {
-        lastCh = ch;
-        ch = source[ pos++ ];
-        if( ( ch == '{' || ch == '[' ) && lastCh != '\\' )
-          level++;
-        if( ( ch == '}' || ch == ']' ) && lastCh != '\\' )
-          level--;
+  pos++;
+  char ch     = 0;
+  char lastCh = 0;
+  while ( !( ch == endChar && lastCh != '\\' && level == 0 ) && pos < source.size() ) {
+    lastCh = ch;
+    ch     = source[ pos++ ];
+    if ( ( ch == '{' || ch == '[' ) && lastCh != '\\' )
+      level++;
+    if ( ( ch == '}' || ch == ']' ) && lastCh != '\\' )
+      level--;
 
-        if( ch == endChar &&
-            ( ( ch == '\"' && lastCh != '\\' ) || ch == ',' )
-            && level == 1)
-          break;
-        str.push_back( ch );
-    }
+    if ( ch == endChar && ( ( ch == '\"' && lastCh != '\\' ) || ch == ',' ) && level == 1 )
+      break;
+    str.push_back( ch );
+  }
 }
 
 map< string, string > parseMetaData( string const & metaData )
 {
-// Parsing JSON string
-    map< string, string > data;
-    string name, value;
-    string::size_type n = 0;
+  // Parsing JSON string
+  map< string, string > data;
+  string name, value;
+  string::size_type n = 0;
 
-    while( n < metaData.length() && metaData[n] != '{' )
-        n++;
-    while( n < metaData.length() )
-    {
-        // Skip to '"'
-        while( n < metaData.length() && metaData[n] != '\"' )
-            n++;
-        if( ++n >= metaData.length() )
-            break;
+  while ( n < metaData.length() && metaData[ n ] != '{' )
+    n++;
+  while ( n < metaData.length() ) {
+    // Skip to '"'
+    while ( n < metaData.length() && metaData[ n ] != '\"' )
+      n++;
+    if ( ++n >= metaData.length() )
+      break;
 
-        // Read name
-        while(  n < metaData.length() &&
-                !( ( metaData[n] == '\"' || metaData[n] == '{' ) && metaData[n-1] != '\\' ) )
-            name.push_back( metaData[n++]);
+    // Read name
+    while ( n < metaData.length()
+            && !( ( metaData[ n ] == '\"' || metaData[ n ] == '{' ) && metaData[ n - 1 ] != '\\' ) )
+      name.push_back( metaData[ n++ ] );
 
-        // Skip to ':'
-        if( ++n >= metaData.length() )
-            break;
-        while( n < metaData.length() && metaData[n] != ':' )
-            n++;
-        if( ++n >= metaData.length() )
-            break;
+    // Skip to ':'
+    if ( ++n >= metaData.length() )
+      break;
+    while ( n < metaData.length() && metaData[ n ] != ':' )
+      n++;
+    if ( ++n >= metaData.length() )
+      break;
 
-        // Find value start after ':'
-        while( n < metaData.length()
-               && !( ( metaData[n] == '\"'
-                       || metaData[n] == '{'
-                       || metaData[n] == '['
-                       || ( metaData[n] >= '0' && metaData[n] <= '9' ) )
-               && metaData[n-1] != '\\' ) )
-            n++;
-        if( n >= metaData.length() )
-            break;
+    // Find value start after ':'
+    while ( n < metaData.length()
+            && !( ( metaData[ n ] == '\"' || metaData[ n ] == '{' || metaData[ n ] == '['
+                    || ( metaData[ n ] >= '0' && metaData[ n ] <= '9' ) )
+                  && metaData[ n - 1 ] != '\\' ) )
+      n++;
+    if ( n >= metaData.length() )
+      break;
 
-        readJSONValue( metaData, value, n);
+    readJSONValue( metaData, value, n );
 
-        data[name] = value;
+    data[ name ] = value;
 
-        name.clear();
-        value.clear();
-        if( ++n >= metaData.length() )
-            break;
-    }
-    return data;
+    name.clear();
+    value.clear();
+    if ( ++n >= metaData.length() )
+      break;
+  }
+  return data;
 }
 
 class AardDictionary: public BtreeIndexing::BtreeDictionary
 {
-    QMutex idxMutex;
-    QMutex aardMutex;
-    File::Class idx;
-    IdxHeader idxHeader;
-    ChunkedStorage::Reader chunks;
-    File::Class df;
+  QMutex idxMutex;
+  QMutex aardMutex;
+  File::Class idx;
+  IdxHeader idxHeader;
+  ChunkedStorage::Reader chunks;
+  File::Class df;
 
-  public:
+public:
 
-    AardDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
+  AardDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
-    ~AardDictionary();
+  ~AardDictionary();
 
-    map< Dictionary::Property, string > getProperties() noexcept override
-    { return map< Dictionary::Property, string >(); }
+  map< Dictionary::Property, string > getProperties() noexcept override
+  {
+    return map< Dictionary::Property, string >();
+  }
 
-    unsigned long getArticleCount() noexcept override
-    { return idxHeader.articleCount; }
+  unsigned long getArticleCount() noexcept override
+  {
+    return idxHeader.articleCount;
+  }
 
-    unsigned long getWordCount() noexcept override
-    { return idxHeader.wordCount; }
+  unsigned long getWordCount() noexcept override
+  {
+    return idxHeader.wordCount;
+  }
 
-    inline quint32 getLangFrom() const override
-    { return idxHeader.langFrom; }
+  inline quint32 getLangFrom() const override
+  {
+    return idxHeader.langFrom;
+  }
 
-    inline quint32 getLangTo() const override
-    { return idxHeader.langTo; }
+  inline quint32 getLangTo() const override
+  {
+    return idxHeader.langTo;
+  }
 
-    sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                        vector< wstring > const & alts,
-                                                        wstring const &,
-                                                        bool ignoreDiacritics ) override
-      ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-    QString const& getDescription() override;
+  QString const & getDescription() override;
 
-    sptr< Dictionary::DataRequest >
-    getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
-    void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
+  sptr< Dictionary::DataRequest >
+  getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
+  void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-    void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
-    void setFTSParameters( Config::FullTextSearch const & fts ) override
-    {
-      can_FTS = fts.enabled
-                && !fts.disabledTypes.contains( "AARD", Qt::CaseInsensitive )
-                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
-    }
+  void setFTSParameters( Config::FullTextSearch const & fts ) override
+  {
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "AARD", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 
 protected:
 
-    void loadIcon() noexcept override;
+  void loadIcon() noexcept override;
 
 private:
 
-    /// Loads the article.
-    void loadArticle( quint32 address,
-                      string & articleText,
-                      bool rawText = false );
-    string convert( string const & in_data );
+  /// Loads the article.
+  void loadArticle( quint32 address, string & articleText, bool rawText = false );
+  string convert( string const & in_data );
 
-    friend class AardArticleRequest;
+  friend class AardArticleRequest;
 };
 
-AardDictionary::AardDictionary( string const & id,
-                                string const & indexFile,
-                                vector< string > const & dictionaryFiles ):
-    BtreeDictionary( id, dictionaryFiles ),
-    idx( indexFile, "rb" ),
-    idxHeader( idx.read< IdxHeader >() ),
-    chunks( idx, idxHeader.chunksOffset ),
-    df( dictionaryFiles[ 0 ], "rb" )
+AardDictionary::AardDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
+  BtreeDictionary( id, dictionaryFiles ),
+  idx( indexFile, "rb" ),
+  idxHeader( idx.read< IdxHeader >() ),
+  chunks( idx, idxHeader.chunksOffset ),
+  df( dictionaryFiles[ 0 ], "rb" )
 {
-    // Read dictionary name
+  // Read dictionary name
 
-    idx.seek( sizeof( idxHeader ) );
-    vector< char > dName( idx.read< quint32 >() );
-    if( dName.size() )
-    {
-        idx.read( &dName.front(), dName.size() );
-        dictionaryName = string( &dName.front(), dName.size() );
-    }
+  idx.seek( sizeof( idxHeader ) );
+  vector< char > dName( idx.read< quint32 >() );
+  if ( dName.size() ) {
+    idx.read( &dName.front(), dName.size() );
+    dictionaryName = string( &dName.front(), dName.size() );
+  }
 
-    // Initialize the index
+  // Initialize the index
 
-    openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                          idxHeader.indexRootOffset ),
-               idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
-    // Full-text search parameters
+  // Full-text search parameters
 
-    can_FTS = true;
+  can_FTS = true;
 
-    ftsIdxName = indexFile + Dictionary::getFtsSuffix();
+  ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
-      FTS_index_completed.ref();
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
+    FTS_index_completed.ref();
 }
 
 AardDictionary::~AardDictionary()
 {
-    df.close();
+  df.close();
 }
 
 void AardDictionary::loadIcon() noexcept
@@ -338,10 +325,9 @@ void AardDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 3 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_aard.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_aard.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -349,255 +335,237 @@ void AardDictionary::loadIcon() noexcept
 
 string AardDictionary::convert( const string & in )
 {
-    string inConverted;
-    char inCh, lastCh = 0;
-    bool afterEol = false;
+  string inConverted;
+  char inCh, lastCh = 0;
+  bool afterEol = false;
 
-    for( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i )
-    {
-        inCh = *i;
-        if( lastCh == '\\' )
-        {
-            inConverted.erase( inConverted.size() - 1 );
-            lastCh = 0;
-            if( inCh == 'n' )
-            {
-                inConverted.append( "<br/>");
-                afterEol = true;
-                continue;
-            }
-            else if( inCh == 'r')
-                continue;
-        }
-        else if( inCh == ' ' && afterEol )
-        {
-            inConverted.append( "&nbsp;" );
-            continue;
-        } else
-            lastCh = inCh;
-        afterEol = false;
-        inConverted.push_back( inCh );
+  for ( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i ) {
+    inCh = *i;
+    if ( lastCh == '\\' ) {
+      inConverted.erase( inConverted.size() - 1 );
+      lastCh = 0;
+      if ( inCh == 'n' ) {
+        inConverted.append( "<br/>" );
+        afterEol = true;
+        continue;
+      }
+      else if ( inCh == 'r' )
+        continue;
     }
+    else if ( inCh == ' ' && afterEol ) {
+      inConverted.append( "&nbsp;" );
+      continue;
+    }
+    else
+      lastCh = inCh;
+    afterEol = false;
+    inConverted.push_back( inCh );
+  }
 
-    QString text = QString::fromUtf8( inConverted.c_str() );
+  QString text = QString::fromUtf8( inConverted.c_str() );
 
-    text.replace( QRegularExpression( R"(<\s*a\s+href\s*=\s*\"(w:|s:){0,1}([^#](?!ttp://)[^\"]*)(.))",
-                                      QRegularExpression::DotMatchesEverythingOption ),
-                  R"(<a href="bword:\2")");
-    text.replace( QRegularExpression( R"(<\s*a\s+href\s*=\s*'(w:|s:){0,1}([^#](?!ttp://)[^']*)(.))",
-                                      QRegularExpression::DotMatchesEverythingOption ),
-                  R"(<a href="bword:\2")");
+  text.replace( QRegularExpression( R"(<\s*a\s+href\s*=\s*\"(w:|s:){0,1}([^#](?!ttp://)[^\"]*)(.))",
+                                    QRegularExpression::DotMatchesEverythingOption ),
+                R"(<a href="bword:\2")" );
+  text.replace( QRegularExpression( R"(<\s*a\s+href\s*=\s*'(w:|s:){0,1}([^#](?!ttp://)[^']*)(.))",
+                                    QRegularExpression::DotMatchesEverythingOption ),
+                R"(<a href="bword:\2")" );
 
-    // Anchors
-    text.replace( QRegularExpression( R"(<a\s+href="bword:([^#"]+)#([^"]+))" ),
-                  R"(<a href="gdlookup://localhost/\1?gdanchor=\2)" );
+  // Anchors
+  text.replace( QRegularExpression( R"(<a\s+href="bword:([^#"]+)#([^"]+))" ),
+                R"(<a href="gdlookup://localhost/\1?gdanchor=\2)" );
 
-    static QRegularExpression self_closing_divs( "(<div\\s+[^>]*)/>",
-                                                 QRegularExpression::CaseInsensitiveOption );  // <div ... />
-    text.replace( self_closing_divs, "\\1></div>" );
+  static QRegularExpression self_closing_divs( "(<div\\s+[^>]*)/>",
+                                               QRegularExpression::CaseInsensitiveOption ); // <div ... />
+  text.replace( self_closing_divs, "\\1></div>" );
 
 
-    // Fix outstanding elements
-    text += "<br style=\"clear:both;\" />";
+  // Fix outstanding elements
+  text += "<br style=\"clear:both;\" />";
 
-    return text.toUtf8().data();
+  return text.toUtf8().data();
 }
 
-void AardDictionary::loadArticle( quint32 address,
-                                  string & articleText,
-                                  bool rawText )
+void AardDictionary::loadArticle( quint32 address, string & articleText, bool rawText )
 {
-    quint32 articleOffset = address;
-    quint32 articleSize;
-    quint32 size;
+  quint32 articleOffset = address;
+  quint32 articleSize;
+  quint32 size;
 
-    vector< char > articleBody;
+  vector< char > articleBody;
 
-    articleText.clear();
+  articleText.clear();
 
 
-    while( 1 )
-    {
-      articleText = QObject::tr( "Article loading error" ).toStdString();
-      try
-      {
-            QMutexLocker _( &aardMutex );
-            df.seek( articleOffset );
-        df.read( &size, sizeof(size) );
-        articleSize = qFromBigEndian( size );
+  while ( 1 ) {
+    articleText = QObject::tr( "Article loading error" ).toStdString();
+    try {
+      QMutexLocker _( &aardMutex );
+      df.seek( articleOffset );
+      df.read( &size, sizeof( size ) );
+      articleSize = qFromBigEndian( size );
 
-        // Don't try to read and decode too big articles,
-        // it is most likely error in dictionary
-        if( articleSize > 1048576 )
-          break;
-
-        articleBody.resize( articleSize );
-        df.read( &articleBody.front(), articleSize );
-      }
-      catch( std::exception &ex )
-      {
-        gdWarning( "AARD: Failed loading article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
-        break;
-      }
-      catch(...)
-      {
-        break;
-      }
-
-      if ( articleBody.empty() )
+      // Don't try to read and decode too big articles,
+      // it is most likely error in dictionary
+      if ( articleSize > 1048576 )
         break;
 
-      articleText.clear();
-
-      string text = decompressBzip2( articleBody.data(), articleSize );
-      if( text.empty() )
-        text = decompressZlib( articleBody.data(), articleSize );
-      if( text.empty() )
-        text = string( articleBody.data(), articleSize );
-
-      if( text.empty() || text[ 0 ] != '[' )
-        break;
-
-      string::size_type n = text.find( '\"' );
-      if( n == string::npos )
-        break;
-
-      readJSONValue( text, articleText, n );
-
-      if( articleText.empty() )
-      {
-        n = text.find( "\"r\"" );
-        if( n != string::npos && n + 3 < text.size() )
-        {
-          n = text.find( '\"', n + 3 );
-          if( n == string::npos )
-            break;
-
-          string link;
-          readJSONValue( text, link, n );
-          if( !link.empty() )
-          {
-            string encodedLink;
-            encodedLink.reserve( link.size() );
-            bool prev = false;
-            for( string::const_iterator i = link.begin(); i != link.end(); ++i )
-            {
-              if( *i == '\\' )
-              {
-                if( !prev )
-                {
-                  prev = true;
-                  continue;
-                }
-              }
-              encodedLink.push_back( *i );
-              prev = false;
-            }
-            encodedLink = string( QUrl( QString::fromUtf8( encodedLink.data(), encodedLink.size() ) ).toEncoded().data() );
-            articleText = "<a href=\"" + encodedLink + "\">" + link + "</a>";
-          }
-        }
-      }
-
+      articleBody.resize( articleSize );
+      df.read( &articleBody.front(), articleSize );
+    }
+    catch ( std::exception & ex ) {
+      gdWarning( "AARD: Failed loading article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
+      break;
+    }
+    catch ( ... ) {
       break;
     }
 
-    if( !articleText.empty() )
-    {
-      if( rawText )
-        return;
+    if ( articleBody.empty() )
+      break;
 
-      articleText = convert( articleText );
+    articleText.clear();
+
+    string text = decompressBzip2( articleBody.data(), articleSize );
+    if ( text.empty() )
+      text = decompressZlib( articleBody.data(), articleSize );
+    if ( text.empty() )
+      text = string( articleBody.data(), articleSize );
+
+    if ( text.empty() || text[ 0 ] != '[' )
+      break;
+
+    string::size_type n = text.find( '\"' );
+    if ( n == string::npos )
+      break;
+
+    readJSONValue( text, articleText, n );
+
+    if ( articleText.empty() ) {
+      n = text.find( "\"r\"" );
+      if ( n != string::npos && n + 3 < text.size() ) {
+        n = text.find( '\"', n + 3 );
+        if ( n == string::npos )
+          break;
+
+        string link;
+        readJSONValue( text, link, n );
+        if ( !link.empty() ) {
+          string encodedLink;
+          encodedLink.reserve( link.size() );
+          bool prev = false;
+          for ( string::const_iterator i = link.begin(); i != link.end(); ++i ) {
+            if ( *i == '\\' ) {
+              if ( !prev ) {
+                prev = true;
+                continue;
+              }
+            }
+            encodedLink.push_back( *i );
+            prev = false;
+          }
+          encodedLink =
+            string( QUrl( QString::fromUtf8( encodedLink.data(), encodedLink.size() ) ).toEncoded().data() );
+          articleText = "<a href=\"" + encodedLink + "\">" + link + "</a>";
+        }
+      }
     }
-    else
-      articleText = QObject::tr( "Article decoding error" ).toStdString();
 
-    // See Issue #271: A mechanism to clean-up invalid HTML cards.
-    const string cleaner = Utils::Html::getHtmlCleaner();
+    break;
+  }
 
-    string prefix( "<div class=\"aard\"" );
-    if( isToLanguageRTL() )
-      prefix += " dir=\"rtl\"";
-    prefix += ">";
+  if ( !articleText.empty() ) {
+    if ( rawText )
+      return;
 
-    articleText = prefix + articleText + cleaner + "</div>";
+    articleText = convert( articleText );
+  }
+  else
+    articleText = QObject::tr( "Article decoding error" ).toStdString();
+
+  // See Issue #271: A mechanism to clean-up invalid HTML cards.
+  const string cleaner = Utils::Html::getHtmlCleaner();
+
+  string prefix( "<div class=\"aard\"" );
+  if ( isToLanguageRTL() )
+    prefix += " dir=\"rtl\"";
+  prefix += ">";
+
+  articleText = prefix + articleText + cleaner + "</div>";
 }
 
-QString const& AardDictionary::getDescription()
+QString const & AardDictionary::getDescription()
 {
-    if( !dictionaryDescription.isEmpty() )
-        return dictionaryDescription;
-
-    AAR_header dictHeader;
-    quint32 size;
-    vector< char > data;
-
-    {
-        QMutexLocker _( &aardMutex );
-        df.seek( 0 );
-        df.read( &dictHeader, sizeof(dictHeader) );
-        size = qFromBigEndian( dictHeader.metaLength );
-        data.resize( size );
-        df.read( &data.front(), size );
-    }
-
-    string metaStr = decompressBzip2( data.data(), size );
-    if( metaStr.empty() )
-        metaStr = decompressZlib( data.data(), size );
-
-    map< string, string > meta = parseMetaData( metaStr );
-
-    if( !meta.empty() )
-    {
-        map< string, string >::const_iterator iter = meta.find( "copyright" );
-        if( iter != meta.end() )
-          dictionaryDescription =  QObject::tr( "Copyright: %1%2" ).arg( QString::fromUtf8( iter->second.c_str() ) ).arg( "\n\n" );
-
-        iter = meta.find( "version" );
-        if( iter != meta.end() )
-          dictionaryDescription = QObject::tr( "Version: %1%2" ).arg( QString::fromUtf8( iter->second.c_str() ) ).arg( "\n\n" );
-
-        iter = meta.find( "description" );
-        if( iter != meta.end() )
-        {
-          QString desc = QString::fromUtf8( iter->second.c_str() );
-          desc.replace( "\\n", "\n" );
-          desc.replace( "\\t", "\t" );
-          dictionaryDescription += desc;
-        }
-    }
-
-    if( dictionaryDescription.isEmpty() )
-      dictionaryDescription = "NONE";
-
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
+
+  AAR_header dictHeader;
+  quint32 size;
+  vector< char > data;
+
+  {
+    QMutexLocker _( &aardMutex );
+    df.seek( 0 );
+    df.read( &dictHeader, sizeof( dictHeader ) );
+    size = qFromBigEndian( dictHeader.metaLength );
+    data.resize( size );
+    df.read( &data.front(), size );
+  }
+
+  string metaStr = decompressBzip2( data.data(), size );
+  if ( metaStr.empty() )
+    metaStr = decompressZlib( data.data(), size );
+
+  map< string, string > meta = parseMetaData( metaStr );
+
+  if ( !meta.empty() ) {
+    map< string, string >::const_iterator iter = meta.find( "copyright" );
+    if ( iter != meta.end() )
+      dictionaryDescription =
+        QObject::tr( "Copyright: %1%2" ).arg( QString::fromUtf8( iter->second.c_str() ) ).arg( "\n\n" );
+
+    iter = meta.find( "version" );
+    if ( iter != meta.end() )
+      dictionaryDescription =
+        QObject::tr( "Version: %1%2" ).arg( QString::fromUtf8( iter->second.c_str() ) ).arg( "\n\n" );
+
+    iter = meta.find( "description" );
+    if ( iter != meta.end() ) {
+      QString desc = QString::fromUtf8( iter->second.c_str() );
+      desc.replace( "\\n", "\n" );
+      desc.replace( "\\t", "\t" );
+      dictionaryDescription += desc;
+    }
+  }
+
+  if ( dictionaryDescription.isEmpty() )
+    dictionaryDescription = "NONE";
+
+  return dictionaryDescription;
 }
 
 void AardDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Aard: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Aard: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Aard: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
@@ -605,8 +573,7 @@ void AardDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
 
 void AardDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     headword.clear();
     string articleText;
 
@@ -614,8 +581,7 @@ void AardDictionary::getArticleText( uint32_t articleAddress, QString & headword
 
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Aard: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -646,8 +612,12 @@ public:
 
   AardArticleRequest( wstring const & word_,
                       vector< wstring > const & alts_,
-                      AardDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                      AardDictionary & dict_,
+                      bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -670,16 +640,14 @@ public:
 
 void AardArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   vector< WordArticleLink > chain = dict.findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
@@ -690,17 +658,15 @@ void AardArticleRequest::run()
   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.
+                                   // appear several times. We combat this
+                                   // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -713,12 +679,10 @@ void AardArticleRequest::run()
     string headword, articleText;
 
     headword = chain[ x ].word;
-    try
-    {
+    try {
       dict.loadArticle( chain[ x ].articleOffset, articleText );
     }
-    catch(...)
-    {
+    catch ( ... ) {
     }
 
     // Ok. Now, does it go to main articles, or to alternate ones? We list
@@ -726,24 +690,19 @@ void AardArticleRequest::run()
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( headword );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, pair< string, string > > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( pair(
-      Folding::applySimpleCaseOnly( headword ),
-      pair( headword, articleText ) ) );
+    mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
     articlesIncluded.insert( chain[ x ].articleOffset );
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -753,27 +712,21 @@ void AardArticleRequest::run()
 
   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 = 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;
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    result += "<h3>";
+    result += i->second.first;
+    result += "</h3>";
+    result += i->second.second;
   }
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -784,261 +737,237 @@ sptr< Dictionary::DataRequest > AardDictionary::getArticle( wstring const & word
                                                             vector< wstring > const & alts,
                                                             wstring const &,
                                                             bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<AardArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< AardArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 } // anonymous namespace
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing,
-                                      unsigned maxHeadwordsToExpand )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing,
+                                                      unsigned maxHeadwordsToExpand )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
-      // Skip files with the extensions different to .aar to speed up the
-      // scanning
-      if ( i->size() < 4 ||
-          strcasecmp( i->c_str() + ( i->size() - 4 ), ".aar" ) != 0 )
-        continue;
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
+    // Skip files with the extensions different to .aar to speed up the
+    // scanning
+    if ( i->size() < 4 || strcasecmp( i->c_str() + ( i->size() - 4 ), ".aar" ) != 0 )
+      continue;
 
-      // Got the file -- check if we need to rebuid the index
+    // Got the file -- check if we need to rebuid the index
 
-      vector< string > dictFiles( 1, *i );
+    vector< string > dictFiles( 1, *i );
 
-      string dictId = Dictionary::makeDictionaryId( dictFiles );
+    string dictId = Dictionary::makeDictionaryId( dictFiles );
 
-      string indexFile = indicesDir + dictId;
+    string indexFile = indicesDir + dictId;
+
+    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
+      try {
+
+        gdDebug( "Aard: Building the index for dictionary: %s\n", i->c_str() );
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
-        try
         {
-
-          gdDebug( "Aard: Building the index for dictionary: %s\n", i->c_str() );
-
-          {
-            QFileInfo info( QString::fromUtf8( i->c_str() ) );
-            if( static_cast< quint64 >( info.size() ) > ULONG_MAX )
-            {
-              gdWarning( "File %s is too large\n", i->c_str() );
-              continue;
-            }
+          QFileInfo info( QString::fromUtf8( i->c_str() ) );
+          if ( static_cast< quint64 >( info.size() ) > ULONG_MAX ) {
+            gdWarning( "File %s is too large\n", i->c_str() );
+            continue;
           }
-
-          File::Class df( *i, "rb" );
-
-          AAR_header dictHeader;
-
-          df.read( &dictHeader, sizeof(dictHeader) );
-          bool has64bitIndex = !strncmp( dictHeader.indexItemFormat, ">LQ", 4 );
-          if( strncmp( dictHeader.signature, "aard", 4 )
-              || ( !has64bitIndex && strncmp( dictHeader.indexItemFormat, ">LL", 4 ) )
-              || strncmp( dictHeader.keyLengthFormat, ">H", 2 )
-              || strncmp( dictHeader.articleLengthFormat, ">L", 2) )
-          {
-              gdWarning( "File %s is not in supported aard format\n", i->c_str() );
-              continue;
-          }
-
-          vector< char > data;
-          quint32 size = qFromBigEndian( dictHeader.metaLength );
-
-          if( size == 0 )
-          {
-              gdWarning( "File %s has invalid metadata", i->c_str() );
-              continue;
-          }
-
-          data.resize( size );
-          df.read( &data.front(), size );
-          string metaStr = decompressBzip2( data.data(), size );
-          if( metaStr.empty() )
-              metaStr = decompressZlib( data.data(), size );
-
-          map< string, string > meta = parseMetaData( metaStr );
-
-          if( meta.empty() )
-          {
-              gdWarning( "File %s has invalid metadata", i->c_str() );
-              continue;
-          }
-
-          string dictName;
-          map< string, string >::const_iterator iter = meta.find( "title" );
-          if( iter != meta.end() )
-              dictName = iter->second;
-
-          string langFrom;
-          iter = meta.find( "index_language" );
-          if( iter != meta.end() )
-              langFrom = iter->second;
-
-          string langTo;
-          iter = meta.find( "article_language" );
-          if( iter != meta.end() )
-              langTo = iter->second;
-
-          if( ( dictName.compare( "Wikipedia") == 0 || dictName.compare( "Wikiquote" ) == 0 || dictName.compare( "Wiktionary" ) == 0 )
-              && !langTo.empty() )
-          {
-            string capitalized = langTo.c_str();
-            capitalized[0] = toupper( capitalized[0] );
-            dictName = dictName + " (" + capitalized + ")";
-          }
-
-          quint16 volumes = qFromBigEndian( dictHeader.totalVolumes );
-          if( volumes > 1 )
-          {
-            QString ss=QString( " (%1/%2)").arg( qFromBigEndian( dictHeader.volume ), volumes );
-            dictName += ss.toLocal8Bit().data();
-          }
-
-          initializing.indexingDictionary( dictName );
-
-          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( (quint32) dictName.size() );
-          if( !dictName.empty() )
-              idx.write( dictName.data(), dictName.size() );
-
-          IndexedWords indexedWords;
-
-          ChunkedStorage::Writer chunks( idx );
-
-          quint32 wordCount = qFromBigEndian( dictHeader.wordsCount );
-          set< quint32 > articleOffsets;
-
-          quint32 pos = df.tell();
-          quint32 wordsBase = pos + wordCount * ( has64bitIndex ? sizeof( IndexElement64 ) : sizeof( IndexElement ) );
-          quint32 articlesBase = qFromBigEndian( dictHeader.articleOffset );
-
-          data.clear();
-          for( quint32 j = 0; j < wordCount; j++ )
-          {
-            quint32 articleOffset;
-            quint32 wordOffset;
-
-            if( has64bitIndex )
-            {
-              IndexElement64 el64;
-
-              df.seek( pos );
-              df.read( &el64, sizeof(el64) );
-              articleOffset = articlesBase + qFromBigEndian( el64.articleOffset );
-              wordOffset = wordsBase + qFromBigEndian( el64.wordOffset );
-            }
-            else
-            {
-              IndexElement el;
-
-              df.seek( pos );
-              df.read( &el, sizeof(el) );
-              articleOffset = articlesBase + qFromBigEndian( el.articleOffset );
-              wordOffset = wordsBase + qFromBigEndian( el.wordOffset );
-            }
-
-            df.seek( wordOffset );
-
-            quint16 sizeBE;
-            df.read( &sizeBE, sizeof(sizeBE) );
-            quint16 wordSize = qFromBigEndian( sizeBE );
-            if( data.size() < wordSize )
-              data.resize( wordSize );
-            df.read( &data.front(), wordSize );
-
-            if( articleOffsets.find( articleOffset ) == articleOffsets.end() )
-                articleOffsets.insert( articleOffset );
-
-            // Insert new entry
-            wstring word = Utf8::decode( string( data.data(), wordSize ) );
-            if( maxHeadwordsToExpand && dictHeader.wordsCount >= maxHeadwordsToExpand )
-              indexedWords.addSingleWord( word, articleOffset);
-            else
-              indexedWords.addWord( word, articleOffset);
-
-            pos += has64bitIndex ? sizeof( IndexElement64 ) : sizeof( IndexElement );
-          }
-          data.clear();
-
-          idxHeader.articleCount = articleOffsets.size();
-          articleOffsets.clear();
-
-          // 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;
-
-          if( langFrom.size() == 3)
-            idxHeader.langFrom = LangCoder::findIdForLanguageCode3( langFrom );
-          else if( langFrom.size() == 2 )
-              idxHeader.langFrom = LangCoder::code2toInt( langFrom.c_str() );
-
-          if( langTo.size() == 3)
-            idxHeader.langTo = LangCoder::findIdForLanguageCode3( langTo );
-          else if( langTo.size() == 2 )
-              idxHeader.langTo = LangCoder::code2toInt( langTo.c_str() );
-
-          idx.rewind();
-
-          idx.write( &idxHeader, sizeof( idxHeader ) );
         }
-        catch( std::exception & e )
-        {
-          gdWarning( "Aard dictionary indexing failed: %s, error: %s\n",
-                    i->c_str(), e.what() );
+
+        File::Class df( *i, "rb" );
+
+        AAR_header dictHeader;
+
+        df.read( &dictHeader, sizeof( dictHeader ) );
+        bool has64bitIndex = !strncmp( dictHeader.indexItemFormat, ">LQ", 4 );
+        if ( strncmp( dictHeader.signature, "aard", 4 )
+             || ( !has64bitIndex && strncmp( dictHeader.indexItemFormat, ">LL", 4 ) )
+             || strncmp( dictHeader.keyLengthFormat, ">H", 2 ) || strncmp( dictHeader.articleLengthFormat, ">L", 2 ) ) {
+          gdWarning( "File %s is not in supported aard format\n", i->c_str() );
           continue;
         }
-        catch( ... )
-        {
-          gdWarning( "Aard dictionary indexing failed\n" );
+
+        vector< char > data;
+        quint32 size = qFromBigEndian( dictHeader.metaLength );
+
+        if ( size == 0 ) {
+          gdWarning( "File %s has invalid metadata", i->c_str() );
           continue;
         }
-      } // if need to rebuild
-      try
-      {
-        dictionaries.push_back( std::make_shared<AardDictionary>( dictId,
-                                                    indexFile,
-                                                    dictFiles ) );
+
+        data.resize( size );
+        df.read( &data.front(), size );
+        string metaStr = decompressBzip2( data.data(), size );
+        if ( metaStr.empty() )
+          metaStr = decompressZlib( data.data(), size );
+
+        map< string, string > meta = parseMetaData( metaStr );
+
+        if ( meta.empty() ) {
+          gdWarning( "File %s has invalid metadata", i->c_str() );
+          continue;
+        }
+
+        string dictName;
+        map< string, string >::const_iterator iter = meta.find( "title" );
+        if ( iter != meta.end() )
+          dictName = iter->second;
+
+        string langFrom;
+        iter = meta.find( "index_language" );
+        if ( iter != meta.end() )
+          langFrom = iter->second;
+
+        string langTo;
+        iter = meta.find( "article_language" );
+        if ( iter != meta.end() )
+          langTo = iter->second;
+
+        if ( ( dictName.compare( "Wikipedia" ) == 0 || dictName.compare( "Wikiquote" ) == 0
+               || dictName.compare( "Wiktionary" ) == 0 )
+             && !langTo.empty() ) {
+          string capitalized = langTo.c_str();
+          capitalized[ 0 ]   = toupper( capitalized[ 0 ] );
+          dictName           = dictName + " (" + capitalized + ")";
+        }
+
+        quint16 volumes = qFromBigEndian( dictHeader.totalVolumes );
+        if ( volumes > 1 ) {
+          QString ss = QString( " (%1/%2)" ).arg( qFromBigEndian( dictHeader.volume ), volumes );
+          dictName += ss.toLocal8Bit().data();
+        }
+
+        initializing.indexingDictionary( dictName );
+
+        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( (quint32)dictName.size() );
+        if ( !dictName.empty() )
+          idx.write( dictName.data(), dictName.size() );
+
+        IndexedWords indexedWords;
+
+        ChunkedStorage::Writer chunks( idx );
+
+        quint32 wordCount = qFromBigEndian( dictHeader.wordsCount );
+        set< quint32 > articleOffsets;
+
+        quint32 pos          = df.tell();
+        quint32 wordsBase    = pos + wordCount * ( has64bitIndex ? sizeof( IndexElement64 ) : sizeof( IndexElement ) );
+        quint32 articlesBase = qFromBigEndian( dictHeader.articleOffset );
+
+        data.clear();
+        for ( quint32 j = 0; j < wordCount; j++ ) {
+          quint32 articleOffset;
+          quint32 wordOffset;
+
+          if ( has64bitIndex ) {
+            IndexElement64 el64;
+
+            df.seek( pos );
+            df.read( &el64, sizeof( el64 ) );
+            articleOffset = articlesBase + qFromBigEndian( el64.articleOffset );
+            wordOffset    = wordsBase + qFromBigEndian( el64.wordOffset );
+          }
+          else {
+            IndexElement el;
+
+            df.seek( pos );
+            df.read( &el, sizeof( el ) );
+            articleOffset = articlesBase + qFromBigEndian( el.articleOffset );
+            wordOffset    = wordsBase + qFromBigEndian( el.wordOffset );
+          }
+
+          df.seek( wordOffset );
+
+          quint16 sizeBE;
+          df.read( &sizeBE, sizeof( sizeBE ) );
+          quint16 wordSize = qFromBigEndian( sizeBE );
+          if ( data.size() < wordSize )
+            data.resize( wordSize );
+          df.read( &data.front(), wordSize );
+
+          if ( articleOffsets.find( articleOffset ) == articleOffsets.end() )
+            articleOffsets.insert( articleOffset );
+
+          // Insert new entry
+          wstring word = Utf8::decode( string( data.data(), wordSize ) );
+          if ( maxHeadwordsToExpand && dictHeader.wordsCount >= maxHeadwordsToExpand )
+            indexedWords.addSingleWord( word, articleOffset );
+          else
+            indexedWords.addWord( word, articleOffset );
+
+          pos += has64bitIndex ? sizeof( IndexElement64 ) : sizeof( IndexElement );
+        }
+        data.clear();
+
+        idxHeader.articleCount = articleOffsets.size();
+        articleOffsets.clear();
+
+        // 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;
+
+        if ( langFrom.size() == 3 )
+          idxHeader.langFrom = LangCoder::findIdForLanguageCode3( langFrom );
+        else if ( langFrom.size() == 2 )
+          idxHeader.langFrom = LangCoder::code2toInt( langFrom.c_str() );
+
+        if ( langTo.size() == 3 )
+          idxHeader.langTo = LangCoder::findIdForLanguageCode3( langTo );
+        else if ( langTo.size() == 2 )
+          idxHeader.langTo = LangCoder::code2toInt( langTo.c_str() );
+
+        idx.rewind();
+
+        idx.write( &idxHeader, sizeof( idxHeader ) );
       }
-      catch( std::exception & e )
-      {
-        gdWarning( "Aard dictionary initializing failed: %s, error: %s\n",
-                  i->c_str(), e.what() );
+      catch ( std::exception & e ) {
+        gdWarning( "Aard dictionary indexing failed: %s, error: %s\n", i->c_str(), e.what() );
         continue;
       }
+      catch ( ... ) {
+        gdWarning( "Aard dictionary indexing failed\n" );
+        continue;
+      }
+    } // if need to rebuild
+    try {
+      dictionaries.push_back( std::make_shared< 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;
 }
 
-}
+} // namespace Aard
diff --git a/src/dict/aard.hh b/src/dict/aard.hh
index 6b7305a9..a9583665 100644
--- a/src/dict/aard.hh
+++ b/src/dict/aard.hh
@@ -12,13 +12,11 @@ namespace Aard {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing &,
-                                      unsigned maxHeadwordsToExpand )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing &,
+                                                      unsigned maxHeadwordsToExpand );
 
-}
+} // namespace Aard
 
 #endif
diff --git a/src/dict/belarusiantranslit.cc b/src/dict/belarusiantranslit.cc
index 7fbf8f12..85d50919 100644
--- a/src/dict/belarusiantranslit.cc
+++ b/src/dict/belarusiantranslit.cc
@@ -53,88 +53,308 @@ public:
     ins( "ż", "ж" );
     ins( "ch", "х" );
 
-    ins( "ja", "я" );   ins( "je", "е" );   ins( "jo", "ё" );   ins( "ju", "ю" );
-    ins( "la", "ля" );  ins( "le", "ле" );  ins( "lo", "лё" );  ins( "lu", "лю" );  ins( "li", "лі" );
+    ins( "ja", "я" );
+    ins( "je", "е" );
+    ins( "jo", "ё" );
+    ins( "ju", "ю" );
+    ins( "la", "ля" );
+    ins( "le", "ле" );
+    ins( "lo", "лё" );
+    ins( "lu", "лю" );
+    ins( "li", "лі" );
 
-    ins( "bia", "бя" );  ins( "bie", "бе" );  ins( "bio", "бё" );  ins( "biu", "бю" );
-    ins( "cia", "ця" );  ins( "cie", "це" );  ins( "cio", "цё" );  ins( "ciu", "цю" );
-    ins( "dzia","дзя" ); ins( "dzie","дзе" ); ins( "dzio","дзё" ); ins( "dziu","дзю" );
-    ins( "fia", "фя" );  ins( "fie", "фе" );  ins( "fio", "фё" );  ins( "fiu", "фю" );
-    ins( "gia", "ґя" );  ins( "gie", "ґе" );  ins( "gio", "ґё" );  ins( "giu", "ґю" );
-    ins( "hia", "гя" );  ins( "hie", "ге" );  ins( "hio", "гё" );  ins( "hiu", "гю" );
-    ins( "kia", "кя" );  ins( "kie", "ке" );  ins( "kio", "кё" );  ins( "kiu", "кю" );
-    ins( "lia", "ліa" ); ins( "lie", "ліэ" ); ins( "lio", "ліо" ); ins( "liu", "ліу" );
-    ins( "mia", "мя" );  ins( "mie", "ме" );  ins( "mio", "мё" );  ins( "miu", "мю" );
-    ins( "nia", "ня" );  ins( "nie", "не" );  ins( "nio", "нё" );  ins( "niu", "ню" );
-    ins( "pia", "пя" );  ins( "pie", "пе" );  ins( "pio", "пё" );  ins( "piu", "пю" );
-    ins( "sia", "ся" );  ins( "sie", "се" );  ins( "sio", "сё" );  ins( "siu", "сю" );
-    ins( "via", "вя" );  ins( "vie", "ве" );  ins( "vio", "вё" );  ins( "viu", "вю" );
-    ins( "wia", "вя" );  ins( "wie", "ве" );  ins( "wio", "вё" );  ins( "wiu", "вю" );
-    ins( "zia", "зя" );  ins( "zie", "зе" );  ins( "zio", "зё" );  ins( "ziu", "зю" );
-    ins( "chia", "хя" ); ins( "chie", "хе" ); ins( "chio", "хё" ); ins( "chiu", "хю" );
+    ins( "bia", "бя" );
+    ins( "bie", "бе" );
+    ins( "bio", "бё" );
+    ins( "biu", "бю" );
+    ins( "cia", "ця" );
+    ins( "cie", "це" );
+    ins( "cio", "цё" );
+    ins( "ciu", "цю" );
+    ins( "dzia", "дзя" );
+    ins( "dzie", "дзе" );
+    ins( "dzio", "дзё" );
+    ins( "dziu", "дзю" );
+    ins( "fia", "фя" );
+    ins( "fie", "фе" );
+    ins( "fio", "фё" );
+    ins( "fiu", "фю" );
+    ins( "gia", "ґя" );
+    ins( "gie", "ґе" );
+    ins( "gio", "ґё" );
+    ins( "giu", "ґю" );
+    ins( "hia", "гя" );
+    ins( "hie", "ге" );
+    ins( "hio", "гё" );
+    ins( "hiu", "гю" );
+    ins( "kia", "кя" );
+    ins( "kie", "ке" );
+    ins( "kio", "кё" );
+    ins( "kiu", "кю" );
+    ins( "lia", "ліa" );
+    ins( "lie", "ліэ" );
+    ins( "lio", "ліо" );
+    ins( "liu", "ліу" );
+    ins( "mia", "мя" );
+    ins( "mie", "ме" );
+    ins( "mio", "мё" );
+    ins( "miu", "мю" );
+    ins( "nia", "ня" );
+    ins( "nie", "не" );
+    ins( "nio", "нё" );
+    ins( "niu", "ню" );
+    ins( "pia", "пя" );
+    ins( "pie", "пе" );
+    ins( "pio", "пё" );
+    ins( "piu", "пю" );
+    ins( "sia", "ся" );
+    ins( "sie", "се" );
+    ins( "sio", "сё" );
+    ins( "siu", "сю" );
+    ins( "via", "вя" );
+    ins( "vie", "ве" );
+    ins( "vio", "вё" );
+    ins( "viu", "вю" );
+    ins( "wia", "вя" );
+    ins( "wie", "ве" );
+    ins( "wio", "вё" );
+    ins( "wiu", "вю" );
+    ins( "zia", "зя" );
+    ins( "zie", "зе" );
+    ins( "zio", "зё" );
+    ins( "ziu", "зю" );
+    ins( "chia", "хя" );
+    ins( "chie", "хе" );
+    ins( "chio", "хё" );
+    ins( "chiu", "хю" );
 
-    ins( "bja", "б'я" );  ins( "bje", "б'е" );  ins( "bjo", "б'ё" );  ins( "bju", "б'ю" );
-    ins( "cia", "ц'я" );  ins( "cje", "ц'е" );  ins( "cjo", "ц'ё" );  ins( "cju", "ц'ю" );
-    ins( "fja", "ф'я" );  ins( "fje", "ф'е" );  ins( "fjo", "ф'ё" );  ins( "fju", "ф'ю" );
-    ins( "hja", "г'я" );  ins( "hje", "г'е" );  ins( "hjo", "г'ё" );  ins( "hju", "г'ю" );
-    ins( "kja", "к'я" );  ins( "kje", "к'е" );  ins( "kjo", "к'ё" );  ins( "kju", "к'ю" );
-    ins( "łja", "л'я" );  ins( "łje", "л'е" );  ins( "łjo", "л'ё" );  ins( "łju", "л'ю" );
-    ins( "mja", "м'я" );  ins( "mje", "м'е" );  ins( "mjo", "м'ё" );  ins( "mju", "м'ю" );
-    ins( "nja", "н'я" );  ins( "nje", "н'е" );  ins( "njo", "н'ё" );  ins( "nju", "н'ю" );
-    ins( "pja", "п'я" );  ins( "pje", "п'е" );  ins( "pjo", "п'ё" );  ins( "pju", "п'ю" );
-    ins( "sja", "с'я" );  ins( "sje", "с'е" );  ins( "sjo", "с'ё" );  ins( "sju", "с'ю" );
-    ins( "vja", "в'я" );  ins( "vje", "в'е" );  ins( "vjo", "в'ё" );  ins( "vju", "в'ю" );
-    ins( "wja", "в'я" );  ins( "wje", "в'е" );  ins( "wjo", "в'ё" );  ins( "wju", "в'ю" );
-    ins( "zja", "з'я" );  ins( "zje", "з'е" );  ins( "zjo", "з'ё" );  ins( "zju", "з'ю" );
-    ins( "chja", "х'я" ); ins( "chje", "х'е" ); ins( "chjo", "х'ё" ); ins( "chju", "х'ю" );
+    ins( "bja", "б'я" );
+    ins( "bje", "б'е" );
+    ins( "bjo", "б'ё" );
+    ins( "bju", "б'ю" );
+    ins( "cia", "ц'я" );
+    ins( "cje", "ц'е" );
+    ins( "cjo", "ц'ё" );
+    ins( "cju", "ц'ю" );
+    ins( "fja", "ф'я" );
+    ins( "fje", "ф'е" );
+    ins( "fjo", "ф'ё" );
+    ins( "fju", "ф'ю" );
+    ins( "hja", "г'я" );
+    ins( "hje", "г'е" );
+    ins( "hjo", "г'ё" );
+    ins( "hju", "г'ю" );
+    ins( "kja", "к'я" );
+    ins( "kje", "к'е" );
+    ins( "kjo", "к'ё" );
+    ins( "kju", "к'ю" );
+    ins( "łja", "л'я" );
+    ins( "łje", "л'е" );
+    ins( "łjo", "л'ё" );
+    ins( "łju", "л'ю" );
+    ins( "mja", "м'я" );
+    ins( "mje", "м'е" );
+    ins( "mjo", "м'ё" );
+    ins( "mju", "м'ю" );
+    ins( "nja", "н'я" );
+    ins( "nje", "н'е" );
+    ins( "njo", "н'ё" );
+    ins( "nju", "н'ю" );
+    ins( "pja", "п'я" );
+    ins( "pje", "п'е" );
+    ins( "pjo", "п'ё" );
+    ins( "pju", "п'ю" );
+    ins( "sja", "с'я" );
+    ins( "sje", "с'е" );
+    ins( "sjo", "с'ё" );
+    ins( "sju", "с'ю" );
+    ins( "vja", "в'я" );
+    ins( "vje", "в'е" );
+    ins( "vjo", "в'ё" );
+    ins( "vju", "в'ю" );
+    ins( "wja", "в'я" );
+    ins( "wje", "в'е" );
+    ins( "wjo", "в'ё" );
+    ins( "wju", "в'ю" );
+    ins( "zja", "з'я" );
+    ins( "zje", "з'е" );
+    ins( "zjo", "з'ё" );
+    ins( "zju", "з'ю" );
+    ins( "chja", "х'я" );
+    ins( "chje", "х'е" );
+    ins( "chjo", "х'ё" );
+    ins( "chju", "х'ю" );
 
-    ins( "nnia", "ньня" );  ins( "nnie", "ньне" );  ins( "nnio", "ньнё" );  ins( "nniu", "ньню" );ins( "nni", "ньні" );
+    ins( "nnia", "ньня" );
+    ins( "nnie", "ньне" );
+    ins( "nnio", "ньнё" );
+    ins( "nniu", "ньню" );
+    ins( "nni", "ньні" );
 
     // cyrillic to latin
-    ins( "а", "a" );   ins( "б", "b" );   ins( "в", "v" );   ins( "г", "h" );
-    ins( "ґ", "g" );   ins( "д", "d" );   ins( "е", "je" );  ins( "ё", "jo" );
-    ins( "ж", "ž" );   ins( "з", "z" );   ins( "і", "i" );   ins( "ї", "ï" );
-    ins( "й", "j" );   ins( "к", "k" );   ins( "л", "ł" );   ins( "м", "m" );
-    ins( "н", "n" );   ins( "о", "o" );   ins( "п", "p" );   ins( "р", "r" );
-    ins( "с", "s" );   ins( "т", "t" );   ins( "у", "u" );   ins( "ў", "ŭ" );
-    ins( "ф", "f" );   ins( "х", "ch" );  ins( "ц", "c" );   ins( "ч", "č" );
-    ins( "ш", "š" );   ins( "ы", "y" );   ins( "э", "e" );   ins( "ю", "ju" );
-    ins( "я", "ja" );  ins( "кг", "g" );
-    ins( "бе", "bie" );  ins( "бё", "bio" );  ins( "бю", "biu" );  ins( "бя", "bia" );
-    ins( "ве", "vie" );  ins( "вё", "vio" );  ins( "вю", "viu" );  ins( "вя", "via" );
-    ins( "ге", "hie" );  ins( "гё", "hio" );  ins( "гю", "hiu" );  ins( "гя", "hia" );
-    ins( "ґе", "gie" );  ins( "ґё", "gio" );  ins( "ґю", "giu" );  ins( "ґя", "gia" );
-    ins( "кге", "gie" ); ins( "кгё", "gio" ); ins( "кгю", "giu" ); ins( "кгя", "gia" );
-    ins( "зе", "zie" );  ins( "зё", "zio" );  ins( "зю", "ziu" );  ins( "зя", "zia" );  ins( "зь", "ź" );
-    ins( "ке", "kie" );  ins( "кё", "kio" );  ins( "кю", "kiu" );  ins( "кя", "kia" );
-    ins( "ле", "le" );   ins( "лё", "lo" );   ins( "лю", "lu" );   ins( "ля", "la" );   ins( "ль", "l" );   ins( "лі", "li" );
-    ins( "ме", "mie" );  ins( "мё", "mio" );  ins( "мю", "miu" );  ins( "мя", "mia" );  ins( "мь", "m" );
-    ins( "не", "nie" );  ins( "нё", "nio" );  ins( "ню", "niu" );  ins( "ня", "nia" );  ins( "нь", "ń" );
-    ins( "пе", "pie" );  ins( "пё", "pio" );  ins( "пю", "piu" );  ins( "пя", "pia" );  ins( "пь", "p" );
-    ins( "се", "sie" );  ins( "сё", "sio" );  ins( "сю", "siu" );  ins( "ся", "sia" );  ins( "сь", "ś" );
-    ins( "фе", "fie" );  ins( "фё", "fio" );  ins( "фю", "fiu" );  ins( "фя", "fia" );  ins( "фь", "f" );
-    ins( "хе", "chie" ); ins( "хё", "chio" ); ins( "хю", "chiu" ); ins( "хя", "chia" );
-    ins( "це", "cie" );  ins( "цё", "cio" );  ins( "цю", "ciu" );  ins( "ця", "cia" );  ins( "ць", "ć" );
-    ins( "бʼ", "b" );    ins( "б'", "b" );    ins( "б’", "b" );
-    ins( "вʼ", "v" );    ins( "в'", "v" );    ins( "в’", "v" );
-    ins( "гʼ", "h" );    ins( "г'", "h" );    ins( "г’", "h" );
-    ins( "ґʼ", "g" );    ins( "ґ'", "g" );    ins( "ґ’", "g" );
-    ins( "дʼ", "d" );    ins( "д'", "d" );    ins( "д’", "d" );
-    ins( "жʼ", "ž" );    ins( "ж'", "ž" );    ins( "ж’", "ž" );
-    ins( "зʼ", "z" );    ins( "з'", "z" );    ins( "з’", "z" );
-    ins( "кʼ", "k" );    ins( "к'", "k" );    ins( "к’", "k" );
-    ins( "лʼ", "ł" );    ins( "л'", "ł" );    ins( "л’", "ł" );
-    ins( "мʼ", "m" );    ins( "м'", "m" );    ins( "м’", "m" );
-    ins( "нʼ", "n" );    ins( "н'", "n" );    ins( "н’", "n" );
-    ins( "пʼ", "p" );    ins( "п'", "p" );    ins( "п’", "p" );
-    ins( "рʼ", "r" );    ins( "р'", "r" );    ins( "р’", "r" );
-    ins( "сʼ", "s" );    ins( "с'", "s" );    ins( "с’", "s" );
-    ins( "тʼ", "t" );    ins( "т'", "t" );    ins( "т’", "t" );
-    ins( "фʼ", "f" );    ins( "ф'", "f" );    ins( "ф’", "f" );
-    ins( "хʼ", "ch" );   ins( "х'", "ch" );   ins( "х’", "ch" );
-    ins( "цʼ", "c" );    ins( "ц'", "c" );    ins( "ц’", "c" );
-    ins( "чʼ", "č" );    ins( "ч'", "č" );    ins( "ч’", "č" );
-    ins( "шʼ", "š" );    ins( "ш'", "š" );    ins( "ш’", "š" );
+    ins( "а", "a" );
+    ins( "б", "b" );
+    ins( "в", "v" );
+    ins( "г", "h" );
+    ins( "ґ", "g" );
+    ins( "д", "d" );
+    ins( "е", "je" );
+    ins( "ё", "jo" );
+    ins( "ж", "ž" );
+    ins( "з", "z" );
+    ins( "і", "i" );
+    ins( "ї", "ï" );
+    ins( "й", "j" );
+    ins( "к", "k" );
+    ins( "л", "ł" );
+    ins( "м", "m" );
+    ins( "н", "n" );
+    ins( "о", "o" );
+    ins( "п", "p" );
+    ins( "р", "r" );
+    ins( "с", "s" );
+    ins( "т", "t" );
+    ins( "у", "u" );
+    ins( "ў", "ŭ" );
+    ins( "ф", "f" );
+    ins( "х", "ch" );
+    ins( "ц", "c" );
+    ins( "ч", "č" );
+    ins( "ш", "š" );
+    ins( "ы", "y" );
+    ins( "э", "e" );
+    ins( "ю", "ju" );
+    ins( "я", "ja" );
+    ins( "кг", "g" );
+    ins( "бе", "bie" );
+    ins( "бё", "bio" );
+    ins( "бю", "biu" );
+    ins( "бя", "bia" );
+    ins( "ве", "vie" );
+    ins( "вё", "vio" );
+    ins( "вю", "viu" );
+    ins( "вя", "via" );
+    ins( "ге", "hie" );
+    ins( "гё", "hio" );
+    ins( "гю", "hiu" );
+    ins( "гя", "hia" );
+    ins( "ґе", "gie" );
+    ins( "ґё", "gio" );
+    ins( "ґю", "giu" );
+    ins( "ґя", "gia" );
+    ins( "кге", "gie" );
+    ins( "кгё", "gio" );
+    ins( "кгю", "giu" );
+    ins( "кгя", "gia" );
+    ins( "зе", "zie" );
+    ins( "зё", "zio" );
+    ins( "зю", "ziu" );
+    ins( "зя", "zia" );
+    ins( "зь", "ź" );
+    ins( "ке", "kie" );
+    ins( "кё", "kio" );
+    ins( "кю", "kiu" );
+    ins( "кя", "kia" );
+    ins( "ле", "le" );
+    ins( "лё", "lo" );
+    ins( "лю", "lu" );
+    ins( "ля", "la" );
+    ins( "ль", "l" );
+    ins( "лі", "li" );
+    ins( "ме", "mie" );
+    ins( "мё", "mio" );
+    ins( "мю", "miu" );
+    ins( "мя", "mia" );
+    ins( "мь", "m" );
+    ins( "не", "nie" );
+    ins( "нё", "nio" );
+    ins( "ню", "niu" );
+    ins( "ня", "nia" );
+    ins( "нь", "ń" );
+    ins( "пе", "pie" );
+    ins( "пё", "pio" );
+    ins( "пю", "piu" );
+    ins( "пя", "pia" );
+    ins( "пь", "p" );
+    ins( "се", "sie" );
+    ins( "сё", "sio" );
+    ins( "сю", "siu" );
+    ins( "ся", "sia" );
+    ins( "сь", "ś" );
+    ins( "фе", "fie" );
+    ins( "фё", "fio" );
+    ins( "фю", "fiu" );
+    ins( "фя", "fia" );
+    ins( "фь", "f" );
+    ins( "хе", "chie" );
+    ins( "хё", "chio" );
+    ins( "хю", "chiu" );
+    ins( "хя", "chia" );
+    ins( "це", "cie" );
+    ins( "цё", "cio" );
+    ins( "цю", "ciu" );
+    ins( "ця", "cia" );
+    ins( "ць", "ć" );
+    ins( "бʼ", "b" );
+    ins( "б'", "b" );
+    ins( "б’", "b" );
+    ins( "вʼ", "v" );
+    ins( "в'", "v" );
+    ins( "в’", "v" );
+    ins( "гʼ", "h" );
+    ins( "г'", "h" );
+    ins( "г’", "h" );
+    ins( "ґʼ", "g" );
+    ins( "ґ'", "g" );
+    ins( "ґ’", "g" );
+    ins( "дʼ", "d" );
+    ins( "д'", "d" );
+    ins( "д’", "d" );
+    ins( "жʼ", "ž" );
+    ins( "ж'", "ž" );
+    ins( "ж’", "ž" );
+    ins( "зʼ", "z" );
+    ins( "з'", "z" );
+    ins( "з’", "z" );
+    ins( "кʼ", "k" );
+    ins( "к'", "k" );
+    ins( "к’", "k" );
+    ins( "лʼ", "ł" );
+    ins( "л'", "ł" );
+    ins( "л’", "ł" );
+    ins( "мʼ", "m" );
+    ins( "м'", "m" );
+    ins( "м’", "m" );
+    ins( "нʼ", "n" );
+    ins( "н'", "n" );
+    ins( "н’", "n" );
+    ins( "пʼ", "p" );
+    ins( "п'", "p" );
+    ins( "п’", "p" );
+    ins( "рʼ", "r" );
+    ins( "р'", "r" );
+    ins( "р’", "r" );
+    ins( "сʼ", "s" );
+    ins( "с'", "s" );
+    ins( "с’", "s" );
+    ins( "тʼ", "t" );
+    ins( "т'", "t" );
+    ins( "т’", "t" );
+    ins( "фʼ", "f" );
+    ins( "ф'", "f" );
+    ins( "ф’", "f" );
+    ins( "хʼ", "ch" );
+    ins( "х'", "ch" );
+    ins( "х’", "ch" );
+    ins( "цʼ", "c" );
+    ins( "ц'", "c" );
+    ins( "ц’", "c" );
+    ins( "чʼ", "č" );
+    ins( "ч'", "č" );
+    ins( "ч’", "č" );
+    ins( "шʼ", "š" );
+    ins( "ш'", "š" );
+    ins( "ш’", "š" );
   }
 };
 
@@ -184,129 +404,512 @@ public:
     ins( "ż", "ж" );
     ins( "ch", "х" );
 
-    ins( "ja", "я" );   ins( "je", "е" );   ins( "jo", "ё" );   ins( "ju", "ю" );
-    ins( "la", "ля" );  ins( "le", "ле" );  ins( "lo", "лё" );  ins( "lu", "лю" );  ins( "li", "лі" );
+    ins( "ja", "я" );
+    ins( "je", "е" );
+    ins( "jo", "ё" );
+    ins( "ju", "ю" );
+    ins( "la", "ля" );
+    ins( "le", "ле" );
+    ins( "lo", "лё" );
+    ins( "lu", "лю" );
+    ins( "li", "лі" );
 
-    ins( "bia", "бя" );  ins( "bie", "бе" );  ins( "bio", "бё" );  ins( "biu", "бю" );
-    ins( "cia", "ця" );  ins( "cie", "це" );  ins( "cio", "цё" );  ins( "ciu", "цю" );
-    ins( "dzia","дзя" ); ins( "dzie","дзе" ); ins( "dzio","дзё" ); ins( "dziu","дзю" );
-    ins( "fia", "фя" );  ins( "fie", "фе" );  ins( "fio", "фё" );  ins( "fiu", "фю" );
-    ins( "gia", "гя" );  ins( "gie", "ге" );  ins( "gio", "гё" );  ins( "giu", "гю" );
-    ins( "hia", "гя" );  ins( "hie", "ге" );  ins( "hio", "гё" );  ins( "hiu", "гю" );
-    ins( "kia", "кя" );  ins( "kie", "ке" );  ins( "kio", "кё" );  ins( "kiu", "кю" );
-    ins( "lia", "ліa" ); ins( "lie", "ліэ" ); ins( "lio", "ліо" ); ins( "liu", "ліу" );
-    ins( "mia", "мя" );  ins( "mie", "ме" );  ins( "mio", "мё" );  ins( "miu", "мю" );
-    ins( "nia", "ня" );  ins( "nie", "не" );  ins( "nio", "нё" );  ins( "niu", "ню" );
-    ins( "pia", "пя" );  ins( "pie", "пе" );  ins( "pio", "пё" );  ins( "piu", "пю" );
-    ins( "sia", "ся" );  ins( "sie", "се" );  ins( "sio", "сё" );  ins( "siu", "сю" );
-    ins( "via", "вя" );  ins( "vie", "ве" );  ins( "vio", "вё" );  ins( "viu", "вю" );
-    ins( "wia", "вя" );  ins( "wie", "ве" );  ins( "wio", "вё" );  ins( "wiu", "вю" );
-    ins( "zia", "зя" );  ins( "zie", "зе" );  ins( "zio", "зё" );  ins( "ziu", "зю" );
-    ins( "chia", "хя" ); ins( "chie", "хе" ); ins( "chio", "хё" ); ins( "chiu", "хю" );
+    ins( "bia", "бя" );
+    ins( "bie", "бе" );
+    ins( "bio", "бё" );
+    ins( "biu", "бю" );
+    ins( "cia", "ця" );
+    ins( "cie", "це" );
+    ins( "cio", "цё" );
+    ins( "ciu", "цю" );
+    ins( "dzia", "дзя" );
+    ins( "dzie", "дзе" );
+    ins( "dzio", "дзё" );
+    ins( "dziu", "дзю" );
+    ins( "fia", "фя" );
+    ins( "fie", "фе" );
+    ins( "fio", "фё" );
+    ins( "fiu", "фю" );
+    ins( "gia", "гя" );
+    ins( "gie", "ге" );
+    ins( "gio", "гё" );
+    ins( "giu", "гю" );
+    ins( "hia", "гя" );
+    ins( "hie", "ге" );
+    ins( "hio", "гё" );
+    ins( "hiu", "гю" );
+    ins( "kia", "кя" );
+    ins( "kie", "ке" );
+    ins( "kio", "кё" );
+    ins( "kiu", "кю" );
+    ins( "lia", "ліa" );
+    ins( "lie", "ліэ" );
+    ins( "lio", "ліо" );
+    ins( "liu", "ліу" );
+    ins( "mia", "мя" );
+    ins( "mie", "ме" );
+    ins( "mio", "мё" );
+    ins( "miu", "мю" );
+    ins( "nia", "ня" );
+    ins( "nie", "не" );
+    ins( "nio", "нё" );
+    ins( "niu", "ню" );
+    ins( "pia", "пя" );
+    ins( "pie", "пе" );
+    ins( "pio", "пё" );
+    ins( "piu", "пю" );
+    ins( "sia", "ся" );
+    ins( "sie", "се" );
+    ins( "sio", "сё" );
+    ins( "siu", "сю" );
+    ins( "via", "вя" );
+    ins( "vie", "ве" );
+    ins( "vio", "вё" );
+    ins( "viu", "вю" );
+    ins( "wia", "вя" );
+    ins( "wie", "ве" );
+    ins( "wio", "вё" );
+    ins( "wiu", "вю" );
+    ins( "zia", "зя" );
+    ins( "zie", "зе" );
+    ins( "zio", "зё" );
+    ins( "ziu", "зю" );
+    ins( "chia", "хя" );
+    ins( "chie", "хе" );
+    ins( "chio", "хё" );
+    ins( "chiu", "хю" );
 
-    ins( "bja", "б'я" );  ins( "bje", "б'е" );  ins( "bjo", "б'ё" );  ins( "bju", "б'ю" );
-    ins( "cia", "ц'я" );  ins( "cje", "ц'е" );  ins( "cjo", "ц'ё" );  ins( "cju", "ц'ю" );
-    ins( "fja", "ф'я" );  ins( "fje", "ф'е" );  ins( "fjo", "ф'ё" );  ins( "fju", "ф'ю" );
-    ins( "hja", "г'я" );  ins( "hje", "г'е" );  ins( "hjo", "г'ё" );  ins( "hju", "г'ю" );
-    ins( "kja", "к'я" );  ins( "kje", "к'е" );  ins( "kjo", "к'ё" );  ins( "kju", "к'ю" );
-    ins( "łja", "л'я" );  ins( "łje", "л'е" );  ins( "łjo", "л'ё" );  ins( "łju", "л'ю" );
-    ins( "mja", "м'я" );  ins( "mje", "м'е" );  ins( "mjo", "м'ё" );  ins( "mju", "м'ю" );
-    ins( "nja", "н'я" );  ins( "nje", "н'е" );  ins( "njo", "н'ё" );  ins( "nju", "н'ю" );
-    ins( "pja", "п'я" );  ins( "pje", "п'е" );  ins( "pjo", "п'ё" );  ins( "pju", "п'ю" );
-    ins( "sja", "с'я" );  ins( "sje", "с'е" );  ins( "sjo", "с'ё" );  ins( "sju", "с'ю" );
-    ins( "vja", "в'я" );  ins( "vje", "в'е" );  ins( "vjo", "в'ё" );  ins( "vju", "в'ю" );
-    ins( "wja", "в'я" );  ins( "wje", "в'е" );  ins( "wjo", "в'ё" );  ins( "wju", "в'ю" );
-    ins( "zja", "з'я" );  ins( "zje", "з'е" );  ins( "zjo", "з'ё" );  ins( "zju", "з'ю" );
-    ins( "źja", "з'я" );  ins( "źje", "з'е" );  ins( "źjo", "з'ё" );  ins( "źju", "з'ю" );
-    ins( "chja", "х'я" ); ins( "chje", "х'е" ); ins( "chjo", "х'ё" ); ins( "chju", "х'ю" );
+    ins( "bja", "б'я" );
+    ins( "bje", "б'е" );
+    ins( "bjo", "б'ё" );
+    ins( "bju", "б'ю" );
+    ins( "cia", "ц'я" );
+    ins( "cje", "ц'е" );
+    ins( "cjo", "ц'ё" );
+    ins( "cju", "ц'ю" );
+    ins( "fja", "ф'я" );
+    ins( "fje", "ф'е" );
+    ins( "fjo", "ф'ё" );
+    ins( "fju", "ф'ю" );
+    ins( "hja", "г'я" );
+    ins( "hje", "г'е" );
+    ins( "hjo", "г'ё" );
+    ins( "hju", "г'ю" );
+    ins( "kja", "к'я" );
+    ins( "kje", "к'е" );
+    ins( "kjo", "к'ё" );
+    ins( "kju", "к'ю" );
+    ins( "łja", "л'я" );
+    ins( "łje", "л'е" );
+    ins( "łjo", "л'ё" );
+    ins( "łju", "л'ю" );
+    ins( "mja", "м'я" );
+    ins( "mje", "м'е" );
+    ins( "mjo", "м'ё" );
+    ins( "mju", "м'ю" );
+    ins( "nja", "н'я" );
+    ins( "nje", "н'е" );
+    ins( "njo", "н'ё" );
+    ins( "nju", "н'ю" );
+    ins( "pja", "п'я" );
+    ins( "pje", "п'е" );
+    ins( "pjo", "п'ё" );
+    ins( "pju", "п'ю" );
+    ins( "sja", "с'я" );
+    ins( "sje", "с'е" );
+    ins( "sjo", "с'ё" );
+    ins( "sju", "с'ю" );
+    ins( "vja", "в'я" );
+    ins( "vje", "в'е" );
+    ins( "vjo", "в'ё" );
+    ins( "vju", "в'ю" );
+    ins( "wja", "в'я" );
+    ins( "wje", "в'е" );
+    ins( "wjo", "в'ё" );
+    ins( "wju", "в'ю" );
+    ins( "zja", "з'я" );
+    ins( "zje", "з'е" );
+    ins( "zjo", "з'ё" );
+    ins( "zju", "з'ю" );
+    ins( "źja", "з'я" );
+    ins( "źje", "з'е" );
+    ins( "źjo", "з'ё" );
+    ins( "źju", "з'ю" );
+    ins( "chja", "х'я" );
+    ins( "chje", "х'е" );
+    ins( "chjo", "х'ё" );
+    ins( "chju", "х'ю" );
 
-    ins( "śbia", "сбя" );  ins( "śbie", "сбе" );  ins( "śbio", "сбё" );  ins( "śbiu", "сбю" );  ins( "śbi", "сбі" );
-    ins( "ścia", "сця" );  ins( "ście", "сце" );  ins( "ścio", "сцё" );  ins( "ściu", "сцю" );  ins( "ści", "сці" );  ins( "ść", "сць" );
-    ins( "śdzia","сдзя" ); ins( "śdzie","сдзе" ); ins( "śdzio","сдзё" ); ins( "śdziu","сдзю" ); ins( "śdzi","сдзі" ); ins( "śdź","сдзь" );
-    ins( "śfia", "сфя" );  ins( "śfie", "сфе" );  ins( "śfio", "сфё" );  ins( "śfiu", "сфю" );  ins( "śfi", "сфі" );
-    ins( "ślia", "сліa" ); ins( "ślie", "сліэ" ); ins( "ślio", "сліо" ); ins( "śliu", "сліу" ); ins( "śli", "слі" );  ins( "śl", "сль" );
-    ins( "śmia", "смя" );  ins( "śmie", "сме" );  ins( "śmio", "смё" );  ins( "śmiu", "смю" );  ins( "śmi", "смі" );
-    ins( "śnia", "сня" );  ins( "śnie", "сне" );  ins( "śnio", "снё" );  ins( "śniu", "сню" );  ins( "śni", "сні" );  ins( "śń", "снь" );
-    ins( "śpia", "спя" );  ins( "śpie", "спе" );  ins( "śpio", "спё" );  ins( "śpiu", "спю" );  ins( "śpi", "спі" );
-    ins( "śsia", "сся" );  ins( "śsie", "ссе" );  ins( "śsio", "ссё" );  ins( "śsiu", "ссю" );  ins( "śsi", "ссі" );
-    ins( "śvia", "свя" );  ins( "śvie", "све" );  ins( "śvio", "свё" );  ins( "śviu", "свю" );  ins( "śvi", "сві" );
-    ins( "świa", "свя" );  ins( "świe", "све" );  ins( "świo", "свё" );  ins( "świu", "свю" );  ins( "świ", "сві" );
-    ins( "śzia", "сзя" );  ins( "śzie", "сзе" );  ins( "śzio", "сзё" );  ins( "śziu", "сзю" );  ins( "śzi", "сзі" );  ins( "śź", "сзь" );
+    ins( "śbia", "сбя" );
+    ins( "śbie", "сбе" );
+    ins( "śbio", "сбё" );
+    ins( "śbiu", "сбю" );
+    ins( "śbi", "сбі" );
+    ins( "ścia", "сця" );
+    ins( "ście", "сце" );
+    ins( "ścio", "сцё" );
+    ins( "ściu", "сцю" );
+    ins( "ści", "сці" );
+    ins( "ść", "сць" );
+    ins( "śdzia", "сдзя" );
+    ins( "śdzie", "сдзе" );
+    ins( "śdzio", "сдзё" );
+    ins( "śdziu", "сдзю" );
+    ins( "śdzi", "сдзі" );
+    ins( "śdź", "сдзь" );
+    ins( "śfia", "сфя" );
+    ins( "śfie", "сфе" );
+    ins( "śfio", "сфё" );
+    ins( "śfiu", "сфю" );
+    ins( "śfi", "сфі" );
+    ins( "ślia", "сліa" );
+    ins( "ślie", "сліэ" );
+    ins( "ślio", "сліо" );
+    ins( "śliu", "сліу" );
+    ins( "śli", "слі" );
+    ins( "śl", "сль" );
+    ins( "śmia", "смя" );
+    ins( "śmie", "сме" );
+    ins( "śmio", "смё" );
+    ins( "śmiu", "смю" );
+    ins( "śmi", "смі" );
+    ins( "śnia", "сня" );
+    ins( "śnie", "сне" );
+    ins( "śnio", "снё" );
+    ins( "śniu", "сню" );
+    ins( "śni", "сні" );
+    ins( "śń", "снь" );
+    ins( "śpia", "спя" );
+    ins( "śpie", "спе" );
+    ins( "śpio", "спё" );
+    ins( "śpiu", "спю" );
+    ins( "śpi", "спі" );
+    ins( "śsia", "сся" );
+    ins( "śsie", "ссе" );
+    ins( "śsio", "ссё" );
+    ins( "śsiu", "ссю" );
+    ins( "śsi", "ссі" );
+    ins( "śvia", "свя" );
+    ins( "śvie", "све" );
+    ins( "śvio", "свё" );
+    ins( "śviu", "свю" );
+    ins( "śvi", "сві" );
+    ins( "świa", "свя" );
+    ins( "świe", "све" );
+    ins( "świo", "свё" );
+    ins( "świu", "свю" );
+    ins( "świ", "сві" );
+    ins( "śzia", "сзя" );
+    ins( "śzie", "сзе" );
+    ins( "śzio", "сзё" );
+    ins( "śziu", "сзю" );
+    ins( "śzi", "сзі" );
+    ins( "śź", "сзь" );
 
-    ins( "ćbia", "цбя" );  ins( "ćbie", "цбе" );  ins( "ćbio", "цбё" );  ins( "ćbiu", "цбю" );  ins( "ćbi", "цбі" );
-    ins( "ćcia", "цця" );  ins( "ćcie", "цце" );  ins( "ćcio", "ццё" );  ins( "ćciu", "ццю" );  ins( "ćci", "цці" );
-    ins( "ćdzia","цдзя" ); ins( "ćdzie","цдзе" ); ins( "ćdzio","цдзё" ); ins( "ćdziu","цдзю" ); ins( "ćdzi","цдзі" );
-    ins( "ćfia", "цфя" );  ins( "ćfie", "цфе" );  ins( "ćfio", "цфё" );  ins( "ćfiu", "цфю" );  ins( "ćfi", "цфі" );
-    ins( "ćlia", "цліa" ); ins( "ćlie", "цліэ" ); ins( "ćlio", "цліо" ); ins( "ćliu", "цліу" ); ins( "ćli", "цлі" );  ins( "ćl", "цль" );
-    ins( "ćmia", "цмя" );  ins( "ćmie", "цме" );  ins( "ćmio", "цмё" );  ins( "ćmiu", "цмю" );  ins( "ćmi", "цмі" );
-    ins( "ćnia", "цня" );  ins( "ćnie", "цне" );  ins( "ćnio", "цнё" );  ins( "ćniu", "цню" );  ins( "ćni", "цні" );  ins( "ćń", "цнь" );
-    ins( "ćpia", "цпя" );  ins( "ćpie", "цпе" );  ins( "ćpio", "цпё" );  ins( "ćpiu", "цпю" );  ins( "ćpi", "цпі" );
-    ins( "ćsia", "цся" );  ins( "ćsie", "цсе" );  ins( "ćsio", "цсё" );  ins( "ćsiu", "цсю" );  ins( "ćsi", "цсі" );  ins( "ćś", "цсь" );
-    ins( "ćvia", "цвя" );  ins( "ćvie", "цве" );  ins( "ćvio", "цвё" );  ins( "ćviu", "цвю" );  ins( "ćvi", "цві" );
-    ins( "ćwia", "цвя" );  ins( "ćwie", "цве" );  ins( "ćwio", "цвё" );  ins( "ćwiu", "цвю" );  ins( "ćwi", "цві" );
-    ins( "ćzia", "цзя" );  ins( "ćzie", "цзе" );  ins( "ćzio", "цзё" );  ins( "ćziu", "цзю" );  ins( "ćzi", "цзі" );  ins( "ćź", "цзь" );
+    ins( "ćbia", "цбя" );
+    ins( "ćbie", "цбе" );
+    ins( "ćbio", "цбё" );
+    ins( "ćbiu", "цбю" );
+    ins( "ćbi", "цбі" );
+    ins( "ćcia", "цця" );
+    ins( "ćcie", "цце" );
+    ins( "ćcio", "ццё" );
+    ins( "ćciu", "ццю" );
+    ins( "ćci", "цці" );
+    ins( "ćdzia", "цдзя" );
+    ins( "ćdzie", "цдзе" );
+    ins( "ćdzio", "цдзё" );
+    ins( "ćdziu", "цдзю" );
+    ins( "ćdzi", "цдзі" );
+    ins( "ćfia", "цфя" );
+    ins( "ćfie", "цфе" );
+    ins( "ćfio", "цфё" );
+    ins( "ćfiu", "цфю" );
+    ins( "ćfi", "цфі" );
+    ins( "ćlia", "цліa" );
+    ins( "ćlie", "цліэ" );
+    ins( "ćlio", "цліо" );
+    ins( "ćliu", "цліу" );
+    ins( "ćli", "цлі" );
+    ins( "ćl", "цль" );
+    ins( "ćmia", "цмя" );
+    ins( "ćmie", "цме" );
+    ins( "ćmio", "цмё" );
+    ins( "ćmiu", "цмю" );
+    ins( "ćmi", "цмі" );
+    ins( "ćnia", "цня" );
+    ins( "ćnie", "цне" );
+    ins( "ćnio", "цнё" );
+    ins( "ćniu", "цню" );
+    ins( "ćni", "цні" );
+    ins( "ćń", "цнь" );
+    ins( "ćpia", "цпя" );
+    ins( "ćpie", "цпе" );
+    ins( "ćpio", "цпё" );
+    ins( "ćpiu", "цпю" );
+    ins( "ćpi", "цпі" );
+    ins( "ćsia", "цся" );
+    ins( "ćsie", "цсе" );
+    ins( "ćsio", "цсё" );
+    ins( "ćsiu", "цсю" );
+    ins( "ćsi", "цсі" );
+    ins( "ćś", "цсь" );
+    ins( "ćvia", "цвя" );
+    ins( "ćvie", "цве" );
+    ins( "ćvio", "цвё" );
+    ins( "ćviu", "цвю" );
+    ins( "ćvi", "цві" );
+    ins( "ćwia", "цвя" );
+    ins( "ćwie", "цве" );
+    ins( "ćwio", "цвё" );
+    ins( "ćwiu", "цвю" );
+    ins( "ćwi", "цві" );
+    ins( "ćzia", "цзя" );
+    ins( "ćzie", "цзе" );
+    ins( "ćzio", "цзё" );
+    ins( "ćziu", "цзю" );
+    ins( "ćzi", "цзі" );
+    ins( "ćź", "цзь" );
 
-    ins( "źbia", "збя" );  ins( "źbie", "збе" );  ins( "źbio", "збё" );  ins( "źbiu", "збю" );  ins( "źbi", "збі" );
-    ins( "źcia", "зця" );  ins( "źcie", "зце" );  ins( "źcio", "зцё" );  ins( "źciu", "зцю" );  ins( "źci", "зці" );  ins( "źć", "зць" );
-    ins( "ździa","здзя" ); ins( "ździe","здзе" ); ins( "ździo","здзё" ); ins( "ździu","здзю" ); ins( "ździ","здзі" ); ins( "źdź","здзь" );
-    ins( "źfia", "зфя" );  ins( "źfie", "зфе" );  ins( "źfio", "зфё" );  ins( "źfiu", "зфю" );  ins( "źfi", "зфі" );
-    ins( "źlia", "зліa" ); ins( "źlie", "зліэ" ); ins( "źlio", "зліо" ); ins( "źliu", "зліу" ); ins( "źli", "злі" );  ins( "źl", "зль" );
-    ins( "źmia", "змя" );  ins( "źmie", "зме" );  ins( "źmio", "змё" );  ins( "źmiu", "змю" );  ins( "źmi", "змі" );
-    ins( "źnia", "зня" );  ins( "źnie", "зне" );  ins( "źnio", "знё" );  ins( "źniu", "зню" );  ins( "źni", "зні" );
-    ins( "źpia", "зпя" );  ins( "źpie", "зпе" );  ins( "źpio", "зпё" );  ins( "źpiu", "зпю" );  ins( "źpi", "зпі" );
-    ins( "źsia", "зся" );  ins( "źsie", "зсе" );  ins( "źsio", "зсё" );  ins( "źsiu", "зсю" );  ins( "źsi", "зсі" );
-    ins( "źvia", "звя" );  ins( "źvie", "зве" );  ins( "źvio", "звё" );  ins( "źviu", "звю" );  ins( "źvi", "зві" );
-    ins( "źwia", "звя" );  ins( "źwie", "зве" );  ins( "źwio", "звё" );  ins( "źwiu", "звю" );  ins( "źwi", "зві" );
-    ins( "źzia", "ззя" );  ins( "źzie", "ззе" );  ins( "źzio", "ззё" );  ins( "źziu", "ззю" );  ins( "źzi", "ззі" );
+    ins( "źbia", "збя" );
+    ins( "źbie", "збе" );
+    ins( "źbio", "збё" );
+    ins( "źbiu", "збю" );
+    ins( "źbi", "збі" );
+    ins( "źcia", "зця" );
+    ins( "źcie", "зце" );
+    ins( "źcio", "зцё" );
+    ins( "źciu", "зцю" );
+    ins( "źci", "зці" );
+    ins( "źć", "зць" );
+    ins( "ździa", "здзя" );
+    ins( "ździe", "здзе" );
+    ins( "ździo", "здзё" );
+    ins( "ździu", "здзю" );
+    ins( "ździ", "здзі" );
+    ins( "źdź", "здзь" );
+    ins( "źfia", "зфя" );
+    ins( "źfie", "зфе" );
+    ins( "źfio", "зфё" );
+    ins( "źfiu", "зфю" );
+    ins( "źfi", "зфі" );
+    ins( "źlia", "зліa" );
+    ins( "źlie", "зліэ" );
+    ins( "źlio", "зліо" );
+    ins( "źliu", "зліу" );
+    ins( "źli", "злі" );
+    ins( "źl", "зль" );
+    ins( "źmia", "змя" );
+    ins( "źmie", "зме" );
+    ins( "źmio", "змё" );
+    ins( "źmiu", "змю" );
+    ins( "źmi", "змі" );
+    ins( "źnia", "зня" );
+    ins( "źnie", "зне" );
+    ins( "źnio", "знё" );
+    ins( "źniu", "зню" );
+    ins( "źni", "зні" );
+    ins( "źpia", "зпя" );
+    ins( "źpie", "зпе" );
+    ins( "źpio", "зпё" );
+    ins( "źpiu", "зпю" );
+    ins( "źpi", "зпі" );
+    ins( "źsia", "зся" );
+    ins( "źsie", "зсе" );
+    ins( "źsio", "зсё" );
+    ins( "źsiu", "зсю" );
+    ins( "źsi", "зсі" );
+    ins( "źvia", "звя" );
+    ins( "źvie", "зве" );
+    ins( "źvio", "звё" );
+    ins( "źviu", "звю" );
+    ins( "źvi", "зві" );
+    ins( "źwia", "звя" );
+    ins( "źwie", "зве" );
+    ins( "źwio", "звё" );
+    ins( "źwiu", "звю" );
+    ins( "źwi", "зві" );
+    ins( "źzia", "ззя" );
+    ins( "źzie", "ззе" );
+    ins( "źzio", "ззё" );
+    ins( "źziu", "ззю" );
+    ins( "źzi", "ззі" );
 
-    ins( "ńnia", "ння" );  ins( "ńnie", "нне" );  ins( "ńnio", "ннё" );  ins( "ńniu", "нню" );  ins( "ńni", "нні" );
-    ins( "dździa", "ддзя" );  ins( "dździe", "ддзе" );  ins( "dździo", "ддзё" );  ins( "dździu", "ддзю" );  ins( "dździ", "ддзі" );
+    ins( "ńnia", "ння" );
+    ins( "ńnie", "нне" );
+    ins( "ńnio", "ннё" );
+    ins( "ńniu", "нню" );
+    ins( "ńni", "нні" );
+    ins( "dździa", "ддзя" );
+    ins( "dździe", "ддзе" );
+    ins( "dździo", "ддзё" );
+    ins( "dździu", "ддзю" );
+    ins( "dździ", "ддзі" );
 
     // cyrillic to latin
-    ins( "а", "a" );   ins( "б", "b" );   ins( "в", "v" );   ins( "г", "h" );
-    ins( "ґ", "g" );   ins( "д", "d" );   ins( "е", "je" );  ins( "ё", "jo" );
-    ins( "ж", "ž" );   ins( "з", "z" );   ins( "і", "i" );   ins( "ї", "ï" );
-    ins( "й", "j" );   ins( "к", "k" );   ins( "л", "ł" );   ins( "м", "m" );
-    ins( "н", "n" );   ins( "о", "o" );   ins( "п", "p" );   ins( "р", "r" );
-    ins( "с", "s" );   ins( "т", "t" );   ins( "у", "u" );   ins( "ў", "ŭ" );
-    ins( "ф", "f" );   ins( "х", "ch" );  ins( "ц", "c" );   ins( "ч", "č" );
-    ins( "ш", "š" );   ins( "ы", "y" );   ins( "э", "e" );   ins( "ю", "ju" );
-    ins( "я", "ja" );  ins( "кг", "g" );
-    ins( "бе", "bie" );  ins( "бё", "bio" );  ins( "бю", "biu" );  ins( "бя", "bia" );
-    ins( "ве", "vie" );  ins( "вё", "vio" );  ins( "вю", "viu" );  ins( "вя", "via" );
-    ins( "ге", "hie" );  ins( "гё", "hio" );  ins( "гю", "hiu" );  ins( "гя", "hia" );
-    ins( "ґе", "gie" );  ins( "ґё", "gio" );  ins( "ґю", "giu" );  ins( "ґя", "gia" );
-    ins( "кге", "gie" ); ins( "кгё", "gio" ); ins( "кгю", "giu" ); ins( "кгя", "gia" );
-    ins( "зе", "zie" );  ins( "зё", "zio" );  ins( "зю", "ziu" );  ins( "зя", "zia" );  ins( "зь", "ź" );
-    ins( "ке", "kie" );  ins( "кё", "kio" );  ins( "кю", "kiu" );  ins( "кя", "kia" );
-    ins( "ле", "le" );   ins( "лё", "lo" );   ins( "лю", "lu" );   ins( "ля", "la" );   ins( "ль", "l" );   ins( "лі", "li" );
-    ins( "ме", "mie" );  ins( "мё", "mio" );  ins( "мю", "miu" );  ins( "мя", "mia" );  ins( "мь", "m" );
-    ins( "не", "nie" );  ins( "нё", "nio" );  ins( "ню", "niu" );  ins( "ня", "nia" );  ins( "нь", "ń" );
-    ins( "пе", "pie" );  ins( "пё", "pio" );  ins( "пю", "piu" );  ins( "пя", "pia" );  ins( "пь", "p" );
-    ins( "се", "sie" );  ins( "сё", "sio" );  ins( "сю", "siu" );  ins( "ся", "sia" );  ins( "сь", "ś" );
-    ins( "фе", "fie" );  ins( "фё", "fio" );  ins( "фю", "fiu" );  ins( "фя", "fia" );  ins( "фь", "f" );
-    ins( "хе", "chie" ); ins( "хё", "chio" ); ins( "хю", "chiu" ); ins( "хя", "chia" );
-    ins( "це", "cie" );  ins( "цё", "cio" );  ins( "цю", "ciu" );  ins( "ця", "cia" );  ins( "ць", "ć" );
-    ins( "бʼ", "b" );    ins( "б'", "b" );    ins( "б’", "b" );
-    ins( "вʼ", "v" );    ins( "в'", "v" );    ins( "в’", "v" );
-    ins( "гʼ", "h" );    ins( "г'", "h" );    ins( "г’", "h" );
-    ins( "ґʼ", "g" );    ins( "ґ'", "g" );    ins( "ґ’", "g" );
-    ins( "дʼ", "d" );    ins( "д'", "d" );    ins( "д’", "d" );
-    ins( "жʼ", "ž" );    ins( "ж'", "ž" );    ins( "ж’", "ž" );
-    ins( "зʼ", "z" );    ins( "з'", "z" );    ins( "з’", "z" );
-    ins( "кʼ", "k" );    ins( "к'", "k" );    ins( "к’", "k" );
-    ins( "лʼ", "ł" );    ins( "л'", "ł" );    ins( "л’", "ł" );
-    ins( "мʼ", "m" );    ins( "м'", "m" );    ins( "м’", "m" );
-    ins( "нʼ", "n" );    ins( "н'", "n" );    ins( "н’", "n" );
-    ins( "пʼ", "p" );    ins( "п'", "p" );    ins( "п’", "p" );
-    ins( "рʼ", "r" );    ins( "р'", "r" );    ins( "р’", "r" );
-    ins( "сʼ", "s" );    ins( "с'", "s" );    ins( "с’", "s" );
-    ins( "тʼ", "t" );    ins( "т'", "t" );    ins( "т’", "t" );
-    ins( "фʼ", "f" );    ins( "ф'", "f" );    ins( "ф’", "f" );
-    ins( "хʼ", "ch" );   ins( "х'", "ch" );   ins( "х’", "ch" );
-    ins( "цʼ", "c" );    ins( "ц'", "c" );    ins( "ц’", "c" );
-    ins( "чʼ", "č" );    ins( "ч'", "č" );    ins( "ч’", "č" );
-    ins( "шʼ", "š" );    ins( "ш'", "š" );    ins( "ш’", "š" );
+    ins( "а", "a" );
+    ins( "б", "b" );
+    ins( "в", "v" );
+    ins( "г", "h" );
+    ins( "ґ", "g" );
+    ins( "д", "d" );
+    ins( "е", "je" );
+    ins( "ё", "jo" );
+    ins( "ж", "ž" );
+    ins( "з", "z" );
+    ins( "і", "i" );
+    ins( "ї", "ï" );
+    ins( "й", "j" );
+    ins( "к", "k" );
+    ins( "л", "ł" );
+    ins( "м", "m" );
+    ins( "н", "n" );
+    ins( "о", "o" );
+    ins( "п", "p" );
+    ins( "р", "r" );
+    ins( "с", "s" );
+    ins( "т", "t" );
+    ins( "у", "u" );
+    ins( "ў", "ŭ" );
+    ins( "ф", "f" );
+    ins( "х", "ch" );
+    ins( "ц", "c" );
+    ins( "ч", "č" );
+    ins( "ш", "š" );
+    ins( "ы", "y" );
+    ins( "э", "e" );
+    ins( "ю", "ju" );
+    ins( "я", "ja" );
+    ins( "кг", "g" );
+    ins( "бе", "bie" );
+    ins( "бё", "bio" );
+    ins( "бю", "biu" );
+    ins( "бя", "bia" );
+    ins( "ве", "vie" );
+    ins( "вё", "vio" );
+    ins( "вю", "viu" );
+    ins( "вя", "via" );
+    ins( "ге", "hie" );
+    ins( "гё", "hio" );
+    ins( "гю", "hiu" );
+    ins( "гя", "hia" );
+    ins( "ґе", "gie" );
+    ins( "ґё", "gio" );
+    ins( "ґю", "giu" );
+    ins( "ґя", "gia" );
+    ins( "кге", "gie" );
+    ins( "кгё", "gio" );
+    ins( "кгю", "giu" );
+    ins( "кгя", "gia" );
+    ins( "зе", "zie" );
+    ins( "зё", "zio" );
+    ins( "зю", "ziu" );
+    ins( "зя", "zia" );
+    ins( "зь", "ź" );
+    ins( "ке", "kie" );
+    ins( "кё", "kio" );
+    ins( "кю", "kiu" );
+    ins( "кя", "kia" );
+    ins( "ле", "le" );
+    ins( "лё", "lo" );
+    ins( "лю", "lu" );
+    ins( "ля", "la" );
+    ins( "ль", "l" );
+    ins( "лі", "li" );
+    ins( "ме", "mie" );
+    ins( "мё", "mio" );
+    ins( "мю", "miu" );
+    ins( "мя", "mia" );
+    ins( "мь", "m" );
+    ins( "не", "nie" );
+    ins( "нё", "nio" );
+    ins( "ню", "niu" );
+    ins( "ня", "nia" );
+    ins( "нь", "ń" );
+    ins( "пе", "pie" );
+    ins( "пё", "pio" );
+    ins( "пю", "piu" );
+    ins( "пя", "pia" );
+    ins( "пь", "p" );
+    ins( "се", "sie" );
+    ins( "сё", "sio" );
+    ins( "сю", "siu" );
+    ins( "ся", "sia" );
+    ins( "сь", "ś" );
+    ins( "фе", "fie" );
+    ins( "фё", "fio" );
+    ins( "фю", "fiu" );
+    ins( "фя", "fia" );
+    ins( "фь", "f" );
+    ins( "хе", "chie" );
+    ins( "хё", "chio" );
+    ins( "хю", "chiu" );
+    ins( "хя", "chia" );
+    ins( "це", "cie" );
+    ins( "цё", "cio" );
+    ins( "цю", "ciu" );
+    ins( "ця", "cia" );
+    ins( "ць", "ć" );
+    ins( "бʼ", "b" );
+    ins( "б'", "b" );
+    ins( "б’", "b" );
+    ins( "вʼ", "v" );
+    ins( "в'", "v" );
+    ins( "в’", "v" );
+    ins( "гʼ", "h" );
+    ins( "г'", "h" );
+    ins( "г’", "h" );
+    ins( "ґʼ", "g" );
+    ins( "ґ'", "g" );
+    ins( "ґ’", "g" );
+    ins( "дʼ", "d" );
+    ins( "д'", "d" );
+    ins( "д’", "d" );
+    ins( "жʼ", "ž" );
+    ins( "ж'", "ž" );
+    ins( "ж’", "ž" );
+    ins( "зʼ", "z" );
+    ins( "з'", "z" );
+    ins( "з’", "z" );
+    ins( "кʼ", "k" );
+    ins( "к'", "k" );
+    ins( "к’", "k" );
+    ins( "лʼ", "ł" );
+    ins( "л'", "ł" );
+    ins( "л’", "ł" );
+    ins( "мʼ", "m" );
+    ins( "м'", "m" );
+    ins( "м’", "m" );
+    ins( "нʼ", "n" );
+    ins( "н'", "n" );
+    ins( "н’", "n" );
+    ins( "пʼ", "p" );
+    ins( "п'", "p" );
+    ins( "п’", "p" );
+    ins( "рʼ", "r" );
+    ins( "р'", "r" );
+    ins( "р’", "r" );
+    ins( "сʼ", "s" );
+    ins( "с'", "s" );
+    ins( "с’", "s" );
+    ins( "тʼ", "t" );
+    ins( "т'", "t" );
+    ins( "т’", "t" );
+    ins( "фʼ", "f" );
+    ins( "ф'", "f" );
+    ins( "ф’", "f" );
+    ins( "хʼ", "ch" );
+    ins( "х'", "ch" );
+    ins( "х’", "ch" );
+    ins( "цʼ", "c" );
+    ins( "ц'", "c" );
+    ins( "ц’", "c" );
+    ins( "чʼ", "č" );
+    ins( "ч'", "č" );
+    ins( "ч’", "č" );
+    ins( "шʼ", "š" );
+    ins( "ш'", "š" );
+    ins( "ш’", "š" );
   }
 };
 
@@ -315,115 +918,497 @@ class BelarusianSchoolToClassicTable: public Transliteration::Table
 public:
   BelarusianSchoolToClassicTable()
   {
-    ins( "ньне", "нне" );   ins( "ньня", "ння" );   ins( "ньню", "нню" );   ins( "ньнё", "ннё" );   ins( "ньні", "нні" );
-    ins( "нне", "ньне" );   ins( "ння", "ньня" );   ins( "нню", "ньню" );   ins( "ннё", "ньнё" );   ins( "нні", "ньні" );
+    ins( "ньне", "нне" );
+    ins( "ньня", "ння" );
+    ins( "ньню", "нню" );
+    ins( "ньнё", "ннё" );
+    ins( "ньні", "нні" );
+    ins( "нне", "ньне" );
+    ins( "ння", "ньня" );
+    ins( "нню", "ньню" );
+    ins( "ннё", "ньнё" );
+    ins( "нні", "ньні" );
 
-    ins( "льле", "лле" );   ins( "льля", "лля" );   ins( "льлю", "ллю" );   ins( "льлё", "ллё" );   ins( "льлі", "ллі" );
-    ins( "лле", "льле" );   ins( "лля", "льля" );   ins( "ллю", "льлю" );   ins( "ллё", "льлё" );   ins( "ллі", "льлі" );
+    ins( "льле", "лле" );
+    ins( "льля", "лля" );
+    ins( "льлю", "ллю" );
+    ins( "льлё", "ллё" );
+    ins( "льлі", "ллі" );
+    ins( "лле", "льле" );
+    ins( "лля", "льля" );
+    ins( "ллю", "льлю" );
+    ins( "ллё", "льлё" );
+    ins( "ллі", "льлі" );
 
-    ins( "зьбе", "збе" );   ins( "зьбя", "збя" );   ins( "зьбю", "збю" );   ins( "зьбё", "збё" );   ins( "зьбі", "збі" );
-    ins( "збе", "зьбе" );   ins( "збя", "зьбя" );   ins( "збю", "зьбю" );   ins( "збё", "зьбё" );   ins( "збі", "зьбі" );
-    ins( "зьве", "зве" );   ins( "зьвя", "звя" );   ins( "зьвю", "звю" );   ins( "зьвё", "звё" );   ins( "зьві", "зві" );
-    ins( "зве", "зьве" );   ins( "звя", "зьвя" );   ins( "звю", "зьвю" );   ins( "звё", "зьвё" );   ins( "зві", "зьві" );
-    ins( "зьдзе", "здзе" ); ins( "зьдзя", "здзя" ); ins( "зьдзю", "здзю" ); ins( "зьдзё", "здзё" ); ins( "зьдзі", "здзі" ); ins( "зьдзь", "здзь" );
-    ins( "здзе", "зьдзе" ); ins( "здзя", "зьдзя" ); ins( "здзю", "зьдзю" ); ins( "здзё", "зьдзё" ); ins( "здзі", "зьдзі" ); ins( "здзь", "здзь" );
-    ins( "зьзе", "ззе" );   ins( "зьзя", "ззя" );   ins( "зьзю", "ззю" );   ins( "зьзё", "ззё" );   ins( "зьзі", "ззі" );   ins( "зьзь", "ззь" );
-    ins( "ззе", "зьзе" );   ins( "ззя", "зьзя" );   ins( "ззю", "зьзю" );   ins( "ззё", "зьзё" );   ins( "ззі", "зьзі" );   ins( "ззь", "зьзь" );
-    ins( "зьле", "зле" );   ins( "зьля", "зля" );   ins( "зьлю", "злю" );   ins( "зьлё", "злё" );   ins( "зьлі", "злі" );   ins( "зьль", "зль" );
-    ins( "зле", "зьле" );   ins( "зля", "зьля" );   ins( "злю", "зьлю" );   ins( "злё", "зьлё" );   ins( "злі", "зьлі" );   ins( "зль", "зьль" );
-    ins( "зьме", "зме" );   ins( "зьмя", "змя" );   ins( "зьмю", "змю" );   ins( "зьмё", "змё" );   ins( "зьмі", "змі" );
-    ins( "зме", "зьме" );   ins( "змя", "зьмя" );   ins( "змю", "зьмю" );   ins( "змё", "зьмё" );   ins( "змі", "зьмі" );
-    ins( "зьне", "зне" );   ins( "зьня", "зня" );   ins( "зьню", "зню" );   ins( "зьнё", "знё" );   ins( "зьні", "зні" );   ins( "зьнь", "знь" );
-    ins( "зне", "зьне" );   ins( "зня", "зьня" );   ins( "зню", "зьню" );   ins( "знё", "зьнё" );   ins( "зні", "зьні" );   ins( "знь", "зьнь" );
-    ins( "зьпе", "зпе" );   ins( "зьпя", "зпя" );   ins( "зьпю", "зпю" );   ins( "зьпё", "зпё" );   ins( "зьпі", "зпі" );
-    ins( "зпе", "зьпе" );   ins( "зпя", "зьпя" );   ins( "зпю", "зьпю" );   ins( "зпё", "зьпё" );   ins( "зпі", "зьпі" );
-    ins( "зьсе", "зсе" );   ins( "зься", "зся" );   ins( "зьсю", "зсю" );   ins( "зьсё", "зсё" );   ins( "зьсі", "зсі" );   ins( "зьсь", "зсь" );
-    ins( "зсе", "зьсе" );   ins( "зся", "зься" );   ins( "зсю", "зьсю" );   ins( "зсё", "зьсё" );   ins( "зсі", "зьсі" );   ins( "зсь", "зьсь" );
-    ins( "зьфе", "зфе" );   ins( "зьфя", "зфя" );   ins( "зьфю", "зфю" );   ins( "зьфё", "зфё" );   ins( "зьфі", "зфі" );
-    ins( "зфе", "зьфе" );   ins( "зфя", "зьфя" );   ins( "зфю", "зьфю" );   ins( "зфё", "зьфё" );   ins( "зфі", "зьфі" );
-    ins( "зьхе", "зхе" );   ins( "зьхя", "зхя" );   ins( "зьхю", "зхю" );   ins( "зьхё", "зхё" );   ins( "зьхі", "зхі" );
-    ins( "зхе", "зьхе" );   ins( "зхя", "зьхя" );   ins( "зхю", "зьхю" );   ins( "зхё", "зьхё" );   ins( "зхі", "зьхі" );
-    ins( "зьце", "зце" );   ins( "зьця", "зця" );   ins( "зьцю", "зцю" );   ins( "зьцё", "зцё" );   ins( "зьці", "зці" );   ins( "зьць", "зць" );
-    ins( "зце", "зьце" );   ins( "зця", "зьця" );   ins( "зцю", "зьцю" );   ins( "зцё", "зьцё" );   ins( "зці", "зьці" );   ins( "зць", "зьць" );
+    ins( "зьбе", "збе" );
+    ins( "зьбя", "збя" );
+    ins( "зьбю", "збю" );
+    ins( "зьбё", "збё" );
+    ins( "зьбі", "збі" );
+    ins( "збе", "зьбе" );
+    ins( "збя", "зьбя" );
+    ins( "збю", "зьбю" );
+    ins( "збё", "зьбё" );
+    ins( "збі", "зьбі" );
+    ins( "зьве", "зве" );
+    ins( "зьвя", "звя" );
+    ins( "зьвю", "звю" );
+    ins( "зьвё", "звё" );
+    ins( "зьві", "зві" );
+    ins( "зве", "зьве" );
+    ins( "звя", "зьвя" );
+    ins( "звю", "зьвю" );
+    ins( "звё", "зьвё" );
+    ins( "зві", "зьві" );
+    ins( "зьдзе", "здзе" );
+    ins( "зьдзя", "здзя" );
+    ins( "зьдзю", "здзю" );
+    ins( "зьдзё", "здзё" );
+    ins( "зьдзі", "здзі" );
+    ins( "зьдзь", "здзь" );
+    ins( "здзе", "зьдзе" );
+    ins( "здзя", "зьдзя" );
+    ins( "здзю", "зьдзю" );
+    ins( "здзё", "зьдзё" );
+    ins( "здзі", "зьдзі" );
+    ins( "здзь", "здзь" );
+    ins( "зьзе", "ззе" );
+    ins( "зьзя", "ззя" );
+    ins( "зьзю", "ззю" );
+    ins( "зьзё", "ззё" );
+    ins( "зьзі", "ззі" );
+    ins( "зьзь", "ззь" );
+    ins( "ззе", "зьзе" );
+    ins( "ззя", "зьзя" );
+    ins( "ззю", "зьзю" );
+    ins( "ззё", "зьзё" );
+    ins( "ззі", "зьзі" );
+    ins( "ззь", "зьзь" );
+    ins( "зьле", "зле" );
+    ins( "зьля", "зля" );
+    ins( "зьлю", "злю" );
+    ins( "зьлё", "злё" );
+    ins( "зьлі", "злі" );
+    ins( "зьль", "зль" );
+    ins( "зле", "зьле" );
+    ins( "зля", "зьля" );
+    ins( "злю", "зьлю" );
+    ins( "злё", "зьлё" );
+    ins( "злі", "зьлі" );
+    ins( "зль", "зьль" );
+    ins( "зьме", "зме" );
+    ins( "зьмя", "змя" );
+    ins( "зьмю", "змю" );
+    ins( "зьмё", "змё" );
+    ins( "зьмі", "змі" );
+    ins( "зме", "зьме" );
+    ins( "змя", "зьмя" );
+    ins( "змю", "зьмю" );
+    ins( "змё", "зьмё" );
+    ins( "змі", "зьмі" );
+    ins( "зьне", "зне" );
+    ins( "зьня", "зня" );
+    ins( "зьню", "зню" );
+    ins( "зьнё", "знё" );
+    ins( "зьні", "зні" );
+    ins( "зьнь", "знь" );
+    ins( "зне", "зьне" );
+    ins( "зня", "зьня" );
+    ins( "зню", "зьню" );
+    ins( "знё", "зьнё" );
+    ins( "зні", "зьні" );
+    ins( "знь", "зьнь" );
+    ins( "зьпе", "зпе" );
+    ins( "зьпя", "зпя" );
+    ins( "зьпю", "зпю" );
+    ins( "зьпё", "зпё" );
+    ins( "зьпі", "зпі" );
+    ins( "зпе", "зьпе" );
+    ins( "зпя", "зьпя" );
+    ins( "зпю", "зьпю" );
+    ins( "зпё", "зьпё" );
+    ins( "зпі", "зьпі" );
+    ins( "зьсе", "зсе" );
+    ins( "зься", "зся" );
+    ins( "зьсю", "зсю" );
+    ins( "зьсё", "зсё" );
+    ins( "зьсі", "зсі" );
+    ins( "зьсь", "зсь" );
+    ins( "зсе", "зьсе" );
+    ins( "зся", "зься" );
+    ins( "зсю", "зьсю" );
+    ins( "зсё", "зьсё" );
+    ins( "зсі", "зьсі" );
+    ins( "зсь", "зьсь" );
+    ins( "зьфе", "зфе" );
+    ins( "зьфя", "зфя" );
+    ins( "зьфю", "зфю" );
+    ins( "зьфё", "зфё" );
+    ins( "зьфі", "зфі" );
+    ins( "зфе", "зьфе" );
+    ins( "зфя", "зьфя" );
+    ins( "зфю", "зьфю" );
+    ins( "зфё", "зьфё" );
+    ins( "зфі", "зьфі" );
+    ins( "зьхе", "зхе" );
+    ins( "зьхя", "зхя" );
+    ins( "зьхю", "зхю" );
+    ins( "зьхё", "зхё" );
+    ins( "зьхі", "зхі" );
+    ins( "зхе", "зьхе" );
+    ins( "зхя", "зьхя" );
+    ins( "зхю", "зьхю" );
+    ins( "зхё", "зьхё" );
+    ins( "зхі", "зьхі" );
+    ins( "зьце", "зце" );
+    ins( "зьця", "зця" );
+    ins( "зьцю", "зцю" );
+    ins( "зьцё", "зцё" );
+    ins( "зьці", "зці" );
+    ins( "зьць", "зць" );
+    ins( "зце", "зьце" );
+    ins( "зця", "зьця" );
+    ins( "зцю", "зьцю" );
+    ins( "зцё", "зьцё" );
+    ins( "зці", "зьці" );
+    ins( "зць", "зьць" );
 
-    ins( "сьбе", "сбе" );   ins( "сьбя", "сбя" );   ins( "сьбю", "сбю" );   ins( "сьбё", "сбё" );   ins( "сьбі", "сбі" );
-    ins( "сбе", "сьбе" );   ins( "сбя", "сьбя" );   ins( "сбю", "сьбю" );   ins( "сбё", "сьбё" );   ins( "сбі", "сьбі" );
-    ins( "сьве", "све" );   ins( "сьвя", "свя" );   ins( "сьвю", "свю" );   ins( "сьвё", "свё" );   ins( "сьві", "сві" );
-    ins( "све", "сьве" );   ins( "свя", "сьвя" );   ins( "свю", "сьвю" );   ins( "свё", "сьвё" );   ins( "сві", "зьві" );
-    ins( "сьдзе", "сдзе" ); ins( "сьдзя", "сдзя" ); ins( "сьдзю", "сдзю" ); ins( "сьдзё", "сдзё" ); ins( "сьдзі", "сдзі" ); ins( "сьдзь", "сдзь" );
-    ins( "сдзе", "сьдзе" ); ins( "сдзя", "сьдзя" ); ins( "сдзю", "сьдзю" ); ins( "сдзё", "сьдзё" ); ins( "сдзі", "сьдзі" ); ins( "сдзь", "сьдзь" );
-    ins( "сьзе", "сзе" );   ins( "сьзя", "сзя" );   ins( "сьзю", "сзю" );   ins( "сьзё", "сзё" );   ins( "сьзі", "сзі" );   ins( "сьзь", "сзь" );
-    ins( "сзе", "сьзе" );   ins( "сзя", "сьзя" );   ins( "сзю", "сьзю" );   ins( "сзё", "сьзё" );   ins( "сзі", "сьзі" );   ins( "сзь", "сьзь" );
-    ins( "сьле", "сле" );   ins( "сьля", "сля" );   ins( "сьлю", "слю" );   ins( "сьлё", "слё" );   ins( "сьлі", "слі" );   ins( "сьль", "сль" );
-    ins( "сле", "сьле" );   ins( "сля", "сьля" );   ins( "слю", "сьлю" );   ins( "слё", "сьлё" );   ins( "слі", "сьлі" );   ins( "сль", "сьль" );
-    ins( "сьме", "сме" );   ins( "сьмя", "смя" );   ins( "сьмю", "смю" );   ins( "сьмё", "смё" );   ins( "сьмі", "смі" );
-    ins( "сме", "сьме" );   ins( "смя", "сьмя" );   ins( "смю", "сьмю" );   ins( "смё", "сьмё" );   ins( "смі", "сьмі" );
-    ins( "сьне", "сне" );   ins( "сьня", "сня" );   ins( "сьню", "сню" );   ins( "сьнё", "снё" );   ins( "сьні", "сні" );   ins( "сьнь", "снь" );
-    ins( "сне", "сьне" );   ins( "сня", "сьня" );   ins( "сню", "сьню" );   ins( "снё", "сьнё" );   ins( "сні", "сьні" );   ins( "снь", "сьнь" );
-    ins( "сьпе", "спе" );   ins( "сьпя", "спя" );   ins( "сьпю", "спю" );   ins( "сьпё", "спё" );   ins( "сьпі", "спі" );
-    ins( "спе", "сьпе" );   ins( "спя", "сьпя" );   ins( "спю", "сьпю" );   ins( "спё", "сьпё" );   ins( "спі", "сьпі" );
-    ins( "сьсе", "ссе" );   ins( "сься", "сся" );   ins( "сьсю", "ссю" );   ins( "сьсё", "ссё" );   ins( "сьсі", "ссі" );   ins( "сьсь", "ссь" );
-    ins( "ссе", "сьсе" );   ins( "сся", "сься" );   ins( "ссю", "сьсю" );   ins( "ссё", "сьсё" );   ins( "ссі", "сьсі" );   ins( "ссь", "сьсь" );
-    ins( "сьфе", "сфе" );   ins( "сьфя", "сфя" );   ins( "сьфю", "сфю" );   ins( "сьфё", "сфё" );   ins( "сьфі", "сфі" );
-    ins( "сфе", "сьфе" );   ins( "сфя", "сьфя" );   ins( "сфю", "сьфю" );   ins( "сфё", "сьфё" );   ins( "сфі", "сьфі" );
-    ins( "сьхе", "схе" );   ins( "сьхя", "схя" );   ins( "сьхю", "схю" );   ins( "сьхё", "схё" );   ins( "сьхі", "схі" );
-    ins( "схе", "сьхе" );   ins( "схя", "сьхя" );   ins( "схю", "сьхю" );   ins( "схё", "сьхё" );   ins( "схі", "сьхі" );
-    ins( "сьце", "сце" );   ins( "сьця", "сця" );   ins( "сьцю", "сцю" );   ins( "сьцё", "сцё" );   ins( "сьці", "сці" );   ins( "сьць", "сць" );
-    ins( "сце", "сьце" );   ins( "сця", "сьця" );   ins( "сцю", "сьцю" );   ins( "сцё", "сьцё" );   ins( "сці", "сьці" );   ins( "сць", "сьць" );
+    ins( "сьбе", "сбе" );
+    ins( "сьбя", "сбя" );
+    ins( "сьбю", "сбю" );
+    ins( "сьбё", "сбё" );
+    ins( "сьбі", "сбі" );
+    ins( "сбе", "сьбе" );
+    ins( "сбя", "сьбя" );
+    ins( "сбю", "сьбю" );
+    ins( "сбё", "сьбё" );
+    ins( "сбі", "сьбі" );
+    ins( "сьве", "све" );
+    ins( "сьвя", "свя" );
+    ins( "сьвю", "свю" );
+    ins( "сьвё", "свё" );
+    ins( "сьві", "сві" );
+    ins( "све", "сьве" );
+    ins( "свя", "сьвя" );
+    ins( "свю", "сьвю" );
+    ins( "свё", "сьвё" );
+    ins( "сві", "зьві" );
+    ins( "сьдзе", "сдзе" );
+    ins( "сьдзя", "сдзя" );
+    ins( "сьдзю", "сдзю" );
+    ins( "сьдзё", "сдзё" );
+    ins( "сьдзі", "сдзі" );
+    ins( "сьдзь", "сдзь" );
+    ins( "сдзе", "сьдзе" );
+    ins( "сдзя", "сьдзя" );
+    ins( "сдзю", "сьдзю" );
+    ins( "сдзё", "сьдзё" );
+    ins( "сдзі", "сьдзі" );
+    ins( "сдзь", "сьдзь" );
+    ins( "сьзе", "сзе" );
+    ins( "сьзя", "сзя" );
+    ins( "сьзю", "сзю" );
+    ins( "сьзё", "сзё" );
+    ins( "сьзі", "сзі" );
+    ins( "сьзь", "сзь" );
+    ins( "сзе", "сьзе" );
+    ins( "сзя", "сьзя" );
+    ins( "сзю", "сьзю" );
+    ins( "сзё", "сьзё" );
+    ins( "сзі", "сьзі" );
+    ins( "сзь", "сьзь" );
+    ins( "сьле", "сле" );
+    ins( "сьля", "сля" );
+    ins( "сьлю", "слю" );
+    ins( "сьлё", "слё" );
+    ins( "сьлі", "слі" );
+    ins( "сьль", "сль" );
+    ins( "сле", "сьле" );
+    ins( "сля", "сьля" );
+    ins( "слю", "сьлю" );
+    ins( "слё", "сьлё" );
+    ins( "слі", "сьлі" );
+    ins( "сль", "сьль" );
+    ins( "сьме", "сме" );
+    ins( "сьмя", "смя" );
+    ins( "сьмю", "смю" );
+    ins( "сьмё", "смё" );
+    ins( "сьмі", "смі" );
+    ins( "сме", "сьме" );
+    ins( "смя", "сьмя" );
+    ins( "смю", "сьмю" );
+    ins( "смё", "сьмё" );
+    ins( "смі", "сьмі" );
+    ins( "сьне", "сне" );
+    ins( "сьня", "сня" );
+    ins( "сьню", "сню" );
+    ins( "сьнё", "снё" );
+    ins( "сьні", "сні" );
+    ins( "сьнь", "снь" );
+    ins( "сне", "сьне" );
+    ins( "сня", "сьня" );
+    ins( "сню", "сьню" );
+    ins( "снё", "сьнё" );
+    ins( "сні", "сьні" );
+    ins( "снь", "сьнь" );
+    ins( "сьпе", "спе" );
+    ins( "сьпя", "спя" );
+    ins( "сьпю", "спю" );
+    ins( "сьпё", "спё" );
+    ins( "сьпі", "спі" );
+    ins( "спе", "сьпе" );
+    ins( "спя", "сьпя" );
+    ins( "спю", "сьпю" );
+    ins( "спё", "сьпё" );
+    ins( "спі", "сьпі" );
+    ins( "сьсе", "ссе" );
+    ins( "сься", "сся" );
+    ins( "сьсю", "ссю" );
+    ins( "сьсё", "ссё" );
+    ins( "сьсі", "ссі" );
+    ins( "сьсь", "ссь" );
+    ins( "ссе", "сьсе" );
+    ins( "сся", "сься" );
+    ins( "ссю", "сьсю" );
+    ins( "ссё", "сьсё" );
+    ins( "ссі", "сьсі" );
+    ins( "ссь", "сьсь" );
+    ins( "сьфе", "сфе" );
+    ins( "сьфя", "сфя" );
+    ins( "сьфю", "сфю" );
+    ins( "сьфё", "сфё" );
+    ins( "сьфі", "сфі" );
+    ins( "сфе", "сьфе" );
+    ins( "сфя", "сьфя" );
+    ins( "сфю", "сьфю" );
+    ins( "сфё", "сьфё" );
+    ins( "сфі", "сьфі" );
+    ins( "сьхе", "схе" );
+    ins( "сьхя", "схя" );
+    ins( "сьхю", "схю" );
+    ins( "сьхё", "схё" );
+    ins( "сьхі", "схі" );
+    ins( "схе", "сьхе" );
+    ins( "схя", "сьхя" );
+    ins( "схю", "сьхю" );
+    ins( "схё", "сьхё" );
+    ins( "схі", "сьхі" );
+    ins( "сьце", "сце" );
+    ins( "сьця", "сця" );
+    ins( "сьцю", "сцю" );
+    ins( "сьцё", "сцё" );
+    ins( "сьці", "сці" );
+    ins( "сьць", "сць" );
+    ins( "сце", "сьце" );
+    ins( "сця", "сьця" );
+    ins( "сцю", "сьцю" );
+    ins( "сцё", "сьцё" );
+    ins( "сці", "сьці" );
+    ins( "сць", "сьць" );
 
-    ins( "цьбе", "цбе" );   ins( "цьбя", "цбя" );   ins( "цьбю", "цбю" );   ins( "цьбё", "цбё" );   ins( "цьбі", "цбі" );
-    ins( "цбе", "цьбе" );   ins( "цбя", "цьбя" );   ins( "цбю", "цьбю" );   ins( "цбё", "цьбё" );   ins( "цбі", "цьбі" );
-    ins( "цьве", "цве" );   ins( "цьвя", "цвя" );   ins( "цьвю", "цвю" );   ins( "цьвё", "цвё" );   ins( "цьві", "цві" );
-    ins( "цве", "цьве" );   ins( "цвя", "цьвя" );   ins( "цвю", "цьвю" );   ins( "цвё", "цьвё" );   ins( "цві", "цьві" );
-    ins( "цьдзе", "цдзе" ); ins( "цьдзя", "цдзя" ); ins( "цьдзю", "цдзю" ); ins( "цьдзё", "цдзё" ); ins( "цьдзі", "цдзі" ); ins( "цьдзь", "цдзь" );
-    ins( "цдзе", "цьдзе" ); ins( "цдзя", "цьдзя" ); ins( "цдзю", "цьдзю" ); ins( "цдзё", "цьдзё" ); ins( "цдзі", "цьдзі" ); ins( "цдзь", "цьдзь" );
-    ins( "цьзе", "цзе" );   ins( "цьзя", "цзя" );   ins( "цьзю", "цзю" );   ins( "цьзё", "цзё" );   ins( "цьзі", "цзі" );   ins( "цьзь", "цзь" );
-    ins( "цзе", "цьзе" );   ins( "цзя", "цьзя" );   ins( "цзю", "цьзю" );   ins( "цзё", "цьзё" );   ins( "цзі", "цьзі" );   ins( "цзь", "цьзь" );
-    ins( "цьле", "цле" );   ins( "цьля", "цля" );   ins( "цьлю", "цлю" );   ins( "цьлё", "цлё" );   ins( "цьлі", "цлі" );   ins( "цьль", "цль" );
-    ins( "цле", "цьле" );   ins( "цля", "цьля" );   ins( "цлю", "цьлю" );   ins( "цлё", "цьлё" );   ins( "цлі", "цьлі" );   ins( "цль", "цьль" );
-    ins( "цьме", "цме" );   ins( "цьмя", "цмя" );   ins( "цьмю", "цмю" );   ins( "цьмё", "цмё" );   ins( "цьмі", "цмі" );
-    ins( "цме", "цьме" );   ins( "цмя", "цьмя" );   ins( "цмю", "цьмю" );   ins( "цмё", "цьмё" );   ins( "цмі", "цьмі" );
-    ins( "цьне", "цне" );   ins( "цьня", "цня" );   ins( "цьню", "цню" );   ins( "цьнё", "цнё" );   ins( "цьні", "цні" );   ins( "цьнь", "цнь" );
-    ins( "цне", "цьне" );   ins( "цня", "цьня" );   ins( "цню", "цьню" );   ins( "цнё", "цьнё" );   ins( "цні", "цьні" );   ins( "цнь", "цьнь" );
-    ins( "цьпе", "цпе" );   ins( "цьпя", "цпя" );   ins( "цьпю", "цпю" );   ins( "цьпё", "цпё" );   ins( "цьпі", "цпі" );
-    ins( "цпе", "цьпе" );   ins( "цпя", "цьпя" );   ins( "цпю", "цьпю" );   ins( "цпё", "цьпё" );   ins( "цпі", "цьпі" );
-    ins( "цьсе", "цсе" );   ins( "цься", "цся" );   ins( "цьсю", "цсю" );   ins( "цьсё", "цсё" );   ins( "цьсі", "цсі" );   ins( "цьсь", "цсь" );
-    ins( "цсе", "цьсе" );   ins( "цся", "цься" );   ins( "цсю", "цьсю" );   ins( "цсё", "цьсё" );   ins( "цсі", "цьсі" );   ins( "цсь", "цьсь" );
-    ins( "цьфе", "цфе" );   ins( "цьфя", "цфя" );   ins( "цьфю", "цфю" );   ins( "цьфё", "цфё" );   ins( "цьфі", "цфі" );
-    ins( "цфе", "цьфе" );   ins( "цфя", "цьфя" );   ins( "цфю", "цьфю" );   ins( "цфё", "цьфё" );   ins( "цфі", "цьфі" );
-    ins( "цьце", "цце" );   ins( "цьця", "цця" );   ins( "цьцю", "ццю" );   ins( "цьцё", "ццё" );   ins( "цьці", "цці" );   ins( "цьць", "цць" );
-    ins( "цце", "цьце" );   ins( "цця", "цьця" );   ins( "ццю", "цьцю" );   ins( "ццё", "цьцё" );   ins( "цці", "цьці" );   ins( "цць", "цьць" );
+    ins( "цьбе", "цбе" );
+    ins( "цьбя", "цбя" );
+    ins( "цьбю", "цбю" );
+    ins( "цьбё", "цбё" );
+    ins( "цьбі", "цбі" );
+    ins( "цбе", "цьбе" );
+    ins( "цбя", "цьбя" );
+    ins( "цбю", "цьбю" );
+    ins( "цбё", "цьбё" );
+    ins( "цбі", "цьбі" );
+    ins( "цьве", "цве" );
+    ins( "цьвя", "цвя" );
+    ins( "цьвю", "цвю" );
+    ins( "цьвё", "цвё" );
+    ins( "цьві", "цві" );
+    ins( "цве", "цьве" );
+    ins( "цвя", "цьвя" );
+    ins( "цвю", "цьвю" );
+    ins( "цвё", "цьвё" );
+    ins( "цві", "цьві" );
+    ins( "цьдзе", "цдзе" );
+    ins( "цьдзя", "цдзя" );
+    ins( "цьдзю", "цдзю" );
+    ins( "цьдзё", "цдзё" );
+    ins( "цьдзі", "цдзі" );
+    ins( "цьдзь", "цдзь" );
+    ins( "цдзе", "цьдзе" );
+    ins( "цдзя", "цьдзя" );
+    ins( "цдзю", "цьдзю" );
+    ins( "цдзё", "цьдзё" );
+    ins( "цдзі", "цьдзі" );
+    ins( "цдзь", "цьдзь" );
+    ins( "цьзе", "цзе" );
+    ins( "цьзя", "цзя" );
+    ins( "цьзю", "цзю" );
+    ins( "цьзё", "цзё" );
+    ins( "цьзі", "цзі" );
+    ins( "цьзь", "цзь" );
+    ins( "цзе", "цьзе" );
+    ins( "цзя", "цьзя" );
+    ins( "цзю", "цьзю" );
+    ins( "цзё", "цьзё" );
+    ins( "цзі", "цьзі" );
+    ins( "цзь", "цьзь" );
+    ins( "цьле", "цле" );
+    ins( "цьля", "цля" );
+    ins( "цьлю", "цлю" );
+    ins( "цьлё", "цлё" );
+    ins( "цьлі", "цлі" );
+    ins( "цьль", "цль" );
+    ins( "цле", "цьле" );
+    ins( "цля", "цьля" );
+    ins( "цлю", "цьлю" );
+    ins( "цлё", "цьлё" );
+    ins( "цлі", "цьлі" );
+    ins( "цль", "цьль" );
+    ins( "цьме", "цме" );
+    ins( "цьмя", "цмя" );
+    ins( "цьмю", "цмю" );
+    ins( "цьмё", "цмё" );
+    ins( "цьмі", "цмі" );
+    ins( "цме", "цьме" );
+    ins( "цмя", "цьмя" );
+    ins( "цмю", "цьмю" );
+    ins( "цмё", "цьмё" );
+    ins( "цмі", "цьмі" );
+    ins( "цьне", "цне" );
+    ins( "цьня", "цня" );
+    ins( "цьню", "цню" );
+    ins( "цьнё", "цнё" );
+    ins( "цьні", "цні" );
+    ins( "цьнь", "цнь" );
+    ins( "цне", "цьне" );
+    ins( "цня", "цьня" );
+    ins( "цню", "цьню" );
+    ins( "цнё", "цьнё" );
+    ins( "цні", "цьні" );
+    ins( "цнь", "цьнь" );
+    ins( "цьпе", "цпе" );
+    ins( "цьпя", "цпя" );
+    ins( "цьпю", "цпю" );
+    ins( "цьпё", "цпё" );
+    ins( "цьпі", "цпі" );
+    ins( "цпе", "цьпе" );
+    ins( "цпя", "цьпя" );
+    ins( "цпю", "цьпю" );
+    ins( "цпё", "цьпё" );
+    ins( "цпі", "цьпі" );
+    ins( "цьсе", "цсе" );
+    ins( "цься", "цся" );
+    ins( "цьсю", "цсю" );
+    ins( "цьсё", "цсё" );
+    ins( "цьсі", "цсі" );
+    ins( "цьсь", "цсь" );
+    ins( "цсе", "цьсе" );
+    ins( "цся", "цься" );
+    ins( "цсю", "цьсю" );
+    ins( "цсё", "цьсё" );
+    ins( "цсі", "цьсі" );
+    ins( "цсь", "цьсь" );
+    ins( "цьфе", "цфе" );
+    ins( "цьфя", "цфя" );
+    ins( "цьфю", "цфю" );
+    ins( "цьфё", "цфё" );
+    ins( "цьфі", "цфі" );
+    ins( "цфе", "цьфе" );
+    ins( "цфя", "цьфя" );
+    ins( "цфю", "цьфю" );
+    ins( "цфё", "цьфё" );
+    ins( "цфі", "цьфі" );
+    ins( "цьце", "цце" );
+    ins( "цьця", "цця" );
+    ins( "цьцю", "ццю" );
+    ins( "цьцё", "ццё" );
+    ins( "цьці", "цці" );
+    ins( "цьць", "цць" );
+    ins( "цце", "цьце" );
+    ins( "цця", "цьця" );
+    ins( "ццю", "цьцю" );
+    ins( "ццё", "цьцё" );
+    ins( "цці", "цьці" );
+    ins( "цць", "цьць" );
 
-    ins( "дзьдзе", "ддзе" ); ins( "дзьдзя", "ддзя" ); ins( "дзьдзю", "ддзю" ); ins( "дзьдзё", "ддзё" ); ins( "дзьдзі", "ддзі" );
-    ins( "ддзе", "дзьдзе" ); ins( "ддзя", "дзьдзя" ); ins( "ддзю", "дзьдзю" ); ins( "ддзё", "дзьдзё" ); ins( "ддзі", "дзьдзі" );
+    ins( "дзьдзе", "ддзе" );
+    ins( "дзьдзя", "ддзя" );
+    ins( "дзьдзю", "ддзю" );
+    ins( "дзьдзё", "ддзё" );
+    ins( "дзьдзі", "ддзі" );
+    ins( "ддзе", "дзьдзе" );
+    ins( "ддзя", "дзьдзя" );
+    ins( "ддзю", "дзьдзю" );
+    ins( "ддзё", "дзьдзё" );
+    ins( "ддзі", "дзьдзі" );
 
-    ins( "з'е", "зье" );   ins( "з'я", "зья" );   ins( "з'ю", "зью" );   ins( "з'ё", "зьё" );   ins( "з'і", "зьі" );
-    ins( "зье", "з'е" );   ins( "зья", "з'я" );   ins( "зью", "з'ю" );   ins( "зьё", "з'ё" );   ins( "зьі", "з'і" );
-    ins( "зʼе", "зье" );   ins( "зʼя", "зья" );   ins( "зʼю", "зью" );   ins( "зʼё", "зьё" );   ins( "зʼі", "зьі" );
-    ins( "зье", "зʼе" );   ins( "зья", "зʼя" );   ins( "зью", "зʼю" );   ins( "зьё", "зʼё" );   ins( "зьі", "зʼі" );
-    ins( "з’е", "зье" );   ins( "з’я", "зья" );   ins( "з’ю", "зью" );   ins( "з’ё", "зьё" );   ins( "з’і", "зьі" );
-    ins( "зье", "з’е" );   ins( "зья", "з’я" );   ins( "зью", "з’ю" );   ins( "зьё", "з’ё" );   ins( "зьі", "з’і" );
+    ins( "з'е", "зье" );
+    ins( "з'я", "зья" );
+    ins( "з'ю", "зью" );
+    ins( "з'ё", "зьё" );
+    ins( "з'і", "зьі" );
+    ins( "зье", "з'е" );
+    ins( "зья", "з'я" );
+    ins( "зью", "з'ю" );
+    ins( "зьё", "з'ё" );
+    ins( "зьі", "з'і" );
+    ins( "зʼе", "зье" );
+    ins( "зʼя", "зья" );
+    ins( "зʼю", "зью" );
+    ins( "зʼё", "зьё" );
+    ins( "зʼі", "зьі" );
+    ins( "зье", "зʼе" );
+    ins( "зья", "зʼя" );
+    ins( "зью", "зʼю" );
+    ins( "зьё", "зʼё" );
+    ins( "зьі", "зʼі" );
+    ins( "з’е", "зье" );
+    ins( "з’я", "зья" );
+    ins( "з’ю", "зью" );
+    ins( "з’ё", "зьё" );
+    ins( "з’і", "зьі" );
+    ins( "зье", "з’е" );
+    ins( "зья", "з’я" );
+    ins( "зью", "з’ю" );
+    ins( "зьё", "з’ё" );
+    ins( "зьі", "з’і" );
   }
 };
 
-std::vector< sptr< Dictionary::Class > > makeDictionaries() 
+std::vector< sptr< Dictionary::Class > > makeDictionaries()
 {
   static BelarusianLatinToClassicTable t0;
   static BelarusianLatinToSchoolTable t1;
   static BelarusianSchoolToClassicTable t2;
   std::vector< sptr< Dictionary::Class > > dicts;
 
-  dicts.push_back( std::make_shared<Transliteration::TransliterationDictionary>( "c31b24abf412abc9b23bb40a898f1040",
-                   QCoreApplication::translate( "BelarusianTranslit", "Belarusian transliteration from latin to cyrillic (classic orthography)" ).toUtf8().data(),
-                   QIcon( ":/flags/by.png" ), t0, false ) );
-  dicts.push_back( std::make_shared<Transliteration::TransliterationDictionary>( "c31b24abf412abc9b23bb40a898f1041",
-                   QCoreApplication::translate( "BelarusianTranslit", "Belarusian transliteration from latin to cyrillic (school orthography)" ).toUtf8().data(),
-                   QIcon( ":/flags/by.png" ), t1, false ) );
-  dicts.push_back( std::make_shared<Transliteration::TransliterationDictionary>( "c31b24abf412abc9b23bb40a898f1042",
-                   QCoreApplication::translate( "BelarusianTranslit", "Belarusian transliteration (smoothes out the difference\n"
-                                                "between classic and school orthography in cyrillic)" ).toUtf8().data(),
-                   QIcon( ":/flags/by.png" ), t2, false ) );
+  dicts.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+    "c31b24abf412abc9b23bb40a898f1040",
+    QCoreApplication::translate( "BelarusianTranslit",
+                                 "Belarusian transliteration from latin to cyrillic (classic orthography)" )
+      .toUtf8()
+      .data(),
+    QIcon( ":/flags/by.png" ),
+    t0,
+    false ) );
+  dicts.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+    "c31b24abf412abc9b23bb40a898f1041",
+    QCoreApplication::translate( "BelarusianTranslit",
+                                 "Belarusian transliteration from latin to cyrillic (school orthography)" )
+      .toUtf8()
+      .data(),
+    QIcon( ":/flags/by.png" ),
+    t1,
+    false ) );
+  dicts.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+    "c31b24abf412abc9b23bb40a898f1042",
+    QCoreApplication::translate( "BelarusianTranslit",
+                                 "Belarusian transliteration (smoothes out the difference\n"
+                                 "between classic and school orthography in cyrillic)" )
+      .toUtf8()
+      .data(),
+    QIcon( ":/flags/by.png" ),
+    t2,
+    false ) );
   return dicts;
 }
 
-}
+} // namespace BelarusianTranslit
diff --git a/src/dict/belarusiantranslit.hh b/src/dict/belarusiantranslit.hh
index c09de673..4ea452db 100644
--- a/src/dict/belarusiantranslit.hh
+++ b/src/dict/belarusiantranslit.hh
@@ -10,8 +10,7 @@
 // Support for Belarusian transliteration
 namespace BelarusianTranslit {
 
-std::vector< sptr< Dictionary::Class > > makeDictionaries() ;
-
+std::vector< sptr< Dictionary::Class > > makeDictionaries();
 }
 
 #endif
diff --git a/src/dict/bgl.cc b/src/dict/bgl.cc
index 4e280d69..c7ff379e 100644
--- a/src/dict/bgl.cc
+++ b/src/dict/bgl.cc
@@ -23,7 +23,7 @@
 #include <zlib.h>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QAtomicInt>
@@ -32,10 +32,10 @@
 #include <QSemaphore>
 #include <QThreadPool>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #else
-#include <QRegExp>
+  #include <QRegExp>
 #endif
 
 namespace Bgl {
@@ -53,428 +53,398 @@ using BtreeIndexing::WordArticleLink;
 using BtreeIndexing::IndexedWords;
 using BtreeIndexing::IndexInfo;
 
-namespace
+namespace {
+enum {
+  Signature            = 0x584c4742, // BGLX on little-endian, XLGB on big-endian
+  CurrentFormatVersion = 19 + BtreeIndexing::FormatVersion
+};
+
+struct IdxHeader
 {
-  enum
-  {
-    Signature = 0x584c4742, // BGLX on little-endian, XLGB on big-endian
-    CurrentFormatVersion = 19 + BtreeIndexing::FormatVersion
-  };
+  uint32_t signature;      // First comes the signature, BGLX
+  uint32_t formatVersion;  // File format version, currently 1.
+  uint32_t parserVersion;  // Version of the parser used to parse the BGL file.
+                           // If it's lower than the current one, the file is to
+                           // be re-parsed.
+  uint32_t foldingVersion; // Version of the folding algorithm used when building
+                           // index. If it's different from the current one,
+                           // the file is to be rebuilt.
+  uint32_t articleCount;   // Total number of articles, for informative purposes only
+  uint32_t wordCount;      // Total number of words, for informative purposes only
+  /// Add more fields here, like name, description, author and such.
+  uint32_t chunksOffset;          // The offset to chunks' storage
+  uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
+  uint32_t indexRootOffset;
+  uint32_t resourceListOffset; // The offset of the list of resources
+  uint32_t resourcesCount;     // Number of resources stored
+  uint32_t langFrom;           // Source language
+  uint32_t langTo;             // Target language
+  uint32_t iconAddress;        // Address of the icon in the chunks' storage
+  uint32_t iconSize;           // Size of the icon in the chunks' storage, 0 = no icon
+  uint32_t descriptionAddress; // Address of the dictionary description in the chunks' storage
+  uint32_t descriptionSize;    // Size of the description in the chunks' storage, 0 = no description
+}
+#ifndef _MSC_VER
+__attribute__( ( packed ) )
+#endif
+;
 
-  struct IdxHeader
-  {
-    uint32_t signature; // First comes the signature, BGLX
-    uint32_t formatVersion; // File format version, currently 1.
-    uint32_t parserVersion; // Version of the parser used to parse the BGL file.
-                            // If it's lower than the current one, the file is to
-                            // be re-parsed.
-    uint32_t foldingVersion; // Version of the folding algorithm used when building
-                             // index. If it's different from the current one,
-                             // the file is to be rebuilt.
-    uint32_t articleCount; // Total number of articles, for informative purposes only
-    uint32_t wordCount; // Total number of words, for informative purposes only
-    /// Add more fields here, like name, description, author and such.
-    uint32_t chunksOffset; // The offset to chunks' storage
-    uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
-    uint32_t indexRootOffset;
-    uint32_t resourceListOffset; // The offset of the list of resources
-    uint32_t resourcesCount; // Number of resources stored
-    uint32_t langFrom;  // Source language
-    uint32_t langTo;    // Target language
-    uint32_t iconAddress; // Address of the icon in the chunks' storage
-    uint32_t iconSize; // Size of the icon in the chunks' storage, 0 = no icon
-    uint32_t descriptionAddress; // Address of the dictionary description in the chunks' storage
-    uint32_t descriptionSize; // Size of the description in the chunks' storage, 0 = no description
-  }
-  #ifndef _MSC_VER
-  __attribute__((packed))
-  #endif
-  ;
+bool indexIsOldOrBad( string const & indexFile )
+{
+  File::Class idx( indexFile, "rb" );
 
-  bool indexIsOldOrBad( string const & indexFile )
-  {
-    File::Class idx( indexFile, "rb" );
+  IdxHeader header;
 
-    IdxHeader header;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion || header.parserVersion != Babylon::ParserVersion
+    || header.foldingVersion != Folding::Version;
+}
 
-    return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-           header.signature != Signature ||
-           header.formatVersion != CurrentFormatVersion ||
-           header.parserVersion != Babylon::ParserVersion ||
-           header.foldingVersion != Folding::Version;
-  }
-
-  // Removes the $1$-like postfix
-  string removePostfix( string const & in )
-  {
-    if ( in.size() && in[ in.size() - 1 ] == '$' )
-    {
-      // Find the end of it and cut it, barring any unexpectedness
-      for( long x = in.size() - 2; x >= 0; x-- )
-      {
-        if ( in[ x ] == '$' )
-          return in.substr( 0, x );
-        else
-        if ( !isdigit( in[ x ] ) )
-          break;
-      }
-    }
-
-    return in;
-  }
-
-  // Removes any leading or trailing whitespace
-  void trimWs( string & word )
-  {
-    if ( word.size() )
-    {
-      unsigned begin = 0;
-
-      while( begin < word.size() && Utf8::isspace( word[ begin ] ) )
-        ++begin;
-
-      if ( begin == word.size() ) // Consists of ws entirely?
-        word.clear();
-      else
-      {
-        unsigned end = word.size();
-
-        // Doesn't consist of ws entirely, so must end with just isspace()
-        // condition.
-        while( Utf8::isspace( word[ end - 1 ] ) )
-          --end;
-
-        if ( end != word.size() || begin )
-          word = string( word, begin, end - begin );
-      }
+// Removes the $1$-like postfix
+string removePostfix( string const & in )
+{
+  if ( in.size() && in[ in.size() - 1 ] == '$' ) {
+    // Find the end of it and cut it, barring any unexpectedness
+    for ( long x = in.size() - 2; x >= 0; x-- ) {
+      if ( in[ x ] == '$' )
+        return in.substr( 0, x );
+      else if ( !isdigit( in[ x ] ) )
+        break;
     }
   }
 
-  void addEntryToIndex( string & word,
-                        uint32_t articleOffset,
-                        IndexedWords & indexedWords,
-                        vector< wchar > & wcharBuffer )
-  {
-    // Strip any leading or trailing whitespaces
+  return in;
+}
+
+// Removes any leading or trailing whitespace
+void trimWs( string & word )
+{
+  if ( word.size() ) {
+    unsigned begin = 0;
+
+    while ( begin < word.size() && Utf8::isspace( word[ begin ] ) )
+      ++begin;
+
+    if ( begin == word.size() ) // Consists of ws entirely?
+      word.clear();
+    else {
+      unsigned end = word.size();
+
+      // Doesn't consist of ws entirely, so must end with just isspace()
+      // condition.
+      while ( Utf8::isspace( word[ end - 1 ] ) )
+        --end;
+
+      if ( end != word.size() || begin )
+        word = string( word, begin, end - begin );
+    }
+  }
+}
+
+void addEntryToIndex( string & word,
+                      uint32_t articleOffset,
+                      IndexedWords & indexedWords,
+                      vector< wchar > & wcharBuffer )
+{
+  // Strip any leading or trailing whitespaces
+  trimWs( word );
+
+  // If the word starts with a slash, we drop it. There are quite a lot
+  // of them, and they all seem to be redudant duplicates.
+
+  if ( word.size() && word[ 0 ] == '/' )
+    return;
+
+  // Check the input word for a superscript postfix ($1$, $2$ etc), which
+  // signifies different meaning in Bgl files. We emit different meaning
+  // as different articles, but they appear in the index as the same word.
+
+  if ( word.size() && word[ word.size() - 1 ] == '$' ) {
+    word = removePostfix( word );
     trimWs( word );
-
-    // If the word starts with a slash, we drop it. There are quite a lot
-    // of them, and they all seem to be redudant duplicates.
-
-    if ( word.size() && word[ 0 ] == '/' )
-      return;
-
-    // Check the input word for a superscript postfix ($1$, $2$ etc), which
-    // signifies different meaning in Bgl files. We emit different meaning
-    // as different articles, but they appear in the index as the same word.
-
-    if ( word.size() && word[ word.size() - 1 ] == '$' )
-    {
-      word = removePostfix( word );
-      trimWs( word );
-    }
-
-    // Convert the word from utf8 to wide chars
-    indexedWords.addWord( Utf8::decode( word ), articleOffset );
   }
 
+  // Convert the word from utf8 to wide chars
+  indexedWords.addWord( Utf8::decode( word ), articleOffset );
+}
 
-  DEF_EX( exFailedToDecompressArticle, "Failed to decompress article's body", Dictionary::Ex )
-  DEF_EX( exChunkIndexOutOfRange, "Chunk index is out of range", Dictionary::Ex )
 
-  class BglDictionary: public BtreeIndexing::BtreeDictionary
+DEF_EX( exFailedToDecompressArticle, "Failed to decompress article's body", Dictionary::Ex )
+DEF_EX( exChunkIndexOutOfRange, "Chunk index is out of range", Dictionary::Ex )
+
+class BglDictionary: public BtreeIndexing::BtreeDictionary
+{
+  QMutex idxMutex;
+  File::Class idx;
+  IdxHeader idxHeader;
+  ChunkedStorage::Reader chunks;
+
+public:
+
+  BglDictionary( string const & id, string const & indexFile, string const & dictionaryFile );
+
+  map< Dictionary::Property, string > getProperties() noexcept override
   {
-    QMutex idxMutex;
-    File::Class idx;
-    IdxHeader idxHeader;
-    ChunkedStorage::Reader chunks;
-
-  public:
-
-    BglDictionary( string const & id, string const & indexFile,
-                   string const & dictionaryFile );
-
-    map< Dictionary::Property, string > getProperties() noexcept override
-    { return map< Dictionary::Property, string >(); }
-
-    unsigned long getArticleCount() noexcept override
-    { return idxHeader.articleCount; }
-
-    unsigned long getWordCount() noexcept override
-    { return idxHeader.wordCount; }
-
-    inline quint32 getLangFrom() const override
-    { return idxHeader.langFrom; }
-
-    inline quint32 getLangTo() const override
-    { return idxHeader.langTo; }
-
-    sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override
-      ;
-
-    sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                        vector< wstring > const & alts,
-                                                        wstring const &,
-                                                        bool ignoreDiacritics ) override
-      ;
-
-    sptr< Dictionary::DataRequest > getResource( string const & name ) override
-      ;
-
-    sptr< Dictionary::DataRequest >
-    getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
-    QString const& getDescription() override;
-
-    void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
-
-    void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
-
-    void setFTSParameters( Config::FullTextSearch const & fts ) override
-    {
-      can_FTS = fts.enabled
-                && !fts.disabledTypes.contains( "BGL", Qt::CaseInsensitive )
-                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
-    }
-
-  protected:
-
-    void loadIcon() noexcept override;
-
-  private:
-
-
-    /// Loads an article with the given offset, filling the given strings.
-    void loadArticle( uint32_t offset, string & headword,
-                      string & displayedHeadword, string & articleText );
-
-    static void replaceCharsetEntities( string & );
-
-    friend class BglHeadwordsRequest;
-    friend class BglArticleRequest;
-    friend class BglResourceRequest;
-  };
-
-  BglDictionary::BglDictionary( string const & id, string const & indexFile,
-                                string const & dictionaryFile ):
-    BtreeDictionary( id, vector< string >( 1, dictionaryFile ) ),
-    idx( indexFile, "rb" ),
-    idxHeader( idx.read< IdxHeader >() ),
-    chunks( idx, idxHeader.chunksOffset )
-  {
-    idx.seek( sizeof( idxHeader ) );
-
-    // Read the dictionary's name
-
-    size_t len = idx.read< uint32_t >();
-
-    if( len )
-    {
-      vector< char > nameBuf( len );
-
-      idx.read( &nameBuf.front(), len );
-
-      dictionaryName = string( &nameBuf.front(), len );
-    }
-
-    // Initialize the index
-
-    openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-               idx, idxMutex );
-
-    can_FTS = true;
-
-    ftsIdxName = indexFile + Dictionary::getFtsSuffix();
-
-    if( !Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
-      FTS_index_completed.ref();
+    return map< Dictionary::Property, string >();
   }
 
-  void BglDictionary::loadIcon() noexcept
+  unsigned long getArticleCount() noexcept override
   {
-    if ( dictionaryIconLoaded )
-      return;
-
-    QString fileName = QDir::fromNativeSeparators( QString::fromStdString(getDictionaryFilenames()[ 0 ] ) );
-
-    // Remove the extension
-    fileName.chop( 3 );
-
-    if( !loadIconFromFile( fileName ) )
-    {
-      if( idxHeader.iconSize )
-      {
-
-        // Try loading icon now
-
-        vector< char > chunk;
-
-        QMutexLocker _( &idxMutex );
-
-        char * iconData = chunks.getBlock( idxHeader.iconAddress, chunk );
-
-        QImage img;
-
-        if (img.loadFromData( ( unsigned char *) iconData, idxHeader.iconSize  ) )
-        {
-          // Load successful
-
-          dictionaryNativeIcon = QIcon( QPixmap::fromImage( img ) );
-
-          // Transform it to be square
-          int max = img.width() > img.height() ? img.width() : img.height();
-
-          QImage result( max, max, QImage::Format_ARGB32 );
-          result.fill( 0 ); // Black transparent
-
-          QPainter painter( &result );
-          painter.setRenderHint(QPainter::RenderHint::Antialiasing);
-
-          painter.drawImage( QPoint( img.width() == max ? 0 : ( max - img.width() ) / 2,
-                                     img.height() == max ? 0 : ( max - img.height() ) / 2 ),
-                             img );
-
-          painter.end();
-
-          dictionaryIcon = QIcon( QPixmap::fromImage( result ) );
-        }
-      }
-
-      if ( dictionaryIcon.isNull() )
-        dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/icon32_bgl.png");
-    }
-
-    dictionaryIconLoaded = true;
+    return idxHeader.articleCount;
   }
 
-  void BglDictionary::loadArticle( uint32_t offset, string & headword,
-                                   string & displayedHeadword,
-                                   string & articleText )
+  unsigned long getWordCount() noexcept override
   {
-    vector< char > chunk;
-
-    QMutexLocker _( &idxMutex );
-
-    char * articleData = chunks.getBlock( offset, chunk );
-
-    headword = articleData;
-
-    displayedHeadword = articleData + headword.size() + 1;
-
-    articleText =
-      string( articleData + headword.size() +
-                displayedHeadword.size() + 2 );
+    return idxHeader.wordCount;
   }
 
-  QString const& BglDictionary::getDescription()
+  inline quint32 getLangFrom() const override
   {
-    if( !dictionaryDescription.isEmpty() )
-      return dictionaryDescription;
+    return idxHeader.langFrom;
+  }
+
+  inline quint32 getLangTo() const override
+  {
+    return idxHeader.langTo;
+  }
+
+  sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override;
+
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
+
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
+
+  sptr< Dictionary::DataRequest >
+  getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
+  QString const & getDescription() override;
+
+  void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
+
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
+
+  void setFTSParameters( Config::FullTextSearch const & fts ) override
+  {
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "BGL", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
+
+protected:
+
+  void loadIcon() noexcept override;
+
+private:
+
+
+  /// Loads an article with the given offset, filling the given strings.
+  void loadArticle( uint32_t offset, string & headword, string & displayedHeadword, string & articleText );
+
+  static void replaceCharsetEntities( string & );
+
+  friend class BglHeadwordsRequest;
+  friend class BglArticleRequest;
+  friend class BglResourceRequest;
+};
+
+BglDictionary::BglDictionary( string const & id, string const & indexFile, string const & dictionaryFile ):
+  BtreeDictionary( id, vector< string >( 1, dictionaryFile ) ),
+  idx( indexFile, "rb" ),
+  idxHeader( idx.read< IdxHeader >() ),
+  chunks( idx, idxHeader.chunksOffset )
+{
+  idx.seek( sizeof( idxHeader ) );
+
+  // Read the dictionary's name
+
+  size_t len = idx.read< uint32_t >();
+
+  if ( len ) {
+    vector< char > nameBuf( len );
+
+    idx.read( &nameBuf.front(), len );
+
+    dictionaryName = string( &nameBuf.front(), len );
+  }
+
+  // Initialize the index
+
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
+
+  can_FTS = true;
+
+  ftsIdxName = indexFile + Dictionary::getFtsSuffix();
+
+  if ( !Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+       && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
+    FTS_index_completed.ref();
+}
+
+void BglDictionary::loadIcon() noexcept
+{
+  if ( dictionaryIconLoaded )
+    return;
+
+  QString fileName = QDir::fromNativeSeparators( QString::fromStdString( getDictionaryFilenames()[ 0 ] ) );
+
+  // Remove the extension
+  fileName.chop( 3 );
+
+  if ( !loadIconFromFile( fileName ) ) {
+    if ( idxHeader.iconSize ) {
+
+      // Try loading icon now
 
-    if( idxHeader.descriptionSize == 0 )
-      dictionaryDescription = "NONE";
-    else
-    {
-      QMutexLocker _( &idxMutex );
       vector< char > chunk;
-      char * dictDescription = chunks.getBlock( idxHeader.descriptionAddress, chunk );
-      string str( dictDescription );
-      if( !str.empty() )
-        dictionaryDescription += QObject::tr( "Copyright: %1%2" )
+
+      QMutexLocker _( &idxMutex );
+
+      char * iconData = chunks.getBlock( idxHeader.iconAddress, chunk );
+
+      QImage img;
+
+      if ( img.loadFromData( (unsigned char *)iconData, idxHeader.iconSize ) ) {
+
+        // Transform it to be square
+        int max = img.width() > img.height() ? img.width() : img.height();
+
+        QImage result( max, max, QImage::Format_ARGB32 );
+        result.fill( 0 ); // Black transparent
+
+        QPainter painter( &result );
+        painter.setRenderHint( QPainter::RenderHint::Antialiasing );
+
+        painter.drawImage( QPoint( img.width() == max ? 0 : ( max - img.width() ) / 2,
+                                   img.height() == max ? 0 : ( max - img.height() ) / 2 ),
+                           img );
+
+        painter.end();
+
+        dictionaryIcon = QIcon( QPixmap::fromImage( result ) );
+      }
+    }
+
+    if ( dictionaryIcon.isNull() )
+      dictionaryIcon = QIcon( ":/icons/icon32_bgl.png" );
+  }
+
+  dictionaryIconLoaded = true;
+}
+
+void BglDictionary::loadArticle( uint32_t offset, string & headword, string & displayedHeadword, string & articleText )
+{
+  vector< char > chunk;
+
+  QMutexLocker _( &idxMutex );
+
+  char * articleData = chunks.getBlock( offset, chunk );
+
+  headword = articleData;
+
+  displayedHeadword = articleData + headword.size() + 1;
+
+  articleText = string( articleData + headword.size() + displayedHeadword.size() + 2 );
+}
+
+QString const & BglDictionary::getDescription()
+{
+  if ( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
+
+  if ( idxHeader.descriptionSize == 0 )
+    dictionaryDescription = "NONE";
+  else {
+    QMutexLocker _( &idxMutex );
+    vector< char > chunk;
+    char * dictDescription = chunks.getBlock( idxHeader.descriptionAddress, chunk );
+    string str( dictDescription );
+    if ( !str.empty() )
+      dictionaryDescription += QObject::tr( "Copyright: %1%2" )
                                  .arg( Html::unescape( QString::fromUtf8( str.data(), str.size() ) ) )
                                  .arg( "\n\n" );
-      dictDescription += str.size() + 1;
+    dictDescription += str.size() + 1;
 
-      str = string( dictDescription );
-      if( !str.empty() )
-        dictionaryDescription += QObject::tr( "Author: %1%2" )
-                                 .arg( QString::fromUtf8( str.data(), str.size() ) )
-                                 .arg( "\n\n" );
-      dictDescription += str.size() + 1;
+    str = string( dictDescription );
+    if ( !str.empty() )
+      dictionaryDescription +=
+        QObject::tr( "Author: %1%2" ).arg( QString::fromUtf8( str.data(), str.size() ) ).arg( "\n\n" );
+    dictDescription += str.size() + 1;
 
-      str = string( dictDescription );
-      if( !str.empty() )
-        dictionaryDescription += QObject::tr( "E-mail: %1%2" )
-                                 .arg( QString::fromUtf8( str.data(), str.size() ) )
-                                 .arg( "\n\n" );
-      dictDescription += str.size() + 1;
+    str = string( dictDescription );
+    if ( !str.empty() )
+      dictionaryDescription +=
+        QObject::tr( "E-mail: %1%2" ).arg( QString::fromUtf8( str.data(), str.size() ) ).arg( "\n\n" );
+    dictDescription += str.size() + 1;
 
-      str = string( dictDescription );
-      if( !str.empty() )
-        dictionaryDescription += Html::unescape( QString::fromUtf8( str.data(), str.size() ) );
-    }
-
-    return dictionaryDescription;
+    str = string( dictDescription );
+    if ( !str.empty() )
+      dictionaryDescription += Html::unescape( QString::fromUtf8( str.data(), str.size() ) );
   }
 
-  void BglDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
-  {
-    try
-    {
-      string headwordStr, displayedHeadwordStr, articleStr;
-      loadArticle( articleAddress, headwordStr, displayedHeadwordStr, articleStr );
+  return dictionaryDescription;
+}
 
-      // Some headword normalization similar while indexing
+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 );
+    }
 
-      if ( headwordStr.size() && headwordStr[ 0 ] == '/' )
-        headwordStr.erase(); // We will take headword from index later
+    headword = QString::fromUtf8( headwordStr.data(), headwordStr.size() );
 
-      if ( headwordStr.size()
-           && headwordStr[ headwordStr.size() - 1 ] == '$' )
-      {
-        headwordStr = removePostfix( headwordStr );
-        trimWs( headwordStr );
+    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
       }
-
-      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( QString::fromStdU32String( wstr ) );
-    }
-    catch( std::exception &ex )
-    {
-      gdWarning( "BGL: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     }
+
+    text = Html::unescape( QString::fromStdU32String( wstr ) );
   }
-
-  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( QString::fromStdString( ftsIdxName ) );
-    }
+  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( 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( QString::fromStdString( ftsIdxName ) );
+  }
+}
 
 /// BglDictionary::findHeadwordsForSynonym()
 
@@ -488,8 +458,7 @@ class BglHeadwordsRequest: public Dictionary::WordSearchRequest
 
 public:
 
-  BglHeadwordsRequest( wstring const & word_,
-                       BglDictionary & dict_ ):
+  BglHeadwordsRequest( wstring const & word_, BglDictionary & dict_ ):
     str( word_ ),
     dict( dict_ )
   {
@@ -514,8 +483,7 @@ public:
 
 void BglHeadwordsRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -524,30 +492,24 @@ void BglHeadwordsRequest::run()
 
   wstring caseFolded = Folding::applySimpleCaseOnly( str );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
 
     string headword, displayedHeadword, articleText;
 
-    dict.loadArticle( chain[ x ].articleOffset,
-                      headword, displayedHeadword, articleText );
+    dict.loadArticle( chain[ x ].articleOffset, headword, displayedHeadword, articleText );
 
     wstring headwordDecoded;
-    try
-    {
-      headwordDecoded = Utf8::decode( removePostfix(  headword ) );
+    try {
+      headwordDecoded = Utf8::decode( removePostfix( headword ) );
     }
-    catch( Utf8::exCantDecode & )
-    {
+    catch ( Utf8::exCantDecode & ) {
     }
 
-    if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) && !headwordDecoded.empty() )
-    {
+    if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) && !headwordDecoded.empty() ) {
       // The headword seems to differ from the input word, which makes the
       // input word its synonym.
       QMutexLocker _( &dataMutex );
@@ -559,11 +521,10 @@ void BglHeadwordsRequest::run()
   finish();
 }
 
-sptr< Dictionary::WordSearchRequest >
-  BglDictionary::findHeadwordsForSynonym( wstring const & word )
-  
+sptr< Dictionary::WordSearchRequest > BglDictionary::findHeadwordsForSynonym( wstring const & word )
+
 {
-  return synonymSearchEnabled ? std::make_shared<BglHeadwordsRequest>( word, *this ) :
+  return synonymSearchEnabled ? std::make_shared< BglHeadwordsRequest >( word, *this ) :
                                 Class::findHeadwordsForSynonym( word );
 }
 
@@ -573,12 +534,9 @@ string postfixToSuperscript( string const & in )
   if ( !in.size() || in[ in.size() - 1 ] != '$' )
     return in;
 
-  for( long x = in.size() - 2; x >= 0; x-- )
-  {
-    if ( in[ x ] == '$' )
-    {
-      if ( in.size() - x - 2 > 2 )
-      {
+  for ( long x = in.size() - 2; x >= 0; x-- ) {
+    if ( in[ x ] == '$' ) {
+      if ( in.size() - x - 2 > 2 ) {
         // Large postfixes seem like something we wouldn't want to show --
         // some dictionaries seem to have each word numbered using the
         // postfix.
@@ -587,8 +545,7 @@ string postfixToSuperscript( string const & in )
       else
         return in.substr( 0, x ) + "<sup>" + in.substr( x + 1, in.size() - x - 2 ) + "</sup>";
     }
-    else
-    if ( !isdigit( in[ x ] ) )
+    else if ( !isdigit( in[ x ] ) )
       break;
   }
 
@@ -613,8 +570,12 @@ public:
 
   BglArticleRequest( wstring const & word_,
                      vector< wstring > const & alts_,
-                     BglDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                     BglDictionary & dict_,
+                     bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -628,8 +589,8 @@ public:
     isCancelled.ref();
   }
 
-  void fixHebString(string & hebStr); // Hebrew support
-  void fixHebArticle(string & hebArticle); // Hebrew support
+  void fixHebString( string & hebStr );      // Hebrew support
+  void fixHebArticle( string & hebArticle ); // Hebrew support
 
   ~BglArticleRequest()
   {
@@ -638,44 +599,44 @@ public:
   }
 };
 
-void BglArticleRequest::fixHebString(string & hebStr) // Hebrew support - convert non-unicode to unicode
+void BglArticleRequest::fixHebString( string & hebStr ) // Hebrew support - convert non-unicode to unicode
 {
   wstring hebWStr;
-  try
-  {
-    hebWStr = Utf8::decode(hebStr);
+  try {
+    hebWStr = Utf8::decode( hebStr );
   }
-  catch( Utf8::exCantDecode & )
-  {
+  catch ( Utf8::exCantDecode & ) {
     hebStr = "Utf-8 decoding error";
     return;
   }
 
-  for (unsigned int i=0; i<hebWStr.size();i++)
-  {
-    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
+  for ( unsigned int i = 0; i < hebWStr.size(); i++ ) {
+    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);
+  hebStr = Utf8::encode( hebWStr );
 }
 
-void BglArticleRequest::fixHebArticle(string & hebArticle) // Hebrew support - remove extra chars at the end
+void BglArticleRequest::fixHebArticle( string & hebArticle ) // Hebrew support - remove extra chars at the end
 {
   unsigned nulls;
 
-  for ( nulls = hebArticle.size(); nulls > 0 &&
-        ( ( hebArticle[ nulls - 1 ] <= 32 &&
-            hebArticle[ nulls - 1 ] >= 0 ) ||
-          ( hebArticle[ nulls - 1 ] >= 65 &&
-            hebArticle[ nulls - 1 ] <= 90 ) ); --nulls ) ; //special chars and A-Z
+  for ( nulls = hebArticle.size(); nulls > 0
+        && ( ( hebArticle[ nulls - 1 ] <= 32 && hebArticle[ nulls - 1 ] >= 0 )
+             || ( hebArticle[ nulls - 1 ] >= 65 && hebArticle[ nulls - 1 ] <= 90 ) );
+        --nulls )
+    ; //special chars and A-Z
 
   hebArticle.resize( nulls );
 }
 
 void BglArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -684,8 +645,7 @@ void BglArticleRequest::run()
 
   static Language::Id hebrew = LangCoder::code2toInt( "he" ); // Hebrew support
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
@@ -703,78 +663,66 @@ void BglArticleRequest::run()
   set< QByteArray > articleBodiesIncluded;
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
 
-    try
-    {
+    try {
 
-    if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
-      continue; // We already have this article in the body.
+      if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
+        continue; // We already have this article in the body.
 
-    // Now grab that article
+      // Now grab that article
 
-    string headword, displayedHeadword, articleText;
+      string headword, displayedHeadword, articleText;
 
-    dict.loadArticle( chain[ x ].articleOffset,
-                      headword, displayedHeadword, articleText );
+      dict.loadArticle( chain[ x ].articleOffset, headword, displayedHeadword, articleText );
 
-    // Ok. Now, does it go to main articles, or to alternate ones? We list
-    // main ones first, and alternates after.
+      // 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 and postfix-less comparison here.
+      // We do the case-folded and postfix-less comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( removePostfix( headword ) );
-    if( ignoreDiacritics )
-      headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
+      wstring headwordStripped = Folding::applySimpleCaseOnly( removePostfix( headword ) );
+      if ( ignoreDiacritics )
+        headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
-    // Hebrew support - fix Hebrew text
-    if (dict.idxHeader.langFrom == hebrew)
-    {
-        displayedHeadword= displayedHeadword.size() ? displayedHeadword : headword;
-        fixHebString(articleText);
-        fixHebArticle(articleText);
-        fixHebString(displayedHeadword);
-    }
+      // Hebrew support - fix Hebrew text
+      if ( dict.idxHeader.langFrom == hebrew ) {
+        displayedHeadword = displayedHeadword.size() ? displayedHeadword : headword;
+        fixHebString( articleText );
+        fixHebArticle( articleText );
+        fixHebString( displayedHeadword );
+      }
 
-    string const & targetHeadword = displayedHeadword.size() ?
-                                    displayedHeadword : headword;
+      string const & targetHeadword = displayedHeadword.size() ? displayedHeadword : headword;
 
-    QCryptographicHash hash( QCryptographicHash::Md5 );
-    hash.addData( targetHeadword.data(), targetHeadword.size() + 1 ); // with 0
-    hash.addData( articleText.data(), articleText.size() );
+      QCryptographicHash hash( QCryptographicHash::Md5 );
+      hash.addData( targetHeadword.data(), targetHeadword.size() + 1 ); // with 0
+      hash.addData( articleText.data(), articleText.size() );
 
-    if ( !articleBodiesIncluded.insert( hash.result() ).second )
-      continue; // Already had this body
+      if ( !articleBodiesIncluded.insert( hash.result() ).second )
+        continue; // Already had this body
 
-    multimap< wstring, pair< string, string > > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      multimap< wstring, pair< string, string > > & mapToUse =
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( pair(
-      Folding::applySimpleCaseOnly( headword ),
-      pair( targetHeadword, articleText ) ) );
+      mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( targetHeadword, articleText ) ) );
 
-    articlesIncluded.insert( chain[ x ].articleOffset );
+      articlesIncluded.insert( chain[ x ].articleOffset );
 
     } // try
-    catch( std::exception &ex )
-    {
+    catch ( std::exception & ex ) {
       gdWarning( "BGL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -785,66 +733,66 @@ void BglArticleRequest::run()
   multimap< wstring, pair< string, string > >::const_iterator i;
 
   string cleaner = Utils::Html::getHtmlCleaner();
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-      if (dict.isFromLanguageRTL() ) // RTL support
-        result += "<h3 style=\"text-align:right;direction:rtl\">";
-      else
-        result += "<h3>";
-      result += postfixToSuperscript( i->second.first );
-      result += "</h3>";
-      if ( dict.isToLanguageRTL() )
-        result += "<div class=\"bglrtl\">" + i->second.second + "</div>";
-      else
-        result += "<div>" + i->second.second + "</div>";
-      result += cleaner;
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    if ( dict.isFromLanguageRTL() ) // RTL support
+      result += "<h3 style=\"text-align:right;direction:rtl\">";
+    else
+      result += "<h3>";
+    result += postfixToSuperscript( i->second.first );
+    result += "</h3>";
+    if ( dict.isToLanguageRTL() )
+      result += "<div class=\"bglrtl\">" + i->second.second + "</div>";
+    else
+      result += "<div>" + i->second.second + "</div>";
+    result += cleaner;
   }
 
- 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-      if (dict.isFromLanguageRTL() ) // RTL support
-        result += "<h3 style=\"text-align:right;direction:rtl\">";
-      else
-        result += "<h3>";
-      result += postfixToSuperscript( i->second.first );
-      result += "</h3>";
-      if ( dict.isToLanguageRTL() )
-        result += "<div class=\"bglrtl\">" + i->second.second + "</div>";
-      else
-        result += "<div>" + i->second.second + "</div>";
-      result += cleaner;
+
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    if ( dict.isFromLanguageRTL() ) // RTL support
+      result += "<h3 style=\"text-align:right;direction:rtl\">";
+    else
+      result += "<h3>";
+    result += postfixToSuperscript( i->second.first );
+    result += "</h3>";
+    if ( dict.isToLanguageRTL() )
+      result += "<div class=\"bglrtl\">" + i->second.second + "</div>";
+    else
+      result += "<div>" + i->second.second + "</div>";
+    result += cleaner;
   }
   // Do some cleanups in the text
 
   BglDictionary::replaceCharsetEntities( result );
 
-  result = QString::fromUtf8( result.c_str() )
-          // onclick location to link
-          .replace( QRegularExpression( R"(<([a-z0-9]+)\s+[^>]*onclick="[a-z.]*location(?:\.href)\s*=\s*'([^']+)[^>]*>([^<]+)</\1>)",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    R"(<a href="\2">\3</a>)")
-           .replace( QRegularExpression( R"((<\s*a\s+[^>]*href\s*=\s*["']\s*)bword://)",
-                                         QRegularExpression::CaseInsensitiveOption ),
-                     "\\1bword:" )
-          //remove invalid width, height attrs
-          .replace( QRegularExpression( R"((width|height)\s*=\s*["']\d{7,}["''])" ),
-                   "" )
-          //remove invalid <br> tag
-          .replace( QRegularExpression( R"(<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))",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "\\1" )
-          .replace( QRegularExpression( R"((AUTOSTATUS, WRAP\);" |</DIV>|addScript\('JS_FILE_PHONG_VT_45634'\);|appendChild\(scNode\);|atag\.firstChild;)<br>)",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    " \\1 " )
-           .toUtf8().data();
+  result =
+    QString::fromUtf8( result.c_str() )
+      // onclick location to link
+      .replace( QRegularExpression(
+                  R"(<([a-z0-9]+)\s+[^>]*onclick="[a-z.]*location(?:\.href)\s*=\s*'([^']+)[^>]*>([^<]+)</\1>)",
+                  QRegularExpression::CaseInsensitiveOption ),
+                R"(<a href="\2">\3</a>)" )
+      .replace(
+        QRegularExpression( R"((<\s*a\s+[^>]*href\s*=\s*["']\s*)bword://)", QRegularExpression::CaseInsensitiveOption ),
+        "\\1bword:" )
+      //remove invalid width, height attrs
+      .replace( QRegularExpression( R"((width|height)\s*=\s*["']\d{7,}["''])" ), "" )
+      //remove invalid <br> tag
+      .replace(
+        QRegularExpression(
+          R"(<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))",
+          QRegularExpression::CaseInsensitiveOption ),
+        "\\1" )
+      .replace(
+        QRegularExpression(
+          R"((AUTOSTATUS, WRAP\);" |</DIV>|addScript\('JS_FILE_PHONG_VT_45634'\);|appendChild\(scNode\);|atag\.firstChild;)<br>)",
+          QRegularExpression::CaseInsensitiveOption ),
+        " \\1 " )
+      .toUtf8()
+      .data();
 
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -855,9 +803,9 @@ sptr< Dictionary::DataRequest > BglDictionary::getArticle( wstring const & word,
                                                            vector< wstring > const & alts,
                                                            wstring const &,
                                                            bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<BglArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< BglArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 
@@ -908,37 +856,33 @@ public:
 
 void BglResourceRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   string nameLowercased = name;
 
-  for( string::iterator i = nameLowercased.begin(); i != nameLowercased.end();
-       ++i )
+  for ( string::iterator i = nameLowercased.begin(); i != nameLowercased.end(); ++i )
     *i = tolower( *i );
 
   QMutexLocker _( &idxMutex );
 
   idx.seek( resourceListOffset );
 
-  for( size_t count = resourcesCount; count--; )
-  {
+  for ( size_t count = resourcesCount; count--; ) {
     if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       break;
 
     vector< char > nameData( idx.read< uint32_t >() );
     idx.read( &nameData.front(), nameData.size() );
 
-    for( size_t x = nameData.size(); x--; )
+    for ( size_t x = nameData.size(); x--; )
       nameData[ x ] = tolower( nameData[ x ] );
 
     uint32_t offset = idx.read< uint32_t >();
 
-    if ( string( &nameData.front(), nameData.size() ) == nameLowercased )
-    {
+    if ( string( &nameData.front(), nameData.size() ) == nameLowercased ) {
       // We have a match.
 
       idx.seek( offset );
@@ -953,12 +897,12 @@ void BglResourceRequest::run()
 
       unsigned long decompressedLength = data.size();
 
-      if ( uncompress( (unsigned char *) &data.front(),
+      if ( uncompress( (unsigned char *)&data.front(),
                        &decompressedLength,
                        &compressedData.front(),
-                       compressedData.size() ) != Z_OK ||
-           decompressedLength != data.size() )
-      {
+                       compressedData.size() )
+             != Z_OK
+           || decompressedLength != data.size() ) {
         gdWarning( "Failed to decompress resource \"%s\", ignoring it.\n", name.c_str() );
       }
       else
@@ -972,92 +916,89 @@ void BglResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > BglDictionary::getResource( string const & name )
-  
+
 {
-  return std::shared_ptr<BglResourceRequest>(new BglResourceRequest(idxMutex, idx, idxHeader.resourceListOffset,
-                                 idxHeader.resourcesCount, name ));
+  return std::shared_ptr< BglResourceRequest >(
+    new BglResourceRequest( idxMutex, idx, idxHeader.resourceListOffset, idxHeader.resourcesCount, name ) );
 }
 
-  /// Replaces <CHARSET c="t">1234;</CHARSET> occurrences with &#x1234;
-  void BglDictionary::replaceCharsetEntities( string & text )
-  {
-    QString str = QString::fromUtf8( text.c_str() );
+/// Replaces <CHARSET c="t">1234;</CHARSET> occurrences with &#x1234;
+void BglDictionary::replaceCharsetEntities( string & text )
+{
+  QString str = QString::fromUtf8( text.c_str() );
 
-    QRegularExpression charsetExp( R"(<\s*charset\s+c\s*=\s*["']?t["']?\s*>((?:\s*[0-9a-fA-F]+\s*;\s*)*)<\s*/\s*charset\s*>)",
-                                   QRegularExpression::CaseInsensitiveOption
-                                   | QRegularExpression::InvertedGreedinessOption );
+  QRegularExpression charsetExp(
+    R"(<\s*charset\s+c\s*=\s*["']?t["']?\s*>((?:\s*[0-9a-fA-F]+\s*;\s*)*)<\s*/\s*charset\s*>)",
+    QRegularExpression::CaseInsensitiveOption | QRegularExpression::InvertedGreedinessOption );
 
-    QRegularExpression oneValueExp( "\\s*([0-9a-fA-F]+)\\s*;" );
-    QString result;
-    int pos = 0;
+  QRegularExpression oneValueExp( "\\s*([0-9a-fA-F]+)\\s*;" );
+  QString result;
+  int pos = 0;
 
-    QRegularExpressionMatchIterator it = charsetExp.globalMatch( str );
-    while( it.hasNext() )
-    {
-      QRegularExpressionMatch match = it.next();
-      result += str.mid( pos, match.capturedStart() - pos );
-      pos = match.capturedEnd();
+  QRegularExpressionMatchIterator it = charsetExp.globalMatch( str );
+  while ( it.hasNext() ) {
+    QRegularExpressionMatch match = it.next();
+    result += str.mid( pos, match.capturedStart() - pos );
+    pos = match.capturedEnd();
 
-      QRegularExpressionMatchIterator itValue = oneValueExp.globalMatch( match.captured( 1 ) );
-      while( itValue.hasNext() )
-      {
-        QRegularExpressionMatch matchValue = itValue.next();
-        result += "&#x" + matchValue.captured( 1 ) + ";";
-      }
+    QRegularExpressionMatchIterator itValue = oneValueExp.globalMatch( match.captured( 1 ) );
+    while ( itValue.hasNext() ) {
+      QRegularExpressionMatch matchValue = itValue.next();
+      result += "&#x" + matchValue.captured( 1 ) + ";";
     }
-
-    if( pos )
-    {
-      result += str.mid( pos );
-      str = result;
-    }
-
-
-    text = str.toUtf8().data();
   }
 
-  class ResourceHandler: public Babylon::ResourceHandler
-  {
-    File::Class & idxFile;
-    list< pair< string, uint32_t > > resources;
-
-  public:
-
-    ResourceHandler( File::Class & idxFile_ ): idxFile( idxFile_ )
-    {}
-
-    list< pair< string, uint32_t > > const & getResources() const
-    { return resources; }
-
-  protected:
-    void handleBabylonResource( string const & filename,
-                                        char const * data, size_t size ) override;
-  };
-
-  void ResourceHandler::handleBabylonResource( string const & filename,
-                                               char const * data, size_t size )
-  {
-    //GD_DPRINTF( "Handling resource file %s (%u bytes)\n", filename.c_str(), size );
-
-    vector< unsigned char > compressedData( compressBound( size ) );
-
-    unsigned long compressedSize = compressedData.size();
-
-    if ( compress( &compressedData.front(), &compressedSize,
-                   (unsigned char const *) data, size ) != Z_OK )
-    {
-      gdWarning( "Failed to compress the body of resource \"%s\", dropping it.\n", filename.c_str() );
-      return;
-    }
-
-    resources.push_back( pair< string, uint32_t >( filename, idxFile.tell() ) );
-
-    idxFile.write< uint32_t >( size );
-    idxFile.write< uint32_t >( compressedSize );
-    idxFile.write( &compressedData.front(), compressedSize );
+  if ( pos ) {
+    result += str.mid( pos );
+    str = result;
   }
+
+
+  text = str.toUtf8().data();
 }
 
+class ResourceHandler: public Babylon::ResourceHandler
+{
+  File::Class & idxFile;
+  list< pair< string, uint32_t > > resources;
+
+public:
+
+  ResourceHandler( File::Class & idxFile_ ):
+    idxFile( idxFile_ )
+  {
+  }
+
+  list< pair< string, uint32_t > > const & getResources() const
+  {
+    return resources;
+  }
+
+protected:
+  void handleBabylonResource( string const & filename, char const * data, size_t size ) override;
+};
+
+void ResourceHandler::handleBabylonResource( string const & filename, char const * data, size_t size )
+{
+  //GD_DPRINTF( "Handling resource file %s (%u bytes)\n", filename.c_str(), size );
+
+  vector< unsigned char > compressedData( compressBound( size ) );
+
+  unsigned long compressedSize = compressedData.size();
+
+  if ( compress( &compressedData.front(), &compressedSize, (unsigned char const *)data, size ) != Z_OK ) {
+    gdWarning( "Failed to compress the body of resource \"%s\", dropping it.\n", filename.c_str() );
+    return;
+  }
+
+  resources.push_back( pair< string, uint32_t >( filename, idxFile.tell() ) );
+
+  idxFile.write< uint32_t >( size );
+  idxFile.write< uint32_t >( compressedSize );
+  idxFile.write( &compressedData.front(), compressedSize );
+}
+} // namespace
+
 sptr< Dictionary::DataRequest > BglDictionary::getSearchResults( QString const & searchString,
                                                                  int searchMode,
                                                                  bool matchCase,
@@ -1072,21 +1013,17 @@ sptr< Dictionary::DataRequest > BglDictionary::getSearchResults( QString const &
 }
 
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
     // Skip files with the extensions different to .bgl to speed up the
     // scanning
-    if ( i->size() < 4 ||
-        strcasecmp( i->c_str() + ( i->size() - 4 ), ".bgl" ) != 0 )
+    if ( i->size() < 4 || strcasecmp( i->c_str() + ( i->size() - 4 ), ".bgl" ) != 0 )
       continue;
 
     // Got the file -- check if we need to rebuid the index
@@ -1097,15 +1034,12 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
     string indexFile = indicesDir + dictId;
 
-    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-         indexIsOldOrBad( indexFile ) )
-    {
+    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
       // Building the index
 
       gdDebug( "Bgl: Building the index for dictionary: %s\n", i->c_str() );
 
-      try
-      {
+      try {
         Babylon b( *i );
 
         if ( !b.open() )
@@ -1113,8 +1047,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         std::string sourceCharset, targetCharset;
 
-        if ( !b.read( sourceCharset, targetCharset ) )
-        {
+        if ( !b.read( sourceCharset, targetCharset ) ) {
           gdWarning( "Failed to start reading from %s, skipping it\n", i->c_str() );
           continue;
         }
@@ -1154,15 +1087,14 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         b.setResourcePrefix( string( "bres://" ) + dictId + "/" );
 
         // Save icon if there's one
-        if ( size_t sz = b.getIcon().size() )
-        {
+        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.descriptionSize    = 0;
         idxHeader.descriptionAddress = chunks.startNewBlock();
 
         chunks.addToBlock( b.copyright().c_str(), b.copyright().size() + 1 );
@@ -1177,8 +1109,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         chunks.addToBlock( b.description().c_str(), b.description().size() + 1 );
         idxHeader.descriptionSize += b.description().size() + 1;
 
-        for( ; ; )
-        {
+        for ( ;; ) {
           bgl_entry e = b.readEntry( &resourceHandler );
 
           if ( e.headword.empty() )
@@ -1196,7 +1127,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           addEntryToIndex( e.headword, articleAddress, indexedWords, wcharBuffer );
 
-          for( unsigned x = 0; x < e.alternates.size(); ++x )
+          for ( unsigned x = 0; x < e.alternates.size(); ++x )
             addEntryToIndex( e.alternates[ x ], articleAddress, indexedWords, wcharBuffer );
 
           wordCount += 1 + e.alternates.size();
@@ -1214,17 +1145,16 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
         idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-        idxHeader.indexRootOffset = idxInfo.rootOffset;
+        idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
         // Save the resource's list.
 
         idxHeader.resourceListOffset = idx.tell();
-        idxHeader.resourcesCount = resourceHandler.getResources().size();
+        idxHeader.resourcesCount     = resourceHandler.getResources().size();
 
-        for( list< pair< string, uint32_t > >::const_iterator j =
-            resourceHandler.getResources().begin();
-             j != resourceHandler.getResources().end(); ++j )
-        {
+        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 );
@@ -1232,40 +1162,33 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         // That concludes it. Update the header.
 
-        idxHeader.signature = Signature;
-        idxHeader.formatVersion = CurrentFormatVersion;
-        idxHeader.parserVersion = Babylon::ParserVersion;
+        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.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.write( &idxHeader, sizeof( idxHeader ) );
       }
-      catch( std::exception & e )
-      {
-        gdWarning( "BGL dictionary indexing failed: %s, error: %s\n",
-                   i->c_str(), e.what() );
+      catch ( std::exception & e ) {
+        gdWarning( "BGL dictionary indexing failed: %s, error: %s\n", i->c_str(), e.what() );
       }
     }
 
-    try
-    {
-      dictionaries.push_back( std::make_shared<BglDictionary>( dictId,
-                                                 indexFile,
-                                                 *i ) );
+    try {
+      dictionaries.push_back( std::make_shared< BglDictionary >( dictId, indexFile, *i ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "BGL dictionary initializing failed: %s, error: %s\n",
-                 i->c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "BGL dictionary initializing failed: %s, error: %s\n", i->c_str(), e.what() );
     }
   }
 
   return dictionaries;
 }
 
-}
+} // namespace Bgl
diff --git a/src/dict/bgl.hh b/src/dict/bgl.hh
index 0fb3e659..de630d16 100644
--- a/src/dict/bgl.hh
+++ b/src/dict/bgl.hh
@@ -19,12 +19,9 @@ using std::string;
 /// there be need for them. The index file name would be the same as the
 /// dictionary's id, made by makeDictionaryId() from the list of file names.
 /// Any exception thrown would terminate the program with an error.
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                    vector< string > const & fileNames,
-                                    string const & indicesDir,
-                                    Dictionary::Initializing & )
-  ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Bgl
 
 #endif
diff --git a/src/dict/bgl_babylon.cc b/src/dict/bgl_babylon.cc
index 06826c73..9bcdf037 100644
--- a/src/dict/bgl_babylon.cc
+++ b/src/dict/bgl_babylon.cc
@@ -38,24 +38,26 @@
 #include <QtEndian>
 
 #ifdef _WIN32
-#include <io.h>
-#define DUP _dup
+  #include <io.h>
+  #define DUP _dup
 #else
-#include <unistd.h>
-#define DUP dup
+  #include <unistd.h>
+  #define DUP dup
 #endif
 
 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 )
+Babylon::Babylon( const std::string & filename ):
+  m_filename( filename ),
+  m_sourceLang( 0 ),
+  m_targetLang( 0 ),
+  m_numEntries( 0 )
 {
-  file = NULL;
+  file = nullptr;
 }
 
 
@@ -67,35 +69,30 @@ Babylon::~Babylon()
 
 bool Babylon::open()
 {
-  FILE *f;
-  unsigned char buf[6];
-  int i;
+  unsigned char buf[ 6 ];
 
-  f = gd_fopen( m_filename.c_str(), "rb" );
-  if( f == NULL )
+  FILE * f = gd_fopen( m_filename.c_str(), "rb" );
+  if ( f == nullptr )
     return false;
 
-  i = fread( buf, 1, 6, f );
+  int i = fread( buf, 1, 6, f );
 
   /* First four bytes: BGL signature 0x12340001 or 0x12340002 (big-endian) */
-  if( i < 6 || memcmp( buf, "\x12\x34\x00", 3 ) || buf[3] == 0 || buf[3] > 2 )
-  {
+  if ( i < 6 || memcmp( buf, "\x12\x34\x00", 3 ) || buf[ 3 ] == 0 || buf[ 3 ] > 2 ) {
     fclose( f );
     return false;
   }
 
   /* Calculate position of gz header */
 
-  i = buf[4] << 8 | buf[5];
+  i = buf[ 4 ] << 8 | buf[ 5 ];
 
-  if( i < 6 )
-  {
+  if ( i < 6 ) {
     fclose( f );
     return false;
   }
 
-  if( ferror( f ) || feof( f ) )
-  {
+  if ( ferror( f ) || feof( f ) ) {
     fclose( f );
     return false;
   }
@@ -112,7 +109,7 @@ bool Babylon::open()
 
   fclose( f );
 
-  if( file == NULL )
+  if ( file == nullptr )
     return false;
 
   return true;
@@ -121,33 +118,31 @@ bool Babylon::open()
 
 void Babylon::close()
 {
-  if ( file )
-  {
+  if ( file ) {
     gzclose( file );
-    file = 0;
+    file = nullptr;
   }
 }
 
 
-bool Babylon::readBlock( bgl_block &block )
+bool Babylon::readBlock( bgl_block & block )
 {
-  if( gzeof( file ) || file == NULL )
+  if ( file == nullptr || gzeof( file ) )
     return false;
 
   block.length = bgl_readnum( 1 );
-  block.type = block.length & 0xf;
-  if( block.type == 4 ) return false; // end of file marker
+  block.type   = block.length & 0xf;
+  if ( block.type == 4 )
+    return false; // end of file marker
   block.length >>= 4;
-  block.length = block.length < 4 ? bgl_readnum( block.length + 1 ) : block.length - 4 ;
-  if( block.length )
-  {
+  block.length = block.length < 4 ? bgl_readnum( block.length + 1 ) : block.length - 4;
+  if ( block.length ) {
     block.data = (char *)malloc( block.length );
-    if( !block.data )
+    if ( !block.data )
       throw exAllocation();
 
     unsigned res = gzread( file, block.data, block.length );
-    if( block.length != res )
-    {
+    if ( block.length != res ) {
       free( block.data );
       block.length = 0;
       gzclearerr( file );
@@ -161,27 +156,27 @@ bool Babylon::readBlock( bgl_block &block )
 
 unsigned int Babylon::bgl_readnum( int bytes )
 {
-  unsigned char buf[4];
+  unsigned char buf[ 4 ];
   unsigned val = 0;
 
-  if ( bytes < 1 || bytes > 4 ) return (0);
+  if ( bytes < 1 || bytes > 4 )
+    return 0;
 
-  int res = gzread( file, buf, bytes );
-
-  if( res != bytes )
-  {
+  if ( const int res = gzread( file, buf, bytes ); res != bytes ) {
     gzclearerr( file );
-    return 4;  // Read error - return end of file marker
+    return 4; // Read error - return end of file marker
   }
 
-  for(int i=0;i<bytes;i++) val= (val << 8) | buf[i];
+  for ( int i = 0; i < bytes; i++ )
+    val = ( val << 8 ) | buf[ i ];
   return val;
 }
 
 
-bool Babylon::read(std::string &source_charset, std::string &target_charset)
+bool Babylon::read( const std::string & source_charset, const std::string & target_charset )
 {
-  if( file == NULL ) return false;
+  if ( file == nullptr )
+    return false;
 
   bgl_block block;
   unsigned int pos;
@@ -193,23 +188,21 @@ bool Babylon::read(std::string &source_charset, std::string &target_charset)
 
   m_sourceCharset = source_charset;
   m_targetCharset = target_charset;
-  m_numEntries = 0;
-  while( readBlock( block ) )
-  {
+  m_numEntries    = 0;
+  while ( readBlock( block ) ) {
     headword.clear();
     definition.clear();
 
-    switch( block.type )
-    {
+    switch ( block.type ) {
       case 0:
-        switch( block.data[0] )
-        {
+        switch ( block.data[ 0 ] ) {
           case 8:
-            type = (unsigned int)block.data[2];
-            if( type > 64 ) type -= 65;
+            type = (unsigned int)block.data[ 2 ];
+            if ( type > 64 )
+              type -= 65;
             if ( type >= 14 )
               type = 0;
-            m_defaultCharset = bgl_charset[type];
+            m_defaultCharset = bgl_charset[ type ];
             break;
           default:
             break;
@@ -224,44 +217,47 @@ bool Babylon::read(std::string &source_charset, std::string &target_charset)
         break;
       case 3:
         pos = 2;
-        switch( block.data[1] )
-        {
+        switch ( block.data[ 1 ] ) {
           case 1:
             headword.reserve( block.length - 2 );
-            for(unsigned int a=0;a<block.length-2;a++) headword += block.data[pos++];
+            for ( unsigned int a = 0; a < block.length - 2; a++ )
+              headword += block.data[ pos++ ];
             m_title = headword;
             break;
           case 2:
             headword.reserve( block.length - 2 );
-            for(unsigned int a=0;a<block.length-2;a++) headword += block.data[pos++];
+            for ( unsigned int a = 0; a < block.length - 2; a++ )
+              headword += block.data[ pos++ ];
             m_author = headword;
             break;
           case 3:
             headword.reserve( block.length - 2 );
-            for(unsigned int a=0;a<block.length-2;a++) headword += block.data[pos++];
+            for ( unsigned int a = 0; a < block.length - 2; a++ )
+              headword += block.data[ pos++ ];
             m_email = headword;
             break;
           case 4:
             headword.reserve( block.length - 2 );
-            for(unsigned int a=0;a<block.length-2;a++) headword += block.data[pos++];
+            for ( unsigned int a = 0; a < block.length - 2; a++ )
+              headword += block.data[ pos++ ];
             m_copyright = headword;
             break;
           case 7:
-            m_sourceLang = bgl_language[(unsigned char)(block.data[5])];
+            m_sourceLang = bgl_language[ (unsigned char)( block.data[ 5 ] ) ];
             //m_sourceLang = headword;
             break;
           case 8:
-            m_targetLang = bgl_language[(unsigned char)(block.data[5])];
-            //m_targetLang = headword;
+            m_targetLang = bgl_language[ (unsigned char)( block.data[ 5 ] ) ];
             break;
           case 9:
             headword.reserve( block.length - 2 );
-            for(unsigned int a=0;a<block.length-2;a++) {
-              if (block.data[pos] == '\r') {
-              } else if (block.data[pos] == '\n') {
+            for ( unsigned int a = 0; a < block.length - 2; a++ ) {
+              if ( block.data[ pos ] == '\r' ) {}
+              else if ( block.data[ pos ] == '\n' ) {
                 headword += "<br>";
-              } else {
-                headword += block.data[pos];
+              }
+              else {
+                headword += block.data[ pos ];
               }
               pos++;
             }
@@ -269,45 +265,45 @@ bool Babylon::read(std::string &source_charset, std::string &target_charset)
             break;
           case 11:
             icon.resize( block.length - 2 );
-            memcpy( &icon.front(), &(block.data[ 2 ]), icon.size() );
-          break;
+            memcpy( &icon.front(), &( block.data[ 2 ] ), icon.size() );
+            break;
           case 17:
-            if ( block.length >= 5 && ( (unsigned char) block.data[ 4 ] & 0x80 ) != 0 )
+            if ( block.length >= 5 && ( (unsigned char)block.data[ 4 ] & 0x80 ) != 0 )
               isUtf8File = true;
-          break;
+            break;
           case 26:
-            type = (unsigned int)block.data[2];
-            if( type > 64 ) type -= 65;
+            type = (unsigned int)block.data[ 2 ];
+            if ( type > 64 )
+              type -= 65;
             if ( type >= 14 )
               type = 0;
-            if (m_sourceCharset.empty())
-              m_sourceCharset = bgl_charset[type];
+            if ( m_sourceCharset.empty() )
+              m_sourceCharset = bgl_charset[ type ];
             break;
           case 27:
-            type = (unsigned int)block.data[2];
-            if( type > 64 ) type -= 65;
+            type = (unsigned int)block.data[ 2 ];
+            if ( type > 64 )
+              type -= 65;
             if ( type >= 14 )
               type = 0;
-            if (m_targetCharset.empty())
-              m_targetCharset = bgl_charset[type];
+            if ( m_targetCharset.empty() )
+              m_targetCharset = bgl_charset[ type ];
             break;
           default:
             break;
         }
         break;
-      default:
-        ;
+      default:;
     }
-    if( block.length ) free( block.data );
+    if ( block.length )
+      free( block.data );
   }
   gzseek( file, 0, SEEK_SET );
 
-  if ( isUtf8File )
-  {
-    //FDPRINTF( stderr, "%s: utf8 file.\n", m_title.c_str() );
+  if ( isUtf8File ) {
     m_defaultCharset = "UTF-8";
-    m_sourceCharset = "UTF-8";
-    m_targetCharset = "UTF-8";
+    m_sourceCharset  = "UTF-8";
+    m_targetCharset  = "UTF-8";
   }
 
   convertToUtf8( m_title, BGL_TARGET_CHARSET );
@@ -315,7 +311,10 @@ bool Babylon::read(std::string &source_charset, std::string &target_charset)
   convertToUtf8( m_email, BGL_TARGET_CHARSET );
   convertToUtf8( m_copyright, BGL_TARGET_CHARSET );
   convertToUtf8( m_description, BGL_TARGET_CHARSET );
-  GD_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;
 }
 
@@ -324,8 +323,7 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
 {
   bgl_entry entry;
 
-  if( file == NULL )
-  {
+  if ( file == nullptr ) {
     entry.headword = "";
     return entry;
   }
@@ -336,29 +334,26 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
   std::string headword, displayedHeadword;
   std::string definition;
   std::string temp;
-  std::vector<std::string> alternates;
+  std::vector< std::string > alternates;
   std::string alternate;
   std::string root;
   bool defBodyEnded = false;
   std::string transcription;
 
-  while( readBlock( block ) )
-  {
-    switch( block.type )
-    {
-      case 2:
-      {
-        pos = 0;
-        len = (unsigned char)block.data[pos++];
-        if( pos + len > block.length )
+  while ( readBlock( block ) ) {
+    switch ( block.type ) {
+      case 2: {
+        // the block data may have length==0
+        if ( block.length == 0 )
           break;
-        std::string filename( block.data+pos, len );
-        //if (filename != "8EAF66FD.bmp" && filename != "C2EEF3F6.html") {
-            pos += len;
+        pos = 0;
+        len = (unsigned char)block.data[ pos++ ];
+        if ( pos + len > block.length )
+          break;
+        std::string filename( block.data + pos, len );
+        pos += len;
         if ( resourceHandler )
-          resourceHandler->handleBabylonResource( filename,
-                                                  block.data + pos,
-                                                  block.length - pos );
+          resourceHandler->handleBabylonResource( filename, block.data + pos, block.length - pos );
         break;
       }
       case 1:
@@ -374,52 +369,51 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
         pos = 0;
 
         // Headword
-        if( block.type == 11 )
-        {
+        if ( block.type == 11 ) {
           pos = 1;
-          if( pos + 4 > block.length )
+          if ( pos + 4 > block.length )
             break;
           len = qFromBigEndian( *reinterpret_cast< quint32 * >( block.data + pos ) );
           pos += 4;
         }
-        else
-        {
-          len = (unsigned char)block.data[pos++];
+        else {
+          if ( pos + 1 > block.length )
+            break;
+          len = (unsigned char)block.data[ pos++ ];
         }
 
-        if( pos + len > block.length )
+        if ( pos + len > block.length )
           break;
 
         headword.reserve( len );
-        for(unsigned int a=0;a<len;a++)
-          headword += block.data[pos++];
+        for ( unsigned int a = 0; a < len; a++ )
+          headword += block.data[ pos++ ];
 
         convertToUtf8( headword, BGL_SOURCE_CHARSET );
 
         // Try to repair malformed headwords
-        if( RX::Html::containHtmlEntity( headword ) )
+        if ( RX::Html::containHtmlEntity( headword ) )
           headword = Html::unescapeUtf8( headword );
 
-        if( block.type == 11 )
-        {
+        if ( block.type == 11 ) {
           // Alternate forms
-          if( pos + 4 >= block.length )
+          if ( pos + 4 >= block.length )
             break;
 
           alts_num = qFromBigEndian( *reinterpret_cast< quint32 * >( block.data + pos ) );
           pos += 4;
 
-          for( unsigned j = 0; j < alts_num; j++ )
-          {
-            if( pos + 4 > block.length )
+          for ( unsigned j = 0; j < alts_num; j++ ) {
+            if ( pos + 4 > block.length )
               break;
             len = qFromBigEndian( *reinterpret_cast< quint32 * >( block.data + pos ) );
             pos += 4;
 
-            if( pos + len >= block.length )
+            if ( pos + len >= block.length )
               break;
             alternate.reserve( len );
-            for(unsigned int a=0;a<len;a++) alternate += block.data[pos++];
+            for ( unsigned int a = 0; a < len; a++ )
+              alternate += block.data[ pos++ ];
             convertToUtf8( alternate, BGL_SOURCE_CHARSET );
 
             // Try to repair malformed forms
@@ -433,48 +427,40 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
 
         // Definition
 
-        if( block.type == 11 )
-        {
-          if( pos + 4 > block.length )
+        if ( block.type == 11 ) {
+          if ( pos + 4 > block.length )
             break;
           len = qFromBigEndian( *reinterpret_cast< quint32 * >( block.data + pos ) );
           pos += 4;
         }
-        else
-        {
+        else {
           len = qFromBigEndian( *reinterpret_cast< quint16 * >( block.data + pos ) );
           pos += 2;
         }
 
-        if( pos + len > block.length )
+        if ( pos + len > block.length )
           break;
 
         definition.reserve( len );
 
-        for(unsigned int a=0;a<len;a++)
-        {
-          if( (unsigned char)block.data[pos] == 0x0a )
-          {
+        for ( unsigned int a = 0; a < len; a++ ) {
+          if ( (unsigned char)block.data[ pos ] == 0x0a ) {
             definition += "<br>";
             pos++;
           }
-          else if ( (unsigned char)block.data[pos] == 6 )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 6 ) {
             // Something
             pos += 2;
             ++a;
             definition += " ";
           }
-          else if ( (unsigned char)block.data[pos] >= 0x40 &&
-                    len - a >= 2 &&
-                    (unsigned char)block.data[pos + 1 ] == 0x18 )
-          {
+          else if ( (unsigned char)block.data[ pos ] >= 0x40 && len - a >= 2
+                    && (unsigned char)block.data[ pos + 1 ] == 0x18 ) {
             // Hidden displayed headword (a displayed headword which
             // contains some garbage and shouldn't probably be visible).
             unsigned length = (unsigned char)block.data[ pos ] - 0x3F;
 
-            if ( length > len - a - 2 )
-            {
+            if ( length > len - a - 2 ) {
               GD_FDPRINTF( stderr, "Hidden displayed headword is too large %s\n", headword.c_str() );
               pos += len - a;
               break;
@@ -483,13 +469,11 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 2;
             a += length + 1;
           }
-          else if ( (unsigned char)block.data[pos] == 0x18 )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 0x18 ) {
             // Displayed headword
-              unsigned length = (unsigned char)block.data[ pos + 1 ];
+            unsigned length = (unsigned char)block.data[ pos + 1 ];
 
-            if ( length > len - a - 2 )
-            {
+            if ( length > len - a - 2 ) {
               GD_FDPRINTF( stderr, "Displayed headword's length is too large for headword %s\n", headword.c_str() );
               pos += len - a;
               break;
@@ -499,15 +483,11 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 2;
             a += length + 1;
           }
-          else
-          if ( block.data[ pos ] == 0x28 && defBodyEnded &&
-               len - a >= 3 )
-          {
+          else if ( block.data[ pos ] == 0x28 && defBodyEnded && len - a >= 3 ) {
             // 2-byte sized displayed headword
             unsigned length = qFromBigEndian( *reinterpret_cast< quint16 * >( block.data + pos + 1 ) );
 
-            if ( length > len - a - 3 )
-            {
+            if ( length > len - a - 3 ) {
               GD_FDPRINTF( stderr, "2-byte sized displayed headword for %s is too large\n", headword.c_str() );
               pos += len - a;
               break;
@@ -518,27 +498,24 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 3;
             a += length + 2;
           }
-          else if ( (unsigned char)block.data[pos] == 0x50 && len - a - 1 >= 2 &&
-                    (unsigned char)block.data[pos + 1 ] == 0x1B )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 0x50 && len - a - 1 >= 2
+                    && (unsigned char)block.data[ pos + 1 ] == 0x1B ) {
             // 1-byte-sized transcription
-            unsigned length = (unsigned char)block.data[pos + 2 ];
+            unsigned length = (unsigned char)block.data[ pos + 2 ];
 
-            if ( length > len - a - 3 )
-            {
-              GD_FDPRINTF( stderr, "1-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
+            if ( length > len - a - 3 ) {
+              GD_FDPRINTF( stderr,
+                           "1-byte-sized transcription's length is too large for headword %s\n",
+                           headword.c_str() );
               pos += len - a;
               break;
             }
 
-            if( m_targetCharset.compare( "UTF-8" ) != 0 )
-            {
-              try
-              {
+            if ( m_targetCharset.compare( "UTF-8" ) != 0 ) {
+              try {
                 transcription = Iconv::toUtf8( "Windows-1252", block.data + pos + 3, length );
               }
-              catch( Iconv::Ex & e )
-              {
+              catch ( Iconv::Ex & e ) {
                 qWarning( "Bgl: charset conversion error, no trancription processing's done: %s\n", e.what() );
                 transcription = std::string( block.data + pos + 3, length );
               }
@@ -549,28 +526,25 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 3;
             a += length + 2;
           }
-          else if ( (unsigned char)block.data[pos] == 0x60 && len - a - 1 >= 3 &&
-                    (unsigned char)block.data[pos + 1 ] == 0x1B )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 0x60 && len - a - 1 >= 3
+                    && (unsigned char)block.data[ pos + 1 ] == 0x1B ) {
             // 2-byte-sized transcription
             unsigned length = qFromBigEndian( *reinterpret_cast< quint16 * >( block.data + pos + 2 ) );
 
-            if ( length > len - a - 4)
-            {
-              GD_FDPRINTF( stderr, "2-byte-sized transcription's length is too large for headword %s\n", headword.c_str() );
+            if ( length > len - a - 4 ) {
+              GD_FDPRINTF( stderr,
+                           "2-byte-sized transcription's length is too large for headword %s\n",
+                           headword.c_str() );
               pos += len - a;
               break;
             }
 
-            if( m_targetCharset.compare( "UTF-8" ) != 0 )
-            {
-              try
-              {
+            if ( m_targetCharset.compare( "UTF-8" ) != 0 ) {
+              try {
                 transcription = Iconv::toUtf8( "Windows-1252", block.data + pos + 4, length );
               }
-              catch( Iconv::Ex & e )
-              {
-                qWarning( "Bgl: charset conversion error, no trancription processing's done: %s\n", e.what() );
+              catch ( Iconv::Ex & e ) {
+                qWarning( "Bgl: charset conversion error, no transcription processing's done: %s\n", e.what() );
                 transcription = std::string( block.data + pos + 4, length );
               }
             }
@@ -580,16 +554,13 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 4;
             a += length + 3;
           }
-          else if ( (unsigned char)block.data[pos] >= 0x40 &&
-                    len - a >= 2 &&
-                    (unsigned char)block.data[pos + 1 ] == 0x1B )
-          {
+          else if ( (unsigned char)block.data[ pos ] >= 0x40 && len - a >= 2
+                    && (unsigned char)block.data[ pos + 1 ] == 0x1B ) {
             // Hidden transcription (a transcription which is usually the same
             // as the headword and shouldn't probably be visible).
             unsigned length = (unsigned char)block.data[ pos ] - 0x3F;
 
-            if ( length > len - a - 2 )
-            {
+            if ( length > len - a - 2 ) {
               GD_FDPRINTF( stderr, "Hidden transcription is too large %s\n", headword.c_str() );
               pos += len - a;
               break;
@@ -598,67 +569,72 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
             pos += length + 2;
             a += length + 1;
           }
-          else if ( (unsigned char)block.data[pos] == 0x1E )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 0x1E ) {
             // Resource reference begin marker
             definition += m_resourcePrefix;
             ++pos;
           }
-          else if ( (unsigned char)block.data[pos] == 0x1F )
-          {
+          else if ( (unsigned char)block.data[ pos ] == 0x1F ) {
             // Resource reference end marker
             ++pos;
           }
-          else if( (unsigned char)block.data[pos] < 0x20 )
-          {
-            if( a <= len - 3 && block.data[pos] == 0x14 && block.data[pos+1] == 0x02 ) {
-              int index = (unsigned char)block.data[pos+2] - 0x30;
-              if (index >= 0 && index <= 10) {
-                definition = "<span class=\"bglpos\">" + partOfSpeech[index] + "</span> " + definition;
+          else if ( (unsigned char)block.data[ pos ] < 0x20 ) {
+            if ( a <= len - 3 && block.data[ pos ] == 0x14 && block.data[ pos + 1 ] == 0x02 ) {
+              int index = (unsigned char)block.data[ pos + 2 ] - 0x30;
+              if ( index >= 0 && index <= 10 ) {
+                definition = "<span class=\"bglpos\">" + partOfSpeech[ index ] + "</span> " + definition;
               }
               pos += 3;
               a += 2;
               //pos += len - a;
               //break;
             }
-            else
-            if (block.data[pos] == 0x14) {
-              defBodyEnded = true; // Presumably
-              pos++;
-            } else if ((unsigned char)block.data[pos] == 0x1A){
+            else {
+              if ( block.data[ pos ] == 0x14 ) {
+                defBodyEnded = true; // Presumably
+                pos++;
+              }
+              else if ( (unsigned char)block.data[ pos ] == 0x1A ) {
                 unsigned length = (unsigned char)block.data[ pos + 1 ];
-                if (length <= 10){// 0x1A identifies two different data types.
-                                  // data about the Hebrew root should be shorter then
-                                  // 10 bytes, and in the other data type the byte
-                          // after 0x1A is > 10 (at least it is in Bybylon's
-                          // Hebrew dictionaries).   
-                    root = std::string( block.data + pos + 2, length );
-                    std::reverse(root.begin(),root.end());
-                    definition += " (" + root + ")";
-                    pos += length + 2;
-                    a += length + 1;
-               }
-                else
-                    pos++;
-            } else {
-                definition += block.data[pos++];
+                if ( length <= 10 ) { // 0x1A identifies two different data types.
+                                      // data about the Hebrew root should be shorter then
+                                      // 10 bytes, and in the other data type the byte
+                                      // after 0x1A is > 10 (at least it is in Bybylon's
+                                      // Hebrew dictionaries).
+                  root = std::string( block.data + pos + 2, length );
+                  std::reverse( root.begin(), root.end() );
+                  definition += " (" + root + ")";
+                  pos += length + 2;
+                  a += length + 1;
+                }
+                else {
+                  pos++;
+                }
+              }
+              else {
+                definition += block.data[ pos++ ];
+              }
             }
-          }else definition += block.data[pos++];
+          }
+          else {
+            definition += block.data[ pos++ ];
+          }
         }
         convertToUtf8( definition, BGL_TARGET_CHARSET );
-        if( !transcription.empty() )
-          definition = std::string( "<span class=\"bgltrn\">" ) +  transcription + "</span>" + definition;
+        if ( !transcription.empty() )
+          definition = std::string( "<span class=\"bgltrn\">" ) + transcription + "</span>" + definition;
 
         if ( displayedHeadword.size() )
           convertToUtf8( displayedHeadword, BGL_TARGET_CHARSET );
 
         // Alternate forms
-        while( pos < block.length )
-        {
-          len = (unsigned char)block.data[pos++];
-          if( pos + len > block.length ) break;
+        while ( pos < block.length ) {
+          len = (unsigned char)block.data[ pos++ ];
+          if ( pos + len > block.length )
+            break;
           alternate.reserve( len );
-          for(unsigned int a=0;a<len;a++) alternate += block.data[pos++];
+          for ( unsigned int a = 0; a < len; a++ )
+            alternate += block.data[ pos++ ];
           convertToUtf8( alternate, BGL_SOURCE_CHARSET );
 
           // Try to repair malformed forms
@@ -670,46 +646,42 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
         }
 
         // Try adding displayed headword to the list of alts
-        if ( headword != displayedHeadword )
-        {
+        if ( headword != displayedHeadword ) {
           // Only add displayed headword if the normal one has two or more digits.
           // This would indicate some irregularity in it (like e.g. if it serves
           // as some kind of an identifier instead of being an actual headword)
           int totalDigits = 0;
 
-          for( char const * p = headword.c_str(); *p; ++p )
-            if ( *p >= '0' && *p <= '9' )
-            {
+          for ( char const * p = headword.c_str(); *p; ++p )
+            if ( *p >= '0' && *p <= '9' ) {
               if ( ++totalDigits > 1 )
                 break;
             }
 
-          if ( totalDigits > 1 )
-          {
+          if ( totalDigits > 1 ) {
             // Ok, let's add it.
 
             // Does it contain HTML? If it does, we need to strip it
-            if ( displayedHeadword.find( '<' ) != string::npos ||
-                 displayedHeadword.find( '&' ) != string::npos )
-            {
+            if ( displayedHeadword.find( '<' ) != string::npos || displayedHeadword.find( '&' ) != string::npos ) {
               string result = Html::unescapeUtf8( displayedHeadword );
 
               if ( result != headword )
                 alternates.push_back( result );
             }
             else
-              alternates.push_back(displayedHeadword);
+              alternates.push_back( displayedHeadword );
           }
         }
 
         entry.headword = headword;
 
         entry.displayedHeadword = displayedHeadword;
-        entry.definition = definition;
+        entry.definition        = definition;
 
         entry.alternates = alternates;
 
-        if( block.length ) free( block.data );
+        if ( block.length )
+          free( block.data );
 
         // Some dictionaries can in fact have an empty headword, so we
         // make it non-empty here to differentiate between the end of entries.
@@ -719,54 +691,59 @@ bgl_entry Babylon::readEntry( ResourceHandler * resourceHandler )
         return entry;
 
         break;
-      default:
-        ;
+      default:;
     }
-    if( block.length ) free( block.data );
+    if ( block.length )
+      free( block.data );
   }
   entry.headword = "";
   return entry;
 }
 
 
-
-void Babylon::convertToUtf8( std::string &s, unsigned int type )
+void Babylon::convertToUtf8( std::string & s, unsigned int type )
 {
-  if( s.size() < 1 ) return;
-  if( type > 2 ) return;
-
-  if( s.compare( 0, 13, "<charset c=U>") == 0 )
-      return;
-
-  std::string charset;
-  switch( type )
-  {
-    case BGL_DEFAULT_CHARSET:
-      if(!m_defaultCharset.empty()) charset = m_defaultCharset;
-      else charset = m_sourceCharset;
-      break;
-    case BGL_SOURCE_CHARSET:
-      if(!m_sourceCharset.empty()) charset = m_sourceCharset;
-      else charset = m_defaultCharset;
-      break;
-    case BGL_TARGET_CHARSET:
-      if(!m_targetCharset.empty()) charset = m_targetCharset;
-      else charset = m_defaultCharset;
-      break;
-    default:
-      ;
-  }
-
-  if( charset == "UTF-8" )
+  if ( s.size() < 1 )
+    return;
+  if ( type > 2 )
     return;
 
-  Iconv conv_("UTF-8", charset.c_str());
+  if ( s.compare( 0, 13, "<charset c=U>" ) == 0 )
+    return;
+
+  std::string charset;
+  switch ( type ) {
+    case BGL_DEFAULT_CHARSET:
+      if ( !m_defaultCharset.empty() )
+        charset = m_defaultCharset;
+      else
+        charset = m_sourceCharset;
+      break;
+    case BGL_SOURCE_CHARSET:
+      if ( !m_sourceCharset.empty() )
+        charset = m_sourceCharset;
+      else
+        charset = m_defaultCharset;
+      break;
+    case BGL_TARGET_CHARSET:
+      if ( !m_targetCharset.empty() )
+        charset = m_targetCharset;
+      else
+        charset = m_defaultCharset;
+      break;
+    default:;
+  }
+
+  if ( charset == "UTF-8" )
+    return;
+
+  Iconv conv_( charset.c_str() );
 
   size_t inbufbytes = s.size();
 
-  char* inbuf = (char*)s.data();
-  const void* test = inbuf;
+  char * inbuf      = (char *)s.data();
+  const void * test = inbuf;
 
-  const QString convStr = conv_.convert(test,inbufbytes);
-  s               = convStr.toStdString();
+  const QString convStr = conv_.convert( test, inbufbytes );
+  s                     = convStr.toStdString();
 }
diff --git a/src/dict/bgl_babylon.hh b/src/dict/bgl_babylon.hh
index e1694be6..565c201c 100644
--- a/src/dict/bgl_babylon.hh
+++ b/src/dict/bgl_babylon.hh
@@ -28,204 +28,206 @@
 #include <vector>
 #include <qglobal.h>
 #include <stdint.h>
+#include <array>
 
-//const std::string bgl_language[] = {
 #ifndef blgCode2Int
-#define blgCode2Int( index, code0, code1 ) (((uint32_t)index) << 16 ) + (((uint32_t)code1) << 8 ) + (uint32_t)code0
+  #define blgCode2Int( index, code0, code1 ) \
+    ( ( (uint32_t)index ) << 16 ) + ( ( (uint32_t)code1 ) << 8 ) + (uint32_t)code0
 #endif
-const quint32 bgl_language[] = {
-    blgCode2Int( 0, 'e', 'n' ),// "English",
-    blgCode2Int( 0, 'f', 'r' ),//"French",
-    blgCode2Int( 0, 'i', 't' ),//"Italian",
-    blgCode2Int( 0, 'e', 's' ),//"Spanish",
-    blgCode2Int( 0, 'n', 'l' ),//"Dutch",
-    blgCode2Int( 0, 'p', 't' ),//"Portuguese",
-    blgCode2Int( 0, 'd', 'e' ),//"German",
-    blgCode2Int( 0, 'r', 'u' ),//"Russian",
-    blgCode2Int( 0, 'j', 'a' ),//"Japanese",
-    blgCode2Int( 1, 'z', 'h' ),//"\x01",//"Traditional Chinese",
-    blgCode2Int( 2, 'z', 'h' ),//"\x02",//"Simplified Chinese",
-    blgCode2Int( 0, 'e', 'l' ),//"Greek",
-    blgCode2Int( 0, 'k', 'o' ),//"Korean",
-    blgCode2Int( 0, 't', 'r' ),//"Turkish",
-    blgCode2Int( 0, 'h', 'e' ),//"Hebrew",
-    blgCode2Int( 0, 'a', 'r' ),//"Arabic",
-    blgCode2Int( 0, 't', 'h' ),//"Thai",
-    blgCode2Int( 3, 0, 0 ),//"\x03",//"Other",
-    blgCode2Int( 4, 'z', 'h' ),//"\x04",//"Other Simplified Chinese dialects",
-    blgCode2Int( 5, 'z', 'h' ),//"\x05",//Other Traditional Chinese dialects",
-    blgCode2Int( 6, 0, 0 ),//"\x06",//Other Eastern-European languages",
-    blgCode2Int( 7, 0, 0 ),//"\x07",//Other Western-European languages",
-    blgCode2Int( 8, 'r', 'u' ),//"\x08",//Other Russian languages",
-    blgCode2Int( 9, 'j', 'a' ),//"\x09",//Other Japanese languages",
-    blgCode2Int( 10, 0, 0 ),//"\x0A",//"Other Baltic languages",
-    blgCode2Int( 11, 'e', 'l' ),//"\x0B",//Other Greek languages",
-    blgCode2Int( 12, 'k', 'o' ),//"\x0C",//"Other Korean dialects",
-    blgCode2Int( 13, 't', 'r' ),//"\x0D",//Other Turkish dialects",
-    blgCode2Int( 14, 't', 'h' ),//"\x0E",//"Other Thai dialects",
-    blgCode2Int( 0, 'p', 'l' ),//"Polish",
-    blgCode2Int( 0, 'h', 'u' ),//"Hungarian",
-    blgCode2Int( 0, 'c', 's' ),//"Czech",
-    blgCode2Int( 0, 'l', 't' ),//"Lithuanian",
-    blgCode2Int( 0, 'l', 'v' ),//"Latvian",
-    blgCode2Int( 0, 'c', 'a' ),//"Catalan",
-    blgCode2Int( 0, 'h', 'r' ),//"Croatian",
-    blgCode2Int( 0, 's', 'r' ),//"Serbian",
-    blgCode2Int( 0, 's', 'k' ),//"Slovak",
-    blgCode2Int( 0, 's', 'q' ),//"Albanian",
-    blgCode2Int( 0, 'u', 'r' ),//"Urdu",
-    blgCode2Int( 0, 's', 'l' ),//"Slovenian",
-    blgCode2Int( 0, 'e', 't' ),//"Estonian",
-    blgCode2Int( 0, 'b', 'g' ),//"Bulgarian",
-    blgCode2Int( 0, 'd', 'a' ),//"Danish",
-    blgCode2Int( 0, 'f', 'i' ),//"Finnish",
-    blgCode2Int( 0, 'i', 's' ),//"Icelandic",
-    blgCode2Int( 0, 'n', 'o' ),//"Norwegian",
-    blgCode2Int( 0, 'r', 'o' ),//"Romanian",
-    blgCode2Int( 0, 's', 'v' ),//"Swedish",
-    blgCode2Int( 0, 'u', 'k' ),//"Ukrainian",
-    blgCode2Int( 0, 'b', 'e' ),//"Belarusian",
-    blgCode2Int( 0, 'f', 'a' ),//"Farsi"=Persian,
-    blgCode2Int( 0, 'e', 'u' ),//"Basque",
-    blgCode2Int( 0, 'm', 'k' ),//"Macedonian",
-    blgCode2Int( 0, 'a', 'f' ),//"Afrikaans",
-    blgCode2Int( 0, 'f', 'o' ),//"Faeroese"=Faroese,
-    blgCode2Int( 0, 'l', 'a' ),//"Latin",
-    blgCode2Int( 0, 'e', 'o' ),//"Esperanto",
-    blgCode2Int( 15, 0, 0 ),//"Tamazight",
-    blgCode2Int( 0, 'h', 'y' )//"Armenian"
+const std::array< quint32, 60 > bgl_language = {
+  blgCode2Int( 0, 'e', 'n' ),  // "English",
+  blgCode2Int( 0, 'f', 'r' ),  //"French",
+  blgCode2Int( 0, 'i', 't' ),  //"Italian",
+  blgCode2Int( 0, 'e', 's' ),  //"Spanish",
+  blgCode2Int( 0, 'n', 'l' ),  //"Dutch",
+  blgCode2Int( 0, 'p', 't' ),  //"Portuguese",
+  blgCode2Int( 0, 'd', 'e' ),  //"German",
+  blgCode2Int( 0, 'r', 'u' ),  //"Russian",
+  blgCode2Int( 0, 'j', 'a' ),  //"Japanese",
+  blgCode2Int( 1, 'z', 'h' ),  //"\x01",//"Traditional Chinese",
+  blgCode2Int( 2, 'z', 'h' ),  //"\x02",//"Simplified Chinese",
+  blgCode2Int( 0, 'e', 'l' ),  //"Greek",
+  blgCode2Int( 0, 'k', 'o' ),  //"Korean",
+  blgCode2Int( 0, 't', 'r' ),  //"Turkish",
+  blgCode2Int( 0, 'h', 'e' ),  //"Hebrew",
+  blgCode2Int( 0, 'a', 'r' ),  //"Arabic",
+  blgCode2Int( 0, 't', 'h' ),  //"Thai",
+  blgCode2Int( 3, 0, 0 ),      //"\x03",//"Other",
+  blgCode2Int( 4, 'z', 'h' ),  //"\x04",//"Other Simplified Chinese dialects",
+  blgCode2Int( 5, 'z', 'h' ),  //"\x05",//Other Traditional Chinese dialects",
+  blgCode2Int( 6, 0, 0 ),      //"\x06",//Other Eastern-European languages",
+  blgCode2Int( 7, 0, 0 ),      //"\x07",//Other Western-European languages",
+  blgCode2Int( 8, 'r', 'u' ),  //"\x08",//Other Russian languages",
+  blgCode2Int( 9, 'j', 'a' ),  //"\x09",//Other Japanese languages",
+  blgCode2Int( 10, 0, 0 ),     //"\x0A",//"Other Baltic languages",
+  blgCode2Int( 11, 'e', 'l' ), //"\x0B",//Other Greek languages",
+  blgCode2Int( 12, 'k', 'o' ), //"\x0C",//"Other Korean dialects",
+  blgCode2Int( 13, 't', 'r' ), //"\x0D",//Other Turkish dialects",
+  blgCode2Int( 14, 't', 'h' ), //"\x0E",//"Other Thai dialects",
+  blgCode2Int( 0, 'p', 'l' ),  //"Polish",
+  blgCode2Int( 0, 'h', 'u' ),  //"Hungarian",
+  blgCode2Int( 0, 'c', 's' ),  //"Czech",
+  blgCode2Int( 0, 'l', 't' ),  //"Lithuanian",
+  blgCode2Int( 0, 'l', 'v' ),  //"Latvian",
+  blgCode2Int( 0, 'c', 'a' ),  //"Catalan",
+  blgCode2Int( 0, 'h', 'r' ),  //"Croatian",
+  blgCode2Int( 0, 's', 'r' ),  //"Serbian",
+  blgCode2Int( 0, 's', 'k' ),  //"Slovak",
+  blgCode2Int( 0, 's', 'q' ),  //"Albanian",
+  blgCode2Int( 0, 'u', 'r' ),  //"Urdu",
+  blgCode2Int( 0, 's', 'l' ),  //"Slovenian",
+  blgCode2Int( 0, 'e', 't' ),  //"Estonian",
+  blgCode2Int( 0, 'b', 'g' ),  //"Bulgarian",
+  blgCode2Int( 0, 'd', 'a' ),  //"Danish",
+  blgCode2Int( 0, 'f', 'i' ),  //"Finnish",
+  blgCode2Int( 0, 'i', 's' ),  //"Icelandic",
+  blgCode2Int( 0, 'n', 'o' ),  //"Norwegian",
+  blgCode2Int( 0, 'r', 'o' ),  //"Romanian",
+  blgCode2Int( 0, 's', 'v' ),  //"Swedish",
+  blgCode2Int( 0, 'u', 'k' ),  //"Ukrainian",
+  blgCode2Int( 0, 'b', 'e' ),  //"Belarusian",
+  blgCode2Int( 0, 'f', 'a' ),  //"Farsi"=Persian,
+  blgCode2Int( 0, 'e', 'u' ),  //"Basque",
+  blgCode2Int( 0, 'm', 'k' ),  //"Macedonian",
+  blgCode2Int( 0, 'a', 'f' ),  //"Afrikaans",
+  blgCode2Int( 0, 'f', 'o' ),  //"Faeroese"=Faroese,
+  blgCode2Int( 0, 'l', 'a' ),  //"Latin",
+  blgCode2Int( 0, 'e', 'o' ),  //"Esperanto",
+  blgCode2Int( 15, 0, 0 ),     //"Tamazight",
+  blgCode2Int( 0, 'h', 'y' )   //"Armenian"
 };
 
+const std::vector< std::string > bgl_charset = { "WINDOWS-1252", /*Default*/
+                                                 "WINDOWS-1252", /*Latin*/
+                                                 "WINDOWS-1250", /*Eastern European*/
+                                                 "WINDOWS-1251", /*Cyriilic*/
+                                                 "CP932",        /*Japanese*/
+                                                 "BIG5",         /*Traditional Chinese*/
+                                                 "GB18030",      /*Simplified Chinese*/
+                                                 "CP1257",       /*Baltic*/
+                                                 "CP1253",       /*Greek*/
+                                                 "EUC-KR",       /*Korean*/
+                                                 "ISO-8859-9",   /*Turkish*/
+                                                 "WINDOWS-1255", /*Hebrew*/
+                                                 "CP1256",       /*Arabic*/
+                                                 "CP874" /*Thai*/ };
 
-const std::string bgl_charsetname[] = {
-	"Default" ,
-	"Latin",
-	"Eastern European",
-	"Cyrillic",
-	"Japanese",
-	"Traditional Chinese",
-	"Simplified Chinese",
-	"Baltic",
-	"Greek",
-	"Korean",
-	"Turkish",
-	"Hebrew",
-	"Arabic",
-	"Thai" };
+const std::array< std::string, 11 > partOfSpeech = {
+  "n.", "adj.", "v.", "adv.", "interj.", "pron.", "prep.", "conj.", "suff.", "pref.", "art." };
 
-const std::string bgl_charset[] = {
-	"WINDOWS-1252", /*Default*/
-	"WINDOWS-1252", /*Latin*/
-	"WINDOWS-1250", /*Eastern European*/
-	"WINDOWS-1251", /*Cyriilic*/
-	"CP932", /*Japanese*/
-	"BIG5", /*Traditional Chinese*/
-	"GB18030", /*Simplified Chinese*/
-	"CP1257", /*Baltic*/
-	"CP1253", /*Greek*/
-	"EUC-KR",  /*Korean*/
-	"ISO-8859-9", /*Turkish*/
-	"WINDOWS-1255", /*Hebrew*/
-	"CP1256", /*Arabic*/
-	"CP874"  /*Thai*/ };
-
-const std::string partOfSpeech[] = {
-  "n.",
-  "adj.",
-  "v.",
-  "adv.",
-  "interj.",
-  "pron.",
-  "prep.",
-  "conj.",
-  "suff.",
-  "pref.",
-  "art." };
-
-typedef struct {
-	unsigned type;
-	unsigned length;
-	char * data;
+typedef struct
+{
+  unsigned type;
+  unsigned length;
+  char * data;
 } bgl_block;
 
-typedef struct {
-        std::string headword;
-        std::string definition;
-        std::string displayedHeadword;
-        std::vector<std::string> alternates;
+typedef struct
+{
+  std::string headword;
+  std::string definition;
+  std::string displayedHeadword;
+  std::vector< std::string > alternates;
 } bgl_entry;
 
 class Babylon
 {
 public:
-    Babylon( std::string );
-    ~Babylon();
+  Babylon( const std::string & );
+  ~Babylon();
 
-    // Subclass this to store resources
-    class ResourceHandler
-    {
-    public:
+  // Subclass this to store resources
+  class ResourceHandler
+  {
+  public:
 
-      virtual void handleBabylonResource( std::string const & filename,
-                                          char const * data, size_t size )=0;
+    virtual void handleBabylonResource( std::string const & filename, char const * data, size_t size ) = 0;
 
-      virtual ~ResourceHandler()
-      {}
-    };
+    virtual ~ResourceHandler() {}
+  };
 
-    /// Sets a prefix string to append to each resource reference in hyperlinks.
-    void setResourcePrefix( std::string const & prefix )
-    { m_resourcePrefix = prefix; }
+  /// Sets a prefix string to append to each resource reference in hyperlinks.
+  void setResourcePrefix( std::string const & prefix )
+  {
+    m_resourcePrefix = prefix;
+  }
 
-    bool open();
-    void close();
-    bool readBlock( bgl_block& );
-    bool read(std::string &source_charset, std::string &target_charset);
-    bgl_entry readEntry( ResourceHandler * = 0 );
+  bool open();
+  void close();
+  bool readBlock( bgl_block & );
+  bool read( const std::string & source_charset, const std::string & target_charset );
+  bgl_entry readEntry( ResourceHandler * = 0 );
 
-    inline std::string title() const { return m_title; }
-    inline std::string author() const { return m_author; }
-    inline std::string email() const { return m_email; }
-    inline std::string description() const { return m_description; }
-    inline std::string copyright() const { return m_copyright; }
-    inline quint32 sourceLang() const { return m_sourceLang; }//std::string sourceLang() const { return m_sourceLang; }
-    inline quint32 targetLang() const { return m_targetLang; }//inline std::string targetLang() const { return m_targetLang; }
-    inline unsigned int numEntries() const { return m_numEntries; }
-    inline std::string charset() const { return m_defaultCharset; }
+  inline std::string title() const
+  {
+    return m_title;
+  }
+  inline std::string author() const
+  {
+    return m_author;
+  }
+  inline std::string email() const
+  {
+    return m_email;
+  }
+  inline std::string description() const
+  {
+    return m_description;
+  }
+  inline std::string copyright() const
+  {
+    return m_copyright;
+  }
+  inline quint32 sourceLang() const
+  {
+    return m_sourceLang;
+  }
+  inline quint32 targetLang() const
+  {
+    return m_targetLang;
+  }
 
-    inline std::string filename() const { return m_filename; }
+  inline std::string filename() const
+  {
+    return m_filename;
+  }
 
-    std::vector< char > const & getIcon() const
-    { return icon; }
+  std::vector< char > const & getIcon() const
+  {
+    return icon;
+  }
 
-    enum
-    {
-      ParserVersion = 17
-    };
+  enum {
+    ParserVersion = 17
+  };
 
 private:
-    unsigned int bgl_readnum( int );
-    void convertToUtf8( std::string &, unsigned int = 0 );
+  unsigned int bgl_readnum( int );
+  void convertToUtf8( std::string &, unsigned int = 0 );
 
-    std::string m_filename;
-    gzFile file;
+  std::string m_filename;
+  gzFile file;
 
-    std::string m_title;
-    std::string m_author;
-    std::string m_email;
-    std::string m_description;
-    std::string m_copyright;
-    quint32 m_sourceLang; //std::string m_sourceLang;
-    quint32 m_targetLang;//std::string m_targetLang;
-    unsigned int m_numEntries;
-    std::string m_defaultCharset;
-    std::string m_sourceCharset;
-    std::string m_targetCharset;
-    std::vector< char > icon;
+  std::string m_title;
+  std::string m_author;
+  std::string m_email;
+  std::string m_description;
+  std::string m_copyright;
+  quint32 m_sourceLang;
+  quint32 m_targetLang;
+  unsigned int m_numEntries;
+  std::string m_defaultCharset;
+  std::string m_sourceCharset;
+  std::string m_targetCharset;
+  std::vector< char > icon;
 
-    std::string m_resourcePrefix;
+  std::string m_resourcePrefix;
 
-    enum CHARSET { BGL_DEFAULT_CHARSET, BGL_SOURCE_CHARSET, BGL_TARGET_CHARSET };
+  enum CHARSET {
+    BGL_DEFAULT_CHARSET,
+    BGL_SOURCE_CHARSET,
+    BGL_TARGET_CHARSET
+  };
 };
 
 #endif // BABYLON_H
diff --git a/src/dict/chinese.cc b/src/dict/chinese.cc
index b6e7c06c..61d35437 100644
--- a/src/dict/chinese.cc
+++ b/src/dict/chinese.cc
@@ -17,86 +17,87 @@ namespace Chinese {
 
 class CharacterConversionDictionary: public Transliteration::BaseTransliterationDictionary
 {
-// #ifdef Q_OS_MAC
+  // #ifdef Q_OS_MAC
   opencc_t converter;
-// #else
-//   opencc::SimpleConverter* converter;
-// #endif
+  // #else
+  //   opencc::SimpleConverter* converter;
+  // #endif
 
 public:
 
-  CharacterConversionDictionary( std::string const & id, std::string const & name,
-                                 QIcon icon, QString const & openccConfig);
+  CharacterConversionDictionary( std::string const & id,
+                                 std::string const & name,
+                                 QIcon icon,
+                                 QString const & openccConfig );
   ~CharacterConversionDictionary();
 
-  std::vector< gd::wstring > getAlternateWritings( gd::wstring const & )
-    noexcept override;
+  std::vector< gd::wstring > getAlternateWritings( gd::wstring const & ) noexcept override;
 };
 
 CharacterConversionDictionary::CharacterConversionDictionary( std::string const & id,
                                                               std::string const & name_,
                                                               QIcon icon_,
-                                                              QString const & openccConfig):
+                                                              QString const & openccConfig ):
   Transliteration::BaseTransliterationDictionary( id, name_, icon_, false ),
   converter( NULL )
 {
   try {
-// #ifdef Q_OS_MAC
+    // #ifdef Q_OS_MAC
     converter = opencc_open( openccConfig.toLocal8Bit().constData() );
-    if( converter == reinterpret_cast< opencc_t >( -1 ) )
-    {
+    if ( converter == reinterpret_cast< opencc_t >( -1 ) ) {
       gdWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s\n",
-                 openccConfig.toLocal8Bit().constData(), opencc_error() );
+                 openccConfig.toLocal8Bit().constData(),
+                 opencc_error() );
     }
-// #else
-//     converter = new opencc::SimpleConverter( openccConfig.toLocal8Bit().constData() );
-// #endif
-  } catch ( std::runtime_error& e ) {
+    // #else
+    //     converter = new opencc::SimpleConverter( openccConfig.toLocal8Bit().constData() );
+    // #endif
+  }
+  catch ( std::runtime_error & e ) {
     gdWarning( "CharacterConversionDictionary: failed to initialize OpenCC from config %s: %s\n",
-               openccConfig.toLocal8Bit().constData(), e.what() );
+               openccConfig.toLocal8Bit().constData(),
+               e.what() );
   }
 }
 
 CharacterConversionDictionary::~CharacterConversionDictionary()
 {
-// #ifdef Q_OS_MAC
+  // #ifdef Q_OS_MAC
   if ( converter != NULL && converter != reinterpret_cast< opencc_t >( -1 ) )
     opencc_close( converter );
-// #else
-//   if ( converter != NULL )
-//     delete converter;
-// #endif
+  // #else
+  //   if ( converter != NULL )
+  //     delete converter;
+  // #endif
 }
 
-std::vector< gd::wstring > CharacterConversionDictionary::getAlternateWritings( gd::wstring const & str )
-  noexcept
+std::vector< gd::wstring > CharacterConversionDictionary::getAlternateWritings( gd::wstring const & str ) noexcept
 {
   std::vector< gd::wstring > results;
 
   if ( converter != NULL ) {
     gd::wstring folded = Folding::applySimpleCaseOnly( str );
-    std::string input = Utf8::encode( folded );
+    std::string input  = Utf8::encode( folded );
     std::string output;
     gd::wstring result;
 
     try {
-// #ifdef Q_OS_MAC
-      if ( converter != NULL && converter != reinterpret_cast< opencc_t >( -1 ) )
-      {
+      // #ifdef Q_OS_MAC
+      if ( converter != NULL && converter != reinterpret_cast< opencc_t >( -1 ) ) {
         char * tmp = opencc_convert_utf8( converter, input.c_str(), input.length() );
-        if( tmp )
-        {
+        if ( tmp ) {
           output = std::string( tmp );
           opencc_convert_utf8_free( tmp );
         }
         else
           gdWarning( "OpenCC: conversion failed %s\n", opencc_error() );
       }
-// #else
-//       output = converter->Convert( input );
-// #endif
+      // #else
+      //       output = converter->Convert( input );
+      // #endif
       result = Utf8::decode( output );
-    } catch ( std::exception& ex ) {
+    }
+    catch ( std::exception & ex ) {
       gdWarning( "OpenCC: conversion failed %s\n", ex.what() );
     }
 
@@ -108,7 +109,7 @@ std::vector< gd::wstring > CharacterConversionDictionary::getAlternateWritings(
 }
 
 std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const & cfg )
-  
+
 {
   std::vector< sptr< Dictionary::Class > > result;
 
@@ -116,35 +117,45 @@ std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const
   QString configDir = "";
 #else
   QString configDir = Config::getOpenCCDir();
-  if( !configDir.isEmpty() )
+  if ( !configDir.isEmpty() )
     configDir += "/";
 #endif
 
-  if ( cfg.enable )
-  {
-    if ( cfg.enableSCToTWConversion )
-    {
-      result.push_back( std::make_shared<CharacterConversionDictionary>( "bf1c33a59cbacea8f39b5b5475787cfd",
-                                                           QCoreApplication::translate( "ChineseConversion", "Simplified to traditional Chinese (Taiwan variant) conversion" ).toUtf8().data(),
-                                                           QIcon( ":/flags/tw.png" ), configDir + "s2tw.json" ) );
+  if ( cfg.enable ) {
+    if ( cfg.enableSCToTWConversion ) {
+      result.push_back( std::make_shared< CharacterConversionDictionary >(
+        "bf1c33a59cbacea8f39b5b5475787cfd",
+        QCoreApplication::translate( "ChineseConversion",
+                                     "Simplified to traditional Chinese (Taiwan variant) conversion" )
+          .toUtf8()
+          .data(),
+        QIcon( ":/flags/tw.png" ),
+        configDir + "s2tw.json" ) );
     }
 
-    if ( cfg.enableSCToHKConversion )
-    {
-      result.push_back( std::make_shared<CharacterConversionDictionary>( "9e0681fb9e1c0b6c90e6fb46111d96b5",
-                                                           QCoreApplication::translate( "ChineseConversion", "Simplified to traditional Chinese (Hong Kong variant) conversion" ).toUtf8().data(),
-                                                           QIcon( ":/flags/hk.png" ), configDir + "s2hk.json" ) );
+    if ( cfg.enableSCToHKConversion ) {
+      result.push_back( std::make_shared< CharacterConversionDictionary >(
+        "9e0681fb9e1c0b6c90e6fb46111d96b5",
+        QCoreApplication::translate( "ChineseConversion",
+                                     "Simplified to traditional Chinese (Hong Kong variant) conversion" )
+          .toUtf8()
+          .data(),
+        QIcon( ":/flags/hk.png" ),
+        configDir + "s2hk.json" ) );
     }
 
-    if ( cfg.enableTCToSCConversion )
-    {
-      result.push_back( std::make_shared<CharacterConversionDictionary>( "0db536ce0bdc52ea30d11a82c5db4a27",
-                                                           QCoreApplication::translate( "ChineseConversion", "Traditional to simplified Chinese conversion" ).toUtf8().data(),
-                                                           QIcon( ":/flags/cn.png" ), configDir + "t2s.json" ) );
+    if ( cfg.enableTCToSCConversion ) {
+      result.push_back( std::make_shared< CharacterConversionDictionary >(
+        "0db536ce0bdc52ea30d11a82c5db4a27",
+        QCoreApplication::translate( "ChineseConversion", "Traditional to simplified Chinese conversion" )
+          .toUtf8()
+          .data(),
+        QIcon( ":/flags/cn.png" ),
+        configDir + "t2s.json" ) );
     }
   }
 
   return result;
 }
 
-}
+} // namespace Chinese
diff --git a/src/dict/chinese.hh b/src/dict/chinese.hh
index e42d27c5..cc3054de 100644
--- a/src/dict/chinese.hh
+++ b/src/dict/chinese.hh
@@ -11,9 +11,7 @@
 /// Chinese character conversion support.
 namespace Chinese {
 
-std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const & )
-  ;
-
+std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::Chinese const & );
 }
 
 #endif
diff --git a/src/dict/customtransliteration.cc b/src/dict/customtransliteration.cc
index b407c184..38a6863a 100644
--- a/src/dict/customtransliteration.cc
+++ b/src/dict/customtransliteration.cc
@@ -36,7 +36,7 @@ void CustomTransTable::parse( const QString & content )
       continue;
     }
 
-    ins(parts[0].toUtf8(),parts[1].toUtf8());
+    ins( parts[ 0 ].toUtf8(), parts[ 1 ].toUtf8() );
   }
 }
 
@@ -45,15 +45,17 @@ std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::CustomTrans c
 
   std::vector< sptr< Dictionary::Class > > result;
 
-  if(cusTran.enable){
-    static CustomTranslit::CustomTransTable t0(cusTran.context);
+  if ( cusTran.enable ) {
+    static CustomTranslit::CustomTransTable t0( cusTran.context );
 
-    result.push_back(  std::make_shared<Transliteration::TransliterationDictionary>( "custom-transliteration-dict",
-                                                                                      QCoreApplication::translate( "CustomTranslit", "custom transliteration" ).toUtf8().data(),
-                                                                                      QIcon( ":/icons/custom_trans.svg" ), t0, false ) );
+    result.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+      "custom-transliteration-dict",
+      QCoreApplication::translate( "CustomTranslit", "custom transliteration" ).toUtf8().data(),
+      QIcon( ":/icons/custom_trans.svg" ),
+      t0,
+      false ) );
   }
   return result;
-
 }
 
-}
+} // namespace CustomTranslit
diff --git a/src/dict/customtransliteration.hh b/src/dict/customtransliteration.hh
index 484815a5..caaa9bb5 100644
--- a/src/dict/customtransliteration.hh
+++ b/src/dict/customtransliteration.hh
@@ -1,5 +1,5 @@
 #ifndef CUSTOMTRANSLITERATION_HH
-  #define CUSTOMTRANSLITERATION_HH
+#define CUSTOMTRANSLITERATION_HH
 
 
 #include <vector>
@@ -22,5 +22,5 @@ private:
 
 std::vector< sptr< Dictionary::Class > > makeDictionaries( Config::CustomTrans const & );
 
-}
+} // namespace CustomTranslit
 #endif // CUSTOMTRANSLITERATION_HH
diff --git a/src/dict/dictdfiles.cc b/src/dict/dictdfiles.cc
index 624b1c90..01db2de0 100644
--- a/src/dict/dictdfiles.cc
+++ b/src/dict/dictdfiles.cc
@@ -24,7 +24,7 @@
 #include <QRegularExpression>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 namespace DictdFiles {
@@ -44,31 +44,30 @@ using BtreeIndexing::IndexInfo;
 
 namespace {
 
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 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
-{
-  Signature = 0x58444344, // DCDX on little-endian, XDCD on big-endian
+enum {
+  Signature            = 0x58444344, // DCDX on little-endian, XDCD on big-endian
   CurrentFormatVersion = 5 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, DCDX
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t wordCount; // Total number of words
-  uint32_t articleCount; // Total number of articles
+  uint32_t signature;             // First comes the signature, DCDX
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t wordCount;             // Total number of words
+  uint32_t articleCount;          // Total number of articles
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-  uint32_t langFrom;  // Source language
-  uint32_t langTo;    // Target language
+  uint32_t langFrom; // Source language
+  uint32_t langTo;   // Target language
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -78,9 +77,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 class DictdDictionary: public BtreeIndexing::BtreeDictionary
@@ -93,50 +91,57 @@ class DictdDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  DictdDictionary( string const & id, string const & indexFile,
-                   vector< string > const & dictionaryFiles );
+  DictdDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   ~DictdDictionary();
 
   string getName() noexcept override
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.articleCount; }
+  {
+    return idxHeader.articleCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   void loadIcon() noexcept override;
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   sptr< Dictionary::DataRequest >
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "DICTD", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "DICTD", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
 };
 
@@ -153,8 +158,7 @@ DictdDictionary::DictdDictionary( string const & id,
   idx.seek( sizeof( idxHeader ) );
 
   vector< char > dName( idx.read< uint32_t >() );
-  if( dName.size() > 0 )
-  {
+  if ( dName.size() > 0 ) {
     idx.read( &dName.front(), dName.size() );
     dictionaryName = string( &dName.front(), dName.size() );
   }
@@ -165,14 +169,11 @@ DictdDictionary::DictdDictionary( string const & id,
   dz = dict_data_open( dictionaryFiles[ 1 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exDictzipError( string( dz_error_str( error ) )
-                          + "(" + getDictionaryFilenames()[ 1 ] + ")" );
+    throw exDictzipError( string( dz_error_str( error ) ) + "(" + getDictionaryFilenames()[ 1 ] + ")" );
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   // Full-text search parameters
 
@@ -180,8 +181,7 @@ DictdDictionary::DictdDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -206,7 +206,7 @@ string nameFromFileName( string const & indexFileName )
   if ( !dot )
     dot = indexFileName.c_str() + indexFileName.size();
 
-  return  string( sep + 1, dot - sep - 1 );
+  return string( sep + 1, dot - sep - 1 );
 }
 
 void DictdDictionary::loadIcon() noexcept
@@ -219,10 +219,9 @@ void DictdDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 5 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_dictd.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_dictd.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -234,8 +233,7 @@ uint32_t decodeBase64( string const & str )
 
   uint32_t number = 0;
 
-  for( char const * next = str.c_str(); *next; ++next )
-  {
+  for ( char const * next = str.c_str(); *next; ++next ) {
     char const * d = strchr( digits, *next );
 
     if ( !d )
@@ -251,14 +249,12 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
                                                              vector< wstring > const & alts,
                                                              wstring const &,
                                                              bool ignoreDiacritics )
-  
+
 {
-  try
-  {
+  try {
     vector< WordArticleLink > chain = findArticles( word, ignoreDiacritics );
 
-    for( unsigned x = 0; x < alts.size(); ++x )
-    {
+    for ( unsigned x = 0; x < alts.size(); ++x ) {
       /// Make an additional query for each alt
 
       vector< WordArticleLink > altChain = findArticles( alts[ x ], ignoreDiacritics );
@@ -273,13 +269,12 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
                                       // by only allowing them to appear once.
 
     wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-    if( ignoreDiacritics )
+    if ( ignoreDiacritics )
       wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
     char buf[ 16384 ];
 
-    for( unsigned x = 0; x < chain.size(); ++x )
-    {
+    for ( unsigned x = 0; x < chain.size(); ++x ) {
       if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
         continue; // We already have this article in the body.
 
@@ -307,15 +302,13 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
 
       uint32_t articleOffset = decodeBase64( string( tab1 + 1, tab2 - tab1 - 1 ) );
 
-      char * tab3 = strchr( tab2 + 1, '\t');
+      char * tab3 = strchr( tab2 + 1, '\t' );
 
       uint32_t articleSize;
-      if ( tab3 )
-      {
-         articleSize = decodeBase64( string( tab2 + 1, tab3 - tab2 - 1 ) );
+      if ( tab3 ) {
+        articleSize = decodeBase64( string( tab2 + 1, tab3 - tab2 - 1 ) );
       }
-      else
-      {
+      else {
         articleSize = decodeBase64( tab2 + 1 );
       }
 
@@ -327,25 +320,21 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
         articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
       }
 
-      if ( !articleBody )
-      {
-        articleText = string( "<div class=\"dictd_article\">DICTZIP error: " )
-                      + dict_error_str( dz ) + "</div>";
+      if ( !articleBody ) {
+        articleText = string( "<div class=\"dictd_article\">DICTZIP error: " ) + dict_error_str( dz ) + "</div>";
       }
-      else
-      {
+      else {
         static QRegularExpression phonetic( R"(\\([^\\]+)\\)",
                                             QRegularExpression::CaseInsensitiveOption ); // phonetics: \stuff\ ...
         static QRegularExpression refs( R"(\{([^\{\}]+)\})",
-                                        QRegularExpression::CaseInsensitiveOption );     // links: {stuff}
+                                        QRegularExpression::CaseInsensitiveOption ); // links: {stuff}
         static QRegularExpression links( "<a href=\"gdlookup://localhost/([^\"]*)\">",
                                          QRegularExpression::CaseInsensitiveOption );
-        static QRegularExpression tags( "<[^>]*>",
-                                        QRegularExpression::CaseInsensitiveOption );
+        static QRegularExpression tags( "<[^>]*>", QRegularExpression::CaseInsensitiveOption );
 
 
         articleText = string( "<div class=\"dictd_article\"" );
-        if( isToLanguageRTL() )
+        if ( isToLanguageRTL() )
           articleText += " dir=\"rtl\"";
         articleText += ">";
 
@@ -353,16 +342,15 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
         free( articleBody );
 
         QString articleString = QString::fromUtf8( convertedText.c_str() )
-                                .replace(phonetic, R"(<span class="dictd_phonetic">\1</span>)")
-                                .replace(refs, R"(<a href="gdlookup://localhost/\1">\1</a>)");
+                                  .replace( phonetic, R"(<span class="dictd_phonetic">\1</span>)" )
+                                  .replace( refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
         convertedText.erase();
 
         int pos = 0;
 
         QString articleNewString;
         QRegularExpressionMatchIterator it = links.globalMatch( articleString );
-        while( it.hasNext() )
-        {
+        while ( it.hasNext() ) {
           QRegularExpressionMatch match = it.next();
           articleNewString += articleString.mid( pos, match.capturedStart() - pos );
           pos = match.capturedEnd();
@@ -372,12 +360,12 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
           link.replace( "&nbsp;", " " );
 
           QString newLink = match.captured();
-          newLink.replace( 30, match.capturedLength( 1 ),
+          newLink.replace( 30,
+                           match.capturedLength( 1 ),
                            QString::fromUtf8( QUrl::toPercentEncoding( link.simplified() ) ) );
           articleNewString += newLink;
         }
-        if( pos )
-        {
+        if ( pos ) {
           articleNewString += articleString.mid( pos );
           articleString = articleNewString;
           articleNewString.clear();
@@ -394,95 +382,81 @@ sptr< Dictionary::DataRequest > DictdDictionary::getArticle( wstring const & wor
 
       // We do the case-folded comparison here.
 
-      wstring headwordStripped =
-        Folding::applySimpleCaseOnly( chain[ x ].word );
-      if( ignoreDiacritics )
+      wstring headwordStripped = Folding::applySimpleCaseOnly( chain[ x ].word );
+      if ( ignoreDiacritics )
         headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
       multimap< wstring, string > & mapToUse =
-        ( wordCaseFolded == headwordStripped ) ?
-          mainArticles : alternateArticles;
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-      mapToUse.insert( pair(
-        Folding::applySimpleCaseOnly(  chain[ x ].word  ),
-        articleText ) );
+      mapToUse.insert( pair( Folding::applySimpleCaseOnly( chain[ x ].word ), articleText ) );
 
       articlesIncluded.insert( chain[ x ].articleOffset );
     }
 
     if ( mainArticles.empty() && alternateArticles.empty() )
-      return std::make_shared<Dictionary::DataRequestInstant>( false );
+      return std::make_shared< Dictionary::DataRequestInstant >( false );
 
     string result;
 
     multimap< wstring, string >::const_iterator i;
 
-    for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
+    for ( i = mainArticles.begin(); i != mainArticles.end(); ++i )
       result += i->second;
 
-    for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
+    for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
       result += i->second;
 
-    sptr< Dictionary::DataRequestInstant > ret =
-      std::make_shared<Dictionary::DataRequestInstant>( true );
-
-    ret->getData().resize( result.size() );
-
-    memcpy( &(ret->getData().front()), result.data(), result.size() );
+    auto ret = std::make_shared< Dictionary::DataRequestInstant >( true );
+    ret->appendString( result );
 
     return ret;
   }
-  catch( std::exception & e )
-  {
-    return std::make_shared<Dictionary::DataRequestInstant>( QString( e.what() ) );
+  catch ( std::exception & e ) {
+    return std::make_shared< Dictionary::DataRequestInstant >( QString( e.what() ) );
   }
 }
 
-QString const& DictdDictionary::getDescription()
+QString const & DictdDictionary::getDescription()
 {
-    if( !dictionaryDescription.isEmpty() )
-        return dictionaryDescription;
-
-    sptr< Dictionary::DataRequest > req =
-      getArticle(  U"00databaseinfo" , vector< wstring >(), wstring(), false );
-
-    if ( req->dataSize() > 0 ) {
-      dictionaryDescription =
-        Html::unescape( QString::fromUtf8( req->getFullData().data(), req->getFullData().size() ),
-                        Html::HtmlOption::Keep );
-    }
-    else {
-      dictionaryDescription = "NONE";
-    }
-
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
+
+  sptr< Dictionary::DataRequest > req = getArticle( U"00databaseinfo", vector< wstring >(), wstring(), false );
+
+  if ( req->dataSize() > 0 ) {
+    dictionaryDescription = Html::unescape( QString::fromUtf8( req->getFullData().data(), req->getFullData().size() ),
+                                            Html::HtmlOption::Keep );
+  }
+  else {
+    dictionaryDescription = "NONE";
+  }
+
+  return dictionaryDescription;
 }
 
 void DictdDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "DictD: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "DictD: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "DictD: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
@@ -490,8 +464,7 @@ void DictdDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteratio
 
 void DictdDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     char buf[ 16384 ];
     {
       QMutexLocker _( &indexFileMutex );
@@ -517,15 +490,13 @@ void DictdDictionary::getArticleText( uint32_t articleAddress, QString & headwor
 
     uint32_t articleOffset = decodeBase64( string( tab1 + 1, tab2 - tab1 - 1 ) );
 
-    char * tab3 = strchr( tab2 + 1, '\t');
+    char * tab3 = strchr( tab2 + 1, '\t' );
 
     uint32_t articleSize;
-    if ( tab3 )
-    {
+    if ( tab3 ) {
       articleSize = decodeBase64( string( tab2 + 1, tab3 - tab2 - 1 ) );
     }
-    else
-    {
+    else {
       articleSize = decodeBase64( tab2 + 1 );
     }
 
@@ -537,29 +508,26 @@ void DictdDictionary::getArticleText( uint32_t articleAddress, QString & headwor
       articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
     }
 
-    if ( !articleBody )
-    {
+    if ( !articleBody ) {
       articleText = dict_error_str( dz );
     }
-    else
-    {
+    else {
       static QRegularExpression phonetic( R"(\\([^\\]+)\\)",
                                           QRegularExpression::CaseInsensitiveOption ); // phonetics: \stuff\ ...
       static QRegularExpression refs( R"(\{([^\{\}]+)\})",
-                                      QRegularExpression::CaseInsensitiveOption );     // links: {stuff}
+                                      QRegularExpression::CaseInsensitiveOption ); // links: {stuff}
 
       string convertedText = Html::preformat( articleBody, isToLanguageRTL() );
       free( articleBody );
 
       text = QString::fromUtf8( convertedText.data(), convertedText.size() )
-            .replace(phonetic, R"(<span class="dictd_phonetic">\1</span>)")
-            .replace(refs, R"(<a href="gdlookup://localhost/\1">\1</a>)");
+               .replace( phonetic, R"(<span class="dictd_phonetic">\1</span>)" )
+               .replace( refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
 
       text = Html::unescape( text );
     }
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "DictD: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -576,25 +544,20 @@ DictdDictionary::getSearchResults( QString const & searchString, int searchMode,
 
 } // anonymous namespace
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
     // Only allow .index suffixes
 
-    if ( i->size() < 6 ||
-         strcasecmp( i->c_str() + ( i->size() - 6 ), ".index" ) != 0 )
+    if ( i->size() < 6 || strcasecmp( i->c_str() + ( i->size() - 6 ), ".index" ) != 0 )
       continue;
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, *i );
 
       // Check if there is an 'abrv' file present
@@ -602,9 +565,8 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
       dictFiles.push_back( string() );
 
-      if ( !File::tryPossibleName( baseName + "dict", dictFiles[ 1 ] ) &&
-           !File::tryPossibleName( baseName + "dict.dz", dictFiles[ 1 ] ) )
-      {
+      if ( !File::tryPossibleName( baseName + "dict", dictFiles[ 1 ] )
+           && !File::tryPossibleName( baseName + "dict.dz", dictFiles[ 1 ] ) ) {
         // No corresponding .dict file, skipping
         continue;
       }
@@ -613,9 +575,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
         string dictionaryName = nameFromFileName( dictFiles[ 0 ] );
 
@@ -642,8 +602,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         char buf[ 16384 ];
 
-        do
-        {
+        do {
           uint32_t curOffset = indexFile.tell();
 
           if ( !indexFile.gets( buf, sizeof( buf ), true ) )
@@ -651,17 +610,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           // Check that there are exactly two or three tabs in the record.
           char * tab1 = strchr( buf, '\t' );
-          if ( tab1 )
-          {
+          if ( tab1 ) {
             char * tab2 = strchr( tab1 + 1, '\t' );
-            if ( tab2 )
-            {
-              char * tab3 = strchr( tab2 + 1, '\t');
-              if ( tab3 )
-              {
-                char * tab4 = strchr( tab3 + 1, '\t');
-                if ( tab4 )
-                {
+            if ( tab2 ) {
+              char * tab3 = strchr( tab2 + 1, '\t' );
+              if ( tab3 ) {
+                char * tab4 = strchr( tab3 + 1, '\t' );
+                if ( tab4 ) {
                   GD_DPRINTF( "Warning: too many tabs present, skipping: %s\n", buf );
                   continue;
                 }
@@ -669,7 +624,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                 // Handle the forth entry, if it exists. From dictfmt man:
                 // When --index-keep-orig option is used fourth column is created
                 // (if necessary) in .index file.
-                indexedWords.addWord( Utf8::decode( string( tab3 + 1, strlen ( tab3 + 1 ) ) ), curOffset );
+                indexedWords.addWord( Utf8::decode( string( tab3 + 1, strlen( tab3 + 1 ) ) ), curOffset );
                 ++idxHeader.wordCount;
               }
               indexedWords.addWord( Utf8::decode( string( buf, strchr( buf, '\t' ) - buf ) ), curOffset );
@@ -677,28 +632,26 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
               ++idxHeader.articleCount;
 
               // Check for proper dictionary name
-              if ( !strncmp( buf, "00databaseshort", 15 ) || !strncmp( buf, "00-database-short", 17 ) )
-              {
+              if ( !strncmp( buf, "00databaseshort", 15 ) || !strncmp( buf, "00-database-short", 17 ) ) {
                 // 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 );
+                uint32_t articleSize   = decodeBase64( tab2 + 1 );
 
                 DZ_ERRORS error;
                 dictData * dz = dict_data_open( dictFiles[ 1 ].c_str(), &error, 0 );
 
-                if ( dz )
-                {
+                if ( dz ) {
                   char * articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
-                  if ( articleBody )
-                  {
+                  if ( articleBody ) {
                     char * eol;
-                    if ( !strncmp( articleBody, "00databaseshort", 15 ) || !strncmp( articleBody, "00-database-short", 17 ) )
-                      eol = strchr( articleBody, '\n'  ); // skip the first line (headword itself)
+                    if ( !strncmp( articleBody, "00databaseshort", 15 )
+                         || !strncmp( articleBody, "00-database-short", 17 ) )
+                      eol = strchr( articleBody, '\n' ); // skip the first line (headword itself)
                     else
                       eol = articleBody; // No headword itself
-                    if ( eol )
-                    {
-                      while( *eol && Utf8::isspace( *eol ) ) ++eol; // skip spaces
+                    if ( eol ) {
+                      while ( *eol && Utf8::isspace( *eol ) )
+                        ++eol; // skip spaces
 
                       // use only the single line for the dictionary title
                       char * endEol = strchr( eol, '\n' );
@@ -712,29 +665,26 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                   dict_data_close( dz );
                 }
                 else
-                  throw exDictzipError( string( dz_error_str( error ) )
-                                        + "(" + dictFiles[ 1 ] + ")" );
+                  throw exDictzipError( string( dz_error_str( error ) ) + "(" + dictFiles[ 1 ] + ")" );
               }
             }
-            else
-            {
+            else {
               GD_DPRINTF( "Warning: only a single tab present, skipping: %s\n", buf );
               continue;
             }
           }
-          else
-          {
+          else {
             GD_DPRINTF( "Warning: no tabs present, skipping: %s\n", buf );
             continue;
           }
 
 
-        } while( !indexFile.eof() );
+        } while ( !indexFile.eof() );
 
 
         // Write dictionary name
 
-        idx.write( (uint32_t) dictionaryName.size() );
+        idx.write( (uint32_t)dictionaryName.size() );
         idx.write( dictionaryName.data(), dictionaryName.size() );
 
         // Build index
@@ -742,44 +692,37 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
         idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-        idxHeader.indexRootOffset = idxInfo.rootOffset;
+        idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
         // That concludes it. Update the header.
 
-        idxHeader.signature = Signature;
+        idxHeader.signature     = Signature;
         idxHeader.formatVersion = CurrentFormatVersion;
 
         // read languages
-        QPair<quint32,quint32> langs =
-            LangCoder::findIdsForFilename( QString::fromStdString( dictFiles[ 0 ] ) );
+        QPair< quint32, quint32 > langs = LangCoder::findIdsForFilename( QString::fromStdString( dictFiles[ 0 ] ) );
 
         // if no languages found, try dictionary's name
-        if ( langs.first == 0 || langs.second == 0 )
-        {
-          langs =
-            LangCoder::findIdsForFilename( QString::fromStdString( nameFromFileName( dictFiles[ 0 ] ) ) );
+        if ( langs.first == 0 || langs.second == 0 ) {
+          langs = LangCoder::findIdsForFilename( QString::fromStdString( nameFromFileName( dictFiles[ 0 ] ) ) );
         }
 
         idxHeader.langFrom = langs.first;
-        idxHeader.langTo = langs.second;
+        idxHeader.langTo   = langs.second;
 
         idx.rewind();
 
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
 
-      dictionaries.push_back( std::make_shared<DictdDictionary>( dictId,
-                                                   indexFile,
-                                                   dictFiles ) );
+      dictionaries.push_back( std::make_shared< DictdDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "Dictd dictionary \"%s\" reading failed, error: %s\n",
-                 i->c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "Dictd dictionary \"%s\" reading failed, error: %s\n", i->c_str(), e.what() );
     }
   }
 
   return dictionaries;
 }
 
-}
+} // namespace DictdFiles
diff --git a/src/dict/dictdfiles.hh b/src/dict/dictdfiles.hh
index bd0b93e2..6c86cfae 100644
--- a/src/dict/dictdfiles.hh
+++ b/src/dict/dictdfiles.hh
@@ -12,12 +12,9 @@ namespace DictdFiles {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-    ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace DictdFiles
 
 #endif
diff --git a/src/dict/dictionary.cc b/src/dict/dictionary.cc
index ed950fc1..0653f9d3 100644
--- a/src/dict/dictionary.cc
+++ b/src/dict/dictionary.cc
@@ -38,8 +38,7 @@ void Request::update()
 
 void Request::finish()
 {
-  if ( !Utils::AtomicInt::loadAcquire( isFinishedFlag ) )
-  {
+  if ( !Utils::AtomicInt::loadAcquire( isFinishedFlag ) ) {
     isFinishedFlag.ref();
 
     emit finished();
@@ -70,7 +69,7 @@ size_t WordSearchRequest::matchesCount()
   return matches.size();
 }
 
-WordMatch WordSearchRequest::operator [] ( size_t index )
+WordMatch WordSearchRequest::operator[]( size_t index )
 {
   QMutexLocker _( &dataMutex );
 
@@ -91,11 +90,11 @@ vector< WordMatch > & WordSearchRequest::getAllMatches()
 void WordSearchRequest::addMatch( WordMatch const & match )
 {
   unsigned n;
-  for( n = 0; n < matches.size(); n++ )
-    if( matches[ n ].word.compare( match.word ) == 0 )
+  for ( n = 0; n < matches.size(); n++ )
+    if ( matches[ n ].word.compare( match.word ) == 0 )
       break;
 
-  if( n >= matches.size() )
+  if ( n >= matches.size() )
     matches.push_back( match );
 }
 
@@ -105,10 +104,11 @@ long DataRequest::dataSize()
 {
   QMutexLocker _( &dataMutex );
 
-  return hasAnyData ? (long) data.size() : -1;
+  return hasAnyData ? (long)data.size() : -1;
 }
 
-void DataRequest::appendDataSlice( const void * buffer, size_t size ) {
+void DataRequest::appendDataSlice( const void * buffer, size_t size )
+{
   QMutexLocker _( &dataMutex );
 
   size_t offset = data.size();
@@ -118,6 +118,13 @@ void DataRequest::appendDataSlice( const void * buffer, size_t size ) {
   memcpy( &data.front() + offset, buffer, size );
 }
 
+void DataRequest::appendString( std::string_view str )
+{
+  QMutexLocker _( &dataMutex );
+  data.reserve( data.size() + str.size() );
+  data.insert( data.end(), str.begin(), str.end() );
+}
+
 void DataRequest::getDataSlice( size_t offset, size_t size, void * buffer )
 {
   if ( size == 0 )
@@ -125,7 +132,7 @@ void DataRequest::getDataSlice( size_t offset, size_t size, void * buffer )
 
   QMutexLocker _( &dataMutex );
 
-  if( !hasAnyData )
+  if ( !hasAnyData )
     throw exSliceOutOfRange();
 
   memcpy( buffer, &data[ offset ], size );
@@ -140,13 +147,18 @@ vector< char > & DataRequest::getFullData()
 }
 
 Class::Class( string const & id_, vector< string > const & dictionaryFiles_ ):
-  id( id_ ), dictionaryFiles( dictionaryFiles_ ), indexedFtsDoc(0)
-  , dictionaryIconLoaded( false ), can_FTS( false),FTS_index_completed( false )
+  id( id_ ),
+  dictionaryFiles( dictionaryFiles_ ),
+  indexedFtsDoc( 0 ),
+  dictionaryIconLoaded( false ),
+  can_FTS( false ),
+  FTS_index_completed( false )
 {
 }
 
 void Class::deferredInit()
 {
+  //base method.
 }
 
 sptr< WordSearchRequest > Class::stemmedMatch( wstring const & /*str*/,
@@ -155,17 +167,16 @@ sptr< WordSearchRequest > Class::stemmedMatch( wstring const & /*str*/,
                                                unsigned long /*maxResults*/ )
 
 {
-  return std::make_shared<WordSearchRequestInstant>();
+  return std::make_shared< WordSearchRequestInstant >();
 }
 
 sptr< WordSearchRequest > Class::findHeadwordsForSynonym( wstring const & )
 
 {
-  return std::make_shared<WordSearchRequestInstant>();
+  return std::make_shared< WordSearchRequestInstant >();
 }
 
-vector< wstring > Class::getAlternateWritings( wstring const & )
-  noexcept
+vector< wstring > Class::getAlternateWritings( wstring const & ) noexcept
 {
   return vector< wstring >();
 }
@@ -185,7 +196,7 @@ QString Class::getContainingFolder() const
 sptr< DataRequest > Class::getResource( string const & /*name*/ )
 
 {
-  return std::make_shared<DataRequestInstant>( false );
+  return std::make_shared< DataRequestInstant >( false );
 }
 
 sptr< DataRequest > Class::getSearchResults( const QString &, int, bool, bool )
@@ -193,9 +204,9 @@ sptr< DataRequest > Class::getSearchResults( const QString &, int, bool, bool )
   return std::make_shared< DataRequestInstant >( false );
 }
 
-QString const& Class::getDescription()
+QString const & Class::getDescription()
 {
-    return dictionaryDescription;
+  return dictionaryDescription;
 }
 
 QString Class::getMainFilename()
@@ -205,18 +216,11 @@ QString Class::getMainFilename()
 
 QIcon const & Class::getIcon() noexcept
 {
-  if( !dictionaryIconLoaded )
+  if ( !dictionaryIconLoaded )
     loadIcon();
   return dictionaryIcon;
 }
 
-QIcon const & Class::getNativeIcon() noexcept
-{
-  if( !dictionaryIconLoaded )
-    loadIcon();
-  return dictionaryNativeIcon;
-}
-
 void Class::loadIcon() noexcept
 {
   dictionaryIconLoaded = true;
@@ -227,50 +231,41 @@ bool Class::loadIconFromFile( QString const & _filename, bool isFullName )
   QFileInfo info;
   QString fileName( _filename );
 
-  if( isFullName )
+  if ( isFullName )
     info = QFileInfo( fileName );
-  else
-  {
+  else {
     fileName += "bmp";
     info = QFileInfo( fileName );
-    if ( !info.isFile() )
-    {
+    if ( !info.isFile() ) {
       fileName.chop( 3 );
       fileName += "png";
       info = QFileInfo( fileName );
     }
-    if ( !info.isFile() )
-    {
+    if ( !info.isFile() ) {
       fileName.chop( 3 );
       fileName += "jpg";
       info = QFileInfo( fileName );
     }
-    if ( !info.isFile() )
-    {
+    if ( !info.isFile() ) {
       fileName.chop( 3 );
       fileName += "ico";
       info = QFileInfo( fileName );
     }
   }
 
-  if ( info.isFile() )
-  {
+  if ( info.isFile() ) {
     QImage img( fileName );
 
-    if ( !img.isNull() )
-    {
+    if ( !img.isNull() ) {
       // Load successful
 
       //some icon is very large ,will crash the application.
       img = img.scaledToWidth( 64 );
       // Apply the color key
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-      img.setAlphaChannel( img.createMaskFromColor( QColor( 192, 192, 192 ).rgb(),
-                                                    Qt::MaskOutColor ) );
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+      img.setAlphaChannel( img.createMaskFromColor( QColor( 192, 192, 192 ).rgb(), Qt::MaskOutColor ) );
 #endif
 
-      dictionaryNativeIcon = QIcon( QPixmap::fromImage( img ));
-
       // Transform it to be square
       int max = img.width() > img.height() ? img.width() : img.height();
 
@@ -278,7 +273,7 @@ bool Class::loadIconFromFile( QString const & _filename, bool isFullName )
       result.fill( 0 ); // Black transparent
 
       QPainter painter( &result );
-      painter.setRenderHint(QPainter::RenderHint::Antialiasing);
+      painter.setRenderHint( QPainter::RenderHint::Antialiasing );
       painter.drawImage( QPoint( img.width() == max ? 0 : ( max - img.width() ) / 2,
                                  img.height() == max ? 0 : ( max - img.height() ) / 2 ),
                          img );
@@ -295,12 +290,11 @@ bool Class::loadIconFromFile( QString const & _filename, bool isFullName )
 
 bool Class::loadIconFromText( QString iconUrl, QString const & text )
 {
-  if( text.isEmpty() )
+  if ( text.isEmpty() )
     return false;
   QImage img( iconUrl );
 
-  if ( !img.isNull() )
-  {
+  if ( !img.isNull() ) {
     int iconSize = 64;
     //some icon is very large ,will crash the application.
     img = img.scaledToWidth( iconSize );
@@ -309,11 +303,11 @@ bool Class::loadIconFromText( QString iconUrl, QString const & text )
     int max = img.width() > img.height() ? img.width() : img.height();
 
     QPainter painter( &result );
-    painter.setRenderHint(QPainter::RenderHint::Antialiasing);
+    painter.setRenderHint( QPainter::RenderHint::Antialiasing );
     painter.drawImage( QPoint( img.width() == max ? 0 : ( max - img.width() ) / 2,
                                img.height() == max ? 0 : ( max - img.height() ) / 2 ),
                        img );
-    painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
+    painter.setCompositionMode( QPainter::CompositionMode_SourceAtop );
 
     QFont font = painter.font();
     //the text should be a little smaller than the icon
@@ -323,14 +317,14 @@ bool Class::loadIconFromText( QString iconUrl, QString const & text )
 
     const QRect rectangle = QRect( 0, 0, iconSize, iconSize );
 
-         //select a single char.
+    //select a single char.
     auto abbrName = getAbbrName( text );
 
-    painter.drawText( rectangle, Qt::AlignCenter, abbrName);
+    painter.drawText( rectangle, Qt::AlignCenter, abbrName );
 
     painter.end();
 
-    dictionaryNativeIcon = dictionaryIcon = QIcon( QPixmap::fromImage( result ) );
+    dictionaryIcon = QIcon( QPixmap::fromImage( result ) );
 
     return !dictionaryIcon.isNull();
   }
@@ -339,21 +333,19 @@ bool Class::loadIconFromText( QString iconUrl, QString const & text )
 
 QString Class::getAbbrName( QString const & text )
 {
-  if(text.isEmpty())
+  if ( text.isEmpty() )
     return QString();
   //remove whitespace
   QString simplified = text;
-  simplified.remove(QRegularExpression("\\s"));
+  simplified.remove( QRegularExpression( "\\s" ) );
   int index = qHash( simplified ) % simplified.size();
 
   QString abbrName;
-  if( !Utils::isCJKChar( simplified.at( index ).unicode() ) )
-  {
+  if ( !Utils::isCJKChar( simplified.at( index ).unicode() ) ) {
     // take two chars.
     abbrName = simplified.mid( index, 2 );
   }
-  else
-  {
+  else {
     abbrName = simplified.mid( index, 1 );
   }
 
@@ -362,11 +354,10 @@ QString Class::getAbbrName( QString const & text )
 
 void Class::isolateCSS( QString & css, QString const & wrapperSelector )
 {
-  if( css.isEmpty() )
+  if ( css.isEmpty() )
     return;
 
-  QRegularExpression reg1( R"(\/\*(?:.(?!\*\/))*.?\*\/)",
-                           QRegularExpression::DotMatchesEverythingOption );
+  QRegularExpression reg1( R"(\/\*(?:.(?!\*\/))*.?\*\/)", QRegularExpression::DotMatchesEverythingOption );
   QRegularExpression reg2( R"([ \*\>\+,;:\[\{\]])" );
   QRegularExpression reg3( "[,;\\{]" );
 
@@ -381,88 +372,74 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
   // Strip comments
   css.replace( reg1, QString() );
 
-  for( ; ; )
-  {
-    if( currentPos >= css.length() )
+  for ( ;; ) {
+    if ( currentPos >= css.length() )
       break;
     QChar ch = css[ currentPos ];
 
-    if( ch == '@' )
-    {
+    if ( ch == '@' ) {
       // @ rules
 
       int n = currentPos;
-      if( css.mid( currentPos, 7 ).compare( "@import", Qt::CaseInsensitive ) == 0
-          || css.mid( currentPos, 10 ).compare( "@font-face", Qt::CaseInsensitive ) == 0
-          || css.mid( currentPos, 10 ).compare( "@namespace", Qt::CaseInsensitive ) == 0
-          || css.mid( currentPos, 8 ).compare( "@charset", Qt::CaseInsensitive ) == 0 )
-      {
+      if ( css.mid( currentPos, 7 ).compare( "@import", Qt::CaseInsensitive ) == 0
+           || css.mid( currentPos, 10 ).compare( "@font-face", Qt::CaseInsensitive ) == 0
+           || css.mid( currentPos, 10 ).compare( "@namespace", Qt::CaseInsensitive ) == 0
+           || css.mid( currentPos, 8 ).compare( "@charset", Qt::CaseInsensitive ) == 0 ) {
         // Copy rule as is.
-        n = css.indexOf( ';', currentPos );
+        n      = css.indexOf( ';', currentPos );
         int n2 = css.indexOf( '{', currentPos );
-        if( n2 > 0 && n > n2 )
+        if ( n2 > 0 && n > n2 )
           n = n2 - 1;
       }
-      else
-      if( css.mid( currentPos, 6 ).compare( "@media", Qt::CaseInsensitive ) == 0 )
-      {
+      else if ( css.mid( currentPos, 6 ).compare( "@media", Qt::CaseInsensitive ) == 0 ) {
         // We must to parse it content to isolate it.
         // Copy all up to '{' and continue parse inside.
         n = css.indexOf( '{', currentPos );
       }
-      else
-      if( css.mid( currentPos, 5 ).compare( "@page", Qt::CaseInsensitive ) == 0 )
-      {
+      else if ( css.mid( currentPos, 5 ).compare( "@page", Qt::CaseInsensitive ) == 0 ) {
         // Don't copy rule. GD use own page layout.
         n = css.indexOf( '}', currentPos );
-        if( n < 0 )
+        if ( n < 0 )
           break;
         currentPos = n + 1;
         continue;
       }
-      else
-      {
+      else {
         // Copy rule as is.
         n = css.indexOf( '}', currentPos );
       }
 
       newCSS.append( css.mid( currentPos, n < 0 ? n : n - currentPos + 1 ) );
 
-      if( n < 0 )
+      if ( n < 0 )
         break;
 
       currentPos = n + 1;
       continue;
     }
 
-    if( ch == '{' )
-    {
+    if ( ch == '{' ) {
       // Selector declaration block.
       // We copy it up to '}' as is.
 
       int n = css.indexOf( '}', currentPos );
       newCSS.append( css.mid( currentPos, n == -1 ? n : n - currentPos + 1 ) );
-      if( n < 0 )
+      if ( n < 0 )
         break;
       currentPos = n + 1;
       continue;
     }
 
-    if( ch.isLetter() || ch == '.' || ch == '#' || ch == '*' || ch == '\\' || ch == ':' )
-    {
-      if( ch.isLetter() || ch == '*' )
-      {
+    if ( ch.isLetter() || ch == '.' || ch == '#' || ch == '*' || ch == '\\' || ch == ':' ) {
+      if ( ch.isLetter() || ch == '*' ) {
         // Check for namespace prefix
         QChar chr;
-        for( int i = currentPos; i < css.length(); i++ )
-        {
+        for ( int i = currentPos; i < css.length(); i++ ) {
           chr = css[ i ];
-          if( chr.isLetterOrNumber() || chr.isMark() || chr == '_' || chr == '-'
-              || ( chr == '*' && i == currentPos ) )
+          if ( chr.isLetterOrNumber() || chr.isMark() || chr == '_' || chr == '-' || ( chr == '*' && i == currentPos ) )
             continue;
 
-          if( chr == '|' )
-          {
+          if ( chr == '|' ) {
             // Namespace prefix found, copy it as is
             newCSS.append( css.mid( currentPos, i - currentPos + 1 ) );
             currentPos = i + 1;
@@ -476,29 +453,26 @@ void Class::isolateCSS( QString & css, QString const & wrapperSelector )
       // This is some selector.
       // We must to add the isolate prefix to it.
 
-      int n = css.indexOf( reg2, currentPos + 1 );
+      int n     = css.indexOf( reg2, currentPos + 1 );
       QString s = css.mid( currentPos, n < 0 ? n : n - currentPos );
-      if( n < 0 )
-      {
+      if ( n < 0 ) {
         newCSS.append( s );
         break;
       }
       QString trimmed = s.trimmed();
-      if( trimmed.compare( "body", Qt::CaseInsensitive ) == 0
-          || trimmed.compare( "html", Qt::CaseInsensitive ) == 0 )
-      {
+      if ( trimmed.compare( "body", Qt::CaseInsensitive ) == 0
+           || trimmed.compare( "html", Qt::CaseInsensitive ) == 0 ) {
         newCSS.append( s + " " + prefix + " " );
         currentPos += 4;
       }
-      else
-      {
+      else {
         newCSS.append( prefix + " " );
       }
 
       n = css.indexOf( reg3, currentPos );
       s = css.mid( currentPos, n < 0 ? n : n - currentPos );
       newCSS.append( s );
-      if( n < 0 )
+      if ( n < 0 )
         break;
       currentPos = n;
       continue;
@@ -514,23 +488,18 @@ string makeDictionaryId( vector< string > const & dictionaryFiles ) noexcept
 {
   std::vector< string > sortedList;
 
-  if ( Config::isPortableVersion() )
-  {
+  if ( Config::isPortableVersion() ) {
     // For portable version, we use relative paths
     sortedList.reserve( dictionaryFiles.size() );
 
-    QDir dictionariesDir( Config::getPortableVersionDictionaryDir() );
-
-    for( unsigned x = 0; x < dictionaryFiles.size(); ++x )
-    {
-      string const & full( dictionaryFiles[ x ] );
+    const QDir dictionariesDir( Config::getPortableVersionDictionaryDir() );
 
+    for ( const auto & full : dictionaryFiles ) {
       QFileInfo fileInfo( QString::fromStdString( full ) );
 
       if ( fileInfo.isAbsolute() )
         sortedList.push_back( dictionariesDir.relativeFilePath( fileInfo.filePath() ).toStdString() );
-      else
-      {
+      else {
         // Well, it's relative. We don't technically support those, but
         // what the heck
         sortedList.push_back( full );
@@ -544,9 +513,9 @@ string makeDictionaryId( vector< string > const & dictionaryFiles ) noexcept
 
   QCryptographicHash hash( QCryptographicHash::Md5 );
 
-  for( std::vector< string >::const_iterator i = sortedList.begin();
-       i != sortedList.end(); ++i )
-    hash.addData( i->c_str(), i->size() + 1 );
+  for ( const auto & i : sortedList ) {
+    hash.addData( i.c_str(), i.size() + 1 );
+  }
 
   return hash.result().toHex().data();
 }
@@ -555,30 +524,25 @@ string makeDictionaryId( vector< string > const & dictionaryFiles ) noexcept
 // the dictionary backends, there's no platform-independent way to get hold
 // of a timestamp of the file, so we use here Qt anyway. It is supposed to
 // be fixed in the future when it's needed.
-bool needToRebuildIndex( vector< string > const & dictionaryFiles,
-                         string const & indexFile ) noexcept
+bool needToRebuildIndex( vector< string > const & dictionaryFiles, string const & indexFile ) noexcept
 {
   unsigned long lastModified = 0;
 
-  for( std::vector< string >::const_iterator i = dictionaryFiles.begin();
-       i != dictionaryFiles.end(); ++i )
-  {
-    QString name = QString::fromUtf8( i->c_str() );
+  for ( const auto & dictionaryFile : dictionaryFiles ) {
+    QString name = QString::fromUtf8( dictionaryFile.c_str() );
     QFileInfo fileInfo( name );
     unsigned long ts;
 
-    if( fileInfo.isDir() )
+    if ( fileInfo.isDir() )
       continue;
 
-    if( name.toLower().endsWith( ".zip" ) )
-    {
+    if ( name.toLower().endsWith( ".zip" ) ) {
       ZipFile::SplitZipFile zf( name );
-      if( !zf.exists() )
+      if ( !zf.exists() )
         return true;
       ts = zf.lastModified().toSecsSinceEpoch();
     }
-    else
-    {
+    else {
       if ( !fileInfo.exists() )
         return true;
       ts = fileInfo.lastModified().toSecsSinceEpoch();
@@ -605,19 +569,19 @@ string getFtsSuffix()
 QString generateRandomDictionaryId()
 {
   return QString(
-    QCryptographicHash::hash(
-      QDateTime::currentDateTime().toString( "\"Random\"dd.MM.yyyy hh:mm:ss.zzz" ).toUtf8(),
-      QCryptographicHash::Md5 ).toHex() );
+    QCryptographicHash::hash( QDateTime::currentDateTime().toString( "\"Random\"dd.MM.yyyy hh:mm:ss.zzz" ).toUtf8(),
+                              QCryptographicHash::Md5 )
+      .toHex() );
 }
 
-QMap< std::string, sptr< Dictionary::Class > >
-dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts )
+QMap< std::string, sptr< Dictionary::Class > > dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts )
 {
   QMap< std::string, sptr< Dictionary::Class > > dictMap;
-  for( auto dict : dicts )
-  {
+  for ( auto & dict : dicts ) {
+    if ( !dict )
+      continue;
     dictMap.insert( dict.get()->getId(), dict );
   }
   return dictMap;
 }
-}
+} // namespace Dictionary
diff --git a/src/dict/dictionary.hh b/src/dict/dictionary.hh
index c016193f..5fc4b646 100644
--- a/src/dict/dictionary.hh
+++ b/src/dict/dictionary.hh
@@ -29,8 +29,7 @@ using std::string;
 using gd::wstring;
 using std::map;
 
-enum Property
-{
+enum Property {
   Author,
   Copyright,
   Description,
@@ -42,6 +41,8 @@ DEF_EX( exIndexOutOfRange, "The supplied index is out of range", Ex )
 DEF_EX( exSliceOutOfRange, "The requested data slice is out of range", Ex )
 DEF_EX( exRequestUnfinished, "The request hasn't yet finished", Ex )
 
+DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+
 /// When you request a search to be performed in a dictionary, you get
 /// this structure in return. It accumulates search results over time.
 /// The finished() signal is emitted when the search has finished and there's
@@ -59,7 +60,8 @@ class Request: public QObject
   Q_OBJECT
 
 public:
-  Request( QObject * parent = nullptr ) : QObject( parent )
+  Request( QObject * parent = nullptr ):
+    QObject( parent )
   {
   }
   /// Returns whether the request has been processed in full and finished.
@@ -82,10 +84,9 @@ public:
   /// request result may be empty or incomplete). That is, finish() must be
   /// called by a derivative at least once if cancel() was called, either after
   /// or before it was called.
-  virtual void cancel()=0;
+  virtual void cancel() = 0;
 
-  virtual ~Request()
-  {}
+  virtual ~Request() {}
 
 signals:
 
@@ -99,7 +100,7 @@ signals:
   /// finished. That is, it's emitted when isFinished() turns true.
   void finished();
 
-  void matchCount(int);
+  void matchCount( int );
 
 protected:
 
@@ -129,10 +130,20 @@ struct WordMatch
   wstring word;
   int weight;
 
-  WordMatch(): weight( 0 ) {}
-  WordMatch( wstring const & word_ ): word( word_ ), weight( 0 ){}
-  WordMatch( wstring const & word_, int weight_ ): word( word_ ),
-    weight( weight_ ) {}
+  WordMatch():
+    weight( 0 )
+  {
+  }
+  WordMatch( wstring const & word_ ):
+    word( word_ ),
+    weight( 0 )
+  {
+  }
+  WordMatch( wstring const & word_, int weight_ ):
+    word( word_ ),
+    weight( weight_ )
+  {
+  }
 };
 
 /// This request type corresponds to all types of word searching operations.
@@ -142,8 +153,10 @@ class WordSearchRequest: public Request
 
 public:
 
-  WordSearchRequest(): uncertain( false )
-  {}
+  WordSearchRequest():
+    uncertain( false )
+  {
+  }
 
   /// Returns the number of matches found. The value can grow over time
   /// unless isFinished() is true.
@@ -151,17 +164,19 @@ public:
 
   /// Returns the match with the given zero-based index, which should be less
   /// than matchesCount().
-  WordMatch operator [] ( size_t index ) ;
+  WordMatch operator[]( size_t index );
 
   /// Returns all the matches found. Since no further locking can or would be
   /// done, this can only be called after the request has finished.
-  vector< WordMatch > & getAllMatches() ;
+  vector< WordMatch > & getAllMatches();
 
   /// Returns true if the match was uncertain -- that is, there may be more
   /// results in the dictionary itself, the dictionary index isn't good enough
   /// to tell that.
   bool isUncertain() const
-  { return uncertain; }
+  {
+    return uncertain;
+  }
 
   /// Add match if one is not presented in matches list
   void addMatch( WordMatch const & match );
@@ -191,16 +206,20 @@ public:
   /// the resource wasn't found.
   long dataSize();
 
+  void appendDataSlice( const void * buffer, size_t size );
+  void appendString( std::string_view str );
+
   /// Writes "size" bytes starting from "offset" of the data read to the given
   /// buffer. "size + offset" must be <= than dataSize().
   void getDataSlice( size_t offset, size_t size, void * buffer );
-  void appendDataSlice( const void * buffer, size_t size );
 
   /// Returns all the data read. Since no further locking can or would be
   /// done, this can only be called after the request has finished.
-  vector< char > & getFullData() ;
+  vector< char > & getFullData();
 
-  DataRequest( QObject * parent = 0 ) : Request( parent ), hasAnyData( false )
+  DataRequest( QObject * parent = 0 ):
+    Request( parent ),
+    hasAnyData( false )
   {
   }
 
@@ -220,16 +239,21 @@ class WordSearchRequestInstant: public WordSearchRequest
 public:
 
   WordSearchRequestInstant()
-  { finish(); }
+  {
+    finish();
+  }
 
-  virtual void cancel()
-  {}
+  void cancel() override {}
 
   vector< WordMatch > & getMatches()
-  { return matches; }
+  {
+    return matches;
+  }
 
   void setUncertain( bool value )
-  { uncertain = value; }
+  {
+    uncertain = value;
+  }
 };
 
 /// A helper class for synchronous data read implementations.
@@ -238,22 +262,28 @@ class DataRequestInstant: public DataRequest
 public:
 
   DataRequestInstant( bool succeeded )
-  { hasAnyData = succeeded; finish(); }
+  {
+    hasAnyData = succeeded;
+    finish();
+  }
 
   DataRequestInstant( QString const & errorString )
-  { setErrorString( errorString ); finish(); }
+  {
+    setErrorString( errorString );
+    finish();
+  }
 
-  virtual void cancel()
-  {}
+  virtual void cancel() {}
 
   vector< char > & getData()
-  { return data; }
+  {
+    return data;
+  }
 };
 
 /// Dictionary features. Different dictionaries can possess different features,
 /// which hint at some of their aspects.
-enum Feature
-{
+enum Feature {
   /// No features
   NoFeatures = 0,
   /// The dictionary is suitable to query when searching for compound expressions.
@@ -276,7 +306,7 @@ class Class: public QObject
 
 protected:
   QString dictionaryDescription;
-  QIcon dictionaryIcon, dictionaryNativeIcon;
+  QIcon dictionaryIcon;
   bool dictionaryIconLoaded;
   bool can_FTS;
   QAtomicInt FTS_index_completed;
@@ -314,13 +344,18 @@ public:
 
   /// Returns the dictionary's id.
   string getId() noexcept
-  { return id; }
+  {
+    return id;
+  }
 
   /// Returns the list of file names the dictionary consists of.
   vector< string > const & getDictionaryFilenames() noexcept
-  { return dictionaryFiles; }
+  {
+    return dictionaryFiles;
+  }
 
-  /// Get the main folder that contains the dictionary, without the ending separator .
+  /// Get the main folder that contains the dictionary, without the ending separator.
+  /// If the dict don't have folder like website/program, an empty string will be returned.
   QString getContainingFolder() const;
 
   /// Returns the dictionary's full name, utf8.
@@ -336,17 +371,19 @@ public:
 
   /// Returns all the available properties, like the author's name, copyright,
   /// description etc. All strings are in utf8.
-  virtual map< Property, string > getProperties() noexcept=0;
+  virtual map< Property, string > getProperties() noexcept = 0;
 
   /// Returns the features the dictionary possess. See the Feature enum for
   /// their list.
   virtual Features getFeatures() const noexcept
-  { return NoFeatures; }
+  {
+    return NoFeatures;
+  }
 
   /// Returns the number of articles in the dictionary.
-  virtual unsigned long getArticleCount() noexcept=0;
+  virtual unsigned long getArticleCount() noexcept = 0;
 
-  void setIndexedFtsDoc(long _indexedFtsDoc)
+  void setIndexedFtsDoc( long _indexedFtsDoc )
   {
     indexedFtsDoc = _indexedFtsDoc;
 
@@ -358,40 +395,39 @@ public:
     }
   }
 
-  int getIndexingFtsProgress(){
+  int getIndexingFtsProgress()
+  {
     auto total = getArticleCount();
-    if(total==0)
-      return 0 ;
-    return indexedFtsDoc*100/total;
+    if ( total == 0 )
+      return 0;
+    return indexedFtsDoc * 100 / total;
   }
 
   /// Returns the number of words in the dictionary. This can be equal to
   /// the number of articles, or can be larger if some synonyms are present.
-  virtual unsigned long getWordCount() noexcept=0;
+  virtual unsigned long getWordCount() noexcept = 0;
 
   /// Returns the dictionary's icon.
   virtual QIcon const & getIcon() noexcept;
 
-  /// Returns the dictionary's native icon. Dsl icons are usually rectangular,
-  /// and are adapted by getIcon() to be square. This function allows getting
-  /// the original icon with no geometry transformations applied.
-  virtual QIcon const & getNativeIcon() noexcept;
-
   /// Returns the dictionary's source language.
   virtual quint32 getLangFrom() const
-  { return 0; }
+  {
+    return 0;
+  }
 
   /// Returns the dictionary's target language.
   virtual quint32 getLangTo() const
-  { return 0; }
+  {
+    return 0;
+  }
 
   /// Looks up a given word in the dictionary, aiming for exact matches and
   /// prefix matches. If it's not possible to locate any prefix matches, no
   /// prefix results should be added. Not more than maxResults results should
   /// be stored. The whole operation is supposed to be fast, though some
   /// dictionaries, the network ones particularly, may of course be slow.
-  virtual sptr< WordSearchRequest > prefixMatch( wstring const &,
-                                                 unsigned long maxResults ) =0;
+  virtual sptr< WordSearchRequest > prefixMatch( wstring const &, unsigned long maxResults ) = 0;
 
   /// Looks up a given word in the dictionary, aiming to find different forms
   /// of the given word by allowing suffix variations. This means allowing words
@@ -401,26 +437,22 @@ public:
   /// Since the goal is to find forms of the words, no matches where a word
   /// in the middle of a phrase got matched should be returned.
   /// The default implementation does nothing, returning an empty result.
-  virtual sptr< WordSearchRequest > stemmedMatch( wstring const &,
-                                                  unsigned minLength,
-                                                  unsigned maxSuffixVariation,
-                                                  unsigned long maxResults ) ;
+  virtual sptr< WordSearchRequest >
+  stemmedMatch( wstring const &, unsigned minLength, unsigned maxSuffixVariation, unsigned long maxResults );
 
   /// Finds known headwords for the given word, that is, the words for which
   /// the given word is a synonym. If a dictionary can't perform this operation,
   /// it should leave the default implementation which always returns an empty
   /// result.
-  virtual sptr< WordSearchRequest > findHeadwordsForSynonym( wstring const & )
-    ;
+  virtual sptr< WordSearchRequest > findHeadwordsForSynonym( wstring const & );
 
   /// For a given word, provides alternate writings of it which are to be looked
   /// up alongside with it. Transliteration dictionaries implement this. The
   /// default implementation returns an empty list. Note that this function is
   /// supposed to be very fast and simple, and the results are thus returned
   /// synchronously.
-  virtual vector< wstring > getAlternateWritings( wstring const & )
-    noexcept;
-  
+  virtual vector< wstring > getAlternateWritings( wstring const & ) noexcept;
+
   /// Returns a definition for the given word. The definition should
   /// be an html fragment (without html/head/body tags) in an utf8 encoding.
   /// The 'alts' vector could contain a list of words the definitions of which
@@ -431,60 +463,70 @@ public:
   virtual sptr< DataRequest > getArticle( wstring const &,
                                           vector< wstring > const & alts,
                                           wstring const & context = wstring(),
-                                          bool ignoreDiacritics = false )
-    =0;
+                                          bool ignoreDiacritics   = false ) = 0;
 
   /// Loads contents of a resource named 'name' into the 'data' vector. This is
   /// usually a picture file referenced in the article or something like that.
   /// The default implementation always returns the non-existing resource
   /// response.
-  virtual sptr< DataRequest > getResource( string const & /*name*/ )
-    ;
+  virtual sptr< DataRequest > getResource( string const & /*name*/ );
 
   /// Returns a results of full-text search of given string similar getArticle().
   virtual sptr< DataRequest >
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics );
 
   // Return dictionary description if presented
-  virtual QString const& getDescription();
+  virtual QString const & getDescription();
 
   // Return dictionary main file name
   virtual QString getMainFilename();
 
   /// Check text direction
   bool isFromLanguageRTL()
-  { return LangCoder::isLanguageRTL( getLangFrom() ); }
+  {
+    return LangCoder::isLanguageRTL( getLangFrom() );
+  }
   bool isToLanguageRTL()
-  { return LangCoder::isLanguageRTL( getLangTo() ); }
+  {
+    return LangCoder::isLanguageRTL( getLangTo() );
+  }
 
   /// Return true if dictionary is local dictionary
   virtual bool isLocalDictionary()
-  { return false; }
+  {
+    return false;
+  }
 
   /// Dictionary can full-text search
   bool canFTS()
-  { return can_FTS; }
+  {
+    return can_FTS;
+  }
 
   /// Dictionary have index for full-text search
   bool haveFTSIndex()
-  { return Utils::AtomicInt::loadAcquire( FTS_index_completed ) != 0; }
+  {
+    return Utils::AtomicInt::loadAcquire( FTS_index_completed ) != 0;
+  }
 
   /// Make index for full-text search
-  virtual void makeFTSIndex( QAtomicInt &, bool )
-  {}
+  virtual void makeFTSIndex( QAtomicInt &, bool ) {}
 
   /// Set full-text search parameters
-  virtual void setFTSParameters( Config::FullTextSearch const & )
-  {}
+  virtual void setFTSParameters( Config::FullTextSearch const & ) {}
 
   /// Retrieve all dictionary headwords
   virtual bool getHeadwords( QStringList & )
-  { return false; }
-  virtual  void findHeadWordsWithLenth( int &, QSet< QString > * /*headwords*/, uint32_t ){}
+  {
+    return false;
+  }
+  virtual void findHeadWordsWithLenth( int &, QSet< QString > * /*headwords*/, uint32_t ) {}
 
   /// Enable/disable search via synonyms
   void setSynonymSearchEnabled( bool enabled )
-  { synonymSearchEnabled = enabled; }
+  {
+    synonymSearchEnabled = enabled;
+  }
 
   virtual ~Class() = default;
 };
@@ -498,7 +540,7 @@ public:
   /// dictionary is being indexed. Since indexing can take some time, this
   /// is useful to show in some kind of a splash screen.
   /// The dictionaryName is in utf8.
-  virtual void indexingDictionary( string const & dictionaryName ) noexcept=0;
+  virtual void indexingDictionary( string const & dictionaryName ) noexcept = 0;
 
   virtual ~Initializing() = default;
 };
@@ -515,18 +557,15 @@ string makeDictionaryId( vector< string > const & dictionaryFiles ) noexcept;
 /// the index file, or the index file doesn't exist, returns true. If some
 /// dictionary files don't exist, returns true, too.
 /// This function is supposed to be used by dictionary implementations.
-bool needToRebuildIndex( vector< string > const & dictionaryFiles,
-                         string const & indexFile ) noexcept;
+bool needToRebuildIndex( vector< string > const & dictionaryFiles, string const & indexFile ) noexcept;
 
 string getFtsSuffix();
 /// Returns a random dictionary id useful for interactively created
 /// dictionaries.
 QString generateRandomDictionaryId();
 
-QMap< std::string, sptr< Dictionary::Class > >
-dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts );
+QMap< std::string, sptr< Dictionary::Class > > dictToMap( std::vector< sptr< Dictionary::Class > > const & dicts );
 
-}
+} // namespace Dictionary
 
 #endif
-
diff --git a/src/dict/dictserver.cc b/src/dict/dictserver.cc
index 178db119..ba58b7be 100644
--- a/src/dict/dictserver.cc
+++ b/src/dict/dictserver.cc
@@ -25,88 +25,78 @@ namespace {
 
 #define MAX_MATCHES_COUNT 60
 
-bool readLine( QTcpSocket & socket, QString & line,
-               QString & errorString, QAtomicInt & isCancelled )
+bool readLine( QTcpSocket & socket, QString & line, QString & errorString, QAtomicInt & isCancelled )
 {
   line.clear();
   errorString.clear();
-  if( socket.state() != QTcpSocket::ConnectedState )
+  if ( socket.state() != QTcpSocket::ConnectedState )
     return false;
 
-  for( ; ; )
-  {
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  for ( ;; ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return false;
 
-    if( socket.canReadLine() )
-    {
+    if ( socket.canReadLine() ) {
       QByteArray reply = socket.readLine();
-      line = QString::fromUtf8( reply.data(), reply.size() );
+      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() + "\"";
+    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 )
+bool connectToServer( QTcpSocket & socket, QString const & url, QString & errorString, QAtomicInt & isCancelled )
 {
   QUrl serverUrl( url );
   quint16 port = serverUrl.port( DefaultPort );
   QString reply;
 
-  for( ; ; )
-  {
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  for ( ;; ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return false;
 
     socket.connectToHost( serverUrl.host(), port );
 
-    if( socket.state() != QTcpSocket::ConnectedState )
-    {
-      if( !socket.waitForConnected( 5000 ) )
+    if ( socket.state() != QTcpSocket::ConnectedState ) {
+      if ( !socket.waitForConnected( 5000 ) )
         break;
     }
 
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return false;
 
-    if( !readLine( socket, reply, errorString, isCancelled ) )
+    if ( !readLine( socket, reply, errorString, isCancelled ) )
       break;
 
-    if( !reply.isEmpty() && reply.left( 3 ) != "220" )
-    {
+    if ( !reply.isEmpty() && reply.left( 3 ) != "220" ) {
       errorString = "Server refuse connection: " + reply;
       return false;
     }
 
-    QString msgId = reply.mid( reply.lastIndexOf(" ") ).trimmed();
+    QString msgId = reply.mid( reply.lastIndexOf( " " ) ).trimmed();
 
-    socket.write( QByteArray( "CLIENT GoldenDict\r\n") );
-    if( !socket.waitForBytesWritten( 1000 ) )
+    socket.write( QByteArray( "CLIENT GoldenDict\r\n" ) );
+    if ( !socket.waitForBytesWritten( 1000 ) )
       break;
 
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return false;
 
-    if( !readLine( socket, reply, errorString, isCancelled ) )
+    if ( !readLine( socket, reply, errorString, isCancelled ) )
       break;
 
-    if( !serverUrl.userInfo().isEmpty() )
-    {
+    if ( !serverUrl.userInfo().isEmpty() ) {
       QString authCommand = QString( "AUTH " );
-      QString authString = msgId;
+      QString authString  = msgId;
 
       int pos = serverUrl.userInfo().indexOf( QRegularExpression( "[:;]" ) );
-      if( pos > 0 )
-      {
+      if ( pos > 0 ) {
         authCommand += serverUrl.userInfo().left( pos );
         authString += serverUrl.userInfo().mid( pos + 1 );
       }
@@ -119,17 +109,16 @@ bool connectToServer( QTcpSocket & socket, QString const & url,
 
       socket.write( authCommand.toUtf8() );
 
-      if( !socket.waitForBytesWritten( 1000 ) )
+      if ( !socket.waitForBytesWritten( 1000 ) )
         break;
 
-      if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
         return false;
 
-      if( !readLine( socket, reply, errorString, isCancelled ) )
+      if ( !readLine( socket, reply, errorString, isCancelled ) )
         break;
 
-      if( reply.left( 3 ) != "230" )
-      {
+      if ( reply.left( 3 ) != "230" ) {
         errorString = "Authentication error: " + reply;
         return false;
       }
@@ -137,17 +126,16 @@ bool connectToServer( QTcpSocket & socket, QString const & url,
 
     socket.write( QByteArray( "OPTION MIME\r\n" ) );
 
-    if( !socket.waitForBytesWritten( 1000 ) )
+    if ( !socket.waitForBytesWritten( 1000 ) )
       break;
 
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return false;
 
-    if( !readLine( socket, reply, errorString, isCancelled ) )
+    if ( !readLine( socket, reply, errorString, isCancelled ) )
       break;
 
-    if( reply.left( 3 ) != "250" )
-    {
+    if ( reply.left( 3 ) != "250" ) {
       // RFC 2229, 3.10.1.1:
       // OPTION MIME is a REQUIRED server capability,
       // all DICT servers MUST implement this command.
@@ -158,16 +146,16 @@ bool connectToServer( QTcpSocket & socket, QString const & url,
     return true;
   }
 
-  if( !Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
     errorString = QString( "Server connection fault, socket error %1: \"%2\"" )
-                  .arg( QString::number( socket.error() ) )
-                  .arg( socket.errorString() );
+                    .arg( QString::number( socket.error() ) )
+                    .arg( socket.errorString() );
   return false;
 }
 
 void disconnectFromServer( QTcpSocket & socket )
 {
-  if( socket.state() == QTcpSocket::ConnectedState )
+  if ( socket.state() == QTcpSocket::ConnectedState )
     socket.write( QByteArray( "QUIT\r\n" ) );
 
   socket.disconnectFromHost();
@@ -186,7 +174,8 @@ class DictServerDictionary: public Dictionary::Class
 
 public:
 
-  DictServerDictionary( string const & id, string const & name_,
+  DictServerDictionary( string const & id,
+                        string const & name_,
                         QString const & url_,
                         QString const & database_,
                         QString const & strategies_,
@@ -198,44 +187,54 @@ public:
     langId( 0 )
   {
     int pos = url.indexOf( "://" );
-    if( pos < 0 )
+    if ( pos < 0 )
       url = "dict://" + url;
 
     databases = database_.split( QRegularExpression( "[ ,;]" ), Qt::SkipEmptyParts );
-    if( databases.isEmpty() )
+    if ( databases.isEmpty() )
       databases.append( "*" );
 
     strategies = strategies_.split( QRegularExpression( "[ ,;]" ), Qt::SkipEmptyParts );
-    if( strategies.isEmpty() )
+    if ( strategies.isEmpty() )
       strategies.append( "prefix" );
   }
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const &,
-                                                 unsigned long maxResults ) override ;
+  sptr< WordSearchRequest > prefixMatch( wstring const &, unsigned long maxResults ) override;
 
-  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts,
-                                          wstring const &, bool ) override
-    ;
+  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ) override;
 
   quint32 getLangFrom() const override
-  { return langId; }
+  {
+    return langId;
+  }
 
   quint32 getLangTo() const override
-  { return langId; }
+  {
+    return langId;
+  }
 
   QString const & getDescription() override;
+
 protected:
 
   void loadIcon() noexcept override;
@@ -251,36 +250,33 @@ void DictServerDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if( !icon.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), icon );
-    if( fInfo.isFile() )
+  if ( !icon.isEmpty() ) {
+    QFileInfo fInfo( QDir( Config::getConfigDir() ), icon );
+    if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
-  if( dictionaryIcon.isNull() )
-    dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/network.svg");
+  if ( dictionaryIcon.isNull() )
+    dictionaryIcon = QIcon( ":/icons/network.svg" );
   dictionaryIconLoaded = true;
 }
 
 QString const & DictServerDictionary::getDescription()
 {
-  if( serverDatabases.isEmpty() )
-  {
+  if ( serverDatabases.isEmpty() ) {
     dictionaryDescription.clear();
     getServerDatabases();
   }
 
-  if( dictionaryDescription.isEmpty() )
-  {
+  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 +=
+      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 += QCoreApplication::translate( "DictServer", "Server databases" ) + " ("
+        + QString::number( serverDatabases.size() ) + "):";
+      for ( QStringList::const_iterator i = serverDatabases.begin(); i != serverDatabases.end(); ++i )
         dictionaryDescription += "\n" + *i;
     }
   }
@@ -292,59 +288,52 @@ void DictServerDictionary::getServerDatabases()
   QAtomicInt isCancelled;
   QTcpSocket * socket = new QTcpSocket;
 
-  if( !socket )
+  if ( !socket )
     return;
 
-  if( connectToServer( *socket, url, errorString, isCancelled ) )
-  {
-    for( ; ; )
-    {
+  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 ) )
+      if ( !readLine( *socket, reply, errorString, isCancelled ) )
         return;
 
-      if( reply.left( 3 ) == "110" )
-      {
+      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 ] == '.' )
+        for ( int x = 0; x < count; x++ ) {
+          if ( !readLine( *socket, reply, errorString, isCancelled ) )
             break;
 
-          while( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
+          if ( reply[ 0 ] == '.' )
+            break;
+
+          while ( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
             reply.chop( 1 );
 
-          if( !reply.isEmpty() )
+          if ( !reply.isEmpty() )
             serverDatabases.append( reply );
         }
 
         break;
       }
-      else
-      {
-        gdWarning( "Retrieving databases from \"%s\" fault: %s\n",
-                   getName().c_str(), reply.toUtf8().data() );
+      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() );
+  if ( !errorString.isEmpty() )
+    gdWarning( "Retrieving databases from \"%s\" fault: %s\n", getName().c_str(), errorString.toUtf8().data() );
   delete socket;
 }
 
@@ -359,8 +348,7 @@ class DictServerWordSearchRequest: public Dictionary::WordSearchRequest
 
 public:
 
-  DictServerWordSearchRequest( wstring const & word_,
-                               DictServerDictionary & dict_ ) :
+  DictServerWordSearchRequest( wstring const & word_, DictServerDictionary & dict_ ):
     word( word_ ),
     dict( dict_ ),
     socket( 0 )
@@ -378,79 +366,68 @@ public:
   }
 
   void cancel() override;
-
 };
 
 void DictServerWordSearchRequest::run()
 {
-  if( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   socket = new QTcpSocket;
 
-  if( !socket )
-  {
+  if ( !socket ) {
     finish();
     return;
   }
 
-  if( connectToServer( *socket, dict.url, errorString, isCancelled ) )
-  {
+  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 )
-                           + " \"" + QString::fromStdU32String( word )
-                           + "\"\r\n";
+    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 ) + " \""
+          + QString::fromStdU32String( word ) + "\"\r\n";
         socket->write( matchReq.toUtf8() );
         socket->waitForBytesWritten( 1000 );
 
-        if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+        if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
           break;
 
         QString reply;
 
-        if( !readLine( *socket, reply, errorString, isCancelled ) )
+        if ( !readLine( *socket, reply, errorString, isCancelled ) )
           break;
 
-        if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+        if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
           break;
 
-        if( reply.left( 3 ) == "250" )
-        {
+        if ( reply.left( 3 ) == "250" ) {
           // "OK" reply - matches info will be later
-          if( !readLine( *socket, reply, errorString, isCancelled ) )
+          if ( !readLine( *socket, reply, errorString, isCancelled ) )
             break;
 
-          if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+          if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
             break;
         }
 
-        if( reply.left( 3 ) == "552" )
-        {
+        if ( reply.left( 3 ) == "552" ) {
           // No matches
           continue;
         }
 
-        if( reply[ 0 ] == '5' || reply[ 0 ] == '4' )
-        {
+        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() );
+                     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" )
-        {
+        if ( reply.left( 3 ) == "152" ) {
           // Matches found
           int countPos = reply.indexOf( ' ', 4 );
 
@@ -458,73 +435,68 @@ void DictServerWordSearchRequest::run()
           int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
 
           // Read matches
-          for( int x = 0; x <= count; x++ )
-          {
-            if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+          for ( int x = 0; x <= count; x++ ) {
+            if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
               break;
 
-            if( !readLine( *socket, reply, errorString, isCancelled ) )
+            if ( !readLine( *socket, reply, errorString, isCancelled ) )
               break;
 
-            if( reply[ 0 ] == '.' )
+            if ( reply[ 0 ] == '.' )
               break;
 
-            while( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
+            while ( reply.endsWith( '\r' ) || reply.endsWith( '\n' ) )
               reply.chop( 1 );
 
             int pos = reply.indexOf( ' ' );
-            if( pos >= 0 )
-            {
+            if ( pos >= 0 ) {
               QString word = reply.mid( pos + 1 );
-              if( word.endsWith( '\"') )
+              if ( word.endsWith( '\"' ) )
                 word.chop( 1 );
-              if( word[ 0 ] ==  '\"' )
+              if ( word[ 0 ] == '\"' )
                 word = word.mid( 1 );
 
               matchesList.append( word );
             }
           }
-          if( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
+          if ( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
             break;
         }
       }
 
-      if( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
         break;
 
       matchesList.removeDuplicates();
-      if( matchesList.size() >= MAX_MATCHES_COUNT )
+      if ( matchesList.size() >= MAX_MATCHES_COUNT )
         break;
     }
 
-    if( !Utils::AtomicInt::loadAcquire( isCancelled ) && errorString.isEmpty() )
-    {
+    if ( !Utils::AtomicInt::loadAcquire( isCancelled ) && errorString.isEmpty() ) {
       matchesList.removeDuplicates();
 
       int count = matchesList.size();
-      if( count > MAX_MATCHES_COUNT )
+      if ( count > MAX_MATCHES_COUNT )
         count = MAX_MATCHES_COUNT;
 
-      if( count )
-      {
+      if ( count ) {
         QMutexLocker _( &dataMutex );
-        for( int x = 0; x < count; x++ )
+        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 ( !errorString.isEmpty() )
+    gdWarning( "Prefix find in \"%s\" fault: %s\n", dict.getName().c_str(), errorString.toUtf8().data() );
 
-  if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
     socket->abort();
   else
     disconnectFromServer( *socket );
 
   delete socket;
-  if( !Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
     finish();
 }
 
@@ -547,8 +519,7 @@ class DictServerArticleRequest: public Dictionary::DataRequest
 
 public:
 
-  DictServerArticleRequest( wstring const & word_,
-                            DictServerDictionary & dict_ ) :
+  DictServerArticleRequest( wstring const & word_, DictServerDictionary & dict_ ):
     word( word_ ),
     dict( dict_ ),
     socket( 0 )
@@ -566,75 +537,66 @@ public:
   }
 
   void cancel() override;
-
 };
 
 void DictServerArticleRequest::run()
 {
-  if( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   socket = new QTcpSocket;
 
-  if( !socket )
-  {
+  if ( !socket ) {
     finish();
     return;
   }
 
-  if( connectToServer( *socket, dict.url, errorString, isCancelled ) )
-  {
+  if ( connectToServer( *socket, dict.url, errorString, isCancelled ) ) {
     string articleData;
 
-    for( int i = 0; i < dict.databases.size(); i++ )
-    {
-      QString defineReq = QString( "DEFINE " )
-                         + dict.databases.at( i )
-                         + " \"" + QString::fromStdU32String( word ) + "\"\r\n";
+    for ( int i = 0; i < dict.databases.size(); i++ ) {
+      QString defineReq =
+        QString( "DEFINE " ) + dict.databases.at( i ) + " \"" + QString::fromStdU32String( word ) + "\"\r\n";
       socket->write( defineReq.toUtf8() );
       socket->waitForBytesWritten( 1000 );
 
       QString reply;
 
-      if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
         break;
 
-      if( !readLine( *socket, reply, errorString, isCancelled ) )
+      if ( !readLine( *socket, reply, errorString, isCancelled ) )
         break;
 
-      if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
         break;
 
-      if( reply.left( 3 ) == "250" )
-      {
+      if ( reply.left( 3 ) == "250" ) {
         // "OK" reply - matches info will be later
-        if( !readLine( *socket, reply, errorString, isCancelled ) )
+        if ( !readLine( *socket, reply, errorString, isCancelled ) )
           break;
 
-        if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+        if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
           break;
       }
 
-      if( reply.left( 3 ) == "552" )
-      {
+      if ( reply.left( 3 ) == "552" ) {
         // No matches found
         continue;
       }
 
-      if( reply[ 0 ] == '5' || reply[ 0 ] == '4' )
-      {
+      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(),
+                   dict.getName().c_str(),
+                   dict.databases.at( i ).toUtf8().data(),
                    reply.toUtf8().data() );
         continue;
       }
 
-      if( reply.left( 3 ) == "150" )
-      {
+      if ( reply.left( 3 ) == "150" ) {
         // Articles found
         int countPos = reply.indexOf( ' ', 4 );
 
@@ -644,30 +606,27 @@ void DictServerArticleRequest::run()
         int count = reply.mid( 4, countPos > 4 ? countPos - 4 : -1 ).toInt();
 
         // Read articles
-        for( int x = 0; x < count; x++ )
-        {
-          if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+        for ( int x = 0; x < count; x++ ) {
+          if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
             break;
 
-          if( !readLine( *socket, reply, errorString, isCancelled ) )
+          if ( !readLine( *socket, reply, errorString, isCancelled ) )
             break;
 
-          if( reply.left( 3 ) == "250" )
+          if ( reply.left( 3 ) == "250" )
             break;
 
-          if( reply.left( 3 ) == "151" )
-          {
+          if ( reply.left( 3 ) == "151" ) {
             int pos = 4;
             int endPos;
 
             // Skip requested word
-            if( reply[ pos ] == '\"' )
+            if ( reply[ pos ] == '\"' )
               endPos = reply.indexOf( '\"', pos + 1 ) + 1;
             else
               endPos = reply.indexOf( ' ', pos );
 
-            if( endPos < pos )
-            {
+            if ( endPos < pos ) {
               // It seems mailformed string
               break;
             }
@@ -679,8 +638,7 @@ void DictServerArticleRequest::run()
             // Retrieve database ID
             endPos = reply.indexOf( ' ', pos );
 
-            if( endPos < pos )
-            {
+            if ( endPos < pos ) {
               // It seems mailformed string
               break;
             }
@@ -688,29 +646,26 @@ void DictServerArticleRequest::run()
             dbID = reply.mid( pos, endPos - pos );
 
             // Retrieve database ID
-            pos = endPos + 1;
+            pos    = endPos + 1;
             endPos = reply.indexOf( ' ', pos );
-            if( reply[ pos ] == '\"' )
+            if ( reply[ pos ] == '\"' )
               endPos = reply.indexOf( '\"', pos + 1 ) + 1;
             else
               endPos = reply.indexOf( ' ', pos );
 
-            if( endPos < pos )
-            {
+            if ( endPos < pos ) {
               // It seems mailformed string
               break;
             }
 
             dbName = reply.mid( pos, endPos - pos );
-            if( dbName.endsWith( '\"' ) )
+            if ( dbName.endsWith( '\"' ) )
               dbName.chop( 1 );
-            if( dbName[ 0 ] == '\"' )
+            if ( dbName[ 0 ] == '\"' )
               dbName = dbName.mid( 1 );
 
-            articleData += string( "<div class=\"dictserver_from\">From " )
-                           + dbName.toUtf8().data()
-                           + " [" + dbID.toUtf8().data() + "]:"
-                           + "</div>";
+            articleData += string( "<div class=\"dictserver_from\">From " ) + dbName.toUtf8().data() + " ["
+              + dbID.toUtf8().data() + "]:" + "</div>";
 
             // Retreive MIME headers if any
 
@@ -718,34 +673,32 @@ void DictServerArticleRequest::run()
                                                        QRegularExpression::CaseInsensitiveOption );
 
             bool contentInHtml = false;
-            for( ; ; )
-            {
-              if( !readLine( *socket, reply, errorString, isCancelled ) )
+            for ( ;; ) {
+              if ( !readLine( *socket, reply, errorString, isCancelled ) )
                 break;
 
-              if( reply == "\r\n" )
+              if ( reply == "\r\n" )
                 break;
 
               QRegularExpressionMatch match = contentTypeExpr.match( reply );
-              if( match.hasMatch() )
+              if ( match.hasMatch() )
                 contentInHtml = true;
             }
 
             // Retrieve article text
 
             articleText.clear();
-            for( ; ; )
-            {
-              if( !readLine( *socket, reply, errorString, isCancelled ) )
+            for ( ;; ) {
+              if ( !readLine( *socket, reply, errorString, isCancelled ) )
                 break;
 
-              if( reply == ".\r\n" )
+              if ( reply == ".\r\n" )
                 break;
 
               articleText += reply;
             }
 
-            if( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
+            if ( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
               break;
 
             static QRegularExpression phonetic( R"(\\([^\\]+)\\)",
@@ -753,22 +706,20 @@ void DictServerArticleRequest::run()
             static QRegularExpression divs_inside_phonetic( "</div([^>]*)><div([^>]*)>",
                                                             QRegularExpression::CaseInsensitiveOption );
             static QRegularExpression refs( R"(\{([^\{\}]+)\})",
-                                            QRegularExpression::CaseInsensitiveOption );     // links: {stuff}
+                                            QRegularExpression::CaseInsensitiveOption ); // links: {stuff}
             static QRegularExpression links( "<a href=\"gdlookup://localhost/([^\"]*)\">",
                                              QRegularExpression::CaseInsensitiveOption );
-            static QRegularExpression tags( "<[^>]*>",
-                                            QRegularExpression::CaseInsensitiveOption );
+            static QRegularExpression tags( "<[^>]*>", QRegularExpression::CaseInsensitiveOption );
 
             string articleStr;
-            if( contentInHtml )
+            if ( contentInHtml )
               articleStr = articleText.toUtf8().data();
             else
               articleStr = Html::preformat( articleText.toUtf8().data() );
 
             articleText = QString::fromUtf8( articleStr.c_str(), articleStr.size() );
-            if( !contentInHtml )
-            {
-              articleText = articleText.replace(refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
+            if ( !contentInHtml ) {
+              articleText = articleText.replace( refs, R"(<a href="gdlookup://localhost/\1">\1</a>)" );
 
               pos = 0;
               QString articleNewText;
@@ -776,8 +727,7 @@ void DictServerArticleRequest::run()
               // Handle phonetics
 
               QRegularExpressionMatchIterator it = phonetic.globalMatch( articleText );
-              while( it.hasNext() )
-              {
+              while ( it.hasNext() ) {
                 QRegularExpressionMatch match = it.next();
                 articleNewText += articleText.mid( pos, match.capturedStart() - pos );
                 pos = match.capturedEnd();
@@ -787,8 +737,7 @@ void DictServerArticleRequest::run()
 
                 articleNewText += "<span class=\"dictd_phonetic\">" + phonetic_text + "</span>";
               }
-              if( pos )
-              {
+              if ( pos ) {
                 articleNewText += articleText.mid( pos );
                 articleText = articleNewText;
                 articleNewText.clear();
@@ -797,9 +746,8 @@ void DictServerArticleRequest::run()
               // Handle links
 
               pos = 0;
-              it = links.globalMatch( articleText );
-              while( it.hasNext() )
-              {
+              it  = links.globalMatch( articleText );
+              while ( it.hasNext() ) {
                 QRegularExpressionMatch match = it.next();
                 articleNewText += articleText.mid( pos, match.capturedStart() - pos );
                 pos = match.capturedEnd();
@@ -809,51 +757,43 @@ void DictServerArticleRequest::run()
                 link.replace( "&nbsp;", " " );
 
                 QString newLink = match.captured();
-                newLink.replace( 30, match.capturedLength( 1 ),
+                newLink.replace( 30,
+                                 match.capturedLength( 1 ),
                                  QString::fromUtf8( QUrl::toPercentEncoding( link.simplified() ) ) );
                 articleNewText += newLink;
               }
-              if( pos )
-              {
+              if ( pos ) {
                 articleNewText += articleText.mid( pos );
                 articleText = articleNewText;
                 articleNewText.clear();
               }
-
             }
 
-            articleData += string( "<div class=\"dictd_article\">" )
-                           + articleText.toUtf8().data()
-                           + "<br></div>";
+            articleData += string( "<div class=\"dictd_article\">" ) + articleText.toUtf8().data() + "<br></div>";
           }
 
-          if( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
+          if ( Utils::AtomicInt::loadAcquire( isCancelled ) || !errorString.isEmpty() )
             break;
         }
       }
     }
-    if( !Utils::AtomicInt::loadAcquire( isCancelled ) && errorString.isEmpty() && !articleData.empty() )
-    {
-      QMutexLocker _( &dataMutex );
-
-      data.resize( articleData.size() );
-      memcpy( &data.front(), articleData.data(), articleData.size() );
+    if ( !Utils::AtomicInt::loadAcquire( isCancelled ) && errorString.isEmpty() && !articleData.empty() ) {
+      appendString( articleData );
 
       hasAnyData = true;
     }
   }
 
-  if( !errorString.isEmpty() )
-    gdWarning( "Articles request from \"%s\" fault: %s\n", dict.getName().c_str(),
-                errorString.toUtf8().data() );
+  if ( !errorString.isEmpty() )
+    gdWarning( "Articles request from \"%s\" fault: %s\n", dict.getName().c_str(), errorString.toUtf8().data() );
 
-  if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
     socket->abort();
   else
     disconnectFromServer( *socket );
 
   delete socket;
-  if( !Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
     finish();
 }
 
@@ -865,52 +805,47 @@ void DictServerArticleRequest::cancel()
   finish();
 }
 
-sptr< WordSearchRequest > DictServerDictionary::prefixMatch( wstring const & word,
-                                                             unsigned long maxResults )
-  
+sptr< WordSearchRequest > DictServerDictionary::prefixMatch( wstring const & word, unsigned long maxResults )
+
 {
-  (void) maxResults;
-  if ( word.size() > 80 )
-  {
+  (void)maxResults;
+  if ( word.size() > 80 ) {
     // Don't make excessively large queries -- they're fruitless anyway
 
-    return std::make_shared<WordSearchRequestInstant>();
+    return std::make_shared< WordSearchRequestInstant >();
   }
   else
-    return std::make_shared<DictServerWordSearchRequest>( word, *this );
+    return std::make_shared< DictServerWordSearchRequest >( word, *this );
 }
 
-sptr< DataRequest > DictServerDictionary::getArticle( wstring const & word,
-                                                      vector< wstring > const &,
-                                                      wstring const &, bool )
-  
+sptr< DataRequest >
+DictServerDictionary::getArticle( wstring const & word, vector< wstring > const &, wstring const &, bool )
+
 {
-  if ( word.size() > 80 )
-  {
+  if ( word.size() > 80 ) {
     // Don't make excessively large queries -- they're fruitless anyway
 
-    return std::make_shared<DataRequestInstant>( false );
+    return std::make_shared< DataRequestInstant >( false );
   }
   else
-    return std::make_shared<DictServerArticleRequest>( word, *this );
+    return std::make_shared< DictServerArticleRequest >( word, *this );
 }
 
-} // Anonimuos namespace
+} // namespace
 
 vector< sptr< Dictionary::Class > > makeDictionaries( Config::DictServers const & servers )
-  
+
 {
   vector< sptr< Dictionary::Class > > result;
 
-  for( int x = 0; x < servers.size(); ++x )
-  {
+  for ( int x = 0; x < servers.size(); ++x ) {
     if ( servers[ x ].enabled )
-      result.push_back( std::make_shared<DictServerDictionary>( servers[ x ].id.toStdString(),
-                                                  servers[ x ].name.toUtf8().data(),
-                                                  servers[ x ].url,
-                                                  servers[ x ].databases,
-                                                  servers[ x ].strategies,
-                                                  servers[ x ].iconFilename  ) );
+      result.push_back( std::make_shared< DictServerDictionary >( servers[ x ].id.toStdString(),
+                                                                  servers[ x ].name.toUtf8().data(),
+                                                                  servers[ x ].url,
+                                                                  servers[ x ].databases,
+                                                                  servers[ x ].strategies,
+                                                                  servers[ x ].iconFilename ) );
   }
 
   return result;
diff --git a/src/dict/dictserver.hh b/src/dict/dictserver.hh
index f766bee8..3a69a10d 100644
--- a/src/dict/dictserver.hh
+++ b/src/dict/dictserver.hh
@@ -10,10 +10,8 @@ namespace DictServer {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      Config::DictServers const & servers )
-    ;
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::DictServers const & servers );
 
-}
+} // namespace DictServer
 
 #endif // __DICTSERVER_HH__INCLUDED__
diff --git a/src/dict/dsl.cc b/src/dict/dsl.cc
index 0e8aac05..575295a4 100644
--- a/src/dict/dsl.cc
+++ b/src/dict/dsl.cc
@@ -28,7 +28,7 @@
 #include <wctype.h>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QSemaphore>
@@ -76,44 +76,42 @@ using BtreeIndexing::IndexInfo;
 
 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 = 23 + BtreeIndexing::FormatVersion + Folding::Version,
+enum {
+  Signature                = 0x584c5344, // DSLX on little-endian, XLSD on big-endian
+  CurrentFormatVersion     = 23 + BtreeIndexing::FormatVersion + Folding::Version,
   CurrentZipSupportVersion = 2,
-  CurrentFtsIndexVersion = 7
+  CurrentFtsIndexVersion   = 7
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, DSLX
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t zipSupportVersion; // Zip support version -- narrows down reindexing
-                              // when it changes only for dictionaries with the
-                              // zip files
-  int dslEncoding; // Which encoding is used for the file indexed
-  uint32_t chunksOffset; // The offset to chunks' storage
-  uint32_t hasAbrv; // Non-zero means file has abrvs at abrvAddress
-  uint32_t abrvAddress; // Address of abrv map in the chunked storage
+  uint32_t signature;             // First comes the signature, DSLX
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t zipSupportVersion;     // Zip support version -- narrows down reindexing
+                                  // when it changes only for dictionaries with the
+                                  // zip files
+  int dslEncoding;                // Which encoding is used for the file indexed
+  uint32_t chunksOffset;          // The offset to chunks' storage
+  uint32_t hasAbrv;               // Non-zero means file has abrvs at abrvAddress
+  uint32_t abrvAddress;           // Address of abrv map in the chunked storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
   uint32_t articleCount; // Number of articles this dictionary has
-  uint32_t wordCount; // Number of headwords this dictionary has
-  uint32_t langFrom;  // Source language
-  uint32_t langTo;    // Target language
-  uint32_t hasZipFile; // Non-zero means there's a zip file with resources
-                       // present
+  uint32_t wordCount;    // Number of headwords this dictionary has
+  uint32_t langFrom;     // Source language
+  uint32_t langTo;       // Target language
+  uint32_t hasZipFile;   // Non-zero means there's a zip file with resources
+                         // present
   uint32_t hasSoundDictionaryName;
   uint32_t zipIndexBtreeMaxElements; // Two fields from IndexInfo of the zip
                                      // resource index.
   uint32_t zipIndexRootOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -122,9 +120,12 @@ struct InsidedCard
   uint32_t offset;
   uint32_t size;
   QVector< wstring > headwords;
-  InsidedCard( uint32_t _offset, uint32_t _size, QVector< wstring > const & words ) :
-  offset( _offset ), size( _size ), headwords( words )
-  {}
+  InsidedCard( uint32_t _offset, uint32_t _size, QVector< wstring > const & words ):
+    offset( _offset ),
+    size( _size ),
+    headwords( words )
+  {
+  }
   InsidedCard() = default;
 };
 
@@ -134,11 +135,9 @@ bool indexIsOldOrBad( string const & indexFile, bool hasZipFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion ||
-         (bool) header.hasZipFile != hasZipFile ||
-         ( hasZipFile && header.zipSupportVersion != CurrentZipSupportVersion );
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion || (bool)header.hasZipFile != hasZipFile
+    || ( hasZipFile && header.zipSupportVersion != CurrentZipSupportVersion );
 }
 
 class DslDictionary: public BtreeIndexing::BtreeDictionary
@@ -171,7 +170,8 @@ class DslDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  DslDictionary( string const & id, string const & indexFile,
+  DslDictionary( string const & id,
+                 string const & indexFile,
                  vector< string > const & dictionaryFiles,
                  int maxPictureWidth_ );
 
@@ -180,62 +180,74 @@ public:
   ~DslDictionary();
 
   string getName() noexcept override
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.articleCount; }
+  {
+    return idxHeader.articleCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
   inline virtual string getResourceDir1() const
-  { return resourceDir1; }
+  {
+    return resourceDir1;
+  }
 
   inline virtual string getResourceDir2() const
-  { return resourceDir2; }
+  {
+    return resourceDir2;
+  }
 
 
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
-
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
   sptr< Dictionary::DataRequest >
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   QString getMainFilename() override;
 
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    if( ensureInitDone().size() )
+    if ( ensureInitDone().size() )
       return;
 
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "DSL", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "DSL", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
 
   uint32_t getFtsIndexVersion() override
-  { return CurrentFtsIndexVersion; }
+  {
+    return CurrentFtsIndexVersion;
+  }
 
 protected:
 
@@ -261,9 +273,12 @@ private:
   // Parts of dslToHtml()
   string nodeToHtml( ArticleDom::Node const & );
   string processNodeChildren( ArticleDom::Node const & node );
+  string getNodeLink( ArticleDom::Node const & node );
 
-  bool hasHiddenZones()           /// Return true if article has hidden zones
-  { return optionalPartNom != 0; }
+  bool hasHiddenZones() /// Return true if article has hidden zones
+  {
+    return optionalPartNom != 0;
+  }
 
   friend class DslArticleRequest;
   friend class DslResourceRequest;
@@ -287,8 +302,7 @@ DslDictionary::DslDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 
   // Read the dictionary name
@@ -296,22 +310,20 @@ DslDictionary::DslDictionary( string const & id,
   idx.seek( sizeof( idxHeader ) );
 
   vector< char > dName( idx.read< uint32_t >() );
-  if( dName.size() > 0 )
-  {
+  if ( dName.size() > 0 ) {
     idx.read( &dName.front(), dName.size() );
     dictionaryName = string( &dName.front(), dName.size() );
   }
 
   vector< char > sName( idx.read< uint32_t >() );
-  if( sName.size() > 0 )
-  {
+  if ( sName.size() > 0 ) {
     idx.read( &sName.front(), sName.size() );
     preferredSoundDictionary = string( &sName.front(), sName.size() );
   }
 
   resourceDir1 = getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator();
   QString s    = QString::fromStdString( getDictionaryFilenames()[ 0 ] );
-  if( s.endsWith( QString::fromLatin1( ".dz" ), Qt::CaseInsensitive ) )
+  if ( s.endsWith( QString::fromLatin1( ".dz" ), Qt::CaseInsensitive ) )
     s.chop( 3 );
   resourceDir2 = s.toStdString() + ".files" + Utils::Fs::separator();
 
@@ -334,16 +346,18 @@ DslDictionary::~DslDictionary()
 
 void DslDictionary::deferredInit()
 {
-  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) )
-  {
+  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) ) {
     QMutexLocker _( &deferredInitMutex );
 
     if ( Utils::AtomicInt::loadAcquire( deferredInitDone ) )
       return;
 
-    if ( !deferredInitRunnableStarted )
-    {
-      QThreadPool::globalInstance()->start( [ this ]() { this->doDeferredInit(); }, -1000 );
+    if ( !deferredInitRunnableStarted ) {
+      QThreadPool::globalInstance()->start(
+        [ this ]() {
+          this->doDeferredInit();
+        },
+        -1000 );
       deferredInitRunnableStarted = true;
     }
   }
@@ -360,8 +374,7 @@ string const & DslDictionary::ensureInitDone()
 
 void DslDictionary::doDeferredInit()
 {
-  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) )
-  {
+  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) ) {
     QMutexLocker _( &deferredInitMutex );
 
     if ( Utils::AtomicInt::loadAcquire( deferredInitDone ) )
@@ -369,13 +382,12 @@ void DslDictionary::doDeferredInit()
 
     // Do deferred init
 
-    try
-    {
+    try {
       // Don't lock index file - no one should be working with it until
       // the init is complete.
       //QMutexLocker _( &idxMutex );
 
-      chunks = std::shared_ptr<ChunkedStorage::Reader>(new ChunkedStorage::Reader(idx, idxHeader.chunksOffset));
+      chunks = std::shared_ptr< ChunkedStorage::Reader >( new ChunkedStorage::Reader( idx, idxHeader.chunksOffset ) );
 
       // Open the .dsl file
 
@@ -383,13 +395,11 @@ void DslDictionary::doDeferredInit()
       dz = dict_data_open( getDictionaryFilenames()[ 0 ].c_str(), &error, 0 );
 
       if ( !dz )
-        throw exDictzipError( string( dz_error_str( error ) )
-                              + "(" + getDictionaryFilenames()[ 0 ] + ")" );
+        throw exDictzipError( string( dz_error_str( error ) ) + "(" + getDictionaryFilenames()[ 0 ] + ")" );
 
       // Read the abrv, if any
 
-      if ( idxHeader.hasAbrv )
-      {
+      if ( idxHeader.hasAbrv ) {
         vector< char > chunk;
 
         char * abrvBlock = chunks->getBlock( idxHeader.abrvAddress, chunk );
@@ -400,8 +410,7 @@ void DslDictionary::doDeferredInit()
 
         GD_DPRINTF( "Loading %u abbrv\n", total );
 
-        while( total-- )
-        {
+        while ( total-- ) {
           uint32_t keySz;
           memcpy( &keySz, abrvBlock, sizeof( uint32_t ) );
           abrvBlock += sizeof( uint32_t );
@@ -422,19 +431,14 @@ void DslDictionary::doDeferredInit()
 
       // Initialize the index
 
-      openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                            idxHeader.indexRootOffset ),
-                 idx, idxMutex );
+      openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
       // Open a resource zip file, if there's one
 
-      if ( idxHeader.hasZipFile &&
-           ( idxHeader.zipIndexBtreeMaxElements ||
-             idxHeader.zipIndexRootOffset ) )
-      {
-        resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements,
-                                          idxHeader.zipIndexRootOffset ),
-                               idx, idxMutex );
+      if ( idxHeader.hasZipFile && ( idxHeader.zipIndexBtreeMaxElements || idxHeader.zipIndexRootOffset ) ) {
+        resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements, idxHeader.zipIndexRootOffset ),
+                               idx,
+                               idxMutex );
 
         QString zipName = QDir::fromNativeSeparators( getDictionaryFilenames().back().c_str() );
 
@@ -442,12 +446,10 @@ void DslDictionary::doDeferredInit()
           resourceZip.openZipFile( zipName );
       }
     }
-    catch( std::exception & e )
-    {
+    catch ( std::exception & e ) {
       initError = e.what();
     }
-    catch( ... )
-    {
+    catch ( ... ) {
       initError = "Unknown error";
     }
 
@@ -469,11 +471,9 @@ void DslDictionary::loadIcon() noexcept
   else
     fileName.chop( 3 );
 
-  if ( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryIcon = QIcon(":/icons/icon32_dsl.png");
-    dictionaryNativeIcon = QIcon(":/icons/icon_dsl_native.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_dsl.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -489,8 +489,7 @@ void DslDictionary::loadIcon() noexcept
 /// ones recognized as spaces by that compiler.
 bool isDslWs( wchar ch )
 {
-  switch( ch )
-  {
+  switch ( ch ) {
     case ' ':
     case '\t':
       return true;
@@ -523,8 +522,7 @@ void DslDictionary::loadArticle( uint32_t address,
     uint32_t articleOffset, articleSize;
 
     memcpy( &articleOffset, articleProps, sizeof( articleOffset ) );
-    memcpy( &articleSize, articleProps + sizeof( articleOffset ),
-            sizeof( articleSize ) );
+    memcpy( &articleSize, articleProps + sizeof( articleOffset ), sizeof( articleSize ) );
 
     GD_DPRINTF( "offset = %x\n", articleOffset );
 
@@ -537,81 +535,68 @@ void DslDictionary::loadArticle( uint32_t address,
       articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
     }
 
-    if ( !articleBody )
-    {
-//      throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
-articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_error_str( dz ) );
+    if ( !articleBody ) {
+      //      throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
+      articleData = U"\n\r\t" + gd::toWString( QString( "DICTZIP error: " ) + dict_error_str( dz ) );
     }
-    else
-    {
-      try
-      {
+    else {
+      try {
         articleData =
-          Iconv::toWstring(
-            Utf8::getEncodingNameFor( Encoding( idxHeader.dslEncoding ) ),
-            articleBody, articleSize );
+          Iconv::toWstring( Utf8::getEncodingNameFor( Encoding( idxHeader.dslEncoding ) ), articleBody, articleSize );
         free( articleBody );
 
         // Strip DSL comments
         bool b = false;
         stripComments( articleData, b );
       }
-      catch( ... )
-      {
+      catch ( ... ) {
         free( articleBody );
         throw;
       }
     }
   }
 
-  size_t pos = 0;
-  bool hadFirstHeadword = false;
+  size_t pos                  = 0;
+  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; ; )
-  {
+  for ( headwordIndex = 0;; ) {
     size_t begin = pos;
 
-    pos = articleData.find_first_of(  U"\n\r" , begin );
+    pos = articleData.find_first_of( U"\n\r", begin );
 
     if ( pos == wstring::npos )
       pos = articleData.size();
 
-    if ( !foundDisplayedHeadword )
-    {
+    if ( !foundDisplayedHeadword ) {
       // Process the headword
 
       wstring rawHeadword = wstring( articleData, begin, pos - begin );
 
-      if( insidedCard && !rawHeadword.empty() && isDslWs( rawHeadword[ 0 ] ) )
-      {
+      if ( insidedCard && !rawHeadword.empty() && isDslWs( rawHeadword[ 0 ] ) ) {
         // Headword of the insided card
         wstring::size_type hpos = rawHeadword.find( L'@' );
-        if( hpos != string::npos )
-        {
+        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'\\' )
+          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 )
+          if ( hpos == string::npos )
             rawHeadword = head;
           else
             rawHeadword.clear();
         }
       }
 
-      if( !rawHeadword.empty() )
-      {
-        if ( !hadFirstHeadword )
-        {
+      if ( !rawHeadword.empty() ) {
+        if ( !hadFirstHeadword ) {
           // We need our tilde expansion value
           tildeValue = rawHeadword;
 
@@ -646,13 +631,13 @@ articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_e
           normalizeHeadword( i );
 
           bool found;
-          if( ignoreDiacritics )
-            found = Folding::applyDiacriticsOnly( Folding::trimWhitespace( i ) ) == Folding::applyDiacriticsOnly( requestedHeadwordFolded );
+          if ( ignoreDiacritics )
+            found = Folding::applyDiacriticsOnly( Folding::trimWhitespace( i ) )
+              == Folding::applyDiacriticsOnly( requestedHeadwordFolded );
           else
             found = Folding::trimWhitespace( i ) == requestedHeadwordFolded;
 
-          if ( found )
-          {
+          if ( found ) {
             // Found it. Now we should make a displayed headword for it.
             if ( hadFirstHeadword )
               expandTildes( rawHeadword, tildeValueWithUnsorted );
@@ -666,8 +651,7 @@ articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_e
           }
         }
 
-        if ( !foundDisplayedHeadword )
-        {
+        if ( !foundDisplayedHeadword ) {
           ++headwordIndex;
           hadFirstHeadword = true;
         }
@@ -683,31 +667,27 @@ articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_e
     if ( articleData[ pos ] == '\r' )
       ++pos;
 
-    if ( pos != articleData.size() )
-    {
+    if ( pos != articleData.size() ) {
       if ( articleData[ pos ] == '\n' )
         ++pos;
     }
 
-    if ( pos == articleData.size() )
-    {
+    if ( pos == articleData.size() ) {
       // Ok, it's end of article
       break;
     }
-    if( isDslWs( articleData[ pos ] ) )
-    {
-     // Check for begin article text
-      if( insidedCard )
-      {
+    if ( isDslWs( articleData[ pos ] ) ) {
+      // Check for begin article text
+      if ( insidedCard ) {
         // Check for next insided headword
-        wstring::size_type hpos = articleData.find_first_of(  U"\n\r" , pos );
+        wstring::size_type hpos = articleData.find_first_of( U"\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'\\' || !isAtSignFirst( str ) )
+        hpos = str.find( L'@' );
+        if ( hpos == wstring::npos || str[ hpos - 1 ] == L'\\' || !isAtSignFirst( str ) )
           break;
       }
       else
@@ -715,11 +695,10 @@ articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_e
     }
   }
 
-  if ( !foundDisplayedHeadword )
-  {
+  if ( !foundDisplayedHeadword ) {
     // This is strange. Anyway, use tilde expansion value, it's better
     // than nothing (or requestedHeadwordFolded for insided card.
-    if( insidedCard )
+    if ( insidedCard )
       displayedHeadword = requestedHeadwordFolded;
     else
       displayedHeadword = tildeValue;
@@ -733,9 +712,9 @@ articleData =  U"\n\r\t"  + gd::toWString( QString( "DICTZIP error: " ) + dict_e
 
 string DslDictionary::dslToHtml( wstring const & str, wstring const & headword )
 {
- // Normalize the string
+  // Normalize the string
   wstring normalizedStr = gd::normalize( str );
-  currentHeadword = headword;
+  currentHeadword       = headword;
 
   ArticleDom dom( normalizedStr, getName(), headword );
 
@@ -755,12 +734,30 @@ string DslDictionary::processNodeChildren( ArticleDom::Node const & node )
 
   return result;
 }
+
+string DslDictionary::getNodeLink( ArticleDom::Node const & node )
+{
+  string link;
+  if ( !node.tagAttrs.empty() ) {
+    QString attrs = QString::fromStdU32String( node.tagAttrs );
+    int n         = attrs.indexOf( "target=\"" );
+    if ( n >= 0 ) {
+      int n_end      = attrs.indexOf( '\"', n + 8 );
+      QString target = attrs.mid( n + 8, n_end > n + 8 ? n_end - ( n + 8 ) : -1 );
+      link           = Html::escape( Filetype::simplifyString( string( target.toUtf8().data() ), false ) );
+    }
+  }
+  if ( link.empty() )
+    link = Html::escape( Filetype::simplifyString( Utf8::encode( node.renderAsText() ), false ) );
+
+  return link;
+}
+
 string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
 {
   string result;
 
-  if ( !node.isTag )
-  {
+  if ( !node.isTag ) {
     result = Html::escape( Utf8::encode( node.text ) );
 
     // Handle all end-of-line
@@ -768,22 +765,21 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
     string::size_type n;
 
     // Strip all '\r'
-    while( ( n = result.find( '\r' ) ) != string::npos )
+    while ( ( n = result.find( '\r' ) ) != string::npos )
       result.erase( n, 1 );
 
     // Replace all '\n'
-    while( ( n = result.find( '\n' ) ) != string::npos )
+    while ( ( n = result.find( '\n' ) ) != string::npos )
       result.replace( n, 1, "<p></p>" );
 
     return result;
   }
 
-  if( node.tagName ==  U"b"  )
+  if ( node.tagName == U"b" )
     result += "<b class=\"dsl_b\">" + processNodeChildren( node ) + "</b>";
-  else if( node.tagName ==  U"i"  )
+  else if ( node.tagName == U"i" )
     result += "<i class=\"dsl_i\">" + processNodeChildren( node ) + "</i>";
-  else if( node.tagName ==  U"u"  )
-  {
+  else if ( node.tagName == U"u" ) {
     string nodeText = processNodeChildren( node );
 
     if ( nodeText.size() && isDslWs( nodeText[ 0 ] ) )
@@ -792,46 +788,35 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
 
     result += "<span class=\"dsl_u\">" + nodeText + "</span>";
   }
-  else if( node.tagName ==  U"c"  )
-  {
-    if( node.tagAttrs.empty() )
-    {
-      result += "<span class=\"c_default_color\">"
-        + processNodeChildren( node ) + "</span>";
+  else if ( node.tagName == U"c" ) {
+    if ( node.tagAttrs.empty() ) {
+      result += "<span class=\"c_default_color\">" + processNodeChildren( node ) + "</span>";
     }
-    else
-    {
-      result += "<font color=\""
-        + Html::escape( Utf8::encode( node.tagAttrs ) ) + "\">"
-        + processNodeChildren( node ) + "</font>";
+    else {
+      result += "<font color=\"" + Html::escape( Utf8::encode( node.tagAttrs ) ) + "\">" + processNodeChildren( node )
+        + "</font>";
     }
   }
-  else if( node.tagName ==  U"*"  )
-  {
-      string id = "O" + getId().substr( 0, 7 ) + "_" +
-                QString::number( articleNom ).toStdString() +
-                "_opt_" + QString::number( optionalPartNom++ ).toStdString();
+  else if ( node.tagName == U"*" ) {
+    string id = "O" + getId().substr( 0, 7 ) + "_" + QString::number( articleNom ).toStdString() + "_opt_"
+      + QString::number( optionalPartNom++ ).toStdString();
     result += R"(<span class="dsl_opt" id=")" + id + "\">" + processNodeChildren( node ) + "</span>";
   }
-  else if( node.tagName ==  U"m"  )
+  else if ( node.tagName == U"m" )
     result += "<div class=\"dsl_m\">" + processNodeChildren( node ) + "</div>";
-  else
-  if ( node.tagName.size() == 2 && node.tagName[ 0 ] == L'm' &&
-       iswdigit( node.tagName[ 1 ] ) )
+  else if ( node.tagName.size() == 2 && node.tagName[ 0 ] == L'm' && iswdigit( node.tagName[ 1 ] ) )
     result += "<div class=\"dsl_" + Utf8::encode( node.tagName ) + "\">" + processNodeChildren( node ) + "</div>";
-  else if( node.tagName ==  U"trn"  )
+  else if ( node.tagName == U"trn" )
     result += "<span class=\"dsl_trn\">" + processNodeChildren( node ) + "</span>";
-  else if( node.tagName ==  U"ex"  )
+  else if ( node.tagName == U"ex" )
     result += "<span class=\"dsl_ex\">" + processNodeChildren( node ) + "</span>";
-  else if( node.tagName ==  U"com"  )
+  else if ( node.tagName == U"com" )
     result += "<span class=\"dsl_com\">" + processNodeChildren( node ) + "</span>";
-  else if( node.tagName ==  U"s"  || node.tagName ==  U"video"  )
-  {
+  else if ( node.tagName == U"s" || node.tagName == U"video" ) {
     string filename = Filetype::simplifyString( Utf8::encode( node.renderAsText() ), false );
     string n        = resourceDir1 + filename;
 
-    if ( Filetype::isNameOfSound( filename ) )
-    {
+    if ( Filetype::isNameOfSound( filename ) ) {
       // If we have the file here, do the exact reference to this dictionary.
       // Otherwise, make a global 'search' one.
 
@@ -843,18 +828,17 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       url.setScheme( "gdau" );
       url.setHost( QString::fromUtf8( search ? "search" : getId().c_str() ) );
       url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
-      if( search && idxHeader.hasSoundDictionaryName )
+      if ( search && idxHeader.hasSoundDictionaryName )
         Utils::Url::setFragment( url, QString::fromUtf8( preferredSoundDictionary.c_str() ) );
 
       string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
       result += addAudioLink( ref, getId() );
 
-      result += "<span class=\"dsl_s_wav\"><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a></span>)";
+      result += "<span class=\"dsl_s_wav\"><a href=" + ref
+        + R"(><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a></span>)";
     }
-    else
-    if ( Filetype::isNameOfPicture( filename ) )
-    {
+    else if ( Filetype::isNameOfPicture( filename ) ) {
       QUrl url;
       url.setScheme( "bres" );
       url.setHost( QString::fromUtf8( getId().c_str() ) );
@@ -863,91 +847,70 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       vector< char > imgdata;
       bool resize = false;
 
-      try
-      {
+      try {
         File::loadFromFile( n, imgdata );
       }
-      catch( File::exCantOpen & )
-      {
-        try
-        {
+      catch ( File::exCantOpen & ) {
+        try {
           n = resourceDir2 + filename;
           File::loadFromFile( n, imgdata );
         }
-        catch( File::exCantOpen & )
-        {
-          try
-          {
+        catch ( File::exCantOpen & ) {
+          try {
             n = getContainingFolder().toStdString() + Utils::Fs::separator() + filename;
             File::loadFromFile( n, imgdata );
           }
-          catch( File::exCantOpen & )
-          {
+          catch ( File::exCantOpen & ) {
             // Try reading from zip file
-            if ( resourceZip.isOpen() )
-            {
+            if ( resourceZip.isOpen() ) {
               QMutexLocker _( &resourceZipMutex );
               resourceZip.loadFile( Utf8::decode( filename ), imgdata );
             }
           }
         }
       }
-      catch(...)
-      {
+      catch ( ... ) {
       }
 
-      if( !imgdata.empty() )
-      {
-        if( Filetype::isNameOfSvg( filename ) )
-        {
+      if ( !imgdata.empty() ) {
+        if ( Filetype::isNameOfSvg( filename ) ) {
           // We don't need to render svg file now
 
           QSvgRenderer svg;
           svg.load( QByteArray::fromRawData( imgdata.data(), imgdata.size() ) );
-          if( svg.isValid() )
-          {
+          if ( svg.isValid() ) {
             QSize imgsize = svg.defaultSize();
-            resize = maxPictureWidth > 0
-                     && imgsize.width() > maxPictureWidth;
+            resize        = maxPictureWidth > 0 && imgsize.width() > maxPictureWidth;
           }
         }
-        else
-        {
-          QImage img = QImage::fromData( (unsigned char *) &imgdata.front(),
-                                         imgdata.size() );
+        else {
+          QImage img = QImage::fromData( (unsigned char *)&imgdata.front(), imgdata.size() );
 
-          resize = maxPictureWidth > 0
-                   && img.width() > maxPictureWidth;
+          resize = maxPictureWidth > 0 && img.width() > maxPictureWidth;
         }
       }
 
-      if( resize )
-      {
+      if ( resize ) {
         string link( url.toEncoded().data() );
         link.replace( 0, 4, "gdpicture" );
-        result += string( "<a href=\"" ) + link + "\">"
-                          + "<img src=\"" + url.toEncoded().data()
-                          + "\" alt=\"" + Html::escape( filename ) + "\""
-                          + "width=\"" + QString::number( maxPictureWidth).toStdString() + "\"/>"
-                          + "</a>";
+        result += string( "<a href=\"" ) + link + "\">" + "<img src=\"" + url.toEncoded().data() + "\" alt=\""
+          + Html::escape( filename ) + "\"" + "width=\"" + QString::number( maxPictureWidth ).toStdString() + "\"/>"
+          + "</a>";
       }
       else
-        result += string( "<img src=\"" ) + url.toEncoded().data()
-                  + "\" alt=\"" + Html::escape( filename ) + "\"/>";
+        result += string( "<img src=\"" ) + url.toEncoded().data() + "\" alt=\"" + Html::escape( filename ) + "\"/>";
     }
-    else
-    if ( Filetype::isNameOfVideo( filename ) ) {
+    else if ( Filetype::isNameOfVideo( filename ) ) {
       QUrl url;
       url.setScheme( "gdvideo" );
       url.setHost( QString::fromUtf8( getId().c_str() ) );
       url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
 
       result += string( R"(<a class="dsl_s dsl_video" href=")" ) + url.toEncoded().data() + "\">"
-             + "<span class=\"img\"></span>"
-             + "<span class=\"filename\">" + processNodeChildren( node ) + "</span>" + "</a>";
+        + "<span class=\"img\"></span>" + "<span class=\"filename\">" + processNodeChildren( node ) + "</span>"
+        + "</a>";
     }
-    else
-    {
+    else {
       // Unknown file type, downgrade to a hyperlink
 
       QUrl url;
@@ -955,153 +918,108 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
       url.setHost( QString::fromUtf8( getId().c_str() ) );
       url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
 
-      result += string( R"(<a class="dsl_s" href=")" ) + url.toEncoded().data()
-             + "\">" + processNodeChildren( node ) + "</a>";
+      result +=
+        string( R"(<a class="dsl_s" href=")" ) + url.toEncoded().data() + "\">" + processNodeChildren( node ) + "</a>";
     }
   }
-  else if( node.tagName ==  U"url"  )
-  {
-    string link = Html::escape( Filetype::simplifyString( Utf8::encode( node.renderAsText() ), false ) );
-    if( QUrl::fromEncoded( link.c_str() ).scheme().isEmpty() )
+  else if ( node.tagName == U"url" ) {
+    string link = getNodeLink( node );
+    if ( QUrl::fromEncoded( link.c_str() ).scheme().isEmpty() )
       link = "http://" + link;
 
     QUrl url( QString::fromUtf8( link.c_str() ) );
-    if( url.isLocalFile() && url.host().isEmpty() )
-    {
+    if ( url.isLocalFile() && url.host().isEmpty() ) {
       // Convert relative links to local files to absolute ones
       QString name = QFileInfo( getMainFilename() ).absolutePath();
       name += url.toLocalFile();
       QFileInfo info( name );
-      if( info.isFile() )
-      {
+      if ( info.isFile() ) {
         name = info.canonicalFilePath();
         url.setPath( Utils::Url::ensureLeadingSlash( QUrl::fromLocalFile( name ).path() ) );
         link = string( url.toEncoded().data() );
       }
     }
 
-    result += R"(<a class="dsl_url" href=")" + link +"\">" + processNodeChildren( node ) + "</a>";
+    result += R"(<a class="dsl_url" href=")" + link + "\">" + processNodeChildren( node ) + "</a>";
   }
-  else if( node.tagName ==  U"!trs"  )
-  {
+  else if ( node.tagName == U"!trs" ) {
     result += "<span class=\"dsl_trs\">" + processNodeChildren( node ) + "</span>";
   }
-  else if( node.tagName ==  U"p"  )
-  {
+  else if ( node.tagName == U"p" ) {
     result += "<span class=\"dsl_p\"";
 
     string val = Utf8::encode( node.renderAsText() );
 
     // If we have such a key, display a title
 
-    map< string, string >::const_iterator i = abrv.find( val );
+    auto i = abrv.find( val );
 
-    if ( i != abrv.end() )
-    {
-      string title;
-
-      if ( Utf8::decode( i->second ).size() < 70 )
-      {
-        // Replace all spaces with non-breakable ones, since that's how
-        // Lingvo shows tooltips
-        title.reserve( i->second.size() );
-
-        for( char const * c = i->second.c_str(); *c; ++c )
-        {
-          if ( *c == ' ' || *c == '\t' )
-          {
-            // u00A0 in utf8
-            title.push_back( 0xC2 );
-            title.push_back( 0xA0 );
-          }
-          else
-          if( *c == '-' ) // Change minus to non-breaking hyphen (uE28091 in utf8)
-          {
-            title.push_back( 0xE2 );
-            title.push_back( 0x80 );
-            title.push_back( 0x91 );
-          }
-          else
-            title.push_back( *c );
-        }
-      }
-      else
-        title = i->second;
+    if ( i != abrv.end() ) {
+      string title = i->second;
 
       result += " title=\"" + Html::escape( title ) + "\"";
     }
 
     result += ">" + processNodeChildren( node ) + "</span>";
   }
-  else if( node.tagName ==  U"'"  )
-  {
+  else if ( node.tagName == U"'" ) {
     // There are two ways to display the stress: by adding an accent sign or via font styles.
     // We generate two spans, one with accented data and another one without it, so the
     // user could pick up the best suitable option.
     string data = processNodeChildren( node );
     result += R"(<span class="dsl_stress"><span class="dsl_stress_without_accent">)" + data + "</span>"
-        + "<span class=\"dsl_stress_with_accent\">" + data + Utf8::encode( wstring( 1, 0x301 ) )
-        + "</span></span>";
+      + "<span class=\"dsl_stress_with_accent\">" + data + Utf8::encode( wstring( 1, 0x301 ) ) + "</span></span>";
   }
-  else if( node.tagName ==  U"lang"  )
-  {
+  else if ( node.tagName == U"lang" ) {
     result += "<span class=\"dsl_lang\"";
-    if( !node.tagAttrs.empty() )
-    {
+    if ( !node.tagAttrs.empty() ) {
       // Find ISO 639-1 code
       string langcode;
       QString attr = QString::fromStdU32String( node.tagAttrs );
-      int n = attr.indexOf( "id=" );
-      if( n >= 0 )
-      {
+      int n        = attr.indexOf( "id=" );
+      if ( n >= 0 ) {
         int id = attr.mid( n + 3 ).toInt();
-        if( id )
+        if ( id )
           langcode = findCodeForDslId( id );
       }
-      else
-      {
+      else {
         n = attr.indexOf( "name=\"" );
-        if( n >= 0 )
-        {
+        if ( n >= 0 ) {
           int n2 = attr.indexOf( '\"', n + 6 );
-          if( n2 > 0 )
-          {
+          if ( n2 > 0 ) {
             quint32 id = dslLanguageToId( gd::toWString( attr.mid( n + 6, n2 - n - 6 ) ) );
-            langcode = LangCoder::intToCode2( id ).toStdString();
+            langcode   = LangCoder::intToCode2( id ).toStdString();
           }
         }
       }
-      if( !langcode.empty() )
+      if ( !langcode.empty() )
         result += " lang=\"" + langcode + "\"";
     }
     result += ">" + processNodeChildren( node ) + "</span>";
   }
-  else if( node.tagName ==  U"ref"  )
-  {
+  else if ( node.tagName == U"ref" ) {
     QUrl url;
 
     url.setScheme( "gdlookup" );
     url.setHost( "localhost" );
-    wstring nodeStr = node.renderAsText();
+    auto nodeStr = Utf8::decode( getNodeLink( node ) );
+
     normalizeHeadword( nodeStr );
     url.setPath( Utils::Url::ensureLeadingSlash( QString::fromStdU32String( nodeStr ) ) );
-    if( !node.tagAttrs.empty() )
-    {
+    if ( !node.tagAttrs.empty() ) {
       QString attr = QString::fromStdU32String( node.tagAttrs ).remove( '\"' );
-      int n = attr.indexOf( '=' );
-      if( n > 0 )
-      {
+      int n        = attr.indexOf( '=' );
+      if ( n > 0 ) {
         QList< QPair< QString, QString > > query;
         query.append( QPair< QString, QString >( attr.left( n ), attr.mid( n + 1 ) ) );
         Utils::Url::setQueryItems( url, query );
       }
     }
 
-    result += string( R"(<a class="dsl_ref" href=")" ) + url.toEncoded().data() +"\">"
-              + processNodeChildren( node ) + "</a>";
+    result +=
+      string( R"(<a class="dsl_ref" href=")" ) + url.toEncoded().data() + "\">" + processNodeChildren( node ) + "</a>";
   }
-  else if( node.tagName ==  U"@"  )
-  {
+  else if ( node.tagName == U"@" ) {
     // Special case - insided card header was not parsed
 
     QUrl url;
@@ -1112,33 +1030,30 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
     normalizeHeadword( nodeStr );
     url.setPath( Utils::Url::ensureLeadingSlash( QString::fromStdU32String( nodeStr ) ) );
 
-    result += string( R"(<a class="dsl_ref" href=")" ) + url.toEncoded().data() +"\">"
-              + processNodeChildren( node ) + "</a>";
+    result +=
+      string( R"(<a class="dsl_ref" href=")" ) + url.toEncoded().data() + "\">" + processNodeChildren( node ) + "</a>";
   }
-  else if( node.tagName ==  U"sub"  )
-  {
+  else if ( node.tagName == U"sub" ) {
     result += "<sub>" + processNodeChildren( node ) + "</sub>";
   }
-  else if( node.tagName ==  U"sup"  )
-  {
+  else if ( node.tagName == U"sup" ) {
     result += "<sup>" + processNodeChildren( node ) + "</sup>";
   }
-  else if( node.tagName ==  U"t"  )
-  {
+  else if ( node.tagName == U"t" ) {
     result += "<span class=\"dsl_t\">" + processNodeChildren( node ) + "</span>";
   }
-  else if( node.tagName ==  U"br"  )
-  {
+  else if ( node.tagName == U"br" ) {
     result += "<br />";
   }
-  else
-  {
+  else {
     gdWarning( R"(DSL: Unknown tag "%s" with attributes "%s" found in "%s", article "%s".)",
-               QString::fromStdU32String( node.tagName ).toUtf8().data(), QString::fromStdU32String( node.tagAttrs ).toUtf8().data(),
-               getName().c_str(), QString::fromStdU32String( currentHeadword ).toUtf8().data() );
+               QString::fromStdU32String( node.tagName ).toUtf8().data(),
+               QString::fromStdU32String( node.tagAttrs ).toUtf8().data(),
+               getName().c_str(),
+               QString::fromStdU32String( currentHeadword ).toUtf8().data() );
 
     result += "<span class=\"dsl_unknown\">[" + string( QString::fromStdU32String( node.tagName ).toUtf8().data() );
-    if( !node.tagAttrs.empty() )
+    if ( !node.tagAttrs.empty() )
       result += " " + string( QString::fromStdU32String( node.tagAttrs ).toUtf8().data() );
     result += "]" + processNodeChildren( node ) + "</span>";
   }
@@ -1146,100 +1061,95 @@ string DslDictionary::nodeToHtml( ArticleDom::Node const & node )
   return result;
 }
 
-QString const& DslDictionary::getDescription()
+QString const & DslDictionary::getDescription()
 {
-    if( !dictionaryDescription.isEmpty() )
-        return dictionaryDescription;
-
-    dictionaryDescription = "NONE";
-
-    QString fileName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() );
-
-    // Remove the extension
-    if ( fileName.endsWith( ".dsl.dz", Qt::CaseInsensitive ) )
-      fileName.chop( 6 );
-    else
-      fileName.chop( 3 );
-
-    fileName += "ann";
-    QFileInfo info( fileName );
-
-    if ( info.exists() )
-    {
-        QFile annFile( fileName );
-        if( !annFile.open( QFile::ReadOnly | QFile::Text ) )
-            return dictionaryDescription;
-
-        QTextStream annStream( &annFile );
-        QString data, str;
-
-        str = annStream.readLine();
-
-        if( str.left( 10 ).compare( "#LANGUAGE " ) != 0 )
-        {
-            annStream.seek( 0 );
-            dictionaryDescription = annStream.readAll();
-        }
-        else
-        {
-            // Multilanguage annotation
-
-            qint32 gdLang, annLang;
-            QString langStr;
-            gdLang = LangCoder::code2toInt( QLocale::system().name().left( 2 ).toLatin1().data() );
-            for(;;)
-            {
-                data.clear();
-                langStr = str.mid( 10 ).replace( '\"', ' ').trimmed();
-                annLang = LangCoder::findIdForLanguage( gd::toWString( langStr ) );
-                do
-                {
-                    str = annStream.readLine();
-                    if( str.left( 10 ).compare( "#LANGUAGE " ) == 0 )
-                        break;
-                    if( !str.endsWith( '\n' ) )
-                        str.append( '\n' );
-                    data += str;
-                }
-                while ( !annStream.atEnd() );
-                if( dictionaryDescription.compare( "NONE ") == 0 || langStr.compare( "English", Qt::CaseInsensitive ) == 0 || gdLang == annLang )
-                    dictionaryDescription = data.trimmed();
-                if( gdLang == annLang || annStream.atEnd() )
-                    break;
-            }
-        }
-    }
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
+
+  dictionaryDescription = "NONE";
+
+  QString fileName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() );
+
+  // Remove the extension
+  if ( fileName.endsWith( ".dsl.dz", Qt::CaseInsensitive ) )
+    fileName.chop( 6 );
+  else
+    fileName.chop( 3 );
+
+  fileName += "ann";
+  QFileInfo info( fileName );
+
+  if ( info.exists() ) {
+    QFile annFile( fileName );
+    if ( !annFile.open( QFile::ReadOnly | QFile::Text ) )
+      return dictionaryDescription;
+
+    QTextStream annStream( &annFile );
+    QString data, str;
+
+    str = annStream.readLine();
+
+    if ( str.left( 10 ).compare( "#LANGUAGE " ) != 0 ) {
+      annStream.seek( 0 );
+      dictionaryDescription = annStream.readAll();
+    }
+    else {
+      // Multilanguage annotation
+
+      qint32 gdLang, annLang;
+      QString langStr;
+      gdLang = LangCoder::code2toInt( QLocale::system().name().left( 2 ).toLatin1().data() );
+      for ( ;; ) {
+        data.clear();
+        langStr = str.mid( 10 ).replace( '\"', ' ' ).trimmed();
+        annLang = LangCoder::findIdForLanguage( gd::toWString( langStr ) );
+        do {
+          str = annStream.readLine();
+          if ( str.left( 10 ).compare( "#LANGUAGE " ) == 0 )
+            break;
+          if ( !str.endsWith( '\n' ) )
+            str.append( '\n' );
+          data += str;
+        } while ( !annStream.atEnd() );
+        if ( dictionaryDescription.compare( "NONE " ) == 0 || langStr.compare( "English", Qt::CaseInsensitive ) == 0
+             || gdLang == annLang )
+          dictionaryDescription = data.trimmed();
+        if ( gdLang == annLang || annStream.atEnd() )
+          break;
+      }
+    }
+  }
+  return dictionaryDescription;
 }
 
-QString DslDictionary::getMainFilename() { return getDictionaryFilenames()[ 0 ].c_str(); }
+QString DslDictionary::getMainFilename()
+{
+  return getDictionaryFilenames()[ 0 ].c_str();
+}
 
 void DslDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Dsl: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Dsl: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "DSL: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
@@ -1263,8 +1173,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
   uint32_t articleOffset, articleSize;
 
   memcpy( &articleOffset, articleProps, sizeof( articleOffset ) );
-  memcpy( &articleSize, articleProps + sizeof( articleOffset ),
-          sizeof( articleSize ) );
+  memcpy( &articleSize, articleProps + sizeof( articleOffset ), sizeof( articleSize ) );
 
   char * articleBody;
 
@@ -1273,26 +1182,20 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
   }
 
-  if ( !articleBody )
-  {
+  if ( !articleBody ) {
     return;
   }
-  else
-  {
-    try
-    {
+  else {
+    try {
       articleData =
-        Iconv::toWstring(
-          getEncodingNameFor( Encoding( idxHeader.dslEncoding ) ),
-          articleBody, articleSize );
+        Iconv::toWstring( getEncodingNameFor( Encoding( idxHeader.dslEncoding ) ), articleBody, articleSize );
       free( articleBody );
 
       // Strip DSL comments
       bool b = false;
       stripComments( articleData, b );
     }
-    catch( ... )
-    {
+    catch ( ... ) {
       free( articleBody );
       return;
     }
@@ -1306,41 +1209,35 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
   // Check if we retrieve insided card
   bool insidedCard = isDslWs( articleData.at( 0 ) );
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     size_t begin = pos;
 
-    pos = articleData.find_first_of(  U"\n\r" , begin );
+    pos = articleData.find_first_of( U"\n\r", begin );
 
-    if ( articleHeadword.empty() )
-    {
+    if ( articleHeadword.empty() ) {
       // Process the headword
 
       articleHeadword = wstring( articleData, begin, pos - begin );
 
-      if( insidedCard && !articleHeadword.empty() && isDslWs( articleHeadword[ 0 ] ) )
-      {
+      if ( insidedCard && !articleHeadword.empty() && isDslWs( articleHeadword[ 0 ] ) ) {
         // Headword of the insided card
         wstring::size_type hpos = articleHeadword.find( L'@' );
-        if( hpos != string::npos )
-        {
+        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'\\' )
+          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 )
+          if ( hpos == string::npos )
             articleHeadword = head;
           else
             articleHeadword.clear();
         }
       }
 
-      if( !articleHeadword.empty() )
-      {
+      if ( !articleHeadword.empty() ) {
         list< wstring > lst;
 
         tildeValue = articleHeadword;
@@ -1361,31 +1258,27 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     if ( articleData[ pos ] == '\r' )
       ++pos;
 
-    if ( pos != articleData.size() )
-    {
+    if ( pos != articleData.size() ) {
       if ( articleData[ pos ] == '\n' )
         ++pos;
     }
 
-    if ( pos == articleData.size() )
-    {
+    if ( pos == articleData.size() ) {
       // Ok, it's end of article
       break;
     }
-    if( isDslWs( articleData[ pos ] ) )
-    {
-     // Check for begin article text
-      if( insidedCard )
-      {
+    if ( isDslWs( articleData[ pos ] ) ) {
+      // Check for begin article text
+      if ( insidedCard ) {
         // Check for next insided headword
-        wstring::size_type hpos = articleData.find_first_of(  U"\n\r" , pos );
+        wstring::size_type hpos = articleData.find_first_of( U"\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'\\' || !isAtSignFirst( str ) )
+        hpos = str.find( L'@' );
+        if ( hpos == wstring::npos || str[ hpos - 1 ] == L'\\' || !isAtSignFirst( str ) )
           break;
       }
       else
@@ -1393,8 +1286,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     }
   }
 
-  if( !articleHeadword.empty() )
-  {
+  if ( !articleHeadword.empty() ) {
     unescapeDsl( articleHeadword );
     normalizeHeadword( articleHeadword );
     headword = QString::fromStdU32String( articleHeadword );
@@ -1407,8 +1299,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
   else
     articleText.clear();
 
-  if( !tildeValue.empty() )
-  {
+  if ( !tildeValue.empty() ) {
     list< wstring > lst;
 
     processUnsortedParts( tildeValue, false );
@@ -1418,8 +1309,7 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
       expandTildes( articleText, lst.front() );
   }
 
-  if( !articleText.empty() )
-  {
+  if ( !articleText.empty() ) {
     text = QString::fromStdU32String( articleText ).normalized( QString::NormalizationForm_C );
 
     articleText.clear();
@@ -1428,55 +1318,36 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
 
     // 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]"
-                                                  };
+    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 )
-    {
+    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 ] == '/' ) )
-        {
+      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 )
+        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 );
+        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.replace( pos, pos2 > 0 ? pos2 - pos + stripEndTags[ n ].length() : text.length() - pos, " " );
             break;
           }
         }
 
-        if( n >= stripTagsNumber )
+        if ( n >= stripTagsNumber )
           pos += 1;
       }
     }
@@ -1493,36 +1364,30 @@ void DslDictionary::getArticleText( uint32_t articleAddress, QString & headword,
     // Chech for insided cards
 
     bool haveInsidedCards = false;
-    pos = 0;
-    while( pos >= 0 )
-    {
+    pos                   = 0;
+    while ( pos >= 0 ) {
       pos = text.indexOf( "@", pos );
-      if( pos > 0 && text.at( pos - 1 ) != '\\' )
-      {
+      if ( pos > 0 && text.at( pos - 1 ) != '\\' ) {
         haveInsidedCards = true;
         break;
       }
 
-      if( pos >= 0 )
+      if ( pos >= 0 )
         pos += 1;
     }
 
-    if( haveInsidedCards )
-    {
+    if ( haveInsidedCards ) {
       // Use base DSL parser for articles with insided cards
       ArticleDom dom( gd::toWString( text ), getName(), articleHeadword );
       text = QString::fromStdU32String( dom.root.renderAsText( true ) );
     }
-    else
-    {
+    else {
       // Unescape DSL symbols
       pos = 0;
-      while( pos >= 0 )
-      {
+      while ( pos >= 0 ) {
         pos = text.indexOf( '\\', pos );
-        if( pos >= 0 )
-        {
-          if( text[ pos + 1 ] == '\\' )
+        if ( pos >= 0 ) {
+          if ( text[ pos + 1 ] == '\\' )
             pos += 1;
 
           text.remove( pos, 1 );
@@ -1549,10 +1414,16 @@ public:
 
   DslArticleRequest( wstring const & word_,
                      vector< wstring > const & alts_,
-                     DslDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                     DslDictionary & dict_,
+                     bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -1571,14 +1442,12 @@ public:
 
 void DslArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
@@ -1604,8 +1473,7 @@ void DslArticleRequest::run()
 
   for ( auto & x : chain ) {
     // Check if we're cancelled occasionally
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -1619,28 +1487,31 @@ void DslArticleRequest::run()
 
     string articleText, articleAfter;
 
-    try
-    {
-      dict.loadArticle( x.articleOffset, wordCaseFolded, ignoreDiacritics, tildeValue,
-                        displayedHeadword, headwordIndex, articleBody );
+    try {
+      dict.loadArticle( x.articleOffset,
+                        wordCaseFolded,
+                        ignoreDiacritics,
+                        tildeValue,
+                        displayedHeadword,
+                        headwordIndex,
+                        articleBody );
 
-      if ( !articlesIncluded.insert( std::make_pair( x.articleOffset,
-                                                     headwordIndex ) ).second )
+      if ( !articlesIncluded.insert( std::make_pair( x.articleOffset, headwordIndex ) ).second )
         continue; // We already have this article in the body.
 
       dict.articleNom += 1;
 
-      if( displayedHeadword.empty() || isDslWs( displayedHeadword[ 0 ] ) )
+      if ( displayedHeadword.empty() || isDslWs( displayedHeadword[ 0 ] ) )
         displayedHeadword = word; // Special case - insided card
 
       articleText += "<div class=\"dsl_article\">";
       articleText += "<div class=\"dsl_headwords\"";
-      if( dict.isFromLanguageRTL() )
+      if ( dict.isFromLanguageRTL() )
         articleText += " dir=\"rtl\"";
       articleText += "><p>";
 
-      if( displayedHeadword.size() == 1 && displayedHeadword[0] == '<' )  // Fix special case - "<" header
-          articleText += "<";                                             // dslToHtml can't handle it correctly.
+      if ( displayedHeadword.size() == 1 && displayedHeadword[ 0 ] == '<' ) // Fix special case - "<" header
+        articleText += "<";                                                 // dslToHtml can't handle it correctly.
       else
         articleText += dict.dslToHtml( displayedHeadword, displayedHeadword );
 
@@ -1651,7 +1522,7 @@ void DslArticleRequest::run()
       expandTildes( articleBody, tildeValue );
 
       articleAfter += "<div class=\"dsl_definition\"";
-      if( dict.isToLanguageRTL() )
+      if ( dict.isToLanguageRTL() )
         articleAfter += " dir=\"rtl\"";
       articleAfter += ">";
 
@@ -1659,14 +1530,13 @@ void DslArticleRequest::run()
       articleAfter += "</div>";
       articleAfter += "</div>";
 
-      if( dict.hasHiddenZones() )
-      {
+      if ( dict.hasHiddenZones() ) {
         string prefix = "O" + dict.getId().substr( 0, 7 ) + "_" + QString::number( dict.articleNom ).toStdString();
-        string id1 = prefix + "_expand";
-        string id2 = prefix + "_opt_";
-        string button = R"( <img src="qrc:///icons/expand_opt.png" class="hidden_expand_opt" id=")" + id1 +
-                        "\" onclick=\"gdExpandOptPart('" + id1 + "','" + id2 +"')\" alt=\"[+]\"/>";
-        if( articleText.compare( articleText.size() - 4, 4, "</p>" ) == 0 )
+        string id1    = prefix + "_expand";
+        string id2    = prefix + "_opt_";
+        string button = R"( <img src="qrc:///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 );
         else
           articleText += button;
@@ -1674,20 +1544,13 @@ void DslArticleRequest::run()
 
       articleText += articleAfter;
     }
-    catch( std::exception &ex )
-    {
+    catch ( std::exception & ex ) {
       gdWarning( "DSL: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
-      articleText = string( "<span class=\"dsl_article\">" )
-                    + QObject::tr( "Article loading error" ).toStdString()
-                    + "</span>";
+      articleText =
+        string( "<span class=\"dsl_article\">" ) + QObject::tr( "Article loading error" ).toStdString() + "</span>";
     }
 
-    QMutexLocker _( &dataMutex );
-
-    data.resize( data.size() + articleText.size() );
-
-    memcpy( &data.front() + data.size() - articleText.size(),
-            articleText.data(), articleText.size() );
+    appendString( articleText );
 
     hasAnyData = true;
   }
@@ -1699,9 +1562,9 @@ sptr< Dictionary::DataRequest > DslDictionary::getArticle( wstring const & word,
                                                            vector< wstring > const & alts,
                                                            wstring const &,
                                                            bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<DslArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< DslArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 //// DslDictionary::getResource()
@@ -1718,12 +1581,13 @@ class DslResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  DslResourceRequest( DslDictionary & dict_,
-                      string const & resourceName_ ):
+  DslResourceRequest( DslDictionary & dict_, string const & resourceName_ ):
     dict( dict_ ),
     resourceName( resourceName_ )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -1744,14 +1608,12 @@ public:
 void DslResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
@@ -1761,38 +1623,31 @@ void DslResourceRequest::run()
 
   GD_DPRINTF( "n is %s\n", n.c_str() );
 
-  try
-  {
-    try
-    {
+  try {
+    try {
       QMutexLocker _( &dataMutex );
 
       File::loadFromFile( n, data );
     }
-    catch( File::exCantOpen & )
-    {
+    catch ( File::exCantOpen & ) {
       n = dict.getResourceDir1() + resourceName;
       try {
         QMutexLocker _( &dataMutex );
 
         File::loadFromFile( n, data );
       }
-      catch( File::exCantOpen & )
-      {
+      catch ( File::exCantOpen & ) {
         n = dict.getResourceDir2() + resourceName;
 
-        try
-        {
+        try {
           QMutexLocker _( &dataMutex );
 
           File::loadFromFile( n, data );
         }
-        catch( File::exCantOpen & )
-        {
+        catch ( File::exCantOpen & ) {
           // Try reading from zip file
 
-          if ( dict.resourceZip.isOpen() )
-          {
+          if ( dict.resourceZip.isOpen() ) {
             QMutexLocker _( &dataMutex );
 
             if ( !dict.resourceZip.loadFile( Utf8::decode( resourceName ), data ) )
@@ -1804,8 +1659,7 @@ void DslResourceRequest::run()
       }
     }
 
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
 
       QMutexLocker _( &dataMutex );
@@ -1816,10 +1670,11 @@ void DslResourceRequest::run()
 
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "DSL: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1827,9 +1682,9 @@ void DslResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > DslDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<DslResourceRequest>( *this, name );
+  return std::make_shared< DslResourceRequest >( *this, name );
 }
 
 
@@ -1850,52 +1705,49 @@ sptr< Dictionary::DataRequest > DslDictionary::getSearchResults( QString const &
 
 /// makeDictionaries
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing,
-                                      int maxPictureWidth, unsigned int maxHeadwordSize )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing,
+                                                      int maxPictureWidth,
+                                                      unsigned int maxHeadwordSize )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
   for ( const auto & fileName : fileNames ) {
     // Try .dsl and .dsl.dz suffixes
 
-    bool uncompressedDsl = ( fileName.size() >= 4 &&
-                             strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".dsl" ) == 0 );
-    if ( !uncompressedDsl &&
-         ( fileName.size() < 7 ||
-           strcasecmp( fileName.c_str() + ( fileName.size() - 7 ), ".dsl.dz" ) != 0 ) )
+    bool uncompressedDsl =
+      ( fileName.size() >= 4 && strcasecmp( fileName.c_str() + ( fileName.size() - 4 ), ".dsl" ) == 0 );
+    if ( !uncompressedDsl
+         && ( fileName.size() < 7 || strcasecmp( fileName.c_str() + ( fileName.size() - 7 ), ".dsl.dz" ) != 0 ) )
       continue;
 
     // Make sure it's not an abbreviation file
 
     int extSize = ( uncompressedDsl ? 4 : 7 );
-    if ( fileName.size() - extSize >= 5 &&
-         strncasecmp( fileName.c_str() + fileName.size() - extSize - 5, "_abrv", 5 ) == 0 )
-    {
+    if ( fileName.size() - extSize >= 5
+         && strncasecmp( fileName.c_str() + fileName.size() - extSize - 5, "_abrv", 5 ) == 0 ) {
       // It is, skip it
       continue;
     }
 
     unsigned atLine = 0; // Indicates current line in .dsl, for debug purposes
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, fileName );
 
       // Check if there is an 'abrv' file present
-      string baseName = ( fileName[ fileName.size() - 4 ] == '.' ) ?
-               string( fileName, 0, fileName.size() - 4 ) : string( fileName, 0, fileName.size() - 7 );
+      string baseName = ( fileName[ fileName.size() - 4 ] == '.' ) ? string( fileName, 0, fileName.size() - 4 ) :
+                                                                     string( fileName, 0, fileName.size() - 7 );
 
       string abrvFileName;
 
-      if ( File::tryPossibleName( baseName + "_abrv.dsl", abrvFileName ) ||
-           File::tryPossibleName( baseName + "_abrv.dsl.dz", abrvFileName ) ||
-           File::tryPossibleName( baseName + "_ABRV.DSL", abrvFileName ) ||
-           File::tryPossibleName( baseName + "_ABRV.DSL.DZ", abrvFileName ) ||
-           File::tryPossibleName( baseName + "_ABRV.DSL.dz", abrvFileName ) )
+      if ( File::tryPossibleName( baseName + "_abrv.dsl", abrvFileName )
+           || File::tryPossibleName( baseName + "_abrv.dsl.dz", abrvFileName )
+           || File::tryPossibleName( baseName + "_ABRV.DSL", abrvFileName )
+           || File::tryPossibleName( baseName + "_ABRV.DSL.DZ", abrvFileName )
+           || File::tryPossibleName( baseName + "_ABRV.DSL.dz", abrvFileName ) )
         dictFiles.push_back( abrvFileName );
 
       string dictId = Dictionary::makeDictionaryId( dictFiles );
@@ -1904,23 +1756,22 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
       string zipFileName;
 
-      if ( File::tryPossibleZipName( baseName + ".dsl.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".dsl.dz.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".DSL.FILES.ZIP", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".DSL.DZ.FILES.ZIP", zipFileName ) )
+      if ( File::tryPossibleZipName( baseName + ".dsl.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".dsl.dz.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".DSL.FILES.ZIP", zipFileName )
+           || File::tryPossibleZipName( baseName + ".DSL.DZ.FILES.ZIP", zipFileName ) )
         dictFiles.push_back( zipFileName );
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile, zipFileName.size() ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile )
+           || indexIsOldOrBad( indexFile, zipFileName.size() ) ) {
         DslScanner scanner( fileName );
 
         try { // Here we intercept any errors during the read to save line at
               // which the incident happened. We need alive scanner for that.
 
-          if( scanner.getDictionaryName() ==  U"Abbrev"  )
+          if ( scanner.getDictionaryName() == U"Abbrev" )
             continue; // For now just skip abbreviations
 
           // Building the index
@@ -1946,416 +1797,381 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           idx.write( dictionaryName.data(), dictionaryName.size() );
 
           string soundDictName = Utf8::encode( scanner.getSoundDictionaryName() );
-          if( !soundDictName.empty() )
-          {
+          if ( !soundDictName.empty() ) {
             idxHeader.hasSoundDictionaryName = 1;
             idx.write( (uint32_t)soundDictName.size() );
             idx.write( soundDictName.data(), soundDictName.size() );
-        }
+          }
 
-        idxHeader.dslEncoding = scanner.getEncoding();
+          idxHeader.dslEncoding = scanner.getEncoding();
 
-        IndexedWords indexedWords;
+          IndexedWords indexedWords;
 
-        ChunkedStorage::Writer chunks( idx );
+          ChunkedStorage::Writer chunks( idx );
 
-        // Read the abbreviations
+          // Read the abbreviations
 
-        if ( abrvFileName.size() )
-        {
-          try
-          {
-            DslScanner abrvScanner( abrvFileName );
+          if ( abrvFileName.size() ) {
+            try {
+              DslScanner abrvScanner( abrvFileName );
 
-            map< string, string > abrv;
+              map< string, string > abrv;
 
-            wstring curString;
-            size_t curOffset;
+              wstring curString;
+              size_t curOffset;
 
-            for( ; ; )
-            {
-              // Skip any whitespace
-              if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset, true ) )
-                break;
-              if ( curString.empty() || isDslWs( curString[ 0 ] ) )
-                continue;
+              for ( ;; ) {
+                // Skip any whitespace
+                if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset, true ) )
+                  break;
+                if ( curString.empty() || isDslWs( curString[ 0 ] ) )
+                  continue;
 
-              list< wstring > keys;
+                list< wstring > keys;
 
-              bool eof = false;
+                bool eof = false;
 
-              // Insert the key and read more, or get to the definition
-              for( ; ; )
-              {
-                processUnsortedParts( curString, true );
+                // Insert the key and read more, or get to the definition
+                for ( ;; ) {
+                  processUnsortedParts( curString, true );
+
+                  if ( keys.size() )
+                    expandTildes( curString, keys.front() );
+
+                  expandOptionalParts( curString, &keys );
+
+                  if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset ) || curString.empty() ) {
+                    gdWarning( "Premature end of file %s\n", abrvFileName.c_str() );
+                    eof = true;
+                    break;
+                  }
+
+                  if ( isDslWs( curString[ 0 ] ) )
+                    break;
+                }
+
+                if ( eof )
+                  break;
+
+                curString.erase( 0, curString.find_first_not_of( U" \t" ) );
 
                 if ( keys.size() )
                   expandTildes( curString, keys.front() );
 
-                expandOptionalParts( curString, &keys );
+                // If the string has any dsl markup, we strip it
+                string value = Utf8::encode( ArticleDom( curString ).root.renderAsText() );
 
-                if ( !abrvScanner.readNextLineWithoutComments( curString, curOffset ) || curString.empty() )
-                {
-                  gdWarning( "Premature end of file %s\n", abrvFileName.c_str() );
-                  eof = true;
+                for ( auto & key : keys ) {
+                  unescapeDsl( key );
+                  normalizeHeadword( key );
+
+                  abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
+                }
+              }
+
+              idxHeader.hasAbrv     = 1;
+              idxHeader.abrvAddress = chunks.startNewBlock();
+
+              uint32_t sz = abrv.size();
+
+              chunks.addToBlock( &sz, sizeof( uint32_t ) );
+
+              for ( const auto & i : abrv ) {
+                //              GD_DPRINTF( "%s:%s\n", i->first.c_str(), i->second.c_str() );
+
+                sz = i.first.size();
+                chunks.addToBlock( &sz, sizeof( uint32_t ) );
+                chunks.addToBlock( i.first.data(), sz );
+                sz = i.second.size();
+                chunks.addToBlock( &sz, sizeof( uint32_t ) );
+                chunks.addToBlock( i.second.data(), sz );
+              }
+            }
+            catch ( std::exception & e ) {
+              gdWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.\n", abrvFileName.c_str(), e.what() );
+            }
+          }
+
+          bool hasString = false;
+          wstring curString;
+          size_t curOffset;
+
+          uint32_t articleCount = 0, wordCount = 0;
+
+          for ( ;; ) {
+            // Find the main headword
+
+            if ( !hasString && !scanner.readNextLineWithoutComments( curString, curOffset, true ) )
+              break; // Clean end of file
+
+            hasString = false;
+
+            // The line read should either consist of pure whitespace, or be a headword
+            // skip too long headword,it can never be headword.
+            if ( curString.empty() || curString.size() > 100 )
+              continue;
+
+            if ( isDslWs( curString[ 0 ] ) ) {
+              // The first character is blank. Let's make sure that all other
+              // characters are blank, too.
+              for ( size_t x = 1; x < curString.size(); ++x ) {
+                if ( !isDslWs( curString[ x ] ) ) {
+                  gdWarning( "Garbage string in %s at offset 0x%lX\n", fileName.c_str(), curOffset );
                   break;
                 }
-
-                if ( isDslWs( curString[ 0 ] ) )
-                  break;
               }
-
-              if ( eof )
-                break;
-
-              curString.erase( 0, curString.find_first_not_of(  U" \t"  ) );
-
-              if ( keys.size() )
-                expandTildes( curString, keys.front() );
-
-              // If the string has any dsl markup, we strip it
-              string value = Utf8::encode( ArticleDom( curString ).root.renderAsText() );
-
-              for ( auto & key : keys ) {
-                unescapeDsl( key );
-                normalizeHeadword( key );
-
-                abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
-              }
-            }
-
-            idxHeader.hasAbrv = 1;
-            idxHeader.abrvAddress = chunks.startNewBlock();
-
-            uint32_t sz = abrv.size();
-
-            chunks.addToBlock( &sz, sizeof( uint32_t ) );
-
-            for ( const auto & i : abrv ) {
-//              GD_DPRINTF( "%s:%s\n", i->first.c_str(), i->second.c_str() );
-
-              sz = i.first.size();
-              chunks.addToBlock( &sz, sizeof( uint32_t ) );
-              chunks.addToBlock( i.first.data(), sz );
-              sz = i.second.size();
-              chunks.addToBlock( &sz, sizeof( uint32_t ) );
-              chunks.addToBlock( i.second.data(), sz );
-            }
-          }
-          catch( std::exception & e )
-          {
-            gdWarning( "Error reading abrv file \"%s\", error: %s. Skipping it.\n",
-                       abrvFileName.c_str(), e.what() );
-          }
-        }
-
-        bool hasString = false;
-        wstring curString;
-        size_t curOffset;
-
-        uint32_t articleCount = 0, wordCount = 0;
-
-        for( ; ; )
-        {
-          // Find the main headword
-
-          if ( !hasString && !scanner.readNextLineWithoutComments( curString, curOffset, true) )
-            break; // Clean end of file
-
-          hasString = false;
-
-          // The line read should either consist of pure whitespace, or be a headword
-          // skip too long headword,it can never be headword.
-          if( curString.empty() || curString.size() > 100 )
-            continue;
-
-          if ( isDslWs( curString[ 0 ] ) )
-          {
-            // The first character is blank. Let's make sure that all other
-            // characters are blank, too.
-            for( size_t x = 1; x < curString.size(); ++x )
-            {
-              if ( !isDslWs( curString[ x ] ) )
-              {
-                gdWarning( "Garbage string in %s at offset 0x%lX\n", fileName.c_str(), curOffset );
-                break;
-              }
-            }
-            continue;
-          }
-
-          // Ok, got the headword
-
-          list< wstring > allEntryWords;
-
-          processUnsortedParts( curString, true );
-          expandOptionalParts( curString, &allEntryWords );
-
-          uint32_t articleOffset = curOffset;
-
-          //GD_DPRINTF( "Headword: %ls\n", curString.c_str() );
-
-          // More headwords may follow
-
-          for( ; ; )
-          {
-            if ( ! ( hasString = scanner.readNextLineWithoutComments( curString, curOffset ) ) )
-            {
-              gdWarning( "Premature end of file %s\n", fileName.c_str() );
-              break;
-            }
-
-            // Lingvo skips empty strings between the headwords
-            if ( curString.empty() )
               continue;
+            }
 
-            if ( isDslWs( curString[ 0 ] ) )
-              break; // No more headwords
+            // Ok, got the headword
 
-#ifdef QT_DEBUG
-            qDebug() << "Alt headword" << QString::fromStdU32String( curString );
-#endif
+            list< wstring > allEntryWords;
 
             processUnsortedParts( curString, true );
-            expandTildes( curString, allEntryWords.front() );
             expandOptionalParts( curString, &allEntryWords );
-          }
 
-          if ( !hasString )
-            break;
+            uint32_t articleOffset = curOffset;
 
-          // Insert new entry
+            //GD_DPRINTF( "Headword: %ls\n", curString.c_str() );
 
-          uint32_t descOffset = chunks.startNewBlock();
+            // More headwords may follow
 
-          chunks.addToBlock( &articleOffset, sizeof( articleOffset ) );
-
-          for ( auto & allEntryWord : allEntryWords ) {
-            unescapeDsl( allEntryWord );
-            normalizeHeadword( allEntryWord );
-            indexedWords.addWord( allEntryWord, descOffset, maxHeadwordSize );
-          }
-
-          ++articleCount;
-          wordCount += allEntryWords.size();
-
-          int insideInsided = 0;
-          wstring headword;
-          QVector< InsidedCard > insidedCards;
-          uint32_t offset = curOffset;
-          QVector< wstring > insidedHeadwords;
-          unsigned linesInsideCard = 0;
-          int dogLine = 0;
-          bool wasEmptyLine = false;
-          int headwordLine = scanner.getLinesRead() - 2;
-          bool noSignificantLines = Folding::applyWhitespaceOnly( curString ).empty();
-          bool haveLine = !noSignificantLines;
-
-          // Skip the article's body
-          for( ; ; )
-          {
-            hasString = haveLine ? true : scanner.readNextLineWithoutComments( curString, curOffset);
-            haveLine = false;
-
-            if ( !hasString || ( curString.size() && !isDslWs( curString[ 0 ] ) ) )
-            {
-              if( insideInsided )
-              {
-                gdWarning( "Unclosed tag '@' at line %i", dogLine );
-                insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+            for ( ;; ) {
+              if ( !( hasString = scanner.readNextLineWithoutComments( curString, curOffset ) ) ) {
+                gdWarning( "Premature end of file %s\n", fileName.c_str() );
+                break;
               }
-              if( noSignificantLines )
-                gdWarning( "Orphan headword at line %i", headwordLine );
 
+              // Lingvo skips empty strings between the headwords
+              if ( curString.empty() )
+                continue;
+
+              if ( isDslWs( curString[ 0 ] ) )
+                break; // No more headwords
+
+#ifdef QT_DEBUG
+              qDebug() << "Alt headword" << QString::fromStdU32String( curString );
+#endif
+
+              processUnsortedParts( curString, true );
+              expandTildes( curString, allEntryWords.front() );
+              expandOptionalParts( curString, &allEntryWords );
+            }
+
+            if ( !hasString )
               break;
+
+            // Insert new entry
+
+            uint32_t descOffset = chunks.startNewBlock();
+
+            chunks.addToBlock( &articleOffset, sizeof( articleOffset ) );
+
+            for ( auto & allEntryWord : allEntryWords ) {
+              unescapeDsl( allEntryWord );
+              normalizeHeadword( allEntryWord );
+              indexedWords.addWord( allEntryWord, descOffset, maxHeadwordSize );
             }
 
-            // Check for orphan strings
+            ++articleCount;
+            wordCount += allEntryWords.size();
 
-            if( curString.empty() )
-            {
-              wasEmptyLine = true;
-              continue;
-            }
-            else
-            {
-              if( wasEmptyLine && !Folding::applyWhitespaceOnly( curString ).empty() )
-                gdWarning( "Orphan string at line %i", scanner.getLinesRead() - 1 );
-            }
+            int insideInsided = 0;
+            wstring headword;
+            QVector< InsidedCard > insidedCards;
+            uint32_t offset = curOffset;
+            QVector< wstring > insidedHeadwords;
+            unsigned linesInsideCard = 0;
+            int dogLine              = 0;
+            bool wasEmptyLine        = false;
+            int headwordLine         = scanner.getLinesRead() - 2;
+            bool noSignificantLines  = Folding::applyWhitespaceOnly( curString ).empty();
+            bool haveLine            = !noSignificantLines;
 
-            if( noSignificantLines )
-              noSignificantLines = Folding::applyWhitespaceOnly( curString ).empty();
+            // Skip the article's body
+            for ( ;; ) {
+              hasString = haveLine ? true : scanner.readNextLineWithoutComments( curString, curOffset );
+              haveLine  = false;
 
-            // Find embedded cards
+              if ( !hasString || ( curString.size() && !isDslWs( curString[ 0 ] ) ) ) {
+                if ( insideInsided ) {
+                  gdWarning( "Unclosed tag '@' at line %i", dogLine );
+                  insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+                }
+                if ( noSignificantLines )
+                  gdWarning( "Orphan headword at line %i", headwordLine );
 
-            wstring::size_type n = curString.find( L'@' );
-            if( n == wstring::npos || curString[ n - 1 ] == L'\\' )
-            {
-              if( insideInsided )
-                linesInsideCard++;
+                break;
+              }
 
-              continue;
-            }
-            else
-            {
-              // Embedded card tag must be placed at first position in line after spaces
-              if( !isAtSignFirst( curString ) )
-              {
-                gdWarning( "Unescaped '@' symbol at line %i", scanner.getLinesRead() - 1 );
+              // Check for orphan strings
 
-                if( insideInsided )
+              if ( curString.empty() ) {
+                wasEmptyLine = true;
+                continue;
+              }
+              else {
+                if ( wasEmptyLine && !Folding::applyWhitespaceOnly( curString ).empty() )
+                  gdWarning( "Orphan string at line %i", scanner.getLinesRead() - 1 );
+              }
+
+              if ( noSignificantLines )
+                noSignificantLines = Folding::applyWhitespaceOnly( curString ).empty();
+
+              // Find embedded cards
+
+              wstring::size_type n = curString.find( L'@' );
+              if ( n == wstring::npos || curString[ n - 1 ] == L'\\' ) {
+                if ( insideInsided )
                   linesInsideCard++;
 
                 continue;
               }
-            }
+              else {
+                // Embedded card tag must be placed at first position in line after spaces
+                if ( !isAtSignFirst( curString ) ) {
+                  gdWarning( "Unescaped '@' symbol at line %i", scanner.getLinesRead() - 1 );
 
-            dogLine = scanner.getLinesRead() - 1;
+                  if ( insideInsided )
+                    linesInsideCard++;
 
-            // Handle embedded card
+                  continue;
+                }
+              }
 
-            if( insideInsided )
-            {
-              if( linesInsideCard )
-              {
-                insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+              dogLine = scanner.getLinesRead() - 1;
 
-                insidedHeadwords.clear();
+              // Handle embedded card
+
+              if ( insideInsided ) {
+                if ( linesInsideCard ) {
+                  insidedCards.append( InsidedCard( offset, curOffset - offset, insidedHeadwords ) );
+
+                  insidedHeadwords.clear();
+                  linesInsideCard = 0;
+                  offset          = curOffset;
+                }
+              }
+              else {
+                offset          = curOffset;
                 linesInsideCard = 0;
-                offset = curOffset;
-              }
-            }
-            else
-            {
-              offset = curOffset;
-              linesInsideCard = 0;
-            }
-
-            headword = Folding::trimWhitespace( curString.substr( n + 1 ) );
-
-            if( !headword.empty() )
-            {
-              processUnsortedParts( headword, true );
-              expandTildes( headword, allEntryWords.front() );
-              insidedHeadwords.append( headword );
-              insideInsided = true;
-            }
-            else
-              insideInsided = false;
-          }
-
-          // Now that we're having read the first string after the article
-          // itself, we can use its offset to calculate the article's size.
-          // An end of file works here, too.
-
-          uint32_t articleSize = ( curOffset - articleOffset );
-
-          chunks.addToBlock( &articleSize, sizeof( articleSize ) );
-
-          for ( auto & insidedCard : insidedCards ) {
-            uint32_t desc_offset = chunks.startNewBlock();
-            chunks.addToBlock( &insidedCard.offset, sizeof( insidedCard.offset ) );
-            chunks.addToBlock( &insidedCard.size, sizeof( insidedCard.size ) );
-
-            for ( auto & hw : insidedCard.headwords ) {
-              allEntryWords.clear();
-              expandOptionalParts( hw, &allEntryWords );
-
-              for ( auto & allEntryWord : allEntryWords ) {
-                unescapeDsl( allEntryWord );
-                normalizeHeadword( allEntryWord );
-                indexedWords.addWord( allEntryWord, desc_offset, maxHeadwordSize );
               }
 
-              wordCount += allEntryWords.size();
+              headword = Folding::trimWhitespace( curString.substr( n + 1 ) );
+
+              if ( !headword.empty() ) {
+                processUnsortedParts( headword, true );
+                expandTildes( headword, allEntryWords.front() );
+                insidedHeadwords.append( headword );
+                insideInsided = true;
+              }
+              else
+                insideInsided = false;
             }
-            ++articleCount;
+
+            // Now that we're having read the first string after the article
+            // itself, we can use its offset to calculate the article's size.
+            // An end of file works here, too.
+
+            uint32_t articleSize = ( curOffset - articleOffset );
+
+            chunks.addToBlock( &articleSize, sizeof( articleSize ) );
+
+            for ( auto & insidedCard : insidedCards ) {
+              uint32_t desc_offset = chunks.startNewBlock();
+              chunks.addToBlock( &insidedCard.offset, sizeof( insidedCard.offset ) );
+              chunks.addToBlock( &insidedCard.size, sizeof( insidedCard.size ) );
+
+              for ( auto & hw : insidedCard.headwords ) {
+                allEntryWords.clear();
+                expandOptionalParts( hw, &allEntryWords );
+
+                for ( auto & allEntryWord : allEntryWords ) {
+                  unescapeDsl( allEntryWord );
+                  normalizeHeadword( allEntryWord );
+                  indexedWords.addWord( allEntryWord, desc_offset, maxHeadwordSize );
+                }
+
+                wordCount += allEntryWords.size();
+              }
+              ++articleCount;
+            }
+
+            if ( !hasString )
+              break;
           }
 
-          if ( !hasString )
-            break;
-        }
+          // Finish with the chunks
 
-        // Finish with the chunks
+          idxHeader.chunksOffset = chunks.finish();
 
-        idxHeader.chunksOffset = chunks.finish();
+          // Build index
 
-        // Build index
+          IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
-        IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+          idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
+          idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
-        idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-        idxHeader.indexRootOffset = idxInfo.rootOffset;
+          indexedWords.clear(); // Release memory -- no need for this data
 
-        indexedWords.clear(); // Release memory -- no need for this data
+          // If there was a zip file, index it too
 
-        // If there was a zip file, index it too
+          if ( zipFileName.size() ) {
+            GD_DPRINTF( "Indexing zip file\n" );
 
-        if ( zipFileName.size() )
-        {
-          GD_DPRINTF( "Indexing zip file\n" );
+            idxHeader.hasZipFile = 1;
 
-          idxHeader.hasZipFile = 1;
+            IndexedWords zipFileNames;
+            IndexedZip zipFile;
+            if ( zipFile.openZipFile( QDir::fromNativeSeparators( zipFileName.c_str() ) ) )
+              zipFile.indexFile( zipFileNames );
 
-          IndexedWords zipFileNames;
-          IndexedZip zipFile;
-          if ( zipFile.openZipFile( QDir::fromNativeSeparators( zipFileName.c_str() ) ) )
-            zipFile.indexFile( zipFileNames );
+            if ( !zipFileNames.empty() ) {
+              // Build the resulting zip file index
 
-          if( !zipFileNames.empty() )
-          {
-            // Build the resulting zip file index
+              IndexInfo idxInfo = BtreeIndexing::buildIndex( zipFileNames, idx );
 
-            IndexInfo idxInfo = BtreeIndexing::buildIndex( zipFileNames, idx );
-
-            idxHeader.zipIndexBtreeMaxElements = idxInfo.btreeMaxElements;
-            idxHeader.zipIndexRootOffset = idxInfo.rootOffset;
+              idxHeader.zipIndexBtreeMaxElements = idxInfo.btreeMaxElements;
+              idxHeader.zipIndexRootOffset       = idxInfo.rootOffset;
+            }
+            else {
+              // Bad zip file -- no index (though the mark that we have one
+              // remains)
+              idxHeader.zipIndexBtreeMaxElements = 0;
+              idxHeader.zipIndexRootOffset       = 0;
+            }
           }
           else
-          {
-            // Bad zip file -- no index (though the mark that we have one
-            // remains)
-            idxHeader.zipIndexBtreeMaxElements = 0;
-            idxHeader.zipIndexRootOffset = 0;
-          }
+            idxHeader.hasZipFile = 0;
+
+          // That concludes it. Update the header.
+
+          idxHeader.signature         = Signature;
+          idxHeader.formatVersion     = CurrentFormatVersion;
+          idxHeader.zipSupportVersion = CurrentZipSupportVersion;
+
+          idxHeader.articleCount = articleCount;
+          idxHeader.wordCount    = wordCount;
+
+          idxHeader.langFrom = dslLanguageToId( scanner.getLangFrom() );
+          idxHeader.langTo   = dslLanguageToId( scanner.getLangTo() );
+
+          idx.rewind();
+
+          idx.write( &idxHeader, sizeof( idxHeader ) );
+
+        } // In-place try for saving line count
+        catch ( ... ) {
+          atLine = scanner.getLinesRead();
+          throw;
         }
-        else
-          idxHeader.hasZipFile = 0;
-
-        // That concludes it. Update the header.
-
-        idxHeader.signature = Signature;
-        idxHeader.formatVersion = CurrentFormatVersion;
-        idxHeader.zipSupportVersion = CurrentZipSupportVersion;
-
-        idxHeader.articleCount = articleCount;
-        idxHeader.wordCount = wordCount;
-
-        idxHeader.langFrom = dslLanguageToId( scanner.getLangFrom() );
-        idxHeader.langTo = dslLanguageToId( scanner.getLangTo() );
-
-        idx.rewind();
-
-        idx.write( &idxHeader, sizeof( idxHeader ) );
-
-      } // In-place try for saving line count
-      catch( ... )
-      {
-        atLine = scanner.getLinesRead();
-        throw;
-      }
 
       } // if need to rebuild
 
-      dictionaries.push_back( std::make_shared<DslDictionary>( dictId,
-                                                 indexFile,
-                                                 dictFiles,
-                                                 maxPictureWidth ) );
+      dictionaries.push_back( std::make_shared< DslDictionary >( dictId, indexFile, dictFiles, maxPictureWidth ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "DSL dictionary reading failed: %s:%u, error: %s\n",
-                 fileName.c_str(), atLine, e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "DSL dictionary reading failed: %s:%u, error: %s\n", fileName.c_str(), atLine, e.what() );
     }
   }
 
@@ -2363,4 +2179,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 }
 
 
-}
+} // namespace Dsl
diff --git a/src/dict/dsl.hh b/src/dict/dsl.hh
index 8641723f..f7f6e7d5 100644
--- a/src/dict/dsl.hh
+++ b/src/dict/dsl.hh
@@ -12,13 +12,12 @@ namespace Dsl {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing &,
-                                      int maxPictureWidth, unsigned int maxHeadwordSize )
-    ;
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing &,
+                                                      int maxPictureWidth,
+                                                      unsigned int maxHeadwordSize );
 
-}
+} // namespace Dsl
 
 #endif
diff --git a/src/dict/dsl_details.cc b/src/dict/dsl_details.cc
index 7ec7d328..cb3b1134 100644
--- a/src/dict/dsl_details.cc
+++ b/src/dict/dsl_details.cc
@@ -9,6 +9,7 @@
 #include "ufile.hh"
 #include "utf8.hh"
 
+#include <exception>
 #include <stdio.h>
 #include <wctype.h>
 
@@ -21,131 +22,30 @@ using gd::wstring;
 using std::list;
 using Utf8::Encoding;
 
-#ifndef __linux__
-
-// wcscasecmp() function is a GNU extension, we need to reimplement it
-// for non-GNU systems.
-
-int wcscasecmp( const wchar *s1, const wchar *s2 )
-{
-  for( ; ; ++s1, ++s2 )
-  {
-    if ( towlower( *s1 ) != towlower( *s2 ) )
-      return towlower( *s1 ) > towlower( *s2 ) ? 1 : -1;
-
-    if ( !*s1 )
-      break;
-  }
-
-  return 0;
-}
-
-#endif
-
-static DSLLangCode LangCodes[] =
-{
-  { 1, "en" },
-  { 1033, "en" },
-  { 2, "ru" },
-  { 1049, "ru" },
-  { 1068, "az" },
-  { 1025, "ar" },
-  { 1067, "am" },
-  { 15, "af" },
-  { 1078, "af" },
-  { 9, "eu" },
-  { 1069, "eu" },
-  { 1133, "ba" },
-  { 21, "be" },
-  { 1059, "be" },
-  { 22, "bg" },
-  { 1026, "bg" },
-  { 19, "hu" },
-  { 1038, "hu" },
-  { 10, "nl" },
-  { 1043, "nl" },
-  { 1032, "el" },
-  { 1079, "ka" },
-  { 13, "da" },
-  { 1030, "da" },
-  { 16, "id" },
-  { 1057, "id" },
-  { 1039, "is" },
-  { 6, "es" },
-  { 7, "es" },
-  { 3082, "es" },
-  { 1034, "es" },
-  { 5, "it" },
-  { 1040, "it" },
-  { 1087, "kk" },
-  { 1595, "ky" },
-  { 28, "ch" },
-  { 29, "ch" },
-  { 1028, "ch" },
-  { 2052, "ch" },
-  { 30, "la" },
-  { 1540, "la" },
-  { 1142, "la" },
-  { 1062, "lv" },
-  { 1063, "lt" },
-  { 1086, "ms" },
-  { 3, "de" },
-  { 26, "de" },
-  { 1031, "de" },
-  { 32775, "de" },
-  { 14, "nb" },
-  { 1044, "nb" },
-  { 25, "nn" },
-  { 2068, "nn" },
-  { 20, "pl" },
-  { 1045, "pl" },
-  { 8, "pt" },
-  { 2070, "pt" },
-  { 1048, "ro" },
-  { 23, "sr" },
-  { 3098, "sr" },
-  { 1051, "sk" },
-  { 1060, "sl" },
-  { 17, "sw" },
-  { 1089, "sw" },
-  { 1064, "tg" },
-  { 1092, "tt" },
-  { 27, "tr" },
-  { 1055, "tr" },
-  { 1090, "tk" },
-  { 1091, "tz" },
-  { 24, "uk" },
-  { 1058, "uk" },
-  { 11, "fi" },
-  { 1035, "fi" },
-  { 4, "fr" },
-  { 1036, "fr" },
-  { 18, "cs" },
-  { 1029, "cs" },
-  { 12, "sv" },
-  { 1053, "sv" },
-  { 1061, "et" },
-  { 0, "" },
-};
+static QMap< int, string > lang_codes = {
+  { 1, "en" },    { 1033, "en" }, { 2, "ru" },    { 1049, "ru" }, { 1068, "az" }, { 1025, "ar" }, { 1067, "am" },
+  { 15, "af" },   { 1078, "af" }, { 9, "eu" },    { 1069, "eu" }, { 1133, "ba" }, { 21, "be" },   { 1059, "be" },
+  { 22, "bg" },   { 1026, "bg" }, { 19, "hu" },   { 1038, "hu" }, { 10, "nl" },   { 1043, "nl" }, { 1032, "el" },
+  { 1079, "ka" }, { 13, "da" },   { 1030, "da" }, { 16, "id" },   { 1057, "id" }, { 1039, "is" }, { 6, "es" },
+  { 7, "es" },    { 3082, "es" }, { 1034, "es" }, { 5, "it" },    { 1040, "it" }, { 1087, "kk" }, { 1595, "ky" },
+  { 28, "ch" },   { 29, "ch" },   { 1028, "ch" }, { 2052, "ch" }, { 30, "la" },   { 1540, "la" }, { 1142, "la" },
+  { 1062, "lv" }, { 1063, "lt" }, { 1086, "ms" }, { 3, "de" },    { 26, "de" },   { 1031, "de" }, { 32775, "de" },
+  { 14, "nb" },   { 1044, "nb" }, { 25, "nn" },   { 2068, "nn" }, { 20, "pl" },   { 1045, "pl" }, { 8, "pt" },
+  { 2070, "pt" }, { 1048, "ro" }, { 23, "sr" },   { 3098, "sr" }, { 1051, "sk" }, { 1060, "sl" }, { 17, "sw" },
+  { 1089, "sw" }, { 1064, "tg" }, { 1092, "tt" }, { 27, "tr" },   { 1055, "tr" }, { 1090, "tk" }, { 1091, "tz" },
+  { 24, "uk" },   { 1058, "uk" }, { 11, "fi" },   { 1035, "fi" }, { 4, "fr" },    { 1036, "fr" }, { 18, "cs" },
+  { 1029, "cs" }, { 12, "sv" },   { 1053, "sv" }, { 1061, "et" } };
 
 string findCodeForDslId( int id )
 {
-  for( DSLLangCode const * lc = LangCodes; lc->code_id; ++lc )
-  {
-    if ( id == lc->code_id )
-    {
-      // We've got a match
-      return string( lc->code );
-    }
-  }
-  return string();
+  return lang_codes[ id ];
 }
 
 bool isAtSignFirst( wstring const & str )
 {
   // Test if '@' is first in string except spaces and dsl tags
-  QRegularExpression reg( R"([ \t]*(?:\[[^\]]+\][ \t]*)*@)", QRegularExpression::PatternOption::CaseInsensitiveOption);
-  return QString::fromStdU32String( str ).indexOf (reg) == 0;
+  QRegularExpression reg( R"([ \t]*(?:\[[^\]]+\][ \t]*)*@)", QRegularExpression::PatternOption::CaseInsensitiveOption );
+  return QString::fromStdU32String( str ).indexOf( reg ) == 0;
 }
 
 /////////////// ArticleDom
@@ -157,9 +57,9 @@ wstring ArticleDom::Node::renderAsText( bool stripTrsTag ) const
 
   wstring result;
 
-  for( list< Node >::const_iterator i = begin(); i != end(); ++i )
-    if( !stripTrsTag || i->tagName !=  U"!trs"  )
-      result += i->renderAsText( stripTrsTag );
+  for ( const auto & i : *this )
+    if ( !stripTrsTag || i.tagName != U"!trs" )
+      result += i.renderAsText( stripTrsTag );
 
   return result;
 }
@@ -174,7 +74,7 @@ bool is_mN( wstring const & tagName )
 
 bool isAnyM( wstring const & tagName )
 {
-  return tagName ==  U"m"  || is_mN( tagName );
+  return tagName == U"m" || is_mN( tagName );
 }
 
 bool checkM( wstring const & dest, wstring const & src )
@@ -195,9 +95,9 @@ struct MustTagBeClosed
 
 } // unnamed namespace
 
-ArticleDom::ArticleDom( wstring const & str, string const & dictName,
-                        wstring const & headword_):
-  root( Node::Tag(), wstring(), wstring() ), stringPos( str.c_str() ),
+ArticleDom::ArticleDom( wstring const & str, string const & dictName, wstring const & headword_ ):
+  root( Node::Tag(), wstring(), wstring() ),
+  stringPos( str.c_str() ),
   lineStartPos( str.c_str() ),
   transcriptionCount( 0 ),
   mediaCount( 0 ),
@@ -208,60 +108,47 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
 
   Node * textNode = 0; // A leaf node which currently accumulates text.
 
-  try
-  {
-    for( ;; )
-    {
+  try {
+    for ( ;; ) {
       nextChar();
 
-      if ( ch == L'@' && !escaped )
-      {
-        if( !atSignFirstInLine() )
-        {
+      if ( ch == L'@' && !escaped ) {
+        if ( !atSignFirstInLine() ) {
           // Not insided card
-          if( dictName.empty() )
+          if ( dictName.empty() )
             gdWarning( "Unescaped '@' symbol found" );
           else
             gdWarning( "Unescaped '@' symbol found in \"%s\"", dictName.c_str() );
         }
-        else
-        {
+        else {
           // Insided card
           wstring linkTo;
           nextChar();
-          for( ; ; nextChar() )
-          {
-            if( ch == L'\n' )
+          for ( ;; nextChar() ) {
+            if ( ch == L'\n' )
               break;
-            if( ch != L'\r' )
-            {
-              if( escaped && ( ch == L'(' || ch == ')' ) )
+            if ( ch != L'\r' ) {
+              if ( escaped && ( ch == L'(' || ch == ')' ) )
                 linkTo.push_back( L'\\' );
               linkTo.push_back( ch );
             }
           }
           linkTo = Folding::trimWhitespace( linkTo );
 
-          if( !linkTo.empty() )
-          {
+          if ( !linkTo.empty() ) {
             list< wstring > allLinkEntries;
             processUnsortedParts( linkTo, true );
             expandOptionalParts( linkTo, &allLinkEntries );
 
-            for( list< wstring >::iterator entry = allLinkEntries.begin();
-                 entry != allLinkEntries.end(); )
-            {
-              if ( !textNode )
-              {
+            for ( auto entry = allLinkEntries.begin(); entry != allLinkEntries.end(); ) {
+              if ( !textNode ) {
                 Node text = Node( Node::Text(), wstring() );
 
-                if ( stack.empty() )
-                {
+                if ( stack.empty() ) {
                   root.push_back( text );
                   stack.push_back( &root.back() );
                 }
-                else
-                {
+                else {
                   stack.back()->push_back( text );
                   stack.push_back( &stack.back()->back() );
                 }
@@ -278,54 +165,48 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
               wstring linkText = Folding::trimWhitespace( *entry );
               ArticleDom nodeDom( linkText, dictName, headword_ );
 
-              Node link( Node::Tag(),  U"@" , wstring() );
-              for( Node::iterator n = nodeDom.root.begin(); n != nodeDom.root.end(); ++n )
-                link.push_back( *n );
+              Node link( Node::Tag(), U"@", wstring() );
+              for ( auto & n : nodeDom.root )
+                link.push_back( n );
 
               ++entry;
 
-              if ( stack.empty() )
-              {
+              if ( stack.empty() ) {
                 root.push_back( link );
-                if( entry != allLinkEntries.end() ) // Add line break before next entry
-                  root.push_back( Node( Node::Tag(),  U"br" , wstring() ) );
+                if ( entry != allLinkEntries.end() ) // Add line break before next entry
+                  root.push_back( Node( Node::Tag(), U"br", wstring() ) );
               }
-              else
-              {
+              else {
                 stack.back()->push_back( link );
-                if( entry != allLinkEntries.end() )
-                  stack.back()->push_back( Node( Node::Tag(),  U"br" , wstring() ) );
+                if ( entry != allLinkEntries.end() )
+                  stack.back()->push_back( Node( Node::Tag(), U"br", wstring() ) );
               }
             }
 
             // Skip to next '@'
 
-            while( !( ch == L'@' && !escaped && atSignFirstInLine() ) )
+            while ( !( ch == L'@' && !escaped && atSignFirstInLine() ) )
               nextChar();
 
             stringPos--;
-            ch = L'\n';
+            ch      = L'\n';
             escaped = false;
           }
         }
       } // if ( ch == L'@' )
 
-      if ( ch == L'[' && !escaped )
-      {
+      if ( ch == L'[' && !escaped ) {
         // Beginning of a tag.
         bool isClosing;
         wstring name;
         wstring attrs;
 
-        try
-        {
-          do
-          {
+        try {
+          do {
             nextChar();
-          } while( Folding::isWhitespace( ch ) );
+          } while ( Folding::isWhitespace( ch ) );
 
-          if ( ch == L'/' && !escaped )
-          {
+          if ( ch == L'/' && !escaped ) {
             // A closing tag.
             isClosing = true;
             nextChar();
@@ -335,62 +216,57 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
 
           // Read tag's name
 
-          while( ( ch != L']' || escaped ) && !Folding::isWhitespace( ch ) )
-          {
+          while ( ( ch != L']' || escaped ) && !Folding::isWhitespace( ch ) ) {
             name.push_back( ch );
             nextChar();
           }
 
-          while( Folding::isWhitespace( ch ) )
+          while ( Folding::isWhitespace( ch ) )
             nextChar();
 
           // Read attrs
 
-          while( ch != L']' || escaped )
-          {
+          while ( ch != L']' || escaped ) {
             attrs.push_back( ch );
             nextChar();
           }
         }
-        catch( eot )
-        {
-          if( !dictionaryName.empty() )
+        catch ( std::exception & ex ) {
+          if ( !dictionaryName.empty() )
             gdWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found in "%s", article "%s".)",
-                       QString::fromStdU32String( name ).toUtf8().data(), QString::fromStdU32String( attrs ).toUtf8().data(),
-                       dictionaryName.c_str(), QString::fromStdU32String( headword ).toUtf8().data() );
+                       QString::fromStdU32String( name ).toUtf8().data(),
+                       QString::fromStdU32String( attrs ).toUtf8().data(),
+                       dictionaryName.c_str(),
+                       QString::fromStdU32String( headword ).toUtf8().data() );
           else
             gdWarning( R"(DSL: Unfinished tag "%s" with attributes "%s" found)",
-                       QString::fromStdU32String( name ).toUtf8().data(), QString::fromStdU32String( attrs ).toUtf8().data() );
+                       QString::fromStdU32String( name ).toUtf8().data(),
+                       QString::fromStdU32String( attrs ).toUtf8().data() );
 
-          throw eot();
+          throw ex;
         }
 
         // Add the tag, or close it
 
-        if ( textNode )
-        {
+        if ( textNode ) {
           // Close the currently opened text node
           stack.pop_back();
           textNode = 0;
         }
 
         // If the tag is [t], we update the transcriptionCount
-        if( name ==  U"t"  )
-        {
-          if ( isClosing )
-          {
+        if ( name == U"t" ) {
+          if ( isClosing ) {
             if ( transcriptionCount )
               --transcriptionCount;
           }
           else
             ++transcriptionCount;
         }
-        
+
         // If the tag is [s], we update the mediaCount
-        if( name ==  U"s"  )
-        {
-          if ( isClosing )
-          {
+        if ( name == U"s" ) {
+          if ( isClosing ) {
             if ( mediaCount )
               --mediaCount;
           }
@@ -398,80 +274,67 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
             ++mediaCount;
         }
 
-        if ( !isClosing )
-        {
-          if( isAnyM( name ) )
-          {
+        if ( !isClosing ) {
+          if ( isAnyM( name ) ) {
             // Opening an 'mX' or 'm' tag closes any previous 'm' tag
-            closeTag(  U"m" , stack, false );
+            closeTag( U"m", stack, false );
           }
           openTag( name, attrs, stack );
-          if( name ==  U"br"  )
-          {
+          if ( name == U"br" ) {
             // [br] tag don't have closing tag
             closeTag( name, stack );
           }
         }
-        else
-        {
+        else {
           closeTag( name, stack );
         } // if ( isClosing )
         continue;
       } // if ( ch == '[' )
 
-      if ( ch == L'<' && !escaped )
-      {
+      if ( ch == L'<' && !escaped ) {
         // Special case: the <<name>> link
 
         nextChar();
 
-        if ( ch != L'<' || escaped )
-        {
+        if ( ch != L'<' || escaped ) {
           // Ok, it's not it.
           --stringPos;
 
-          if ( escaped )
-          {
+          if ( escaped ) {
             --stringPos;
             escaped = false;
           }
           ch = L'<';
         }
-        else
-        {
+        else {
           // Get the link's body
-          do
-          {
+          do {
             nextChar();
-          } while( Folding::isWhitespace( ch ) );
+          } while ( Folding::isWhitespace( ch ) );
 
           wstring linkTo, linkText;
 
-          for( ; ; nextChar() )
-          {
+          for ( ;; nextChar() ) {
             // Is it the end?
-            if ( ch == L'>' && !escaped )
-            {
+            if ( ch == L'>' && !escaped ) {
               nextChar();
 
               if ( ch == L'>' && !escaped )
                 break;
-              else
-              {
+              else {
                 linkTo.push_back( L'>' );
                 linkTo.push_back( ch );
 
                 linkText.push_back( L'>' );
-                if( escaped )
+                if ( escaped )
                   linkText.push_back( L'\\' );
                 linkText.push_back( ch );
               }
             }
-            else
-            {
+            else {
               linkTo.push_back( ch );
 
-              if( escaped )
+              if ( escaped )
                 linkText.push_back( L'\\' );
               linkText.push_back( ch );
             }
@@ -479,8 +342,7 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
 
           // Add the corresponding node
 
-          if ( textNode )
-          {
+          if ( textNode ) {
             // Close the currently opened text node
             stack.pop_back();
             textNode = 0;
@@ -490,9 +352,9 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
           processUnsortedParts( linkText, true );
           ArticleDom nodeDom( linkText, dictName, headword_ );
 
-          Node link( Node::Tag(),  U"ref" , wstring() );
-          for( Node::iterator n = nodeDom.root.begin(); n != nodeDom.root.end(); ++n )
-            link.push_back( *n );
+          Node link( Node::Tag(), U"ref", wstring() );
+          for ( auto & n : nodeDom.root )
+            link.push_back( n );
 
           if ( stack.empty() )
             root.push_back( link );
@@ -503,34 +365,28 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
         }
       } // if ( ch == '<' )
 
-      if ( ch == L'{' && !escaped )
-      {
+      if ( ch == L'{' && !escaped ) {
         // Special case: {{comment}}
 
         nextChar();
 
-        if ( ch != L'{' || escaped )
-        {
+        if ( ch != L'{' || escaped ) {
           // Ok, it's not it.
           --stringPos;
 
-          if ( escaped )
-          {
+          if ( escaped ) {
             --stringPos;
             escaped = false;
           }
           ch = L'{';
         }
-        else
-        {
+        else {
           // Skip the comment's body
-          for( ; ; )
-          {
+          for ( ;; ) {
             nextChar();
 
             // Is it the end?
-            if ( ch == L'}' && !escaped )
-            {
+            if ( ch == L'}' && !escaped ) {
               nextChar();
 
               if ( ch == L'}' && !escaped )
@@ -545,17 +401,14 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
       // If we're here, we've got a normal symbol, to be saved as text.
 
       // If there's currently no text node, open one
-      if ( !textNode )
-      {
+      if ( !textNode ) {
         Node text = Node( Node::Text(), wstring() );
 
-        if ( stack.empty() )
-        {
+        if ( stack.empty() ) {
           root.push_back( text );
           stack.push_back( &root.back() );
         }
-        else
-        {
+        else {
           stack.back()->push_back( text );
           stack.push_back( &stack.back()->back() );
         }
@@ -564,141 +417,269 @@ ArticleDom::ArticleDom( wstring const & str, string const & dictName,
       }
 
       // If we're inside the transcription, do old-encoding conversion
-      if ( transcriptionCount )
-      {
-        switch ( ch )
-        {
-          case 0x2021: ch = 0xE6; break;
-          case 0x407: ch = 0x72; break;
-          case 0xB0: ch = 0x6B; break;
-          case 0x20AC: ch = 0x254; break;
-          case 0x404: ch = 0x7A; break;
-          case 0x40F: ch = 0x283; break;
-          case 0xAB: ch = 0x74; break;
-          case 0xAC: ch = 0x64; break;
-          case 0x2020: ch = 0x259; break;
-          case 0x490: ch = 0x6D; break;
-          case 0xA7: ch = 0x66; break;
-          case 0xAE: ch = 0x6C; break;
-          case 0xB1: ch = 0x67; break;
-          case 0x45E: ch = 0x65; break;
-          case 0xAD: ch = 0x6E; break;
-          case 0xA9: ch = 0x73; break;
-          case 0xA6: ch = 0x77; break;
-          case 0x2026: ch = 0x28C; break;
-          case 0x452: ch = 0x76; break;
-          case 0x408: ch = 0x70; break;
-          case 0x40C: ch = 0x75; break;
-          case 0x406: ch = 0x68; break;
-          case 0xB5: ch = 0x61; break;
-          case 0x491: ch = 0x25B; break;
-          case 0x40A: ch = 0x14B; break;
-          case 0x2030: ch = 0xF0; break;
-          case 0x456: ch = 0x6A; break;
-          case 0xA4: ch = 0x62; break;
-          case 0x409: ch = 0x292; break;
-          case 0x40E: ch = 0x69; break;
+      if ( transcriptionCount ) {
+        switch ( ch ) {
+          case 0x2021:
+            ch = 0xE6;
+            break;
+          case 0x407:
+            ch = 0x72;
+            break;
+          case 0xB0:
+            ch = 0x6B;
+            break;
+          case 0x20AC:
+            ch = 0x254;
+            break;
+          case 0x404:
+            ch = 0x7A;
+            break;
+          case 0x40F:
+            ch = 0x283;
+            break;
+          case 0xAB:
+            ch = 0x74;
+            break;
+          case 0xAC:
+            ch = 0x64;
+            break;
+          case 0x2020:
+            ch = 0x259;
+            break;
+          case 0x490:
+            ch = 0x6D;
+            break;
+          case 0xA7:
+            ch = 0x66;
+            break;
+          case 0xAE:
+            ch = 0x6C;
+            break;
+          case 0xB1:
+            ch = 0x67;
+            break;
+          case 0x45E:
+            ch = 0x65;
+            break;
+          case 0xAD:
+            ch = 0x6E;
+            break;
+          case 0xA9:
+            ch = 0x73;
+            break;
+          case 0xA6:
+            ch = 0x77;
+            break;
+          case 0x2026:
+            ch = 0x28C;
+            break;
+          case 0x452:
+            ch = 0x76;
+            break;
+          case 0x408:
+            ch = 0x70;
+            break;
+          case 0x40C:
+            ch = 0x75;
+            break;
+          case 0x406:
+            ch = 0x68;
+            break;
+          case 0xB5:
+            ch = 0x61;
+            break;
+          case 0x491:
+            ch = 0x25B;
+            break;
+          case 0x40A:
+            ch = 0x14B;
+            break;
+          case 0x2030:
+            ch = 0xF0;
+            break;
+          case 0x456:
+            ch = 0x6A;
+            break;
+          case 0xA4:
+            ch = 0x62;
+            break;
+          case 0x409:
+            ch = 0x292;
+            break;
+          case 0x40E:
+            ch = 0x69;
+            break;
           //case 0x44D: ch = 0x131; break;
-          case 0x40B: ch = 0x4E8; break;
-          case 0xB6: ch = 0x28A; break;
-          case 0x2018: ch = 0x251; break;
-          case 0x457: ch = 0x265; break;
-          case 0x458: ch = 0x153; break;
-          case 0x405: textNode->text.push_back( 0x153 ); ch = 0x303; break;
-          case 0x441: ch = 0x272; break;
-          case 0x442: textNode->text.push_back( 0x254 ); ch = 0x303; break;
-          case 0x443: ch = 0xF8; break;
-          case 0x445: textNode->text.push_back(0x25B ); ch = 0x303; break;
-          case 0x446: ch = 0xE7; break;
-          case 0x44C: textNode->text.push_back( 0x251 ); ch = 0x303; break;
-          case 0x44D: ch = 0x26A; break;
-          case 0x44F: ch = 0x252; break;
-          case 0x30: ch = 0x3B2; break;
-          case 0x31: textNode->text.push_back( 0x65 ); ch = 0x303; break;
-          case 0x32: ch = 0x25C; break;
-          case 0x33: ch = 0x129; break;
-          case 0x34: ch = 0xF5; break;
-          case 0x36: ch = 0x28E; break;
-          case 0x37: ch = 0x263; break;
-          case 0x38: ch = 0x1DD; break;
-          case 0x3A: ch = 0x2D0; break;
-          case 0x27: ch = 0x2C8; break;
-          case 0x455: ch = 0x1D0; break;
-          case 0xB7: ch = 0xE3; break;
+          case 0x40B:
+            ch = 0x4E8;
+            break;
+          case 0xB6:
+            ch = 0x28A;
+            break;
+          case 0x2018:
+            ch = 0x251;
+            break;
+          case 0x457:
+            ch = 0x265;
+            break;
+          case 0x458:
+            ch = 0x153;
+            break;
+          case 0x405:
+            textNode->text.push_back( 0x153 );
+            ch = 0x303;
+            break;
+          case 0x441:
+            ch = 0x272;
+            break;
+          case 0x442:
+            textNode->text.push_back( 0x254 );
+            ch = 0x303;
+            break;
+          case 0x443:
+            ch = 0xF8;
+            break;
+          case 0x445:
+            textNode->text.push_back( 0x25B );
+            ch = 0x303;
+            break;
+          case 0x446:
+            ch = 0xE7;
+            break;
+          case 0x44C:
+            textNode->text.push_back( 0x251 );
+            ch = 0x303;
+            break;
+          case 0x44D:
+            ch = 0x26A;
+            break;
+          case 0x44F:
+            ch = 0x252;
+            break;
+          case 0x30:
+            ch = 0x3B2;
+            break;
+          case 0x31:
+            textNode->text.push_back( 0x65 );
+            ch = 0x303;
+            break;
+          case 0x32:
+            ch = 0x25C;
+            break;
+          case 0x33:
+            ch = 0x129;
+            break;
+          case 0x34:
+            ch = 0xF5;
+            break;
+          case 0x36:
+            ch = 0x28E;
+            break;
+          case 0x37:
+            ch = 0x263;
+            break;
+          case 0x38:
+            ch = 0x1DD;
+            break;
+          case 0x3A:
+            ch = 0x2D0;
+            break;
+          case 0x27:
+            ch = 0x2C8;
+            break;
+          case 0x455:
+            ch = 0x1D0;
+            break;
+          case 0xB7:
+            ch = 0xE3;
+            break;
 
-          case 0x00a0: ch = 0x02A7; break;
+          case 0x00a0:
+            ch = 0x02A7;
+            break;
           //case 0x00b1: ch = 0x0261; break;
-          case 0x0402: textNode->text.push_back( 0x0069 ); ch = L':'; break;
-          case 0x0403: textNode->text.push_back( 0x0251 ); ch = L':'; break;
+          case 0x0402:
+            textNode->text.push_back( 0x0069 );
+            ch = L':';
+            break;
+          case 0x0403:
+            textNode->text.push_back( 0x0251 );
+            ch = L':';
+            break;
           //case 0x040b: ch = 0x03b8; break;
           //case 0x040e: ch = 0x026a; break;
-          case 0x0428: ch = 0x0061; break;
-          case 0x0453: textNode->text.push_back( 0x0075 ); ch = L':'; break;
-          case 0x201a: ch = 0x0254; break;
-          case 0x201e: ch = 0x0259; break;
-          case 0x2039: textNode->text.push_back( 0x0064 ); ch = 0x0292; break;
+          case 0x0428:
+            ch = 0x0061;
+            break;
+          case 0x0453:
+            textNode->text.push_back( 0x0075 );
+            ch = L':';
+            break;
+          case 0x201a:
+            ch = 0x0254;
+            break;
+          case 0x201e:
+            ch = 0x0259;
+            break;
+          case 0x2039:
+            textNode->text.push_back( 0x0064 );
+            ch = 0x0292;
+            break;
         }
       }
 
       if ( escaped && ch == L' ' && mediaCount == 0 )
         ch = 0xA0; // Escaped spaces turn into non-breakable ones in Lingvo
-            
+
       textNode->text.push_back( ch );
     } // for( ; ; )
   }
-  catch( eot )
-  {
+  catch ( eot & ) {
   }
 
   if ( textNode )
     stack.pop_back();
 
-  if ( stack.size() )
-  {
-    list< Node * >::iterator it = std::find_if( stack.begin(), stack.end(), MustTagBeClosed() );
-    if( it == stack.end() )
+  if ( !stack.empty() ) {
+    auto it = std::find_if( stack.begin(), stack.end(), MustTagBeClosed() );
+    if ( it == stack.end() )
       return; // no unclosed tags that must be closed => nothing to warn about
     QByteArray const firstTagName = QString::fromStdU32String( ( *it )->tagName ).toUtf8();
     ++it;
     unsigned const unclosedTagCount = 1 + std::count_if( it, stack.end(), MustTagBeClosed() );
 
-    if( dictName.empty() )
-    {
+    if ( dictName.empty() ) {
       gdWarning( "Warning: %u tag(s) were unclosed, first tag name \"%s\".\n",
-                 unclosedTagCount, firstTagName.constData() );
+                 unclosedTagCount,
+                 firstTagName.constData() );
     }
-    else
-    {
+    else {
       gdWarning( "Warning: %u tag(s) were unclosed in \"%s\", article \"%s\", first tag name \"%s\".\n",
-                 unclosedTagCount, dictName.c_str(), QString::fromStdU32String( headword ).toUtf8().constData(),
+                 unclosedTagCount,
+                 dictName.c_str(),
+                 QString::fromStdU32String( headword ).toUtf8().constData(),
                  firstTagName.constData() );
     }
   }
 }
 
-void ArticleDom::openTag( wstring const & name,
-                          wstring const & attrs,
-                          list<Node *> &stack )
+void ArticleDom::openTag( wstring const & name, wstring const & attrs, list< Node * > & stack )
 {
   list< Node > nodesToReopen;
 
-  if( isAnyM( name ) )
-  {
+  if ( isAnyM( name ) ) {
     // 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 ) );
+    while ( !stack.empty() ) {
+      nodesToReopen.emplace_back( Node::Tag(), stack.back()->tagName, stack.back()->tagAttrs );
 
-      if ( stack.back()->empty() )
-      {
+      if ( stack.back()->empty() ) {
         // Empty nodes are deleted since they're no use
 
         stack.pop_back();
 
-        Node * parent = stack.size() ? stack.back() : &root;
+        Node * parent = !stack.empty() ? stack.back() : &root;
 
         parent->pop_back();
       }
@@ -711,78 +692,57 @@ void ArticleDom::openTag( wstring const & name,
 
   Node node( Node::Tag(), name, attrs );
 
-  if ( stack.empty() )
-  {
+  if ( stack.empty() ) {
     root.push_back( node );
     stack.push_back( &root.back() );
   }
-  else
-  {
+  else {
     stack.back()->push_back( node );
     stack.push_back( &stack.back()->back() );
   }
 
   // Reopen tags if needed
 
-  while( nodesToReopen.size() )
-  {
-    if ( stack.empty() )
-    {
+  while ( !nodesToReopen.empty() ) {
+    if ( stack.empty() ) {
       root.push_back( nodesToReopen.back() );
       stack.push_back( &root.back() );
     }
-    else
-    {
+    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 )
+void ArticleDom::closeTag( wstring const & name, list< Node * > & stack, bool warn )
 {
   // Find the tag which is to be closed
 
   list< Node * >::reverse_iterator n;
 
-  for( n = stack.rbegin(); n != stack.rend(); ++n )
-  {
-    if ( (*n)->tagName == name || checkM( (*n)->tagName, name ) )
-    {
+  for ( n = stack.rbegin(); n != stack.rend(); ++n ) {
+    if ( ( *n )->tagName == name || checkM( ( *n )->tagName, name ) ) {
       // Found it
       break;
     }
   }
 
-  if ( n != stack.rend() )
-  {
+  if ( n != stack.rend() ) {
     // If there is a corresponding tag, close all tags above it,
-    // then close the tag itself, then reopen all the tags which got
-    // closed.
+    // then close the tag itself
 
-    list< Node > nodesToReopen;
+    while ( !stack.empty() ) {
+      bool found = stack.back()->tagName == name || checkM( stack.back()->tagName, name );
 
-    while( stack.size() )
-    {
-      bool found = stack.back()->tagName == name ||
-                   checkM( stack.back()->tagName, name );
-
-      if ( !found )
-        nodesToReopen.push_back( Node( Node::Tag(), stack.back()->tagName,
-                                       stack.back()->tagAttrs ) );
-
-      if( stack.back()->empty() && stack.back()->tagName !=  U"br"  )
-      {
+      if ( stack.back()->empty() && stack.back()->tagName != U"br" ) {
         // Empty nodes except [br] tag are deleted since they're no use
 
         stack.pop_back();
 
-        Node * parent = stack.size() ? stack.back() : &root;
+        Node * parent = !stack.empty() ? stack.back() : &root;
 
         parent->pop_back();
       }
@@ -792,29 +752,12 @@ void ArticleDom::closeTag( wstring const & name,
       if ( found )
         break;
     }
-
-    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();
-    }
   }
-  else
-  if ( warn )
-  {
-    if( !dictionaryName.empty() )
+  else if ( warn ) {
+    if ( !dictionaryName.empty() )
       gdWarning( R"(No corresponding opening tag for closing tag "%s" found in "%s", article "%s".)",
-                 QString::fromStdU32String( name ).toUtf8().data(), dictionaryName.c_str(),
+                 QString::fromStdU32String( name ).toUtf8().data(),
+                 dictionaryName.c_str(),
                  QString::fromStdU32String( headword ).toUtf8().data() );
     else
       gdWarning( "No corresponding opening tag for closing tag \"%s\" found.",
@@ -822,44 +765,40 @@ void ArticleDom::closeTag( wstring const & name,
   }
 }
 
-void ArticleDom::nextChar() 
+void ArticleDom::nextChar()
 {
+  if ( !*stringPos )
+    throw eot();
+
+  ch = *stringPos++;
+
+  if ( ch == L'\\' ) {
     if ( !*stringPos )
-        throw eot();
+      throw eot();
 
     ch = *stringPos++;
 
-    if ( ch == L'\\' )
-    {
-        if ( !*stringPos )
-            throw eot();
-
-        ch = *stringPos++;
-
-        escaped = true;
-    }
-    else if ( ch == L'[' && *stringPos == L'[' )
-    {
-        ++stringPos;
-        escaped = true;
-    }
-    else if ( ch == L']' && *stringPos == L']' )
-    {
-        ++stringPos;
-        escaped = true;
-    }
-    else
-        escaped = false;
-
-    if( ch == '\n' || ch == '\r' )
-        lineStartPos = stringPos;
+    escaped = true;
+  }
+  else if ( ch == L'[' && *stringPos == L'[' ) {
+    ++stringPos;
+    escaped = true;
+  }
+  else if ( ch == L']' && *stringPos == L']' ) {
+    ++stringPos;
+    escaped = true;
+  }
+  else
+    escaped = false;
 
+  if ( ch == '\n' || ch == '\r' )
+    lineStartPos = stringPos;
 }
 
 bool ArticleDom::atSignFirstInLine()
 {
   // Check if '@' sign is first after '\n', leading spaces and dsl tags
-  if( stringPos <= lineStartPos )
+  if ( stringPos <= lineStartPos )
     return true;
 
   return isAtSignFirst( wstring( lineStartPos ) );
@@ -867,9 +806,11 @@ bool ArticleDom::atSignFirstInLine()
 
 /////////////// DslScanner
 
-DslScanner::DslScanner( string const & fileName ) :
-  encoding( Utf8::Windows1252 ), readBufferPtr( readBuffer ),
-  readBufferLeft( 0 ), linesRead( 0 )
+DslScanner::DslScanner( string const & fileName ):
+  encoding( Utf8::Windows1252 ),
+  readBufferPtr( readBuffer ),
+  readBufferLeft( 0 ),
+  linesRead( 0 )
 {
   // Since .dz is backwards-compatible with .gz, we use gz- functions to
   // read it -- they are much nicer than the dict_data- ones.
@@ -880,10 +821,9 @@ DslScanner::DslScanner( string const & fileName ) :
 
   // Now try guessing the encoding by reading the first two bytes
 
-  unsigned char firstBytes[ 2 ];
+  unsigned char firstBytes[ 50 ];
 
-  if ( gzread( f, firstBytes, sizeof( firstBytes ) ) != sizeof( firstBytes ) )
-  {
+  if ( gzread( f, firstBytes, sizeof( firstBytes ) ) != sizeof( firstBytes ) ) {
     // Apparently the file's too short
     gzclose( f );
     throw exMalformedDslFile( fileName );
@@ -891,62 +831,26 @@ DslScanner::DslScanner( string const & fileName ) :
 
   bool needExactEncoding = false;
 
+  QByteArray ba = QByteArray::fromRawData( (const char *)firstBytes, 50 );
+  codec         = QTextCodec::codecForUtfText( ba, QTextCodec::codecForName( "UTF-8" ) );
 
-  // If the file begins with the dedicated Unicode marker, we just consume
-  // it. If, on the other hand, it's not, we return the bytes back
-  if ( firstBytes[ 0 ] == 0xFF && firstBytes[ 1 ] == 0xFE )
-    encoding = Utf8::Utf16LE;
-  else
-  if ( firstBytes[ 0 ] == 0xFE && firstBytes[ 1 ] == 0xFF )
-    encoding = Utf8::Utf16BE;
-  else
-  if ( firstBytes[ 0 ] == 0xEF && firstBytes[ 1 ] == 0xBB )
-  {
-    // Looks like Utf8, read one more byte
-    if ( gzread( f, firstBytes, 1 ) != 1 || firstBytes[ 0 ] != 0xBF )
-    {
-      // Either the file's too short, or the BOM is weird
-      gzclose( f );
-      throw exMalformedDslFile( fileName );
-    }
-    
-    encoding = Utf8::Utf8;
-  }
-  else
-  {
-    if ( firstBytes[ 0 ] && !firstBytes[ 1 ] )
-      encoding = Utf8::Utf16LE;
-    else
-    if ( !firstBytes[ 0 ] && firstBytes[ 1 ] )
-      encoding = Utf8::Utf16BE;
-    else
-    {
-      // Ok, this doesn't look like 16-bit Unicode. We will start with a
-      // 8-bit encoding with an intent to find out the exact one from
-      // the header.
-      needExactEncoding = true;
-      encoding = Utf8::Windows1251;
-    }
+  encoding = Utf8::getEncodingForName( codec->name() );
+  qDebug() << codec->name();
 
-    if ( gzrewind( f ) )
-    {
-      gzclose( f );
-      throw exCantOpen( fileName );
-    }
+  if ( gzrewind( f ) ) {
+    gzclose( f );
+    throw exCantOpen( fileName );
   }
 
   //iconv.reinit( encoding );
-  codec = QTextCodec::codecForName(getEncodingNameFor(encoding));
-  lineFeed=Utf8::initLineFeed(encoding);
+  lineFeed = Utf8::initLineFeed( encoding );
   // We now can use our own readNextLine() function
 
   wstring str;
   size_t offset;
 
-  for( ; ; )
-  {
-    if ( !readNextLine( str, offset ) )
-    {
+  for ( ;; ) {
+    if ( !readNextLine( str, offset ) ) {
       gzclose( f );
       throw exMalformedDslFile( fileName );
     }
@@ -954,20 +858,20 @@ DslScanner::DslScanner( string const & fileName ) :
     if ( str.empty() || str[ 0 ] != L'#' )
       break;
 
-    bool isName = false;
-    bool isLangFrom = false;
-    bool isLangTo = false;
+    bool isName      = false;
+    bool isLangFrom  = false;
+    bool isLangTo    = false;
     bool isSoundDict = false;
 
-    if( !str.compare( 0, 5,  U"#NAME" , 5 ) )
+    if ( !str.compare( 0, 5, U"#NAME", 5 ) )
       isName = true;
-    else if( !str.compare( 0, 15,  U"#INDEX_LANGUAGE" , 15 ) )
+    else if ( !str.compare( 0, 15, U"#INDEX_LANGUAGE", 15 ) )
       isLangFrom = true;
-    else if( !str.compare( 0, 18,  U"#CONTENTS_LANGUAGE" , 18 ) )
+    else if ( !str.compare( 0, 18, U"#CONTENTS_LANGUAGE", 18 ) )
       isLangTo = true;
-    else if( !str.compare( 0, 17,  U"#SOUND_DICTIONARY" , 17 ) )
+    else if ( !str.compare( 0, 17, U"#SOUND_DICTIONARY", 17 ) )
       isSoundDict = true;
-    else if( str.compare( 0, 17,  U"#SOURCE_CODE_PAGE" , 17 ) )
+    else if ( str.compare( 0, 17, U"#SOURCE_CODE_PAGE", 17 ) )
       continue;
 
     // Locate the argument
@@ -992,22 +896,19 @@ DslScanner::DslScanner( string const & fileName ) :
       langTo = arg;
     else if ( isSoundDict )
       soundDictionary = arg;
-    else
-    {
+    else {
       // The encoding
-      if ( !needExactEncoding )
-      {
+      if ( !needExactEncoding ) {
         // We don't need that!
         GD_FDPRINTF( stderr, "Warning: encoding was specified in a Unicode file, ignoring.\n" );
       }
-      else if( !arg.compare( U"Latin"  ) )
+      else if ( !arg.compare( U"Latin" ) )
         encoding = Utf8::Windows1252;
-      else if( !arg.compare( U"Cyrillic"  ) )
+      else if ( !arg.compare( U"Cyrillic" ) )
         encoding = Utf8::Windows1251;
-      else if( !arg.compare( U"EasternEuropean"  ) )
+      else if ( !arg.compare( U"EasternEuropean" ) )
         encoding = Utf8::Windows1250;
-      else
-      {
+      else {
         gzclose( f );
         throw exUnknownCodePage();
       }
@@ -1018,10 +919,10 @@ DslScanner::DslScanner( string const & fileName ) :
   // We need to rewind to that line so readNextLine() would return it again
   // next time it's called. To do that, we just use the slow gzseek() and
   // empty the read buffer.
-  if( gzdirect( f ) )                    // Without this ZLib 1.2.7 gzread() return 0
-    gzrewind( f );                       // after gzseek() call on uncompressed files
+  if ( gzdirect( f ) ) // Without this ZLib 1.2.7 gzread() return 0
+    gzrewind( f );     // after gzseek() call on uncompressed files
   gzseek( f, offset, SEEK_SET );
-  readBufferPtr = readBuffer;
+  readBufferPtr  = readBuffer;
   readBufferLeft = 0;
 }
 
@@ -1032,59 +933,49 @@ DslScanner::~DslScanner() noexcept
 
 bool DslScanner::readNextLine( wstring & out, size_t & offset, bool only_head_word )
 {
-  offset = (size_t)( gztell( f ) - readBufferLeft/*+pos*/ );
+  offset = gztell( f ) - readBufferLeft /*+pos*/;
 
-  for(;;)
-  {
+  for ( ;; ) {
     // Check that we have bytes to read
-    if ( readBufferLeft < 5000 )
-    {
-      if ( !gzeof( f ) )
-      {
+    if ( readBufferLeft < 5000 ) {
+      if ( !gzeof( f ) ) {
         // To avoid having to deal with ring logic, we move the remaining bytes
         // to the beginning
         memmove( readBuffer, readBufferPtr, readBufferLeft );
 
         // Read some more bytes to readBuffer
-        int result = gzread( f, readBuffer + readBufferLeft,
-                             sizeof( readBuffer ) - readBufferLeft );
+        const int result = gzread( f, readBuffer + readBufferLeft, sizeof( readBuffer ) - readBufferLeft );
 
         if ( result == -1 )
           throw exCantReadDslFile();
 
         readBufferPtr = readBuffer;
-        readBufferLeft += (size_t) result;
+        readBufferLeft += (size_t)result;
       }
     }
-    if(readBufferLeft<=0)
-        return false;
-
-    int pos = Utf8::findFirstLinePosition(readBufferPtr, readBufferLeft, lineFeed.lineFeed, lineFeed.length);
-    if (pos == -1)
+    if ( readBufferLeft <= 0 )
       return false;
-    QString line = codec->toUnicode(readBufferPtr, pos);
-    line = Utils::rstrip(line);
 
-    if (pos > readBufferLeft) {
+    int pos = Utf8::findFirstLinePosition( readBufferPtr, readBufferLeft, lineFeed.lineFeed, lineFeed.length );
+    if ( pos == -1 )
+      return false;
+    QString line = codec->toUnicode( readBufferPtr, pos );
+    line         = Utils::rstrip( line );
+
+    if ( pos > readBufferLeft ) {
       pos = readBufferLeft;
     }
     readBufferLeft -= pos;
     readBufferPtr += pos;
     linesRead++;
-    if(only_head_word &&( line.isEmpty()||line.at(0).isSpace()))
-        continue;
-#ifdef __WIN32
-    out=line.toStdU32String();
-#else
-    out=line.toStdU32String();
-#endif
+    if ( only_head_word && ( line.isEmpty() || line.at( 0 ).isSpace() ) )
+      continue;
+    out = line.toStdU32String();
     return true;
-
   }
 }
 
-bool DslScanner::readNextLineWithoutComments( wstring & out, size_t & offset , bool only_headword)
-                 
+bool DslScanner::readNextLineWithoutComments( wstring & out, size_t & offset, bool only_headword )
 {
   wstring str;
   bool commentToNextLine = false;
@@ -1093,21 +984,19 @@ bool DslScanner::readNextLineWithoutComments( wstring & out, size_t & offset , b
   out.erase();
   offset = 0;
 
-  do
-  {
+  do {
     bool b = readNextLine( str, currentOffset, only_headword );
 
-    if( offset == 0 )
+    if ( offset == 0 )
       offset = currentOffset;
 
-    if( !b )
+    if ( !b )
       return false;
 
-    stripComments( str, commentToNextLine);
+    stripComments( str, commentToNextLine );
 
     out += str;
-  }
-  while( commentToNextLine );
+  } while ( commentToNextLine );
 
   return true;
 }
@@ -1120,42 +1009,33 @@ void processUnsortedParts( wstring & str, bool strip )
 
   size_t startPos = 0;
 
-  for( size_t x = 0; x < str.size(); )
-  {
+  for ( size_t x = 0; x < str.size(); ) {
     wchar ch = str[ x ];
 
-    if ( ch == L'\\' )
-    {
+    if ( ch == L'\\' ) {
       // Escape code
       x += 2;
       continue;
     }
 
-    if ( ch == '{' )
-    {
+    if ( ch == '{' ) {
       ++refCount;
 
-      if ( !strip )
-      {
+      if ( !strip ) {
         // Just remove it and continue
         str.erase( x, 1 );
         continue;
       }
-      else
-      if ( refCount == 1 )
-      {
+      else if ( refCount == 1 ) {
         // First opening brace. Save this position, we will be erasing the
         // whole range when we encounter the last closing brace.
         startPos = x;
       }
     }
-    else
-    if ( ch == '}' )
-    {
+    else if ( ch == '}' ) {
       --refCount;
 
-      if ( refCount < 0 )
-      {
+      if ( refCount < 0 ) {
         GD_FDPRINTF( stderr, "Warning: an unmatched closing brace was encountered.\n" );
         refCount = 0;
         // But we remove that thing either way
@@ -1163,15 +1043,12 @@ void processUnsortedParts( wstring & str, bool strip )
         continue;
       }
 
-      if ( !strip )
-      {
+      if ( !strip ) {
         // Just remove it and continue
         str.erase( x, 1 );
         continue;
       }
-      else
-      if ( !refCount )
-      {
+      else if ( !refCount ) {
         // The final closing brace -- we can erase the whole range now.
         str.erase( startPos, x - startPos + 1 );
         x = startPos;
@@ -1183,59 +1060,46 @@ void processUnsortedParts( wstring & str, bool strip )
     ++x;
   }
 
-  if ( strip && refCount )
-  {
+  if ( strip && refCount ) {
     GD_FDPRINTF( stderr, "Warning: unclosed brace(s) encountered.\n" );
     str.erase( startPos );
   }
 }
 
-void expandOptionalParts( wstring & str, list< wstring > * result,
-                          size_t x, bool inside_recurse )
+void expandOptionalParts( wstring & str, list< wstring > * result, size_t x, bool inside_recurse )
 {
   // if str is too long ,it can never be headwords.
-  if( str.size() > 100 )
-  {
+  if ( str.size() > 100 ) {
     return;
   }
   list< wstring > expanded;
   list< wstring > * headwords;
   headwords = inside_recurse ? result : &expanded;
 
-  for( ; x < str.size(); )
-  {
+  for ( ; x < str.size(); ) {
     wchar ch = str[ x ];
 
-    if ( ch == L'\\' )
-    {
+    if ( ch == L'\\' ) {
       // Escape code
       x += 2;
     }
-    else
-    if ( ch == L'(' )
-    {
+    else if ( ch == L'(' ) {
       // First, handle the case where this block is removed
 
       {
         int refCount = 1;
 
-        for( size_t y = x + 1; y < str.size(); ++y )
-        {
+        for ( size_t y = x + 1; y < str.size(); ++y ) {
           wchar ch = str[ y ];
 
-          if ( ch == L'\\' )
-          {
+          if ( ch == L'\\' ) {
             // Escape code
             ++y;
           }
-          else
-          if ( ch == L'(' )
+          else if ( ch == L'(' )
             ++refCount;
-          else
-          if ( ch == L')' )
-          {
-            if ( !--refCount )
-            {
+          else if ( ch == L')' ) {
+            if ( !--refCount ) {
               // Now that the closing parenthesis is found,
               // cut the whole thing out and be done.
 
@@ -1252,8 +1116,7 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
           }
         }
 
-        if ( refCount && x != str.size() - 1 )
-        {
+        if ( refCount && x != str.size() - 1 ) {
           // Closing paren not found? Chop it.
 
           wstring removed( str, 0, x );
@@ -1261,11 +1124,9 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
           // Limit the amount of results to avoid excessive resource consumption
           if ( headwords->size() < 32 )
             headwords->push_back( removed );
-          else
-          {
-            if( !inside_recurse )
-            {
-                result->splice(result->end(),expanded);
+          else {
+            if ( !inside_recurse ) {
+              result->splice( result->end(), expanded );
             }
             return;
           }
@@ -1277,9 +1138,7 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
 
       str.erase( x, 1 );
     }
-    else
-    if ( ch == L')' )
-    {
+    else if ( ch == L')' ) {
       // Closing paren doesn't mean much -- just erase it
       str.erase( x, 1 );
     }
@@ -1290,26 +1149,22 @@ void expandOptionalParts( wstring & str, list< wstring > * result,
   // Limit the amount of results to avoid excessive resource consumption
   if ( headwords->size() < 32 )
     headwords->push_back( str );
-  if (!inside_recurse)
-  {
-         result->splice(result->end(),expanded);
+  if ( !inside_recurse ) {
+    result->splice( result->end(), expanded );
   }
 }
 
-static const wstring openBraces(  U"{{"  );
-static const wstring closeBraces(  U"}}"  );
+static const wstring openBraces( U"{{" );
+static const wstring closeBraces( U"}}" );
 
 void stripComments( wstring & str, bool & nextLine )
 {
   string::size_type n = 0, n2 = 0;
 
-  for( ; ; )
-  {
-    if( nextLine )
-    {
+  for ( ;; ) {
+    if ( nextLine ) {
       n = str.find( closeBraces, n2 );
-      if( n == string::npos )
-      {
+      if ( n == string::npos ) {
         str.erase( n2, n );
         return;
       }
@@ -1318,31 +1173,27 @@ void stripComments( wstring & str, bool & nextLine )
     }
 
     n = str.find( openBraces, n2 );
-    if( n == string::npos )
+    if ( n == string::npos )
       return;
     nextLine = true;
-    n2 = n;
+    n2       = n;
   }
 }
 
 void expandTildes( wstring & str, wstring const & tildeReplacement )
 {
   wstring tildeValue = Folding::trimWhitespace( tildeReplacement );
-  for( size_t x = 0; x < str.size(); )
+  for ( size_t x = 0; x < str.size(); )
     if ( str[ x ] == L'\\' )
-      x+=2;
-    else
-    if ( str[ x ] == L'~' )
-    {
-      if( x > 0 && str[ x - 1 ] == '^' && ( x < 2 || str[ x - 2 ] != '\\' ) )
-      {
+      x += 2;
+    else if ( str[ x ] == L'~' ) {
+      if ( x > 0 && str[ x - 1 ] == '^' && ( x < 2 || str[ x - 2 ] != '\\' ) ) {
         str.replace( x - 1, 2, tildeValue );
-        str[ x - 1 ] = QChar( str[ x - 1 ] ).isUpper() ? QChar::toLower( (uint)str[ x - 1 ] )
-                                                       : QChar::toUpper( (uint)str[ x - 1 ] );
+        str[ x - 1 ] =
+          QChar( str[ x - 1 ] ).isUpper() ? QChar::toLower( str[ x - 1 ] ) : QChar::toUpper( str[ x - 1 ] );
         x = x - 1 + tildeValue.size();
       }
-      else
-      {
+      else {
         str.replace( x, 1, tildeValue );
         x += tildeValue.size();
       }
@@ -1353,22 +1204,21 @@ void expandTildes( wstring & str, wstring const & tildeReplacement )
 
 void unescapeDsl( wstring & str )
 {
-  for( size_t x = 0; x < str.size(); ++x )
+  for ( size_t x = 0; x < str.size(); ++x )
     if ( str[ x ] == L'\\' )
       str.erase( x, 1 ); // ++x would skip the next char without processing it
 }
 
 void normalizeHeadword( wstring & str )
 {
-  for( size_t x = str.size(); x-- > 1; ) // >1 -- Don't test the first char
+  for ( size_t x = str.size(); x-- > 1; ) // >1 -- Don't test the first char
   {
-    if ( str[ x ] == L' ' )
-    {
+    if ( str[ x ] == L' ' ) {
       size_t y;
-      for( y = x; y && ( str[ y - 1 ] == L' ' ) ; --y );
+      for ( y = x; y && ( str[ y - 1 ] == L' ' ); --y )
+        ;
 
-      if ( y != x )
-      {
+      if ( y != x ) {
         // Remove extra spaces
 
         str.erase( y, x - y );
@@ -1377,30 +1227,27 @@ void normalizeHeadword( wstring & str )
       }
     }
   }
-  if( !str.empty() && str[ str.size() - 1 ] == L' ' )
+  if ( !str.empty() && str[ str.size() - 1 ] == L' ' )
     str.erase( str.size() - 1, 1 );
-  if( !str.empty() && str[ 0 ] == L' ' )
+  if ( !str.empty() && str[ 0 ] == L' ' )
     str.erase( 0, 1 );
 }
 
-namespace
+namespace {
+void cutEnding( wstring & where, wstring const & ending )
 {
-  void cutEnding( wstring & where, wstring const & ending )
-  {
-    if ( where.size() > ending.size() &&
-         where.compare( where.size() - ending.size(),
-                               ending.size(), ending ) == 0 )
-      where.erase( where.size() - ending.size() );
-  }
+  if ( where.size() > ending.size() && where.compare( where.size() - ending.size(), ending.size(), ending ) == 0 )
+    where.erase( where.size() - ending.size() );
 }
+} // namespace
 
 quint32 dslLanguageToId( wstring const & name )
 {
-  static wstring newSp(  U"newspelling"  );
-  static wstring st(  U"standard"  );
-  static wstring ms(  U"modernsort"  );
-  static wstring ts(  U"traditionalsort"  );
-  static wstring prc(  U"prc"  );
+  static wstring newSp( U"newspelling" );
+  static wstring st( U"standard" );
+  static wstring ms( U"modernsort" );
+  static wstring ts( U"traditionalsort" );
+  static wstring prc( U"prc" );
 
   // Any of those endings are to be removed
 
@@ -1415,5 +1262,5 @@ quint32 dslLanguageToId( wstring const & name )
   return LangCoder::findIdForLanguage( nameStripped );
 }
 
-}
-}
+} // namespace Details
+} // namespace Dsl
diff --git a/src/dict/dsl_details.hh b/src/dict/dsl_details.hh
index bbd56c1f..a74cafdf 100644
--- a/src/dict/dsl_details.hh
+++ b/src/dict/dsl_details.hh
@@ -10,10 +10,10 @@
 #include <zlib.h>
 #include "dictionary.hh"
 #include "iconv.hh"
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 #include <QByteArray>
 #include "utf8.hh"
@@ -30,14 +30,6 @@ using std::vector;
 using Utf8::Encoding;
 using Utf8::LineFeed;
 
-
-
-struct DSLLangCode
-{
-  int code_id;
-  char code[ 3 ]; // ISO 639-1
-};
-
 string findCodeForDslId( int id );
 
 bool isAtSignFirst( wstring const & str );
@@ -54,15 +46,23 @@ struct ArticleDom
     wstring tagAttrs;
     wstring text; // This is only used if isTag is false
 
-    class Text {};
-    class Tag {};
+    class Text
+    {};
+    class Tag
+    {};
 
-    Node( Tag, wstring const & name, wstring const & attrs ): isTag( true ),
-      tagName( name ), tagAttrs( attrs )
-    {}
+    Node( Tag, wstring const & name, wstring const & attrs ):
+      isTag( true ),
+      tagName( name ),
+      tagAttrs( attrs )
+    {
+    }
 
-    Node( Text, wstring const & text_ ): isTag( false ), text( text_ )
-    {}
+    Node( Text, wstring const & text_ ):
+      isTag( false ),
+      text( text_ )
+    {
+    }
 
     /// Concatenates all childen text nodes recursively to form all text
     /// the node contains stripped of any markup.
@@ -71,8 +71,7 @@ struct ArticleDom
 
   /// Does the parse at construction. Refer to the 'root' member variable
   /// afterwards.
-  explicit ArticleDom( wstring const &, string const & dictName = string(),
-              wstring const & headword_ = wstring() );
+  explicit ArticleDom( wstring const &, string const & dictName = string(), wstring const & headword_ = wstring() );
 
   /// Root of DOM's tree
   Node root;
@@ -81,21 +80,21 @@ private:
 
   void openTag( wstring const & name, wstring const & attr, list< Node * > & stack );
 
-  void closeTag( wstring const & name, list< Node * > & stack,
-                 bool warn = true );
+  void closeTag( wstring const & name, list< Node * > & stack, bool warn = true );
 
   bool atSignFirstInLine();
 
-  wchar const * stringPos, * lineStartPos;
+  wchar const *stringPos, *lineStartPos;
 
-  class eot: std::exception {};
+  class eot: std::exception
+  {};
 
   wchar ch;
   bool escaped;
   unsigned transcriptionCount; // >0 = inside a [t] tag
-  unsigned mediaCount; // >0 = inside a [s] tag
+  unsigned mediaCount;         // >0 = inside a [s] tag
 
-  void nextChar() ;
+  void nextChar();
 
   /// Information for diagnostic purposes
   string dictionaryName;
@@ -108,7 +107,7 @@ class DslScanner
 {
   gzFile f;
   Encoding encoding;
-  QTextCodec* codec;
+  QTextCodec * codec;
   wstring dictionaryName;
   wstring langFrom, langTo;
   wstring soundDictionary;
@@ -128,28 +127,38 @@ public:
   DEF_EX( exUnknownCodePage, "The .dsl file specified an unknown code page", Ex )
   DEF_EX( exEncodingError, "Encoding error", Ex ) // Should never happen really
 
-  explicit DslScanner( string const & fileName ) ;
+  explicit DslScanner( string const & fileName );
   ~DslScanner() noexcept;
 
   /// Returns the detected encoding of this file.
   Encoding getEncoding() const
-  { return encoding; }
+  {
+    return encoding;
+  }
 
   /// Returns the dictionary's name, as was read from file's headers.
   wstring const & getDictionaryName() const
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   /// Returns the dictionary's source language, as was read from file's headers.
   wstring const & getLangFrom() const
-  { return langFrom; }
+  {
+    return langFrom;
+  }
 
   /// Returns the dictionary's target language, as was read from file's headers.
   wstring const & getLangTo() const
-  { return langTo; }
+  {
+    return langTo;
+  }
 
   /// Returns the preferred external dictionary with sounds, as was read from file's headers.
   wstring const & getSoundDictionaryName() const
-  { return soundDictionary; }
+  {
+    return soundDictionary;
+  }
 
   /// Reads next line from the file. Returns true if reading succeeded --
   /// the string gets stored in the one passed, along with its physical
@@ -157,14 +166,16 @@ public:
   /// If end of file is reached, false is returned.
   /// Reading begins from the first line after the headers (ones which start
   /// with #).
-  bool readNextLine( wstring &, size_t & offset, bool only_head_word = false ) ;
+  bool readNextLine( wstring &, size_t & offset, bool only_head_word = false );
 
   /// Similar readNextLine but strip all DSL comments {{...}}
-  bool readNextLineWithoutComments( wstring &, size_t & offset, bool only_headword = false ) ;
+  bool readNextLineWithoutComments( wstring &, size_t & offset, bool only_headword = false );
 
   /// Returns the number of lines read so far from the file.
   unsigned getLinesRead() const
-  { return linesRead; }
+  {
+    return linesRead;
+  }
 
   /// Converts the given number of characters to the number of bytes they
   /// would occupy in the file, knowing its encoding. It's possible to know
@@ -178,8 +189,7 @@ void processUnsortedParts( wstring & str, bool strip );
 
 /// Expands optional parts of a headword (ones marked with parentheses),
 /// producing all possible combinations where they are present or absent.
-void expandOptionalParts( wstring & str, list< wstring > * result,
-                          size_t x = 0, bool inside_recurse = false );
+void expandOptionalParts( wstring & str, list< wstring > * result, size_t x = 0, bool inside_recurse = false );
 
 /// Expands all unescaped tildes, inserting tildeReplacement text instead of
 /// them.
@@ -198,11 +208,10 @@ void stripComments( wstring &, bool & );
 
 inline size_t DslScanner::distanceToBytes( size_t x ) const
 {
-  switch( encoding )
-  {
+  switch ( encoding ) {
     case Utf8::Utf16LE:
     case Utf8::Utf16BE:
-      return x*2;
+      return x * 2;
     default:
       return x;
   }
@@ -212,7 +221,7 @@ inline size_t DslScanner::distanceToBytes( size_t x ) const
 /// getLangTo()) to its proper language id.
 quint32 dslLanguageToId( wstring const & name );
 
-}
-}
+} // namespace Details
+} // namespace Dsl
 
 #endif
diff --git a/src/dict/epwing.cc b/src/dict/epwing.cc
index b783e0ac..0c645166 100644
--- a/src/dict/epwing.cc
+++ b/src/dict/epwing.cc
@@ -45,27 +45,26 @@ namespace {
 
 #pragma pack( push, 1 )
 
-enum
-{
-  Signature = 0x58575045, // EPWX on little-endian, XWPE on big-endian
+enum {
+  Signature            = 0x58575045, // EPWX on little-endian, XWPE on big-endian
   CurrentFormatVersion = 6 + 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 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
+  quint32 langFrom; // Source language
+  quint32 langTo;   // Target language
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -77,15 +76,14 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 class EpwingHeadwordsRequest;
 
 class EpwingDictionary: public BtreeIndexing::BtreeDictionary
 {
-  Q_DECLARE_TR_FUNCTIONS(Epwing::EpwingDictionary)
+  Q_DECLARE_TR_FUNCTIONS( Epwing::EpwingDictionary )
 
   QMutex idxMutex;
   File::Class idx;
@@ -97,14 +95,17 @@ class EpwingDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  EpwingDictionary( string const & id, string const & indexFile,
+  EpwingDictionary( string const & id,
+                    string const & indexFile,
                     vector< string > const & dictionaryFiles,
                     int subBook );
 
   ~EpwingDictionary();
 
   string getName() noexcept override
-  { return bookName; }
+  {
+    return bookName;
+  }
 
   void setName( string _name ) noexcept override
   {
@@ -112,47 +113,52 @@ public:
   }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.articleCount; }
+  {
+    return idxHeader.articleCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   void getHeadwordPos( wstring const & word_, QVector< int > & pg, QVector< int > & off );
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
   sptr< Dictionary::DataRequest >
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    if( ensureInitDone().size() )
+    if ( ensureInitDone().size() )
       return;
 
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
 
   static int japaneseWriting( gd::wchar ch );
@@ -161,15 +167,10 @@ public:
 
   static bool isJapanesePunctiation( gd::wchar ch );
 
-  sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &,
-                                                             unsigned long ) override
-    ;
+  sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &, unsigned long ) override;
 
-  sptr< Dictionary::WordSearchRequest > stemmedMatch( wstring const &,
-                                                              unsigned minLength,
-                                                              unsigned maxSuffixVariation,
-                                                              unsigned long maxResults ) override
-    ;
+  sptr< Dictionary::WordSearchRequest >
+  stemmedMatch( wstring const &, unsigned minLength, unsigned maxSuffixVariation, unsigned long maxResults ) override;
 
 protected:
 
@@ -178,41 +179,44 @@ protected:
 private:
 
   /// Loads the article.
-  void loadArticle( quint32 address,
-                    string & articleHeadword,
-                    string & articleText,
-                    int & articlePage,
-                    int & articleOffset );
+  void loadArticle(
+    quint32 address, string & articleHeadword, string & articleText, int & articlePage, int & articleOffset );
 
 
   sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & word ) override;
 
   void loadArticleNextPage( string & articleHeadword, string & articleText, int & articlePage, int & articleOffset );
-  void loadArticlePreviousPage( string & articleHeadword, string & articleText, int & articlePage, int & articleOffset );
-  
-  void loadArticle( int articlePage, int articleOffset, string & articleHeadword,
-                    string & articleText );
+  void
+  loadArticlePreviousPage( 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(); }
+  {
+    return eBook.getImagesCacheDir();
+  }
 
   QString const & getSoundsCacheDir()
-  { return eBook.getSoundsCacheDir(); }
+  {
+    return eBook.getSoundsCacheDir();
+  }
 
   QString const & getMoviesCacheDir()
-  { return eBook.getMoviesCacheDir(); }
+  {
+    return eBook.getMoviesCacheDir();
+  }
 
   friend class EpwingArticleRequest;
   friend class EpwingResourceRequest;
   friend class EpwingWordSearchRequest;
 
   friend class EpwingHeadwordsRequest;
-  string epwing_previous_button( const int& articleOffset, const int& articlePage);
-  string epwing_next_button( const int& articleOffset, const int& articlePage);
+  string epwing_previous_button( const int & articleOffset, const int & articlePage );
+  string epwing_next_button( const int & articleOffset, const int & articlePage );
   bool readHeadword( const EB_Position & pos, QString & headword );
 };
 
@@ -228,8 +232,7 @@ EpwingDictionary::EpwingDictionary( string const & id,
 {
   vector< char > data( idxHeader.nameSize );
   idx.seek( sizeof( idxHeader ) );
-  if( data.size() > 0 )
-  {
+  if ( data.size() > 0 ) {
     idx.read( &data.front(), idxHeader.nameSize );
     bookName = string( &data.front(), idxHeader.nameSize );
   }
@@ -241,15 +244,11 @@ EpwingDictionary::EpwingDictionary( string const & id,
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   eBook.setDictID( getId() );
 
-  cacheDirectory = QDir::tempPath() + QDir::separator()
-                   + QString::fromUtf8( getId().c_str() )
-                   + ".cache";
+  cacheDirectory = QDir::tempPath() + QDir::separator() + QString::fromUtf8( getId().c_str() ) + ".cache";
   eBook.setCacheDirectory( cacheDirectory );
 
   // Full-text search parameters
@@ -258,8 +257,7 @@ EpwingDictionary::EpwingDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -276,13 +274,12 @@ void EpwingDictionary::loadIcon() noexcept
   QString fileName = QString::fromStdString( getDictionaryFilenames()[ 0 ] ) + QDir::separator()
     + eBook.getCurrentSubBookDirectory() + ".";
 
-  if( !fileName.isEmpty() )
+  if ( !fileName.isEmpty() )
     loadIconFromFile( fileName );
 
-  if( dictionaryIcon.isNull() )
-  {
+  if ( dictionaryIcon.isNull() ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_epwing.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_epwing.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -291,12 +288,9 @@ void EpwingDictionary::loadIcon() noexcept
 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() )
+  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() );
@@ -318,86 +312,84 @@ void EpwingDictionary::loadArticle(
   }
 
   memcpy( &articlePage, articleProps, sizeof( articlePage ) );
-  memcpy( &articleOffset, articleProps + sizeof( articlePage ),
-          sizeof( articleOffset ) );
+  memcpy( &articleOffset, articleProps + sizeof( articlePage ), sizeof( articleOffset ) );
 
   QString headword, text;
 
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
-    eBook.getArticle( headword, text, articlePage, articleOffset, false);
+    eBook.getArticle( headword, text, articlePage, articleOffset, false );
   }
-  catch( std::exception & e )
-  {
-    text = QString( "Article reading error: %1")
-           .arg( QString::fromUtf8( e.what() ) );
+  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() );
+  articleText     = string( text.toUtf8().data() );
 
   string prefix( "<div class=\"epwing_text\">" );
 
   articleText = prefix + articleText + "</div>";
 }
 
-string Epwing::EpwingDictionary::epwing_previous_button( const int& articlePage, const int& articleOffset)
+string Epwing::EpwingDictionary::epwing_previous_button( const int & articlePage, const int & articleOffset )
 {
-    QString previousButton = QString( "p%1At%2" ).arg( articlePage ).arg( articleOffset );
-    string previousLink    = R"(<p><a class="epwing_previous_page" href="gdlookup://localhost/)"
-      + previousButton.toStdString() + "\">" + tr( "Previous Page" ).toStdString() + "</a></p>";
+  QString previousButton = QString( "p%1At%2" ).arg( articlePage ).arg( articleOffset );
+  string previousLink    = R"(<p><a class="epwing_previous_page" href="gdlookup://localhost/)"
+    + previousButton.toStdString() + "\">" + tr( "Previous Page" ).toStdString() + "</a></p>";
 
-    return previousLink;
+  return previousLink;
 }
 
-void EpwingDictionary::loadArticleNextPage(string & articleHeadword, string & articleText, int & articlePage, int & articleOffset )
+void EpwingDictionary::loadArticleNextPage( string & articleHeadword,
+                                            string & articleText,
+                                            int & articlePage,
+                                            int & articleOffset )
 {
   QString headword, text;
   EB_Position pos;
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
     pos = eBook.getArticleNextPage( headword, text, articlePage, articleOffset, false );
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     qWarning() << QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) );
     return;
   }
 
   articleHeadword = string( headword.toUtf8().data() );
-  articleText = string( text.toUtf8().data() );
+  articleText     = string( text.toUtf8().data() );
 
   string prefix( "<div class=\"epwing_text\">" );
-  string previousLink = epwing_previous_button(articlePage, articleOffset);
+  string previousLink = epwing_previous_button( articlePage, articleOffset );
 
   articleText     = prefix + previousLink + articleText;
-  string nextLink = epwing_next_button(pos.page, pos.offset);
-  articleText = articleText + nextLink;
-  articleText = articleText + "</div>";
+  string nextLink = epwing_next_button( pos.page, pos.offset );
+  articleText     = articleText + nextLink;
+  articleText     = articleText + "</div>";
 }
 
-string Epwing::EpwingDictionary::epwing_next_button( const int& articlePage, const int& articleOffset )
+string Epwing::EpwingDictionary::epwing_next_button( const int & articlePage, const int & articleOffset )
 {
-    QString refLink = QString( "r%1At%2" ).arg( articlePage ).arg( articleOffset );
-    string nextLink = R"(<p><a class="epwing_next_page" href="gdlookup://localhost/)" + refLink.toStdString() + "\">"
-      + tr( "Next Page" ).toStdString() + "</a></p>";
+  QString refLink = QString( "r%1At%2" ).arg( articlePage ).arg( articleOffset );
+  string nextLink = R"(<p><a class="epwing_next_page" href="gdlookup://localhost/)" + refLink.toStdString() + "\">"
+    + tr( "Next Page" ).toStdString() + "</a></p>";
 
-    return nextLink;
+  return nextLink;
 }
 
-void EpwingDictionary::loadArticlePreviousPage(
-  string & articleHeadword, string & articleText, int & articlePage, int & articleOffset )
+void EpwingDictionary::loadArticlePreviousPage( string & articleHeadword,
+                                                string & articleText,
+                                                int & articlePage,
+                                                int & articleOffset )
 {
   QString headword, text;
   EB_Position pos;
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
     pos = eBook.getArticlePreviousPage( headword, text, articlePage, articleOffset, false );
   }
-  catch( std::exception & e ) {
+  catch ( std::exception & e ) {
     qDebug() << QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) );
     return;
   }
@@ -407,42 +399,36 @@ void EpwingDictionary::loadArticlePreviousPage(
 
   string prefix( "<div class=\"epwing_text\">" );
 
-  string previousLink = epwing_previous_button(pos.page, pos.offset );
-  articleText     = prefix + previousLink + articleText;
-  string nextLink = epwing_next_button( articlePage, articleOffset );
-  articleText = articleText + nextLink;
-  articleText = articleText + "</div>";
+  string previousLink = epwing_previous_button( pos.page, pos.offset );
+  articleText         = prefix + previousLink + articleText;
+  string nextLink     = epwing_next_button( articlePage, articleOffset );
+  articleText         = articleText + nextLink;
+  articleText         = articleText + "</div>";
 }
 
-void EpwingDictionary::loadArticle( int articlePage,
-                                    int articleOffset,
-                                    string & articleHeadword,
-                                    string & articleText )
+void EpwingDictionary::loadArticle( int articlePage, int articleOffset, string & articleHeadword, string & articleText )
 {
   QString headword, text;
 
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
     eBook.getArticle( headword, text, articlePage, articleOffset, false );
   }
-  catch( std::exception & e )
-  {
-    text = QString( "Article reading error: %1")
-           .arg( QString::fromUtf8( e.what() ) );
+  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() );
+  articleText     = string( text.toUtf8().data() );
 
   string prefix( "<div class=\"epwing_text\">" );
 
   articleText = prefix + articleText + "</div>";
 }
 
-QString const& EpwingDictionary::getDescription()
+QString const & EpwingDictionary::getDescription()
 {
-  if( !dictionaryDescription.isEmpty() )
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
 
   dictionaryDescription = "NONE";
@@ -453,7 +439,7 @@ QString const& EpwingDictionary::getDescription()
     str = eBook.copyright();
   }
 
-  if( !str.isEmpty() )
+  if ( !str.isEmpty() )
     dictionaryDescription = str;
 
   return dictionaryDescription;
@@ -461,28 +447,27 @@ QString const& EpwingDictionary::getDescription()
 
 void EpwingDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Epwing: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Epwing: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  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() );
+  catch ( std::exception & ex ) {
+    gdWarning( "Epwing: Failed building full-text search index for \"%s\", reason: %s\n",
+               getName().c_str(),
+               ex.what() );
     QFile::remove( QString::fromStdString( ftsIdxName ) );
   }
 }
@@ -503,24 +488,18 @@ void EpwingDictionary::getArticleText( uint32_t articleAddress, QString & headwo
   uint32_t articlePage, articleOffset;
 
   memcpy( &articlePage, articleProps, sizeof( articlePage ) );
-  memcpy( &articleOffset, articleProps + sizeof( articlePage ),
-          sizeof( articleOffset ) );
+  memcpy( &articleOffset, articleProps + sizeof( articlePage ), sizeof( articleOffset ) );
 
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
     eBook.getArticle( headword, text, articlePage, articleOffset, true );
   }
-  catch( std::exception & e )
-  {
-    text = QString( "Article reading error: %1")
-           .arg( QString::fromUtf8( e.what() ) );
+  catch ( std::exception & e ) {
+    text = QString( "Article reading error: %1" ).arg( QString::fromUtf8( e.what() ) );
   }
 }
 
 
-
-
 class EpwingHeadwordsRequest: public Dictionary::WordSearchRequest
 {
   wstring str;
@@ -542,7 +521,10 @@ public:
 
   void run();
 
-  void cancel() override { isCancelled.ref(); }
+  void cancel() override
+  {
+    isCancelled.ref();
+  }
 
   ~EpwingHeadwordsRequest()
   {
@@ -576,9 +558,8 @@ void EpwingHeadwordsRequest::run()
     return;
   }
 
-  auto parts = headword.split(' ',Qt::SkipEmptyParts);
-  if(parts.empty())
-  {
+  auto parts = headword.split( ' ', Qt::SkipEmptyParts );
+  if ( parts.empty() ) {
     finish();
     return;
   }
@@ -586,7 +567,7 @@ void EpwingHeadwordsRequest::run()
 
   QVector< int > pg;
   QVector< int > off;
-  dict.getHeadwordPos( parts[0].toStdU32String(), pg, off );
+  dict.getHeadwordPos( parts[ 0 ].toStdU32String(), pg, off );
 
   for ( unsigned i = 0; i < pg.size(); ++i ) {
     if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
@@ -598,7 +579,7 @@ void EpwingHeadwordsRequest::run()
 
       QMutexLocker _( &dataMutex );
 
-      matches.emplace_back( parts[0].toStdU32String() );
+      matches.emplace_back( parts[ 0 ].toStdU32String() );
       break;
     }
   }
@@ -626,15 +607,22 @@ public:
 
   EpwingArticleRequest( wstring const & word_,
                         vector< wstring > const & alts_,
-                        EpwingDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                        EpwingDictionary & dict_,
+                        bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
 
-  void getBuiltInArticle(wstring const & word_, QVector< int > & pages,
+  void getBuiltInArticle( wstring const & word_,
+                          QVector< int > & pages,
                           QVector< int > & offsets,
                           multimap< wstring, pair< string, string > > & mainArticles );
 
@@ -652,8 +640,7 @@ public:
 
 void EpwingArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -674,14 +661,13 @@ void EpwingArticleRequest::run()
                                    // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
   QVector< int > pages, offsets;
 
   for ( auto & x : chain ) {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -694,12 +680,10 @@ void EpwingArticleRequest::run()
     string headword, articleText;
     int articlePage, articleOffset;
 
-    try
-    {
+    try {
       dict.loadArticle( x.articleOffset, headword, articleText, articlePage, articleOffset );
     }
-    catch(...)
-    {
+    catch ( ... ) {
     }
 
     pages.append( articlePage );
@@ -710,18 +694,14 @@ void EpwingArticleRequest::run()
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( headword );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, pair< string, string > > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( pair(
-      Folding::applySimpleCaseOnly( headword ),
-      pair( headword, articleText ) ) );
+    mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
     articlesIncluded.insert( x.articleOffset );
   }
@@ -735,8 +715,7 @@ void EpwingArticleRequest::run()
     getBuiltInArticle( alt, pages, offsets, alternateArticles );
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() && !ref)
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() && !ref ) {
     // No such word
     finish();
     return;
@@ -746,32 +725,28 @@ void EpwingArticleRequest::run()
 
   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 = 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;
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    result += "<h3>";
+    result += i->second.first;
+    result += "</h3>";
+    result += i->second.second;
   }
 
   //only load the next/previous page when not hitted.
-  if( mainArticles.empty() && alternateArticles.empty() && ref )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() && ref ) {
     string headword, articleText;
     int articlePage   = m.captured( 1 ).toInt();
     int articleOffset = m.captured( 2 ).toInt();
-    if( word[ 0 ] =='r' )
+    if ( word[ 0 ] == 'r' )
       dict.loadArticleNextPage( headword, articleText, articlePage, articleOffset );
-    else
-    {
+    else {
       //starts with p
       dict.loadArticlePreviousPage( headword, articleText, articlePage, articleOffset );
     }
@@ -790,11 +765,7 @@ void EpwingArticleRequest::run()
 
   result += "</div>";
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -806,8 +777,7 @@ void EpwingArticleRequest::getBuiltInArticle( wstring const & word_,
                                               QVector< int > & offsets,
                                               multimap< wstring, pair< string, string > > & mainArticles )
 {
-  try
-  {
+  try {
     string headword, articleText;
 
     QVector< int > pg, off;
@@ -816,33 +786,26 @@ void EpwingArticleRequest::getBuiltInArticle( wstring const & word_,
       dict.eBook.getArticlePos( QString::fromStdU32String( word_ ), pg, off );
     }
 
-    for( int i = 0; i < pg.size(); i++ )
-    {
+    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 )
-        {
+      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 )
-      {
+      if ( !already ) {
         dict.loadArticle( pg.at( i ), off.at( i ), headword, articleText );
 
-        mainArticles.insert(
-          pair( Folding::applySimpleCaseOnly( headword ),
-                                                   pair( headword, articleText ) ) );
+        mainArticles.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
         pages.append( pg.at( i ) );
         offsets.append( off.at( i ) );
       }
     }
   }
-  catch( ... )
-  {
+  catch ( ... ) {
   }
 }
 
@@ -861,9 +824,9 @@ sptr< Dictionary::DataRequest > EpwingDictionary::getArticle( wstring const & wo
                                                               vector< wstring > const & alts,
                                                               wstring const &,
                                                               bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<EpwingArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< EpwingArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 //// EpwingDictionary::getResource()
@@ -890,7 +853,10 @@ public:
 
   void run();
 
-  void cancel() override { isCancelled.ref(); }
+  void cancel() override
+  {
+    isCancelled.ref();
+  }
 
   ~EpwingResourceRequest()
   {
@@ -902,8 +868,7 @@ public:
 void EpwingResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -911,20 +876,16 @@ void EpwingResourceRequest::run()
   QString cacheDir;
   {
     QMutexLocker _( &dict.eBook.getLibMutex() );
-    if( Filetype::isNameOfPicture( resourceName ) )
+    if ( Filetype::isNameOfPicture( resourceName ) )
       cacheDir = dict.getImagesCacheDir();
-    else
-    if( Filetype::isNameOfSound( resourceName ) )
+    else if ( Filetype::isNameOfSound( resourceName ) )
       cacheDir = dict.getSoundsCacheDir();
-    else
-    if( Filetype::isNameOfVideo( resourceName ) )
+    else if ( Filetype::isNameOfVideo( resourceName ) )
       cacheDir = dict.getMoviesCacheDir();
   }
 
-  try
-  {
-    if( cacheDir.isEmpty() )
-    {
+  try {
+    if ( cacheDir.isEmpty() ) {
       finish();
       return;
     }
@@ -932,8 +893,7 @@ void EpwingResourceRequest::run()
     QString fullName = cacheDir + QDir::separator() + QString::fromStdString( resourceName );
 
     QFile f( fullName );
-    if( f.open( QFile::ReadOnly ) )
-    {
+    if ( f.open( QFile::ReadOnly ) ) {
       QByteArray buffer = f.readAll();
 
       QMutexLocker _( &dataMutex );
@@ -945,10 +905,11 @@ void EpwingResourceRequest::run()
       hasAnyData = true;
     }
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Epwing: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -956,9 +917,9 @@ void EpwingResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > EpwingDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<EpwingResourceRequest>( *this, name );
+  return std::make_shared< EpwingResourceRequest >( *this, name );
 }
 
 
@@ -976,19 +937,12 @@ sptr< Dictionary::DataRequest > EpwingDictionary::getSearchResults( QString cons
 
 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 ) )
+  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 ) )
+  else if ( ( ch >= 0x3040 && ch <= 0x309F ) || ( ch == 0x1B001 ) )
     return 2; // Hiragana
-  else
-  if( ( ch >= 0x4E00 && ch <= 0x9FAF )
-      || ( ch >= 0x3400 && ch <= 0x4DBF ) )
+  else if ( ( ch >= 0x4E00 && ch <= 0x9FAF ) || ( ch >= 0x3400 && ch <= 0x4DBF ) )
     return 3; // Kanji
 
   return 0;
@@ -996,8 +950,7 @@ int EpwingDictionary::japaneseWriting( gd::wchar ch )
 
 bool EpwingDictionary::isSign( gd::wchar ch )
 {
-  switch( ch )
-  {
+  switch ( ch ) {
     case 0x002B: // PLUS SIGN
     case 0x003C: // LESS-THAN SIGN
     case 0x003D: // EQUALS SIGN
@@ -1049,21 +1002,19 @@ public:
 void EpwingWordSearchRequest::findMatches()
 {
   BtreeWordSearchRequest::findMatches();
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  while( matches.size() < maxResults )
-  {
+  while ( matches.size() < maxResults ) {
     QVector< QString > headwords;
     {
       QMutexLocker _( &edict.eBook.getLibMutex() );
-      if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
         break;
 
-      if( !edict.eBook.getMatches( QString::fromStdU32String( str ), headwords ) )
+      if ( !edict.eBook.getMatches( QString::fromStdU32String( str ), headwords ) )
         break;
     }
 
@@ -1078,32 +1029,34 @@ void EpwingWordSearchRequest::findMatches()
   finish();
 }
 
-sptr< Dictionary::WordSearchRequest > EpwingDictionary::prefixMatch(
-  wstring const & str, unsigned long maxResults )
-  
+sptr< Dictionary::WordSearchRequest > EpwingDictionary::prefixMatch( wstring const & str, unsigned long maxResults )
+
 {
-  return std::make_shared<EpwingWordSearchRequest>( *this, str, 0, -1, true, maxResults );
+  return std::make_shared< EpwingWordSearchRequest >( *this, str, 0, -1, true, maxResults );
 }
 
-sptr< Dictionary::WordSearchRequest > EpwingDictionary::stemmedMatch(
-  wstring const & str, unsigned minLength, unsigned maxSuffixVariation,
-  unsigned long maxResults )
-  
+sptr< Dictionary::WordSearchRequest > EpwingDictionary::stemmedMatch( wstring const & str,
+                                                                      unsigned minLength,
+                                                                      unsigned maxSuffixVariation,
+                                                                      unsigned long maxResults )
+
 {
-  return std::make_shared<EpwingWordSearchRequest>( *this, str, minLength, (int)maxSuffixVariation,
-                                      false, maxResults );
+  return std::make_shared< EpwingWordSearchRequest >( *this,
+                                                      str,
+                                                      minLength,
+                                                      (int)maxSuffixVariation,
+                                                      false,
+                                                      maxResults );
 }
 bool Epwing::EpwingDictionary::readHeadword( const EB_Position & pos, QString & headword )
 {
-  try
-  {
+  try {
     QMutexLocker _( &eBook.getLibMutex() );
-    eBook.readHeadword( pos,headword, true);
+    eBook.readHeadword( pos, headword, true );
     eBook.fixHeadword( headword );
-    return eBook.isHeadwordCorrect( headword ) ;
+    return eBook.isHeadwordCorrect( headword );
   }
-  catch( std::exception &  )
-  {
+  catch ( std::exception & ) {
     return false;
   }
 }
@@ -1116,8 +1069,7 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
                       int & wordCount,
                       int & articleCount )
 {
-  if( !head.headword.isEmpty() )
-  {
+  if ( !head.headword.isEmpty() ) {
     uint32_t offset = chunks.startNewBlock();
     chunks.addToBlock( &head.page, sizeof( head.page ) );
     chunks.addToBlock( &head.offset, sizeof( head.offset ) );
@@ -1134,21 +1086,19 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
 
     int w_prev = 0;
     wstring word;
-    for( wstring::size_type n = 0; n < hw.size(); n++ )
-    {
+    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 ) )
+      if ( Folding::isPunct( ch ) || Folding::isWhitespace( ch ) || EpwingDictionary::isSign( ch )
+           || EpwingDictionary::isJapanesePunctiation( ch ) )
         continue;
 
       int w = EpwingDictionary::japaneseWriting( ch );
 
-      if( w > 0 )
-      {
+      if ( w > 0 ) {
         // Store only separated words
         gd::wchar ch_prev = 0;
-        if( n )
+        if ( n )
           ch_prev = hw[ n - 1 ];
         bool needStore = ( n == 0 || Folding::isPunct( ch_prev ) || Folding::isWhitespace( ch_prev )
                            || EpwingDictionary::isJapanesePunctiation( ch ) );
@@ -1156,53 +1106,47 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
         word.push_back( ch );
         w_prev = w;
         wstring::size_type i;
-        for( i = n + 1; i < hw.size(); i++ )
-        {
+        for ( i = n + 1; i < hw.size(); i++ ) {
           ch = hw[ i ];
-          if( Folding::isPunct( ch ) || Folding::isWhitespace( ch ) || EpwingDictionary::isJapanesePunctiation( ch ) )
+          if ( Folding::isPunct( ch ) || Folding::isWhitespace( ch ) || EpwingDictionary::isJapanesePunctiation( ch ) )
             break;
           w = EpwingDictionary::japaneseWriting( ch );
-          if( w != w_prev )
+          if ( w != w_prev )
             break;
           word.push_back( ch );
         }
 
-        if( needStore )
-        {
-          if( i >= hw.size() || Folding::isPunct( ch ) || Folding::isWhitespace( ch )
-              || EpwingDictionary::isJapanesePunctiation( 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() )
+        if ( i < hw.size() )
           n = i;
         else
           break;
       }
     }
 
-    if( words.size() > 1 )
-    {
+    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++ )
-      {
+      for ( n = 0; n < words.size(); n++ ) {
         int w = EpwingDictionary::japaneseWriting( words[ n ][ 0 ] );
-        if( writings[ w ] )
+        if ( writings[ w ] )
           break;
         else
           writings[ w ] = 1;
       }
 
-      if( n >= words.size() )
-      {
-        for( n = 0; n < words.size(); n++ )
-        {
+      if ( n >= words.size() ) {
+        for ( n = 0; n < words.size(); n++ ) {
           indexedWords.addWord( words[ n ], offset );
           wordCount++;
         }
@@ -1211,155 +1155,140 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
   }
 }
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
   vector< string > dictFiles;
-  QByteArray catName = QString("%1catalogs").arg(QDir::separator()).toUtf8();
+  QByteArray catName = QString( "%1catalogs" ).arg( QDir::separator() ).toUtf8();
 
   for ( const auto & fileName : fileNames ) {
-      // Skip files other than "catalogs" to speed up the scanning
+    // Skip files other than "catalogs" to speed up the scanning
 
-      if ( fileName.size() < (unsigned)catName.size() ||
-          strcasecmp( fileName.c_str() + ( fileName.size() - catName.size() ), catName.data() ) != 0 )
-        continue;
+    if ( fileName.size() < (unsigned)catName.size()
+         || strcasecmp( fileName.c_str() + ( fileName.size() - catName.size() ), catName.data() ) != 0 )
+      continue;
 
-      int ndir = fileName.size() - catName.size();
-      if( ndir < 1 )
-        ndir = 1;
+    int ndir = fileName.size() - catName.size();
+    if ( ndir < 1 )
+      ndir = 1;
 
-      string mainDirectory = fileName.substr( 0, ndir );
+    string mainDirectory = fileName.substr( 0, ndir );
 
-      Epwing::Book::EpwingBook dict;
-      int subBooksNumber = 0;
-      try
-      {
-        subBooksNumber = dict.setBook( mainDirectory );
-      }
-      catch( std::exception & e )
-      {
-        gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n",
-                   mainDirectory.c_str(), e.what() );
-        continue;
-      }
+    Epwing::Book::EpwingBook dict;
+    int subBooksNumber = 0;
+    try {
+      subBooksNumber = dict.setBook( mainDirectory );
+    }
+    catch ( std::exception & e ) {
+      gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n", mainDirectory.c_str(), e.what() );
+      continue;
+    }
 
-      for( int sb = 0; sb < subBooksNumber; sb++ )
-      {
-        QString dir;
+    for ( int sb = 0; sb < subBooksNumber; sb++ ) {
+      QString dir;
 
-        try
-        {
-          dictFiles.clear();
-          dictFiles.push_back( mainDirectory );
-          dictFiles.push_back( fileName );
+      try {
+        dictFiles.clear();
+        dictFiles.push_back( mainDirectory );
+        dictFiles.push_back( fileName );
 
-          dict.setSubBook( sb );
+        dict.setSubBook( sb );
 
-          dir = QString::fromStdString( mainDirectory ) + Utils::Fs::separator() + dict.getCurrentSubBookDirectory();
+        dir = QString::fromStdString( mainDirectory ) + Utils::Fs::separator() + dict.getCurrentSubBookDirectory();
 
-          Epwing::Book::EpwingBook::collectFilenames( dir, dictFiles );
+        Epwing::Book::EpwingBook::collectFilenames( dir, dictFiles );
 
-          QString fontSubName =
-            QString::fromStdString( mainDirectory ) + QDir::separator() + "afonts_" + QString::number( sb );
-          QFileInfo info( fontSubName );
-          if( info.exists() && info.isFile() )
+        QString fontSubName =
+          QString::fromStdString( mainDirectory ) + QDir::separator() + "afonts_" + QString::number( sb );
+        QFileInfo info( fontSubName );
+        if ( info.exists() && info.isFile() )
           dictFiles.push_back( fontSubName.toStdString() );
 
-          // Check if we need to rebuid the index
+        // Check if we need to rebuid the index
 
-          string dictId = Dictionary::makeDictionaryId( dictFiles );
+        string dictId = Dictionary::makeDictionaryId( dictFiles );
 
-          string indexFile = indicesDir + dictId;
+        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() );
+        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() );
+          QString str         = dict.title();
+          QByteArray nameData = str.toUtf8();
+          initializing.indexingDictionary( nameData.data() );
 
-            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( nameData.data(), nameData.size() );
-            idxHeader.nameSize = nameData.size();
+          idx.write( nameData.data(), nameData.size() );
+          idxHeader.nameSize = nameData.size();
 
-            IndexedWords indexedWords;
+          IndexedWords indexedWords;
 
-            ChunkedStorage::Writer chunks( idx );
+          ChunkedStorage::Writer chunks( idx );
 
-            Epwing::Book::EpwingHeadword head;
+          Epwing::Book::EpwingHeadword head;
 
-            dict.getFirstHeadword( head );
+          dict.getFirstHeadword( head );
 
-            int wordCount = 0;
-            int articleCount = 0;
+          int wordCount    = 0;
+          int articleCount = 0;
 
-            for( ; ; )
-            {
-              addWordToChunks( head, chunks, indexedWords, wordCount, articleCount );
-              if( !dict.getNextHeadword( head ) )
-                break;
-            }
+          for ( ;; ) {
+            addWordToChunks( head, chunks, indexedWords, wordCount, articleCount );
+            if ( !dict.getNextHeadword( head ) )
+              break;
+          }
 
-            dict.clearBuffers();
+          dict.clearBuffers();
 
-            // Finish with the chunks
+          // Finish with the chunks
 
-            idxHeader.chunksOffset = chunks.finish();
+          idxHeader.chunksOffset = chunks.finish();
 
-            // Build index
+          // Build index
 
-            IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+          IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
-            idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-            idxHeader.indexRootOffset = idxInfo.rootOffset;
+          idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
+          idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
-            indexedWords.clear(); // Release memory -- no need for this data
+          indexedWords.clear(); // Release memory -- no need for this data
 
-            // That concludes it. Update the header.
+          // That concludes it. Update the header.
 
-            idxHeader.signature = Signature;
-            idxHeader.formatVersion = CurrentFormatVersion;
+          idxHeader.signature     = Signature;
+          idxHeader.formatVersion = CurrentFormatVersion;
 
-            idxHeader.wordCount = wordCount;
-            idxHeader.articleCount = articleCount;
+          idxHeader.wordCount    = wordCount;
+          idxHeader.articleCount = articleCount;
 
-            idx.rewind();
+          idx.rewind();
 
-            idx.write( &idxHeader, sizeof( idxHeader ) );
+          idx.write( &idxHeader, sizeof( idxHeader ) );
 
 
-          } // If need to rebuild
+        } // If need to rebuild
 
-          dictionaries.push_back( std::make_shared<EpwingDictionary>( dictId,
-                                                        indexFile,
-                                                        dictFiles,
-                                                        sb ) );
-        }
-        catch( std::exception & e )
-        {
-          gdWarning( "Epwing dictionary initializing failed: %s, error: %s\n",
-                     dir.toUtf8().data(), e.what() );
-          continue;
-        }
+        dictionaries.push_back( std::make_shared< 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;
 }
diff --git a/src/dict/epwing.hh b/src/dict/epwing.hh
index 9201068c..8c9c6241 100644
--- a/src/dict/epwing.hh
+++ b/src/dict/epwing.hh
@@ -18,11 +18,7 @@ void addWordToChunks( Epwing::Book::EpwingHeadword & head,
                       int & articleCount );
 
 vector< sptr< Dictionary::Class > >
-makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-    ;
-}
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
+} // namespace Epwing
 
 #endif // __EPWING_HH__INCLUDED__
diff --git a/src/dict/epwing_book.cc b/src/dict/epwing_book.cc
index 404636dd..305dad96 100644
--- a/src/dict/epwing_book.cc
+++ b/src/dict/epwing_book.cc
@@ -16,7 +16,7 @@
 #include "epwing_charmap.hh"
 #include "htmlescape.hh"
 #if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
-#define _FILE_OFFSET_BITS 64
+  #define _FILE_OFFSET_BITS 64
 #endif
 
 #include <eb/text.h>
@@ -41,9 +41,7 @@ void finalize()
 
 namespace Book {
 
-#define HookFunc(name) \
-    EB_Error_Code name(EB_Book *, EB_Appendix *, void*, EB_Hook_Code, int, \
-                       const unsigned int*)
+#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 );
@@ -62,134 +60,120 @@ 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 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 }
-};
+  { 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
+#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 */
+  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 */
+  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 * )
+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' );
+  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 )
+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() )
-  {
+  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 )
+EB_Error_Code
+hook_narrow_jisx0208( EB_Book * book, EB_Appendix *, void * container, EB_Hook_Code, int, const unsigned int * argv )
 {
-  if( *argv == 0xA1E3 )
+  if ( *argv == 0xA1E3 )
     eb_write_text_string( book, "&lt;" );
-  else
-  if( *argv == 0xA1E4 )
+  else if ( *argv == 0xA1E4 )
     eb_write_text_string( book, "&gt;" );
-  else
-  if( *argv == 0xA1F5 )
+  else if ( *argv == 0xA1F5 )
     eb_write_text_string( book, "&amp;" );
-  else
-  {
+  else {
     unsigned char buf[ 2 ];
-    buf[ 0 ] = argv[ 0 ] >> 8;
-    buf[ 1 ] = argv[ 0 ] & 0xff;
+    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 )
+    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 )
+    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 )
-    {
+    if ( out_code == 0 ) {
       EContainer * cont = static_cast< EContainer * >( container );
-      if( cont->book->codecEuc() )
-      {
+      if ( cont->book->codecEuc() ) {
         QByteArray str = cont->book->codecEuc()->toUnicode( (const char *)buf, 2 ).toUtf8();
         eb_write_text( book, str.data(), str.size() );
       }
@@ -203,17 +187,16 @@ EB_Error_Code hook_narrow_jisx0208( EB_Book * book, EB_Appendix *,
   return EB_SUCCESS;
 }
 
-EB_Error_Code hook_wide_jisx0208( EB_Book * book, EB_Appendix *, void * ptr,
-                                  EB_Hook_Code, int, const unsigned int * argv )
+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;
+  char buf[ 2 ];
+  buf[ 1 ] = *argv & 0xFF;
+  buf[ 0 ] = ( *argv & 0xFF00 ) >> 8;
 
-  if( ebook->codecEuc() )
-  {
+  if ( ebook->codecEuc() ) {
     QByteArray b = ebook->codecEuc()->toUnicode( buf, 2 ).toUtf8();
     eb_write_text( book, b.data(), b.size() );
   }
@@ -223,17 +206,16 @@ EB_Error_Code hook_wide_jisx0208( EB_Book * book, EB_Appendix *, void * ptr,
   return EB_SUCCESS;
 }
 
-EB_Error_Code hook_gb2312( EB_Book * book, EB_Appendix *, void * container,
-                           EB_Hook_Code, int, const unsigned int * argv )
+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 ;
+  char buf[ 2 ];
+  buf[ 1 ] = *argv & 0xFF;
+  buf[ 0 ] = ( *argv & 0xFF00 ) >> 8;
 
-  if( ebook->codecGB() )
-  {
+  if ( ebook->codecGB() ) {
     QByteArray b = ebook->codecGB()->toUnicode( buf, 2 ).toUtf8();
     eb_write_text( book, b.data(), b.size() );
   }
@@ -243,151 +225,151 @@ EB_Error_Code hook_gb2312( EB_Book * book, EB_Appendix *, void * container,
   return EB_SUCCESS;
 }
 
-EB_Error_Code hook_subscript( EB_Book * book, EB_Appendix *, void * container,
-                              EB_Hook_Code code, int, const unsigned int * )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
-  if( code == EB_HOOK_BEGIN_SUBSCRIPT )
+  if ( code == EB_HOOK_BEGIN_SUBSCRIPT )
     eb_write_text_string( book, cn->book->beginDecoration( EpwingBook::SUBSCRIPT ) );
 
-  if( code == EB_HOOK_END_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 * )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
-  if( code == EB_HOOK_BEGIN_SUPERSCRIPT )
+  if ( code == EB_HOOK_BEGIN_SUPERSCRIPT )
     eb_write_text_string( book, cn->book->beginDecoration( EpwingBook::SUPERSCRIPT ) );
 
-  if( code == EB_HOOK_END_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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
-  if( code == EB_HOOK_BEGIN_DECORATION )
+  if ( code == EB_HOOK_BEGIN_DECORATION )
     eb_write_text_string( book, cn->book->beginDecoration( argv[ 1 ] ) );
 
-  if( code == EB_HOOK_END_DECORATION )
+  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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
   QByteArray str = cn->book->handleColorImage( code, argv );
-  if( !str.isEmpty() )
+  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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
   QByteArray str = cn->book->handleMonoImage( code, argv );
-  if( !str.isEmpty() )
+  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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
   QByteArray str = cn->book->handleWave( code, argv );
-  if( !str.isEmpty() )
+  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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
   QByteArray str = cn->book->handleMpeg( code, argv );
-  if( !str.isEmpty() )
+  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 )
+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() )
+  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 )
+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() )
+  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 )
+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 )
+  if ( cn->textOnly )
     return EB_SUCCESS;
 
   QByteArray str = cn->book->handleReference( code, argv );
-  if( !str.isEmpty() )
+  if ( !str.isEmpty() )
     eb_write_text( book, str.data(), str.size() );
 
   return EB_SUCCESS;
@@ -395,12 +377,12 @@ EB_Error_Code hook_reference( EB_Book * book, EB_Appendix *, void * container,
 
 // EpwingBook class
 
-EpwingBook::EpwingBook() :
+EpwingBook::EpwingBook():
   currentSubBook( -1 )
 {
   codec_ISO = QTextCodec::codecForName( "ISO8859-1" );
-  codec_GB = QTextCodec::codecForName( "GB2312" );
-  codec_Euc = QTextCodec::codecForName("EUC-JP");
+  codec_GB  = QTextCodec::codecForName( "GB2312" );
+  codec_Euc = QTextCodec::codecForName( "EUC-JP" );
 
   eb_initialize_book( &book );
   eb_initialize_appendix( &appendix );
@@ -422,13 +404,14 @@ EpwingBook::~EpwingBook()
 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 ) ) );
+                   .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 ) );
+  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 )
@@ -438,15 +421,13 @@ void EpwingBook::collectFilenames( QString const & directory, vector< string > &
   catName += QDir::separator();
   catName += "catalogs";
 
-  QFileInfoList entries = dir.entryInfoList( QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot,
-                                             QDir::Name | QDir::DirsLast );
+  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 )
-  {
+  for ( QFileInfoList::const_iterator i = entries.constBegin(); i != entries.constEnd(); ++i ) {
     QString fullName = QDir::toNativeSeparators( i->filePath() );
 
-    if( i->isDir() )
+    if ( i->isDir() )
       collectFilenames( fullName, files );
     else
       files.push_back( fullName.toStdString() );
@@ -457,46 +438,41 @@ int EpwingBook::setBook( string const & directory )
 {
   error_string.clear();
 
-  if( directory.empty() )
+  if ( directory.empty() )
     throw exEpwing( "No such directory" );
 
   currentPosition.page = 0;
 
-  indexHeadwordsPosition.page = 0;
+  indexHeadwordsPosition.page   = 0;
   indexHeadwordsPosition.offset = 0;
 
   currentSubBook = -1;
 
   EB_Error_Code ret = eb_bind( &book, directory.c_str() );
-  if( ret != EB_SUCCESS )
-  {
+  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 )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_bind_appendix", ret );
   }
 
   ret = eb_subbook_list( &book, subBookList, &subBookCount );
-  if( ret != EB_SUCCESS )
-  {
+  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 )
-  {
+  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 ) )
+  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 = QString::fromStdString( directory );
@@ -512,56 +488,49 @@ bool EpwingBook::setSubBook( int book_nom )
 
   currentPosition.page = 0;
 
-  if( book_nom < 0 || book_nom >= subBookCount )
+  if ( book_nom < 0 || book_nom >= subBookCount )
     throw exEpwing( "Invalid subbook number" );
 
-  if( currentSubBook == book_nom )
+  if ( currentSubBook == book_nom )
     return true;
 
   EB_Error_Code ret = eb_set_subbook( &book, subBookList[ book_nom ] );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_set_subbook", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
   currentSubBook = book_nom;
 
-  if( book_nom < subAppendixCount )
-  {
+  if ( book_nom < subAppendixCount ) {
     ret = eb_set_appendix_subbook( &appendix, subAppendixList[ book_nom ] );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_set_appendix_subbook", ret );
     }
   }
 
-  if( eb_have_font( &book, EB_FONT_16 ) )
-  {
+  if ( eb_have_font( &book, EB_FONT_16 ) ) {
     ret = eb_set_font( &book, EB_FONT_16 );
-    if( ret != EB_SUCCESS )
+    if ( ret != EB_SUCCESS )
       setErrorString( "eb_set_font", ret );
   }
 
   // Load fonts list
 
-  QString fileName = rootDir + QDir::separator()
-                     + "afonts_" + QString::number( book_nom );
+  QString fileName = rootDir + QDir::separator() + "afonts_" + QString::number( book_nom );
 
   QFile f( fileName );
-  if( f.open( QFile::ReadOnly | QFile::Text ) )
-  {
+  if ( f.open( QFile::ReadOnly | QFile::Text ) ) {
     QTextStream ts( &f );
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
     ts.setCodec( "UTF-8" );
 #else
-    ts.setEncoding(QStringConverter::Utf8);
+    ts.setEncoding( QStringConverter::Utf8 );
 #endif
 
     QString line = ts.readLine();
-    while( !line.isEmpty() )
-    {
+    while ( !line.isEmpty() ) {
       QStringList list = line.remove( '\n' ).split( ' ', Qt::SkipEmptyParts );
-      if( list.count() == 2 )
+      if ( list.count() == 2 )
         customFontsMap[ list[ 0 ] ] = list[ 1 ];
       line = ts.readLine();
     }
@@ -590,21 +559,17 @@ QString EpwingBook::createCacheDir( QString const & dirName )
 {
   QDir dir;
   QFileInfo info( mainCacheDir );
-  if( !info.exists() || !info.isDir() )
-  {
-    if( !dir.mkdir( 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 ) )
-    {
+  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();
     }
@@ -616,8 +581,7 @@ QString EpwingBook::getCurrentSubBookDirectory()
 {
   error_string.clear();
 
-  if( currentSubBook < 0 || currentSubBook >= subBookCount )
-  {
+  if ( currentSubBook < 0 || currentSubBook >= subBookCount ) {
     setErrorString( "eb_subbook_directory2", EB_ERR_NO_SUCH_BOOK );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
@@ -625,8 +589,7 @@ QString EpwingBook::getCurrentSubBookDirectory()
   char buffer[ EB_MAX_PATH_LENGTH + 1 ];
 
   EB_Error_Code ret = eb_subbook_directory2( &book, subBookList[ currentSubBook ], buffer );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_subbook_directory2", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
@@ -636,11 +599,7 @@ QString EpwingBook::getCurrentSubBookDirectory()
 
 QString EpwingBook::makeFName( QString const & ext, int page, int offset ) const
 {
-  QString name = QString::number( page )
-                 + "x"
-                 + QString::number( offset )
-                 + "."
-                 + ext;
+  QString name = QString::number( page ) + "x" + QString::number( offset ) + "." + ext;
   return name;
 }
 
@@ -650,14 +609,13 @@ QString EpwingBook::title()
   error_string.clear();
 
   EB_Error_Code ret = eb_subbook_title( &book, buf );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_subbook_title", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
 
   buf[ EB_MAX_TITLE_LENGTH ] = 0;
-  if( codec_Euc )
+  if ( codec_Euc )
     return codec_Euc->toUnicode( buf );
 
   return QString();
@@ -667,13 +625,12 @@ QString EpwingBook::copyright()
 {
   error_string.clear();
 
-  if( !eb_have_copyright( &book ) )
+  if ( !eb_have_copyright( &book ) )
     return QString();
 
   EB_Position position;
   EB_Error_Code ret = eb_copyright( &book, &position );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_copyright", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
@@ -697,32 +654,28 @@ QString EpwingBook::getText( int page, int offset, bool text_only )
 
   prepareToRead();
 
-  for( ; ; )
-  {
-    EB_Error_Code ret = eb_read_text( &book, &appendix, &hookSet, &container,
-                        TextBufferSize, buffer, &buffer_length );
+  for ( ;; ) {
+    EB_Error_Code ret = eb_read_text( &book, &appendix, &hookSet, &container, TextBufferSize, buffer, &buffer_length );
 
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_read_text", ret );
       break;
     }
 
     buf += QByteArray( buffer, buffer_length );
 
-    if( eb_is_text_stopped( &book ) )
+    if ( eb_is_text_stopped( &book ) )
       break;
 
-    if( buf.length() > TextSizeLimit )
-    {
-      error_string = "Data too large";
+    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);
+  finalizeText( text );
   return text;
 }
 
@@ -734,15 +687,14 @@ void EpwingBook::seekBookThrow( int page, int offset )
   currentPosition = pos;
 
   EB_Error_Code ret = eb_seek_text( &book, &pos );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_seek_text", ret );
     currentPosition.page = 0;
     throw exEbLibrary( error_string.toUtf8().data() );
   }
 }
 
-  QString EpwingBook::getTextWithLength( int page, int offset, int total, EB_Position & pos )
+QString EpwingBook::getTextWithLength( int page, int offset, int total, EB_Position & pos )
 {
   error_string.clear();
   int currentLength = 0;
@@ -756,12 +708,10 @@ void EpwingBook::seekBookThrow( int page, int offset )
 
   prepareToRead();
 
-  for( ;; )
-  {
+  for ( ;; ) {
     EB_Error_Code ret = eb_read_text( &book, &appendix, &hookSet, &container, TextBufferSize, buffer, &buffer_length );
 
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_read_text", ret );
       break;
     }
@@ -769,19 +719,17 @@ void EpwingBook::seekBookThrow( int page, int offset )
     buf += QByteArray( buffer, buffer_length );
     currentLength += buffer_length;
 
-    if( currentLength > total || buffer_length == 0 )
+    if ( currentLength > total || buffer_length == 0 )
       break;
 
-    if( buf.length() > TextSizeLimit )
-    {
+    if ( buf.length() > TextSizeLimit ) {
       error_string         = "Data too large";
       currentPosition.page = 0;
       return QString();
     }
 
     ret = eb_forward_text( &book, &appendix );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_seek_text", ret );
       currentPosition.page = 0;
       throw exEbLibrary( error_string.toUtf8().data() );
@@ -806,12 +754,10 @@ QString EpwingBook::getPreviousTextWithLength( int page, int offset, int total,
 
   prepareToRead();
 
-  for( ;; )
-  {
+  for ( ;; ) {
     seekBookThrow( page, offset );
     EB_Error_Code ret = eb_backward_text( &book, &appendix );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_backward_text", ret );
       currentPosition.page = 0;
       throw exEbLibrary( error_string.toUtf8().data() );
@@ -822,20 +768,18 @@ QString EpwingBook::getPreviousTextWithLength( int page, int offset, int total,
 
     ret = eb_read_text( &book, &appendix, &hookSet, &container, TextBufferSize, buffer, &buffer_length );
 
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_read_text", ret );
       break;
     }
 
-    buf.prepend( QByteArray( buffer, buffer_length ));
+    buf.prepend( QByteArray( buffer, buffer_length ) );
     currentLength += buffer_length;
 
-    if( currentLength > total || buffer_length == 0 )
+    if ( currentLength > total || buffer_length == 0 )
       break;
 
-    if( buf.length() > TextSizeLimit )
-    {
+    if ( buf.length() > TextSizeLimit ) {
       error_string         = "Data too large";
       currentPosition.page = 0;
       return QString();
@@ -847,21 +791,19 @@ QString EpwingBook::getPreviousTextWithLength( int page, int offset, int total,
   return text;
 }
 
-  
 
 void EpwingBook::getReferencesFromText( int page, int offset )
 {
   error_string.clear();
 
   EB_Position pos;
-  pos.page = page;
+  pos.page   = page;
   pos.offset = offset;
 
   currentPosition = pos;
 
-  EB_Error_Code ret = eb_seek_text(&book, &pos);
-  if( ret != EB_SUCCESS )
-  {
+  EB_Error_Code ret = eb_seek_text( &book, &pos );
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_seek_text", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
@@ -873,23 +815,19 @@ void EpwingBook::getReferencesFromText( int page, int offset )
 
   prepareToRead();
 
-  for( ; ; )
-  {
-    ret = eb_read_text( &book, &appendix, &refHookSet, &container,
-                        TextBufferSize, buffer, &buffer_length );
+  for ( ;; ) {
+    ret = eb_read_text( &book, &appendix, &refHookSet, &container, TextBufferSize, buffer, &buffer_length );
 
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_read_text", ret );
       break;
     }
 
-    if( eb_is_text_stopped( &book ) )
+    if ( eb_is_text_stopped( &book ) )
       break;
   }
 
-  for( int x = 0; x < refPages.size(); x++ )
-  {
+  for ( int x = 0; x < refPages.size(); x++ ) {
     LinksQueue.push_back( EWPos( refPages[ x ], refOffsets[ x ] ) );
   }
 }
@@ -897,20 +835,18 @@ void EpwingBook::getReferencesFromText( int page, int offset )
 EB_Error_Code EpwingBook::forwardText( EB_Position & startPos )
 {
   EB_Error_Code ret = eb_seek_text( &book, &startPos );
-  if( ret != EB_SUCCESS )
-  {
+  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 )
-  {
+  while ( ret == EB_ERR_END_OF_CONTENT ) {
     ret = eb_tell_text( &book, &startPos );
-    if( ret != EB_SUCCESS )
+    if ( ret != EB_SUCCESS )
       break;
 
-    if( startPos.page >= book.subbook_current->text.end_page )
+    if ( startPos.page >= book.subbook_current->text.end_page )
       return EB_ERR_END_OF_CONTENT;
 
     startPos.offset += 2;
@@ -918,7 +854,7 @@ EB_Error_Code EpwingBook::forwardText( EB_Position & startPos )
 
     ret = eb_seek_text( &book, &startPos );
 
-    if( ret == EB_SUCCESS )
+    if ( ret == EB_SUCCESS )
       ret = eb_forward_text( &book, &appendix );
   }
   return ret;
@@ -931,15 +867,13 @@ void EpwingBook::getFirstHeadword( EpwingHeadword & head )
   EB_Position pos;
 
   EB_Error_Code ret = eb_text( &book, &pos );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_text", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
 
   ret = forwardText( pos );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "forwardText", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
@@ -947,31 +881,30 @@ void EpwingBook::getFirstHeadword( EpwingHeadword & head )
   eb_backward_text( &book, &appendix );
 
   ret = eb_tell_text( &book, &pos );
-  if( ret != EB_SUCCESS )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_tell_text", ret );
     throw exEbLibrary( error_string.toUtf8().data() );
   }
 
-  currentPosition = pos;
+  currentPosition        = pos;
   indexHeadwordsPosition = pos;
 
-  head.page = pos.page;
+  head.page   = pos.page;
   head.offset = pos.offset;
 
-  if( !readHeadword( pos, head.headword, true ) )
+  if ( !readHeadword( pos, head.headword, true ) )
     throw exEbLibrary( error_string.toUtf8().data() );
 
   fixHeadword( head.headword );
 
   EWPos epos( pos.page, pos.offset );
-  allHeadwordPositions[ ((uint64_t)pos.page)<<32|(pos.offset) ] =true;
+  allHeadwordPositions[ ( (uint64_t)pos.page ) << 32 | ( pos.offset ) ] = true;
 }
 
 bool EpwingBook::getNextHeadword( EpwingHeadword & head )
 {
   EB_Position pos;
-  
+
 
   // No queued positions - forward to next article
 
@@ -979,51 +912,44 @@ bool EpwingBook::getNextHeadword( EpwingHeadword & head )
 
   pos = indexHeadwordsPosition;
 
-  for( ; ; )
-  {
-    EB_Error_Code ret = forwardText( pos );
+  for ( ;; ) {
+    EB_Error_Code ret      = forwardText( pos );
     indexHeadwordsPosition = pos;
 
-    if( ret == EB_ERR_END_OF_CONTENT )
+    if ( ret == EB_ERR_END_OF_CONTENT )
       return false;
-    else
-    if( ret != EB_SUCCESS )
-    {
+    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 )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_tell_text", ret );
       throw exEbLibrary( error_string.toUtf8().data() );
     }
 
     indexHeadwordsPosition = pos;
 
-    head.page = pos.page;
+    head.page   = pos.page;
     head.offset = pos.offset;
 
-    if( !readHeadword( pos, head.headword, true ) )
+    if ( !readHeadword( pos, head.headword, true ) )
       throw exEbLibrary( error_string.toUtf8().data() );
 
-    if( head.headword.isEmpty() )
+    if ( head.headword.isEmpty() )
       continue;
 
     fixHeadword( head.headword );
 
-    try
-    {
-      getReferencesFromText( pos.page, pos.offset);
+    try {
+      getReferencesFromText( pos.page, pos.offset );
     }
-    catch( std::exception & )
-    {
+    catch ( std::exception & ) {
     }
 
-    if( !allHeadwordPositions.contains( ((uint64_t)pos.page) << 32 | ( pos.offset  ) ) )
-    {
-      allHeadwordPositions[ ((uint64_t)pos.page) << 32 | ( pos.offset  ) ] = true;
+    if ( !allHeadwordPositions.contains( ( (uint64_t)pos.page ) << 32 | ( pos.offset ) ) ) {
+      allHeadwordPositions[ ( (uint64_t)pos.page ) << 32 | ( pos.offset ) ] = true;
       return true;
     }
   }
@@ -1031,9 +957,7 @@ bool EpwingBook::getNextHeadword( EpwingHeadword & head )
   return true;
 }
 
-bool EpwingBook::readHeadword( EB_Position const& pos,
-                               QString & headword,
-                               bool text_only )
+bool EpwingBook::readHeadword( EB_Position const & pos, QString & headword, bool text_only )
 {
   EContainer container( this, text_only );
   ssize_t head_length;
@@ -1041,18 +965,15 @@ bool EpwingBook::readHeadword( EB_Position const& pos,
   EB_Position newPos = pos;
 
   EB_Error_Code ret = eb_seek_text( &book, &newPos );
-  if( ret != EB_SUCCESS )
-  {
+  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 )
-  {
+  ret = eb_read_heading( &book, &appendix, &hookSet, &container, TextBufferSize, buffer, &head_length );
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_read_heading", ret );
     return false;
   }
@@ -1068,30 +989,27 @@ bool EpwingBook::isHeadwordCorrect( QString const & headword )
   int hit_count;
   EB_Error_Code ret;
 
-  if( headword.isEmpty() )
+  if ( headword.isEmpty() )
     return false;
 
-  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+  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 )
+  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 )
+  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 )
-  {
+  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 )
+    if ( ret == EB_SUCCESS && hit_count > 0 )
       return true;
   }
 
-  if( !buf2.isEmpty() && eb_search_exactword( &book, buf2.data() ) == EB_SUCCESS )
-  {
+  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 )
+    if ( ret == EB_SUCCESS && hit_count > 0 )
       return true;
   }
 
@@ -1100,20 +1018,21 @@ bool EpwingBook::isHeadwordCorrect( QString const & headword )
 
 void EpwingBook::fixHeadword( QString & headword )
 {
-  if(headword.isEmpty() )
+  if ( headword.isEmpty() )
     return;
 
   headword.remove( QChar( 0x30FB ) ); // Used in Japan transcription
 
   //replace any unicode Number ,Symbol ,Punctuation ,Mark character to whitespace
-  headword.replace( QRegularExpression( R"([\p{N}\p{S}\p{P}\p{M}])" ), " " );
+  headword.replace( QRegularExpression( R"([\p{N}\p{S}\p{P}\p{M}])", QRegularExpression::UseUnicodePropertiesOption ),
+                    " " );
 
   //if( isHeadwordCorrect( headword) )
   //  return;
 
   QString fixed = headword;
   QRegularExpression leadingSlashRx( "/[^/]+/" );
-  fixed.remove(leadingSlashRx );
+  fixed.remove( leadingSlashRx );
 
   //if( isHeadwordCorrect( fixed ) )
   //{
@@ -1131,7 +1050,7 @@ void EpwingBook::fixHeadword( QString & headword )
   //}
 
   folded = Folding::applyDiacriticsOnly( folded );
-  fixed = QString::fromStdU32String( folded );
+  fixed  = QString::fromStdU32String( folded );
 
   //if( isHeadwordCorrect( fixed ) )
   //{
@@ -1150,7 +1069,7 @@ void EpwingBook::fixHeadword( QString & headword )
   fixed.remove( leadingNumAndSpace );
 
   auto parts = fixed.split( ' ', Qt::SkipEmptyParts );
-  if( parts.size() > 2 ) {
+  if ( parts.size() > 2 ) {
     //only return the first parts to avoid duplication
     headword = QString( "%1 %2" ).arg( parts[ 0 ], parts[ 1 ] );
     return;
@@ -1159,8 +1078,7 @@ void EpwingBook::fixHeadword( QString & headword )
   headword = fixed;
 }
 
-void EpwingBook::getArticle( QString & headword, QString & articleText,
-                             int page, int offset, bool text_only)
+void EpwingBook::getArticle( QString & headword, QString & articleText, int page, int offset, bool text_only )
 {
   error_string.clear();
 
@@ -1171,12 +1089,11 @@ void EpwingBook::getArticle( QString & headword, QString & articleText,
   QString hw = Html::unescape( headword, Html::HtmlOption::Keep );
   fixHeadword( hw );
 
-  auto parts = hw.split( QChar::Space, Qt::SkipEmptyParts );
+  auto parts  = hw.split( QChar::Space, Qt::SkipEmptyParts );
   articleText = getText( page, offset, text_only );
-
 }
 
-void EpwingBook::readHeadword(QString & headword, bool text_only)
+void EpwingBook::readHeadword( QString & headword, bool text_only )
 {
   EContainer container( this, text_only );
   ssize_t length;
@@ -1185,24 +1102,21 @@ void EpwingBook::readHeadword(QString & headword, bool text_only)
 
   char buffer[ TextBufferSize + 1 ];
 
-  EB_Error_Code ret = eb_read_heading( &book, &appendix, &hookSet, &container,
-    TextBufferSize, buffer, &length );
-  if( ret != EB_SUCCESS )
-  {
+  EB_Error_Code 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);
+  finalizeText( headword );
 
-  if( text_only )
+  if ( text_only )
     fixHeadword( headword );
 }
 
-EB_Position EpwingBook::getArticleNextPage(
-  QString & headword, QString & articleText,
-  int page, int offset, bool text_only)
+EB_Position
+EpwingBook::getArticleNextPage( QString & headword, QString & articleText, int page, int offset, bool text_only )
 {
   error_string.clear();
 
@@ -1211,12 +1125,12 @@ EB_Position EpwingBook::getArticleNextPage(
   readHeadword( headword, text_only );
 
   EB_Position pos;
-  articleText = getTextWithLength( page, offset, 4000, pos);
+  articleText = getTextWithLength( page, offset, 4000, pos );
   return pos;
 }
 
-EB_Position EpwingBook::getArticlePreviousPage(
-  QString & headword, QString & articleText, int page, int offset, bool text_only )
+EB_Position
+EpwingBook::getArticlePreviousPage( QString & headword, QString & articleText, int page, int offset, bool text_only )
 {
   error_string.clear();
 
@@ -1235,21 +1149,26 @@ const char * EpwingBook::beginDecoration( unsigned int code )
 
   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;
+  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;
@@ -1261,34 +1180,37 @@ const char * EpwingBook::endDecoration( unsigned int code )
 
   code = normalizeDecorationCode( code );
 
-  if( code != ITALIC && code != BOLD && code != EMPHASIS
-      && code != SUBSCRIPT && code != SUPERSCRIPT )
+  if ( code != ITALIC && code != BOLD && code != EMPHASIS && code != SUBSCRIPT && code != SUPERSCRIPT )
     code = UNKNOWN;
 
   unsigned int storedCode = UNKNOWN;
-  if( !decorationStack.isEmpty() )
+  if ( !decorationStack.isEmpty() )
     storedCode = decorationStack.pop();
 
-  if( storedCode != code )
-  {
+  if ( storedCode != code ) {
     gdWarning( "Epwing: tags mismatch detected" );
-    if( storedCode == UNKNOWN )
+    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;
+  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;
@@ -1297,10 +1219,11 @@ const char * EpwingBook::endDecoration( unsigned int code )
 unsigned int EpwingBook::normalizeDecorationCode( unsigned int code )
 {
   // Some non-standard codes
-  switch( code )
-  {
-    case 0x1101: return BOLD;
-    case 0x1103: return ITALIC;
+  switch ( code ) {
+    case 0x1101:
+      return BOLD;
+    case 0x1103:
+      return ITALIC;
   }
   return code;
 }
@@ -1308,53 +1231,55 @@ unsigned int EpwingBook::normalizeDecorationCode( unsigned int code )
 void EpwingBook::finalizeText( QString & text )
 {
   // Close unclosed tags
-  while( !decorationStack.isEmpty() )
-  {
+  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;
+    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;
-  QString reg1( "<R%1>");
-  QString reg2( "</R%1>");
+  QString reg1( "<R%1>" );
+  QString reg2( "</R%1>" );
 
-  for( int x = 0; x < refCloseCount; x++ )
-  {
-    auto tag1=reg1.arg(x);
-    auto tag2=reg2.arg(x);
-    pos = text.indexOf( tag1 );
-    if( pos < 0 )
+  for ( int x = 0; x < refCloseCount; x++ ) {
+    auto tag1 = reg1.arg( x );
+    auto tag2 = reg2.arg( x );
+    pos       = text.indexOf( tag1 );
+    if ( pos < 0 )
       continue;
 
     EB_Position ebpos;
-    ebpos.page = refPages[ x ];
+    ebpos.page   = refPages[ x ];
     ebpos.offset = refOffsets[ x ];
 
     QUrl url;
     url.setScheme( "gdlookup" );
     url.setHost( "localhost" );
 
-    url.setPath( Utils::Url::ensureLeadingSlash( QString( "r%1At%2" ).arg( ebpos.page ).arg(ebpos.offset) ) );
+    url.setPath( Utils::Url::ensureLeadingSlash( QString( "r%1At%2" ).arg( ebpos.page ).arg( ebpos.offset ) ) );
 
     QString link = "<a href=\"" + url.toEncoded() + "\">";
 
     text.replace( tag1, link );
 
     pos = text.indexOf( tag2 );
-    if( pos < 0 )
+    if ( pos < 0 )
       continue;
 
     text.replace( tag2, "</a>" );
@@ -1368,79 +1293,65 @@ void EpwingBook::prepareToRead()
   refOpenCount = refCloseCount = 0;
 }
 
-QByteArray EpwingBook::handleColorImage( EB_Hook_Code code,
-                                         const unsigned int * argv )
+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 )
+  if ( code == EB_HOOK_END_COLOR_GRAPHIC || code == EB_HOOK_END_IN_COLOR_GRAPHIC )
     return QByteArray();
 
-  pos.page = argv[ 2 ];
+  pos.page   = argv[ 2 ];
   pos.offset = argv[ 3 ];
 
-  EB_Error_Code ret = eb_set_binary_color_graphic( &book, & pos );
-  if( ret != EB_SUCCESS )
-  {
+  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() );
+    gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
     return QByteArray();
   }
 
-  if( cacheImagesDir.isEmpty() )
+  if ( cacheImagesDir.isEmpty() )
     cacheImagesDir = createCacheDir( "images" );
 
-  if( code == EB_HOOK_BEGIN_COLOR_BMP
-      || code == EB_HOOK_BEGIN_IN_COLOR_BMP )
+  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 )
+  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() )
+  if ( !cacheImagesDir.isEmpty() )
     fullName = cacheImagesDir + QDir::separator() + name;
 
   QUrl url;
   url.setScheme( "bres" );
   url.setHost( dictID );
   url.setPath( Utils::Url::ensureLeadingSlash( name ) );
-  QByteArray urlStr = R"(<p class="epwing_image"><img src=")" + url.toEncoded()
-                      + "\" alt=\"" + name.toUtf8() + "\"></p>";
+  QByteArray urlStr =
+    R"(<p class="epwing_image"><img src=")" + url.toEncoded() + "\" alt=\"" + name.toUtf8() + "\"></p>";
 
-  if( imageCacheList.contains( name, Qt::CaseSensitive ) )
-  {
+  if ( imageCacheList.contains( name, Qt::CaseSensitive ) ) {
     // We already have this image in cache
     return urlStr;
   }
 
-  if( !fullName.isEmpty() )
-  {
+  if ( !fullName.isEmpty() ) {
     QFile f( fullName );
-    if( f.open( QFile::WriteOnly ) )
-    {
+    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 )
-        {
+      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() );
+          gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
         f.write( buffer.data(), length );
 
-        if( length < BinaryBufferSize )
+        if ( length < BinaryBufferSize )
           break;
       }
       f.close();
@@ -1452,78 +1363,67 @@ QByteArray EpwingBook::handleColorImage( EB_Hook_Code code,
   return urlStr;
 }
 
-QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code,
-                                        const unsigned int * argv )
+QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code, const unsigned int * argv )
 {
   QString name, fullName;
   EB_Position pos;
 
-  if( code == EB_HOOK_BEGIN_MONO_GRAPHIC )
-  {
+  if ( code == EB_HOOK_BEGIN_MONO_GRAPHIC ) {
     monoHeight = argv[ 2 ];
-    monoWidth = argv[ 3 ];
+    monoWidth  = argv[ 3 ];
     return QByteArray();
   }
 
   // Handle EB_HOOK_END_MONO_GRAPHIC hook
 
-  pos.page = argv[ 1 ];
+  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 )
-  {
+  if ( ret != EB_SUCCESS ) {
     setErrorString( "eb_set_binary_mono_graphic", ret );
-    gdWarning( "Epwing image retrieve error: %s",
-               error_string.toUtf8().data() );
+    gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
     return QByteArray();
   }
 
-  if( cacheImagesDir.isEmpty() )
+  if ( cacheImagesDir.isEmpty() )
     cacheImagesDir = createCacheDir( "images" );
 
   name = makeFName( "bmp", pos.page, pos.offset );
 
-  if( !cacheImagesDir.isEmpty() )
+  if ( !cacheImagesDir.isEmpty() )
     fullName = cacheImagesDir + QDir::separator() + name;
 
   QUrl url;
   url.setScheme( "bres" );
   url.setHost( dictID );
   url.setPath( Utils::Url::ensureLeadingSlash( name ) );
-  QByteArray urlStr = R"(<span class="epwing_image"><img src=")" + url.toEncoded()
-                      + "\" alt=\"" + name.toUtf8() + "\"/></span>";
+  QByteArray urlStr =
+    R"(<span class="epwing_image"><img src=")" + url.toEncoded() + "\" alt=\"" + name.toUtf8() + "\"/></span>";
 
-  if( imageCacheList.contains( name, Qt::CaseSensitive ) )
-  {
+  if ( imageCacheList.contains( name, Qt::CaseSensitive ) ) {
     // We already have this image in cache
     return urlStr;
   }
 
-  if( !fullName.isEmpty() )
-  {
+  if ( !fullName.isEmpty() ) {
     QFile f( fullName );
-    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
-    {
+    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 )
-        {
+      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() );
+          gdWarning( "Epwing image retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
         f.write( buffer.data(), length );
 
-        if( length < BinaryBufferSize )
+        if ( length < BinaryBufferSize )
           break;
       }
       f.close();
@@ -1538,26 +1438,27 @@ QByteArray EpwingBook::handleMonoImage( EB_Hook_Code code,
 QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv )
 {
 
-  if( code == EB_HOOK_END_WAVE )
-    return QByteArray( R"(<img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a></span>)" );
+  if ( code == EB_HOOK_END_WAVE )
+    return QByteArray(
+      R"(<img src="qrc:///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.page   = argv[ 2 ];
   spos.offset = argv[ 3 ];
-  epos.page = argv[ 4 ];
+  epos.page   = argv[ 4 ];
   epos.offset = argv[ 5 ];
 
   eb_set_binary_wave( &book, &spos, &epos );
 
-  if( cacheSoundsDir.isEmpty() )
+  if ( cacheSoundsDir.isEmpty() )
     cacheSoundsDir = createCacheDir( "sounds" );
 
   QString name = makeFName( "wav", spos.page, spos.offset );
   QString fullName;
 
-  if( !cacheSoundsDir.isEmpty() )
+  if ( !cacheSoundsDir.isEmpty() )
     fullName = cacheSoundsDir + QDir::separator() + name;
 
   QUrl url;
@@ -1565,41 +1466,34 @@ QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv
   url.setHost( dictID );
   url.setPath( Utils::Url::ensureLeadingSlash( name ) );
 
-  string ref = string( "\"" )+ url.toEncoded().data() + "\"";
-  QByteArray result = addAudioLink( ref , dictID.toUtf8().data() ).c_str();
+  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 ) )
-  {
+  if ( soundsCacheList.contains( name, Qt::CaseSensitive ) ) {
     // We already have this sound in cache
     return result;
   }
 
-  if( !fullName.isEmpty() )
-  {
+  if ( !fullName.isEmpty() ) {
     QFile f( fullName );
-    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
-    {
+    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 )
-        {
+      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() );
+          gdWarning( "Epwing sound retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
         f.write( buffer.data(), length );
 
-        if( length < BinaryBufferSize )
+        if ( length < BinaryBufferSize )
           break;
       }
       f.close();
@@ -1613,28 +1507,28 @@ QByteArray EpwingBook::handleWave( EB_Hook_Code code, const unsigned int * argv
 QByteArray EpwingBook::handleMpeg( EB_Hook_Code code, const unsigned int * argv )
 {
 
-  if( code == EB_HOOK_END_MPEG )
+  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 );
+  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         = QFileInfo( name ).fileName();
   name += ".mpg";
 
   eb_set_binary_mpeg( &book, argv + 2 );
 
-  if( cacheMoviesDir.isEmpty() )
+  if ( cacheMoviesDir.isEmpty() )
     cacheMoviesDir = createCacheDir( "movies" );
 
   QString fullName;
 
-  if( !cacheMoviesDir.isEmpty() )
+  if ( !cacheMoviesDir.isEmpty() )
     fullName = cacheMoviesDir + QDir::separator() + name;
 
   QUrl url;
@@ -1644,36 +1538,29 @@ QByteArray EpwingBook::handleMpeg( EB_Hook_Code code, const unsigned int * argv
 
   QByteArray result = QByteArray( "<span class=\"epwing_mpeg\"><a href=" ) + url.toEncoded() + ">";
 
-  if( moviesCacheList.contains( name, Qt::CaseSensitive ) )
-  {
+  if ( moviesCacheList.contains( name, Qt::CaseSensitive ) ) {
     // We already have this movie in cache
     return result;
   }
 
-  if( !fullName.isEmpty() )
-  {
+  if ( !fullName.isEmpty() ) {
     QFile f( fullName );
-    if( f.open( QFile::WriteOnly | QFile::Truncate ) )
-    {
+    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 )
-        {
+      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() );
+          gdWarning( "Epwing movie retrieve error: %s", error_string.toUtf8().data() );
           break;
         }
 
         f.write( buffer.data(), length );
 
-        if( length < BinaryBufferSize )
+        if ( length < BinaryBufferSize )
           break;
       }
       f.close();
@@ -1688,77 +1575,69 @@ QByteArray EpwingBook::codeToUnicode( QString const & code )
 {
   QString subst;
 
-  if( !customFontsMap.isEmpty() && customFontsMap.contains( code ) )
-  {
-    subst = QTextDocumentFragment::fromHtml( customFontsMap[ code ] )
-                                   .toPlainText();
+  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 )
+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 )
+  if ( !b.isEmpty() || text_only )
     return b;
 
   // Find font image in book
 
-  if( !eb_have_narrow_font( &book ) )
+  if ( !eb_have_narrow_font( &book ) )
     return QByteArray( "?" );
 
   QString fname = fcode + ".png";
 
-  if( cacheFontsDir.isEmpty() )
+  if ( cacheFontsDir.isEmpty() )
     cacheFontsDir = createCacheDir( "fonts" );
 
   QString fullName = cacheFontsDir + QDir::separator() + fname;
 
   QUrl url;
   url.setScheme( "file" );
-  url.setHost( "/");
+  url.setHost( "/" );
   url.setPath( Utils::Url::ensureLeadingSlash( QDir::fromNativeSeparators( fullName ) ) );
 
   QByteArray link = R"(<img class="epwing_narrow_font" src=")" + url.toEncoded() + "\"/>";
 
-  if( fontsCacheList.contains( fname, Qt::CaseSensitive ) )
-  {
+  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];
+  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 )
-    {
+    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( "?" );
-      }
+    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 ) )
-    {
+    if ( f.open( QFile::WriteOnly | QFile::Truncate ) ) {
       f.write( buff, nlen );
       f.close();
       fontsCacheList.append( fname );
@@ -1768,66 +1647,60 @@ QByteArray EpwingBook::handleNarrowFont( const unsigned int * argv,
   return link;
 }
 
-QByteArray EpwingBook::handleWideFont( const unsigned int * argv,
-                                       bool text_only )
+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 )
+  if ( !b.isEmpty() || text_only )
     return b;
 
   // Find font image in book
 
-  if( !eb_have_wide_font( &book ) )
+  if ( !eb_have_wide_font( &book ) )
     return QByteArray( "?" );
 
   QString fname = fcode + ".png";
 
-  if( cacheFontsDir.isEmpty() )
+  if ( cacheFontsDir.isEmpty() )
     cacheFontsDir = createCacheDir( "fonts" );
 
   QString fullName = cacheFontsDir + QDir::separator() + fname;
 
   QUrl url;
   url.setScheme( "file" );
-  url.setHost( "/");
+  url.setHost( "/" );
   url.setPath( Utils::Url::ensureLeadingSlash( QDir::fromNativeSeparators( fullName ) ) );
 
   QByteArray link = R"(<img class="epwing_wide_font" src=")" + url.toEncoded() + "\"/>";
 
-  if( fontsCacheList.contains( fname, Qt::CaseSensitive ) )
-  {
+  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];
+  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 )
-    {
+    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];
+    char buff[ EB_SIZE_WIDE_FONT_16_PNG ];
     ret = eb_bitmap_to_png( bitmap, 16, 16, buff, &wlen );
-    if( ret != EB_SUCCESS )
-    {
+    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 ) )
-    {
+    if ( f.open( QFile::WriteOnly | QFile::Truncate ) ) {
       f.write( buff, wlen );
       f.close();
       fontsCacheList.append( fname );
@@ -1839,19 +1712,18 @@ QByteArray EpwingBook::handleWideFont( const unsigned int * argv,
 
 QByteArray EpwingBook::handleReference( EB_Hook_Code code, const unsigned int * argv )
 {
-  if( code == EB_HOOK_BEGIN_REFERENCE )
-  {
-    if( refOpenCount > refCloseCount )
+  if ( code == EB_HOOK_BEGIN_REFERENCE ) {
+    if ( refOpenCount > refCloseCount )
       return QByteArray();
 
-    QString str=QString( "<R%1>").arg( refOpenCount );
+    QString str = QString( "<R%1>" ).arg( refOpenCount );
     refOpenCount += 1;
     return str.toUtf8();
   }
 
   // EB_HOOK_END_REFERENCE
 
-  if( refCloseCount >= refOpenCount )
+  if ( refCloseCount >= refOpenCount )
     return QByteArray();
 
   refPages.append( argv[ 1 ] );
@@ -1869,81 +1741,64 @@ bool EpwingBook::getMatches( QString word, QVector< QString > & matches )
   EB_Hit hits[ HitsBufferSize ];
   int hitCount = 0;
 
-  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+  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 )
+  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 )
+  if ( book.character_code == EB_CHARCODE_JISX0208_GB2312 && codec_GB )
     bword2 = codec_GB->fromUnicode( word );
 
-  if( !bword.isEmpty() )
-  {
+  if ( !bword.isEmpty() ) {
     EB_Error_Code ret = eb_search_word( &book, bword.data() );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, 10, hits, &hitCount );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
 
-  if( hitCount == 0 && !bword2.isEmpty() )
-  {
+  if ( hitCount == 0 && !bword2.isEmpty() ) {
     EB_Error_Code ret = eb_search_word( &book, bword2.data() );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, 10, hits, &hitCount );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
 
   QVector< int > pages, offsets;
 
-  for( int i = 0; i < hitCount; i++ )
-  {
+  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 )
-      {
+    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 )
-    {
+    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 ) )
+      if ( readHeadword( hits[ i ].heading, headword, true ) ) {
+        if ( isHeadwordCorrect( headword ) )
           matches.push_back( headword );
       }
     }
@@ -1957,72 +1812,56 @@ bool EpwingBook::getArticlePos( QString word, QVector< int > & pages, QVector< i
   EB_Hit hits[ HitsBufferSize ];
   int hitCount = 0;
 
-  if( book.character_code == EB_CHARCODE_ISO8859_1 && codec_ISO )
+  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 )
+  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 )
+  if ( book.character_code == EB_CHARCODE_JISX0208_GB2312 && codec_GB )
     bword2 = codec_GB->fromUnicode( word );
 
-  if( !bword.isEmpty() )
-  {
+  if ( !bword.isEmpty() ) {
     EB_Error_Code ret = eb_search_exactword( &book, bword.data() );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
 
-  if( hitCount == 0 && !bword2.isEmpty() )
-  {
+  if ( hitCount == 0 && !bword2.isEmpty() ) {
     EB_Error_Code ret = eb_search_exactword( &book, bword2.data() );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_search_word", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
 
     ret = eb_hit_list( &book, HitsBufferSize, hits, &hitCount );
-    if( ret != EB_SUCCESS )
-    {
+    if ( ret != EB_SUCCESS ) {
       setErrorString( "eb_hit_list", ret );
-      gdWarning( "Epwing word search error: %s",
-                   error_string.toUtf8().data() );
+      gdWarning( "Epwing word search error: %s", error_string.toUtf8().data() );
       return false;
     }
   }
 
-  for( int i = 0; i < hitCount; i++ )
-  {
+  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 )
-      {
+    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 )
-    {
+    if ( !same_article ) {
       pages.push_back( hits[ i ].text.page );
       offsets.push_back( hits[ i ].text.offset );
     }
diff --git a/src/dict/epwing_book.hh b/src/dict/epwing_book.hh
index 59ef05c9..4b7a7633 100644
--- a/src/dict/epwing_book.hh
+++ b/src/dict/epwing_book.hh
@@ -13,19 +13,19 @@
 #include <vector>
 
 #if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
-#define _FILE_OFFSET_BITS 64
+  #define _FILE_OFFSET_BITS 64
 #endif
 
 #include <QString>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <eb/eb.h>
@@ -44,9 +44,9 @@ using std::vector;
 using std::string;
 
 enum {
-  TextBufferSize = 4095,
+  TextBufferSize   = 4095,
   BinaryBufferSize = 50000,
-  TextSizeLimit = 2800000
+  TextSizeLimit    = 2800000
 };
 
 struct EpwingHeadword
@@ -74,19 +74,19 @@ class EpwingBook
   QString mainCacheDir, rootDir;
   QString cacheImagesDir, cacheSoundsDir, cacheMoviesDir, cacheFontsDir;
   QString dictID;
-  QTextCodec * codec_ISO, * codec_GB, * codec_Euc;
+  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< uint64_t,bool > allHeadwordPositions;
+  QMap< uint64_t, bool > allHeadwordPositions;
   QMap< uint64_t, bool > allRefPositions;
   QVector< EWPos > LinksQueue;
   int refOpenCount, refCloseCount;
   static QMutex libMutex;
 
-  QString createCacheDir( QString const & dir);
+  QString createCacheDir( QString const & dir );
 
   // Close unslosed tags
   void finalizeText( QString & text );
@@ -101,7 +101,7 @@ class EpwingBook
   EB_Error_Code forwardText( EB_Position & startPos );
 
   // Retrieve article text from dictionary
-  QString getText( int page, int offset, bool text_only);
+  QString getText( int page, int offset, bool text_only );
   void seekBookThrow( int page, int offset );
   QString getTextWithLength( int page, int offset, int total, EB_Position & pos );
   QString getPreviousTextWithLength( int page, int offset, int total, EB_Position & pos );
@@ -113,11 +113,11 @@ class EpwingBook
 public:
 
   enum DecorationCodes {
-    UNKNOWN = 0,
-    ITALIC = 1,
-    BOLD = 3,
-    EMPHASIS = 4,
-    SUBSCRIPT = 5,
+    UNKNOWN     = 0,
+    ITALIC      = 1,
+    BOLD        = 3,
+    EMPHASIS    = 4,
+    SUBSCRIPT   = 5,
     SUPERSCRIPT = 6
   };
 
@@ -129,32 +129,50 @@ public:
     return libMutex;
   }
 
-  QString const &errorString() const
-  { return error_string; }
+  QString const & errorString() const
+  {
+    return error_string;
+  }
 
   QTextCodec * codecISO()
-  { return codec_ISO; }
+  {
+    return codec_ISO;
+  }
 
   QTextCodec * codecGB()
-  { return codec_GB; }
+  {
+    return codec_GB;
+  }
 
-  QTextCodec *codecEuc()
-  { return codec_Euc; }
+  QTextCodec * codecEuc()
+  {
+    return codec_Euc;
+  }
 
   int getSubBookCount()
-  { return subBookCount; }
+  {
+    return subBookCount;
+  }
 
   void setDictID( const string & id )
-  { dictID = QString::fromUtf8( id.c_str() ); }
+  {
+    dictID = QString::fromUtf8( id.c_str() );
+  }
 
   QString const & getImagesCacheDir()
-  { return cacheImagesDir; }
+  {
+    return cacheImagesDir;
+  }
 
   QString const & getSoundsCacheDir()
-  { return cacheSoundsDir; }
+  {
+    return cacheSoundsDir;
+  }
 
   QString const & getMoviesCacheDir()
-  { return cacheMoviesDir; }
+  {
+    return cacheMoviesDir;
+  }
 
   void clearBuffers()
   {
@@ -168,8 +186,7 @@ public:
   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 );
+  static void collectFilenames( QString const & directory, vector< string > & files );
 
   // Initialize dictionary book
   int setBook( string const & directory );
@@ -190,45 +207,34 @@ public:
   // Find next headword and article position
   bool getNextHeadword( EpwingHeadword & head );
 
-  bool readHeadword( EB_Position const & pos,
-                     QString & headword,
-                     bool text_only );
+  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 );
-  void readHeadword( QString & headword, bool text_only);
+  void getArticle( QString & headword, QString & articleText, int page, int offset, bool text_only );
+  void readHeadword( QString & headword, bool text_only );
 
-  EB_Position getArticleNextPage( QString & headword, QString & articleText,
-    int page, int offset, bool text_only );
+  EB_Position getArticleNextPage( QString & headword, QString & articleText, int page, int offset, bool text_only );
   EB_Position getArticlePreviousPage( 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 handleColorImage( EB_Hook_Code code, const unsigned int * argv );
 
-  QByteArray handleMonoImage( 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 handleWave( EB_Hook_Code code, const unsigned int * argv );
 
-  QByteArray handleMpeg( 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 handleNarrowFont( const unsigned int * argv, bool text_only );
 
-  QByteArray handleWideFont( 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 );
+  QByteArray handleReference( EB_Hook_Code code, const unsigned int * argv );
 
   bool getMatches( QString word, QVector< QString > & matches );
 
@@ -240,21 +246,23 @@ struct EContainer
   EpwingBook * book;
   bool textOnly;
 
-  EContainer( EpwingBook * book_ ) :
+  EContainer( EpwingBook * book_ ):
     book( book_ ),
     textOnly( false )
-  {}
+  {
+  }
 
-  EContainer( EpwingBook * book_, bool text_only ) :
+  EContainer( EpwingBook * book_, bool text_only ):
     book( book_ ),
     textOnly( text_only )
-  {}
+  {
+  }
 };
 
 
-}
+} // namespace Book
 
-}
+} // namespace Epwing
 
 
 #endif // __EPWING_BOOK_HH_INCLUDED__
diff --git a/src/dict/epwing_charmap.cc b/src/dict/epwing_charmap.cc
index e26408d8..0a6fbb8c 100644
--- a/src/dict/epwing_charmap.cc
+++ b/src/dict/epwing_charmap.cc
@@ -13,7 +13,7 @@ EpwingCharmap & EpwingCharmap::instance()
 
 QByteArray EpwingCharmap::mapToUtf8( QString const & code )
 {
-  if( charMap.contains( code ) )
+  if ( charMap.contains( code ) )
     return QString( charMap[ code ] ).toUtf8();
 
   return QByteArray();
@@ -21,7 +21,7 @@ QByteArray EpwingCharmap::mapToUtf8( QString const & code )
 
 void EpwingCharmap::addEntry( QString const & code, int ch )
 {
-    charMap[ code ] = QChar(ch);
+  charMap[ code ] = QChar( ch );
 }
 
 } // namespace Epwing
diff --git a/src/dict/epwing_charmap.hh b/src/dict/epwing_charmap.hh
index b26438b1..66e37ffd 100644
--- a/src/dict/epwing_charmap.hh
+++ b/src/dict/epwing_charmap.hh
@@ -14,12 +14,13 @@ public:
 
   /// Map Epwing extra char to Utf-8
   QByteArray mapToUtf8( QString const & code );
+
 private:
   void addEntry( QString const & code, int ch );
 
   QMap< QString, QChar > charMap;
 };
 
-}
+} // namespace Epwing
 
 #endif // __EPWING_CHARMAP_HH_INCLUDED_
diff --git a/src/dict/forvo.cc b/src/dict/forvo.cc
index 6a54f82f..44308b5b 100644
--- a/src/dict/forvo.cc
+++ b/src/dict/forvo.cc
@@ -26,7 +26,8 @@ class ForvoDictionary: public Dictionary::Class
 
 public:
 
-  ForvoDictionary( string const & id, string const & name_,
+  ForvoDictionary( string const & id,
+                   string const & name_,
                    QString const & apiKey_,
                    QString const & languageCode_,
                    QNetworkAccessManager & netMgr_ ):
@@ -39,21 +40,28 @@ public:
   }
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
-
-  sptr< WordSearchRequest > prefixMatch( wstring const & /*word*/,
-                                                 unsigned long /*maxResults*/ ) override 
   {
-    sptr< WordSearchRequestInstant > sr =  std::make_shared<WordSearchRequestInstant>();
+    return 0;
+  }
+
+  sptr< WordSearchRequest > prefixMatch( wstring const & /*word*/, unsigned long /*maxResults*/ ) override
+  {
+    sptr< WordSearchRequestInstant > sr = std::make_shared< WordSearchRequestInstant >();
 
     sr->setUncertain( true );
 
@@ -65,24 +73,19 @@ public:
 protected:
 
   void loadIcon() noexcept override;
-
 };
 
-sptr< DataRequest > ForvoDictionary::getArticle( wstring const & word,
-                                                 vector< wstring > const & alts,
-                                                 wstring const &, bool )
-  
+sptr< DataRequest >
+ForvoDictionary::getArticle( wstring const & word, vector< wstring > const & alts, wstring const &, bool )
+
 {
-  if ( word.size() > 80 || apiKey.isEmpty() )
-  {
+  if ( word.size() > 80 || apiKey.isEmpty() ) {
     // Don't make excessively large queries -- they're fruitless anyway
 
-    return std::make_shared<DataRequestInstant>( false );
+    return std::make_shared< DataRequestInstant >( false );
   }
-  else
-  {
-    return std::make_shared<ForvoArticleRequest>( word, alts, apiKey, languageCode, getId(),
-                                    netMgr );
+  else {
+    return std::make_shared< ForvoArticleRequest >( word, alts, apiKey, languageCode, getId(), netMgr );
   }
 }
 
@@ -91,11 +94,11 @@ void ForvoDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/forvo.png" );
+  dictionaryIcon       = QIcon( ":/icons/forvo.png" );
   dictionaryIconLoaded = true;
 }
 
-}
+} // namespace
 
 void ForvoArticleRequest::cancel()
 {
@@ -108,38 +111,39 @@ ForvoArticleRequest::ForvoArticleRequest( wstring const & str,
                                           QString const & languageCode_,
                                           string const & dictionaryId_,
                                           QNetworkAccessManager & mgr ):
-  apiKey( apiKey_ ), languageCode( languageCode_ ),
+  apiKey( apiKey_ ),
+  languageCode( languageCode_ ),
   dictionaryId( dictionaryId_ )
 {
   connect( &mgr, &QNetworkAccessManager::finished, this, &ForvoArticleRequest::requestFinished, Qt::QueuedConnection );
 
-  addQuery(  mgr, str );
+  addQuery( mgr, str );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
+  for ( unsigned x = 0; x < alts.size(); ++x )
     addQuery( mgr, alts[ x ] );
 }
 
-void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr,
-                                    wstring const & str )
+void ForvoArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const & str )
 {
   gdDebug( "Forvo: requesting article %s\n", QString::fromStdU32String( str ).toUtf8().data() );
 
   QString key = apiKey;
 
-  QUrl reqUrl = QUrl::fromEncoded(
-      QString( "https://apifree.forvo.com"
-               "/key/" + key +
-               "/action/word-pronunciations"
-               "/format/xml"
-               "/word/" + QLatin1String( QUrl::toPercentEncoding( QString::fromStdU32String( str ) ) ) +
-               "/language/" + languageCode +
-               "/order/rate-desc"
-       ).toUtf8() );
+  QUrl reqUrl =
+    QUrl::fromEncoded( QString( "https://apifree.forvo.com"
+                                "/key/"
+                                + key
+                                + "/action/word-pronunciations"
+                                  "/format/xml"
+                                  "/word/"
+                                + QLatin1String( QUrl::toPercentEncoding( QString::fromStdU32String( str ) ) )
+                                + "/language/" + languageCode + "/order/rate-desc" )
+                         .toUtf8() );
 
-//  GD_DPRINTF( "req: %s\n", reqUrl.toEncoded().data() );
+  //  GD_DPRINTF( "req: %s\n", reqUrl.toEncoded().data() );
+
+  sptr< QNetworkReply > netReply = std::shared_ptr< QNetworkReply >( mgr.get( QNetworkRequest( reqUrl ) ) );
 
-  sptr< QNetworkReply > netReply = std::shared_ptr<QNetworkReply>(mgr.get( QNetworkRequest( reqUrl ) ));
-  
   netReplies.push_back( NetReply( netReply, Utf8::encode( str ) ) );
 }
 
@@ -153,53 +157,44 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
   // Find this reply
 
   bool found = false;
-  
-  for( NetReplies::iterator i = netReplies.begin(); i != netReplies.end(); ++i )
-  {
-    if ( i->reply.get() == r )
-    {
+
+  for ( NetReplies::iterator i = netReplies.begin(); i != netReplies.end(); ++i ) {
+    if ( i->reply.get() == r ) {
       i->finished = true; // Mark as finished
-      found = true;
+      found       = true;
       break;
     }
   }
 
-  if ( !found )
-  {
+  if ( !found ) {
     // Well, that's not our reply, don't do anything
     return;
   }
-  
+
   bool updated = false;
 
-  for( ; netReplies.size() && netReplies.front().finished; netReplies.pop_front() )
-  {
+  for ( ; netReplies.size() && netReplies.front().finished; netReplies.pop_front() ) {
     sptr< QNetworkReply > netReply = netReplies.front().reply;
-    
-    if ( netReply->error() == QNetworkReply::NoError )
-    {
+
+    if ( netReply->error() == QNetworkReply::NoError ) {
       QDomDocument dd;
-  
+
       QString errorStr;
       int errorLine, errorColumn;
-  
-      if ( !dd.setContent( netReply.get(), false, &errorStr, &errorLine, &errorColumn  ) )
-      {
-        setErrorString( QString( tr( "XML parse error: %1 at %2,%3" ).
-                                 arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
+
+      if ( !dd.setContent( netReply.get(), false, &errorStr, &errorLine, &errorColumn ) ) {
+        setErrorString(
+          QString( tr( "XML parse error: %1 at %2,%3" ).arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
       }
-      else
-      {
-//        GD_DPRINTF( "%s\n", dd.toByteArray().data() );
+      else {
+        //        GD_DPRINTF( "%s\n", dd.toByteArray().data() );
 
         QDomNode items = dd.namedItem( "items" );
-  
-        if ( !items.isNull() )
-        {
+
+        if ( !items.isNull() ) {
           QDomNodeList nl = items.toElement().elementsByTagName( "item" );
 
-          if ( nl.count() )
-          {
+          if ( nl.count() ) {
             string articleBody;
 
             articleBody += "<div class='forvo_headword'>";
@@ -208,14 +203,12 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
             articleBody += "<table class=\"forvo_play\">";
 
-            for( int x = 0; x < nl.length(); ++x )
-            {
+            for ( int x = 0; x < nl.length(); ++x ) {
               QDomElement item = nl.item( x ).toElement();
 
               QDomNode mp3 = item.namedItem( "pathmp3" );
 
-              if ( !mp3.isNull() )
-              {
+              if ( !mp3.isNull() ) {
                 articleBody += "<tr>";
 
                 QUrl url( mp3.toElement().text() );
@@ -226,31 +219,28 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
                 bool isMale = ( item.namedItem( "sex" ).toElement().text().toLower() != "f" );
 
-                QString user = item.namedItem( "username" ).toElement().text();
+                QString user    = item.namedItem( "username" ).toElement().text();
                 QString country = item.namedItem( "country" ).toElement().text();
 
-                string userProfile = string( "http://www.forvo.com/user/" ) +
-                                     QUrl::toPercentEncoding( user ).data() + "/";
+                string userProfile =
+                  string( "http://www.forvo.com/user/" ) + QUrl::toPercentEncoding( user ).data() + "/";
 
-                int totalVotes = item.namedItem( "num_votes" ).toElement().text().toInt();
+                int totalVotes    = item.namedItem( "num_votes" ).toElement().text().toInt();
                 int positiveVotes = item.namedItem( "num_positive_votes" ).toElement().text().toInt();
                 int negativeVotes = totalVotes - positiveVotes;
 
                 string votes;
 
-                if ( positiveVotes || negativeVotes )
-                {
+                if ( positiveVotes || negativeVotes ) {
                   votes += " ";
 
-                  if ( positiveVotes )
-                  {
+                  if ( positiveVotes ) {
                     votes += "<span class='forvo_positive_votes'>+";
                     votes += QByteArray::number( positiveVotes ).data();
                     votes += "</span>";
                   }
 
-                  if ( negativeVotes )
-                  {
+                  if ( negativeVotes ) {
                     if ( positiveVotes )
                       votes += " ";
 
@@ -260,36 +250,22 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
                   }
                 }
 
-                string addTime =
-                    tr( "Added %1" ).arg( item.namedItem( "addtime" ).toElement().text() ).toUtf8().data();
+                string addTime = tr( "Added %1" ).arg( item.namedItem( "addtime" ).toElement().text() ).toUtf8().data();
 
-                articleBody += "<td><a href=" + ref + " title=\"" + Html::escape( addTime ) + R"("><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
+                articleBody += "<td><a href=" + ref + " title=\"" + Html::escape( addTime )
+                  + R"("><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
                 articleBody += string( "<td>" ) + tr( "by" ).toUtf8().data() + " <a class='forvo_user' href='"
-                               + userProfile + "'>"
-                               + Html::escape( user.toUtf8().data() )
-                               + "</a> <span class='forvo_location'>("
-                               + ( isMale ? tr( "Male" ) : tr( "Female" ) ).toUtf8().data()
-                               + " "
-                               + tr( "from" ).toUtf8().data()
-                               + " "
-                               + Html::escape( country.toUtf8().data() )
-                               + ")</span>"
-                               + votes
-                               + "</td>";
+                  + userProfile + "'>" + Html::escape( user.toUtf8().data() ) + "</a> <span class='forvo_location'>("
+                  + ( isMale ? tr( "Male" ) : tr( "Female" ) ).toUtf8().data() + " " + tr( "from" ).toUtf8().data()
+                  + " " + Html::escape( country.toUtf8().data() ) + ")</span>" + votes + "</td>";
                 articleBody += "</tr>";
               }
             }
 
             articleBody += "</table>";
 
-            QMutexLocker _( &dataMutex );
+            appendString( articleBody );
 
-            size_t prevSize = data.size();
-            
-            data.resize( prevSize + articleBody.size() );
-  
-            memcpy( &data.front() + prevSize, articleBody.data(), articleBody.size() );
-  
             hasAnyData = true;
 
             updated = true;
@@ -298,15 +274,16 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
         QDomNode errors = dd.namedItem( "errors" );
 
-        if ( !errors.isNull() )
-        {
+        if ( !errors.isNull() ) {
           QString text( errors.namedItem( "error" ).toElement().text() );
 
-          if ( text == "Limit/day reached." && apiKey.simplified().isEmpty() )
-          {
+          if ( text == "Limit/day reached." && apiKey.simplified().isEmpty() ) {
             // Give a hint that the user should apply for his own key.
 
-            text += "\n" + tr( "Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear." );
+            text +=
+              "\n"
+              + tr(
+                "Go to Edit|Dictionaries|Sources|Forvo and apply for our own API key to make this error disappear." );
           }
 
           setErrorString( text );
@@ -320,31 +297,25 @@ void ForvoArticleRequest::requestFinished( QNetworkReply * r )
 
   if ( netReplies.empty() )
     finish();
-  else
-  if ( updated )
+  else if ( updated )
     update();
 }
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      Dictionary::Initializing &,
-                                      Config::Forvo const & forvo,
-                                      QNetworkAccessManager & mgr )
-  
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::Forvo const & forvo, QNetworkAccessManager & mgr )
+
 {
   vector< sptr< Dictionary::Class > > result;
 
-  if ( forvo.enable && !forvo.apiKey.isEmpty())
-  {
+  if ( forvo.enable && !forvo.apiKey.isEmpty() ) {
     QStringList codes = forvo.languageCodes.split( ',', Qt::SkipEmptyParts );
 
     QSet< QString > usedCodes;
 
-    for( int x = 0; x < codes.size(); ++x )
-    {
+    for ( int x = 0; x < codes.size(); ++x ) {
       QString code = codes[ x ].simplified();
 
-      if ( code.size() && !usedCodes.contains( code ) )
-      {
+      if ( code.size() && !usedCodes.contains( code ) ) {
         // Generate id
 
         QCryptographicHash hash( QCryptographicHash::Md5 );
@@ -358,9 +329,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           displayedCode[ 0 ] = displayedCode[ 0 ].toUpper();
 
         result.push_back(
-                std::make_shared<ForvoDictionary>( hash.result().toHex().data(),
-                                 QString( "Forvo (%1)" ).arg( displayedCode ).toUtf8().data(),
-                                 forvo.apiKey, code, mgr ) );
+          std::make_shared< ForvoDictionary >( hash.result().toHex().data(),
+                                               QString( "Forvo (%1)" ).arg( displayedCode ).toUtf8().data(),
+                                               forvo.apiKey,
+                                               code,
+                                               mgr ) );
 
         usedCodes.insert( code );
       }
@@ -370,4 +343,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
   return result;
 }
 
-}
+} // namespace Forvo
diff --git a/src/dict/forvo.hh b/src/dict/forvo.hh
index 0607ba79..a291eca4 100644
--- a/src/dict/forvo.hh
+++ b/src/dict/forvo.hh
@@ -17,11 +17,8 @@ using std::vector;
 using std::string;
 using gd::wstring;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      Dictionary::Initializing &,
-                                      Config::Forvo const &,
-                                      QNetworkAccessManager & )
-    ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::Forvo const &, QNetworkAccessManager & );
 
 /// Exposed here for moc
 class ForvoArticleRequest: public Dictionary::DataRequest
@@ -35,8 +32,11 @@ class ForvoArticleRequest: public Dictionary::DataRequest
     bool finished;
 
     NetReply( sptr< QNetworkReply > const & reply_, string const & word_ ):
-      reply( reply_ ), word( word_ ), finished( false )
-    {}
+      reply( reply_ ),
+      word( word_ ),
+      finished( false )
+    {
+    }
   };
 
   typedef std::list< NetReply > NetReplies;
@@ -46,7 +46,8 @@ class ForvoArticleRequest: public Dictionary::DataRequest
 
 public:
 
-  ForvoArticleRequest( wstring const & word, vector< wstring > const & alts,
+  ForvoArticleRequest( wstring const & word,
+                       vector< wstring > const & alts,
                        QString const & apiKey_,
                        QString const & languageCode_,
                        string const & dictionaryId_,
@@ -62,6 +63,6 @@ private slots:
   virtual void requestFinished( QNetworkReply * );
 };
 
-}
+} // namespace Forvo
 
 #endif
diff --git a/src/dict/german.cc b/src/dict/german.cc
index 2a87f3e9..968a5d53 100644
--- a/src/dict/german.cc
+++ b/src/dict/german.cc
@@ -33,22 +33,22 @@ GermanTable::GermanTable()
   ins( "Oe", "Ö" );
   ins( "Ss", "ß" );
 
-//  ins( "ü", "ue" );
-//  ins( "ä", "ae" );
-//  ins( "ö", "oe" );
-//  ins( "ß", "ss" );
-
+  //  ins( "ü", "ue" );
+  //  ins( "ä", "ae" );
+  //  ins( "ö", "oe" );
+  //  ins( "ß", "ss" );
 }
 
-sptr< Dictionary::Class > makeDictionary() 
+sptr< Dictionary::Class > makeDictionary()
 {
   static GermanTable t;
 
-  return std::make_shared<Transliteration::TransliterationDictionary>( "cf1b74acd98adea9b2bba16af38f1081",
-                      QCoreApplication::translate( "GermanTranslit", "German Transliteration" ).toUtf8().data(),
-                      QIcon( ":/flags/de.png" ), t );
+  return std::make_shared< Transliteration::TransliterationDictionary >(
+    "cf1b74acd98adea9b2bba16af38f1081",
+    QCoreApplication::translate( "GermanTranslit", "German Transliteration" ).toUtf8().data(),
+    QIcon( ":/flags/de.png" ),
+    t );
 }
 
 
-}
-
+} // namespace GermanTranslit
diff --git a/src/dict/german.hh b/src/dict/german.hh
index 38afbe71..46b80416 100644
--- a/src/dict/german.hh
+++ b/src/dict/german.hh
@@ -9,8 +9,7 @@
 // Support for German transliteration
 namespace GermanTranslit {
 
-sptr< Dictionary::Class > makeDictionary() ;
-
+sptr< Dictionary::Class > makeDictionary();
 }
 
 #endif // GERMAN_HH
diff --git a/src/dict/gls.cc b/src/dict/gls.cc
index ecb51743..0b63817c 100644
--- a/src/dict/gls.cc
+++ b/src/dict/gls.cc
@@ -32,10 +32,10 @@
 #include <QBuffer>
 
 #include <QRegularExpression>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 #include <string>
 #include <list>
@@ -43,7 +43,7 @@
 #include <set>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 namespace Gls {
@@ -69,7 +69,7 @@ class GlsScanner
 {
   gzFile f;
   Encoding encoding;
-  QTextCodec* codec;
+  QTextCodec * codec;
   wstring dictionaryName;
   wstring dictionaryDecription, dictionaryAuthor;
   wstring langFrom, langTo;
@@ -87,32 +87,44 @@ public:
   DEF_EX_STR( exMalformedGlsFile, "The .gls file is malformed:", Ex )
   DEF_EX( exEncodingError, "Encoding error", Ex ) // Should never happen really
 
-  GlsScanner( string const & fileName ) ;
+  GlsScanner( string const & fileName );
   ~GlsScanner() noexcept;
 
   /// Returns the detected encoding of this file.
   Encoding getEncoding() const
-  { return encoding; }
+  {
+    return encoding;
+  }
 
   /// Returns the dictionary's name, as was read from file's headers.
   wstring const & getDictionaryName() const
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   /// Returns the dictionary's author, as was read from file's headers.
   wstring const & getDictionaryAuthor() const
-  { return dictionaryAuthor; }
+  {
+    return dictionaryAuthor;
+  }
 
   /// Returns the dictionary's description, as was read from file's headers.
   wstring const & getDictionaryDescription() const
-  { return dictionaryDecription; }
+  {
+    return dictionaryDecription;
+  }
 
   /// Returns the dictionary's source language, as was read from file's headers.
   wstring const & getLangFrom() const
-  { return langFrom; }
+  {
+    return langFrom;
+  }
 
   /// Returns the dictionary's target language, as was read from file's headers.
   wstring const & getLangTo() const
-  { return langTo; }
+  {
+    return langTo;
+  }
 
   /// Reads next line from the file. Returns true if reading succeeded --
   /// the string gets stored in the one passed, along with its physical
@@ -120,15 +132,19 @@ public:
   /// If end of file is reached, false is returned.
   /// Reading begins from the first line after the headers (ones which end
   /// by the "### Glossary section:" line).
-  bool readNextLine( wstring &, size_t & offset ) ;
+  bool readNextLine( wstring &, size_t & offset );
   /// Returns the number of lines read so far from the file.
   unsigned getLinesRead() const
-  { return linesRead; }
+  {
+    return linesRead;
+  }
 };
 
-GlsScanner::GlsScanner( string const & fileName ) :
-  encoding( Utf8::Utf8 ), readBufferPtr( readBuffer ),
-  readBufferLeft( 0 ), linesRead( 0 )
+GlsScanner::GlsScanner( string const & fileName ):
+  encoding( Utf8::Utf8 ),
+  readBufferPtr( readBuffer ),
+  readBufferLeft( 0 ),
+  linesRead( 0 )
 {
   // Since .dz is backwards-compatible with .gz, we use gz- functions to
   // read it -- they are much nicer than the dict_data- ones.
@@ -141,8 +157,7 @@ GlsScanner::GlsScanner( string const & fileName ) :
 
   unsigned char firstBytes[ 2 ];
 
-  if ( gzread( f, firstBytes, sizeof( firstBytes ) ) != sizeof( firstBytes ) )
-  {
+  if ( gzread( f, firstBytes, sizeof( firstBytes ) ) != sizeof( firstBytes ) ) {
     // Apparently the file's too short
     gzclose( f );
     throw exMalformedGlsFile( fileName );
@@ -152,95 +167,74 @@ GlsScanner::GlsScanner( string const & fileName ) :
   // it. If, on the other hand, it's not, we return the bytes back
   if ( firstBytes[ 0 ] == 0xFF && firstBytes[ 1 ] == 0xFE )
     encoding = Utf8::Utf16LE;
-  else
-  if ( firstBytes[ 0 ] == 0xFE && firstBytes[ 1 ] == 0xFF )
+  else if ( firstBytes[ 0 ] == 0xFE && firstBytes[ 1 ] == 0xFF )
     encoding = Utf8::Utf16BE;
-  else
-  if ( firstBytes[ 0 ] == 0xEF && firstBytes[ 1 ] == 0xBB )
-  {
+  else if ( firstBytes[ 0 ] == 0xEF && firstBytes[ 1 ] == 0xBB ) {
     // Looks like Utf8, read one more byte
-    if ( gzread( f, firstBytes, 1 ) != 1 || firstBytes[ 0 ] != 0xBF )
-    {
+    if ( gzread( f, firstBytes, 1 ) != 1 || firstBytes[ 0 ] != 0xBF ) {
       // Either the file's too short, or the BOM is weird
       gzclose( f );
       throw exMalformedGlsFile( fileName );
     }
     encoding = Utf8::Utf8;
   }
-  else
-  {
-    if ( gzrewind( f ) )
-    {
+  else {
+    if ( gzrewind( f ) ) {
       gzclose( f );
       throw exCantOpen( fileName );
     }
     encoding = Utf8::Utf8;
   }
 
-  codec = QTextCodec::codecForName(Utf8::getEncodingNameFor(encoding));
+  codec = QTextCodec::codecForName( Utf8::getEncodingNameFor( encoding ) );
   // We now can use our own readNextLine() function
-  lineFeed = Utf8::initLineFeed(encoding);
+  lineFeed = Utf8::initLineFeed( encoding );
 
   wstring str;
-  wstring *currentField = 0;
-  wstring mark            =  U"###" ;
-  wstring titleMark       =  U"### Glossary title:" ;
-  wstring authorMark      =  U"### Author:" ;
-  wstring descriptionMark =  U"### Description:" ;
-  wstring langFromMark    =  U"### Source language:" ;
-  wstring langToMark      =  U"### Target language:" ;
-  wstring endOfHeaderMark =  U"### Glossary section:" ;
+  wstring * currentField  = 0;
+  wstring mark            = U"###";
+  wstring titleMark       = U"### Glossary title:";
+  wstring authorMark      = U"### Author:";
+  wstring descriptionMark = U"### Description:";
+  wstring langFromMark    = U"### Source language:";
+  wstring langToMark      = U"### Target language:";
+  wstring endOfHeaderMark = U"### Glossary section:";
   size_t offset;
 
-  for( ; ; )
-  {
-    if ( !readNextLine( str, offset ) )
-    {
+  for ( ;; ) {
+    if ( !readNextLine( str, offset ) ) {
       gzclose( f );
       throw exMalformedGlsFile( fileName );
     }
 
-    if( str.compare( 0, 3, mark.c_str(), 3 ) == 0 )
-    {
+    if ( str.compare( 0, 3, mark.c_str(), 3 ) == 0 ) {
       currentField = 0;
 
-      if( str.compare( 0, titleMark.size(), titleMark ) == 0 )
-      {
+      if ( str.compare( 0, titleMark.size(), titleMark ) == 0 ) {
         dictionaryName = wstring( str, titleMark.size(), str.size() - titleMark.size() );
-        currentField = &dictionaryName;
+        currentField   = &dictionaryName;
       }
-      else
-      if( str.compare( 0, authorMark.size(), authorMark ) == 0 )
-      {
+      else if ( str.compare( 0, authorMark.size(), authorMark ) == 0 ) {
         dictionaryAuthor = wstring( str, authorMark.size(), str.size() - authorMark.size() );
-        currentField = &dictionaryAuthor;
+        currentField     = &dictionaryAuthor;
       }
-      else
-      if( str.compare( 0, descriptionMark.size(), descriptionMark ) == 0 )
-      {
+      else if ( str.compare( 0, descriptionMark.size(), descriptionMark ) == 0 ) {
         dictionaryDecription = wstring( str, descriptionMark.size(), str.size() - descriptionMark.size() );
-        currentField = &dictionaryDecription;
+        currentField         = &dictionaryDecription;
       }
-      else
-      if( str.compare( 0, langFromMark.size(), langFromMark ) == 0 )
-      {
+      else if ( str.compare( 0, langFromMark.size(), langFromMark ) == 0 ) {
         langFrom = wstring( str, langFromMark.size(), str.size() - langFromMark.size() );
       }
-      else
-      if( str.compare( 0, langToMark.size(), langToMark ) == 0 )
-      {
+      else if ( str.compare( 0, langToMark.size(), langToMark ) == 0 ) {
         langTo = wstring( str, langToMark.size(), str.size() - langToMark.size() );
       }
-      else
-      if( str.compare( 0, endOfHeaderMark.size(), endOfHeaderMark ) == 0 )
-      {
+      else if ( str.compare( 0, endOfHeaderMark.size(), endOfHeaderMark ) == 0 ) {
         break;
       }
     }
-    else
-    {
+    else {
       /// Handle multiline headers
-      if( currentField )
+      if ( currentField )
         *currentField += str;
     }
   }
@@ -248,49 +242,46 @@ GlsScanner::GlsScanner( string const & fileName ) :
 
 bool GlsScanner::readNextLine( wstring & out, size_t & offset )
 {
-    offset = (size_t)(gztell(f) - readBufferLeft);
+  offset = (size_t)( gztell( f ) - readBufferLeft );
 
-    {
-      // Check that we have bytes to read
-      if ( readBufferLeft < 5000 )
-      {
-        if ( !gzeof( f ) )
-        {
-          // To avoid having to deal with ring logic, we move the remaining bytes
-          // to the beginning
-          memmove( readBuffer, readBufferPtr, readBufferLeft );
+  {
+    // Check that we have bytes to read
+    if ( readBufferLeft < 5000 ) {
+      if ( !gzeof( f ) ) {
+        // To avoid having to deal with ring logic, we move the remaining bytes
+        // to the beginning
+        memmove( readBuffer, readBufferPtr, readBufferLeft );
 
-          // Read some more bytes to readBuffer
-          int result = gzread( f, readBuffer + readBufferLeft,
-                               sizeof( readBuffer ) - readBufferLeft );
+        // Read some more bytes to readBuffer
+        int result = gzread( f, readBuffer + readBufferLeft, sizeof( readBuffer ) - readBufferLeft );
 
-          if (result == -1)
-            throw exCantReadGlsFile();
+        if ( result == -1 )
+          throw exCantReadGlsFile();
 
-          readBufferPtr = readBuffer;
-          readBufferLeft += (size_t) result;
-        }
+        readBufferPtr = readBuffer;
+        readBufferLeft += (size_t)result;
       }
-      if(readBufferLeft<=0)
-          return false;
-
-      int pos = Utf8::findFirstLinePosition(readBufferPtr,readBufferLeft, lineFeed.lineFeed,lineFeed.length);
-      if(pos==-1)
-          return false;
-      QString line = codec->toUnicode(readBufferPtr, pos);
-
-      line = Utils::rstrip(line);
-
-      if(pos>readBufferLeft){
-          pos=readBufferLeft;
-      }
-      readBufferLeft -= pos;
-      readBufferPtr += pos;
-      linesRead++;
-
-      out = line.toStdU32String();
-      return true;
     }
+    if ( readBufferLeft <= 0 )
+      return false;
+
+    int pos = Utf8::findFirstLinePosition( readBufferPtr, readBufferLeft, lineFeed.lineFeed, lineFeed.length );
+    if ( pos == -1 )
+      return false;
+    QString line = codec->toUnicode( readBufferPtr, pos );
+
+    line = Utils::rstrip( line );
+
+    if ( pos > readBufferLeft ) {
+      pos = readBufferLeft;
+    }
+    readBufferLeft -= pos;
+    readBufferPtr += pos;
+    linesRead++;
+
+    out = line.toStdU32String();
+    return true;
+  }
 }
 
 GlsScanner::~GlsScanner() noexcept
@@ -302,41 +293,40 @@ namespace {
 
 ////////////////// GLS Dictionary
 
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
 DEF_EX_STR( exDictzipError, "DICTZIP error", Dictionary::Ex )
 
-enum
-{
-  Signature = 0x58534c47, // GLSX on little-endian, XSLG on big-endian
-  CurrentFormatVersion = 1 + BtreeIndexing::FormatVersion + Folding::Version,
+enum {
+  Signature                = 0x58534c47, // GLSX on little-endian, XSLG on big-endian
+  CurrentFormatVersion     = 1 + BtreeIndexing::FormatVersion + Folding::Version,
   CurrentZipSupportVersion = 2,
-  CurrentFtsIndexVersion = 1
+  CurrentFtsIndexVersion   = 1
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, GLSX
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t zipSupportVersion; // Zip support version -- narrows down reindexing
-                              // when it changes only for dictionaries with the
-                              // zip files
-  int glsEncoding; // Which encoding is used for the file indexed
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t signature;             // First comes the signature, GLSX
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t zipSupportVersion;     // Zip support version -- narrows down reindexing
+                                  // when it changes only for dictionaries with the
+                                  // zip files
+  int glsEncoding;                // Which encoding is used for the file indexed
+  uint32_t chunksOffset;          // The offset to chunks' storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-  uint32_t articleCount; // Number of articles this dictionary has
-  uint32_t wordCount; // Number of headwords this dictionary has
-  uint32_t langFrom;  // Source language
-  uint32_t langTo;    // Target language
-  uint32_t hasZipFile; // Non-zero means there's a zip file with resources
-                       // present
+  uint32_t articleCount;             // Number of articles this dictionary has
+  uint32_t wordCount;                // Number of headwords this dictionary has
+  uint32_t langFrom;                 // Source language
+  uint32_t langTo;                   // Target language
+  uint32_t hasZipFile;               // Non-zero means there's a zip file with resources
+                                     // present
   uint32_t zipIndexBtreeMaxElements; // Two fields from IndexInfo of the zip
                                      // resource index.
   uint32_t zipIndexRootOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -346,11 +336,9 @@ bool indexIsOldOrBad( string const & indexFile, bool hasZipFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion ||
-         (bool) header.hasZipFile != hasZipFile ||
-         ( hasZipFile && header.zipSupportVersion != CurrentZipSupportVersion );
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion || (bool)header.hasZipFile != hasZipFile
+    || ( hasZipFile && header.zipSupportVersion != CurrentZipSupportVersion );
 }
 
 class GlsDictionary: public BtreeIndexing::BtreeDictionary
@@ -371,36 +359,43 @@ public:
   ~GlsDictionary();
 
   string getName() noexcept override
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.articleCount; }
+  {
+    return idxHeader.articleCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
-  sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override
-    ;
+  sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override;
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   QString getMainFilename() override;
 
@@ -409,14 +404,14 @@ public:
 
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "GLS", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "GLS", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
+
 protected:
 
   void loadIcon() noexcept override;
@@ -425,14 +420,10 @@ private:
 
   /// Loads the article, storing its headword and formatting the data it has
   /// into an html.
-  void loadArticle(  uint32_t address,
-                     string & headword,
-                     string & articleText );
+  void loadArticle( uint32_t address, string & headword, string & articleText );
 
   /// Loads the article
-  void loadArticleText(  uint32_t address,
-                         vector< string > & headwords,
-                         string & articleText );
+  void loadArticleText( uint32_t address, vector< string > & headwords, string & articleText );
 
   /// Process resource links (images, audios, etc)
   QString & filterResource( QString & article );
@@ -442,9 +433,7 @@ private:
   friend class GlsHeadwordsRequest;
 };
 
-GlsDictionary::GlsDictionary( string const & id,
-                              string const & indexFile,
-                              vector< string > const & dictionaryFiles ):
+GlsDictionary::GlsDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
   BtreeDictionary( id, dictionaryFiles ),
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() ),
@@ -457,35 +446,28 @@ GlsDictionary::GlsDictionary( string const & id,
   dz = dict_data_open( getDictionaryFilenames()[ 0 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exDictzipError( string( dz_error_str( error ) )
-                          + "(" + getDictionaryFilenames()[ 0 ] + ")" );
+    throw exDictzipError( string( dz_error_str( error ) ) + "(" + getDictionaryFilenames()[ 0 ] + ")" );
 
   // Read the dictionary name
 
   idx.seek( sizeof( idxHeader ) );
 
   vector< char > dName( idx.read< uint32_t >() );
-  if( dName.size() > 0 )
-  {
+  if ( dName.size() > 0 ) {
     idx.read( &dName.front(), dName.size() );
     dictionaryName = string( &dName.front(), dName.size() );
   }
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   // Open a resource zip file, if there's one
 
-  if ( idxHeader.hasZipFile &&
-       ( idxHeader.zipIndexBtreeMaxElements ||
-         idxHeader.zipIndexRootOffset ) )
-  {
-    resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements,
-                                      idxHeader.zipIndexRootOffset ),
-                           idx, idxMutex );
+  if ( idxHeader.hasZipFile && ( idxHeader.zipIndexBtreeMaxElements || idxHeader.zipIndexRootOffset ) ) {
+    resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements, idxHeader.zipIndexRootOffset ),
+                           idx,
+                           idxMutex );
 
     QString zipName = QDir::fromNativeSeparators( getDictionaryFilenames().back().c_str() );
 
@@ -499,8 +481,7 @@ GlsDictionary::GlsDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -523,30 +504,26 @@ void GlsDictionary::loadIcon() noexcept
   else
     fileName.chop( 3 );
 
-  if ( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icon
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_gls.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_gls.png" );
   }
 
   dictionaryIconLoaded = true;
 }
 
-QString const& GlsDictionary::getDescription()
+QString const & GlsDictionary::getDescription()
 {
-  if( !dictionaryDescription.isEmpty() )
-      return dictionaryDescription;
+  if ( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
 
   try {
     GlsScanner scanner( getDictionaryFilenames()[ 0 ] );
     string str = Utf8::encode( scanner.getDictionaryAuthor() );
-    if( !str.empty() )
-      dictionaryDescription = QObject::tr( "Author: %1%2" )
-                              .arg( QString::fromUtf8( str.c_str() ) )
-                              .arg( "\n\n" );
+    if ( !str.empty() )
+      dictionaryDescription = QObject::tr( "Author: %1%2" ).arg( QString::fromUtf8( str.c_str() ) ).arg( "\n\n" );
     str = Utf8::encode( scanner.getDictionaryDescription() );
-    if( !str.empty() )
-    {
+    if ( !str.empty() ) {
       QString desc = QString::fromUtf8( str.c_str() );
       desc.replace( "\t", "<br/>" );
       desc.replace( "\\n", "<br/>" );
@@ -554,53 +531,49 @@ QString const& GlsDictionary::getDescription()
       dictionaryDescription += Html::unescape( desc, Html::HtmlOption::Keep );
     }
   }
-  catch( std::exception & e )
-  {
-    gdWarning( "GLS dictionary description reading failed: %s, error: %s\n",
-               getName().c_str(), e.what() );
+  catch ( std::exception & e ) {
+    gdWarning( "GLS dictionary description reading failed: %s, error: %s\n", getName().c_str(), e.what() );
   }
 
-  if( dictionaryDescription.isEmpty() )
+  if ( dictionaryDescription.isEmpty() )
     dictionaryDescription = "NONE";
 
   return dictionaryDescription;
 }
 
-QString GlsDictionary::getMainFilename() { return getDictionaryFilenames()[ 0 ].c_str(); }
+QString GlsDictionary::getMainFilename()
+{
+  return getDictionaryFilenames()[ 0 ].c_str();
+}
 
 void GlsDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Gls: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Gls: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Gls: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
 
-void GlsDictionary::loadArticleText( uint32_t address,
-                                     vector< string > & headwords,
-                                     string & articleText )
+void GlsDictionary::loadArticleText( uint32_t address, vector< string > & headwords, string & articleText )
 {
   vector< char > chunk;
   char * articleProps;
@@ -613,8 +586,7 @@ void GlsDictionary::loadArticleText( uint32_t address,
   uint32_t articleOffset, articleSize;
 
   memcpy( &articleOffset, articleProps, sizeof( articleOffset ) );
-  memcpy( &articleSize, articleProps + sizeof( articleOffset ),
-          sizeof( articleSize ) );
+  memcpy( &articleSize, articleProps + sizeof( articleOffset ), sizeof( articleSize ) );
 
   char * articleBody;
 
@@ -628,26 +600,22 @@ void GlsDictionary::loadArticleText( uint32_t address,
   articleText.clear();
   string headword;
 
-  if ( !articleBody )
-  {
+  if ( !articleBody ) {
     articleText = string( "\n\tDICTZIP error: " ) + dict_error_str( dz );
   }
-  else
-  {
-    string articleData = Iconv::toUtf8( Utf8::getEncodingNameFor( Encoding( idxHeader.glsEncoding ) ), articleBody, articleSize );
+  else {
+    string articleData =
+      Iconv::toUtf8( Utf8::getEncodingNameFor( Encoding( idxHeader.glsEncoding ) ), articleBody, articleSize );
     string::size_type start_pos = 0, end_pos = 0;
 
-    for( ; ; )
-    {
+    for ( ;; ) {
       // Replace all "\r\n" by "\n"
       end_pos = articleData.find( "\r\n", start_pos );
-      if( end_pos == string::npos )
-      {
+      if ( end_pos == string::npos ) {
         articleText += articleData.substr( start_pos, end_pos );
         break;
       }
-      else
-      {
+      else {
         articleText += articleData.substr( start_pos, end_pos - start_pos ) + "\n";
         start_pos = end_pos + 2;
       }
@@ -655,23 +623,20 @@ void GlsDictionary::loadArticleText( uint32_t address,
 
     // Find headword
     start_pos = articleText.find( '\n' );
-    if( start_pos != string::npos )
-    {
-      headword = articleText.substr( 0, start_pos );
+    if ( start_pos != string::npos ) {
+      headword    = articleText.substr( 0, start_pos );
       articleText = articleText.substr( start_pos + 1, string::npos );
     }
 
     // Parse headwords
 
     start_pos = 0;
-    end_pos = 0;
-    for( ; ; )
-    {
+    end_pos   = 0;
+    for ( ;; ) {
       end_pos = headword.find( '|', start_pos );
-      if( end_pos == wstring::npos )
-      {
+      if ( end_pos == wstring::npos ) {
         string hw = headword.substr( start_pos );
-        if( !hw.empty() )
+        if ( !hw.empty() )
           headwords.push_back( hw );
         break;
       }
@@ -681,27 +646,22 @@ void GlsDictionary::loadArticleText( uint32_t address,
   }
 }
 
-void GlsDictionary::loadArticle( uint32_t address,
-                                 string & headword,
-                                 string & articleText )
+void GlsDictionary::loadArticle( uint32_t address, string & headword, string & articleText )
 {
   string articleBody;
   vector< string > headwords;
   loadArticleText( address, headwords, articleBody );
 
   QString article = QString::fromLatin1( "<div class=\"glsdict\">" );
-  if( headwords.size() )
-  {
+  if ( headwords.size() ) {
     // Headwords
     article += "<div class=\"glsdict_headwords\"";
-    if( isFromLanguageRTL() )
+    if ( isFromLanguageRTL() )
       article += " dir=\"rtl\"";
-    if( headwords.size() > 1 )
-    {
+    if ( headwords.size() > 1 ) {
       QString altHeadwords;
-      for( vector< string >::size_type i = 1; i < headwords.size(); i++ )
-      {
-        if( i > 1 )
+      for ( vector< string >::size_type i = 1; i < headwords.size(); i++ ) {
+        if ( i > 1 )
           altHeadwords += ", ";
         altHeadwords += QString::fromUtf8( headwords[ i ].c_str(), headwords[ i ].size() );
       }
@@ -715,17 +675,17 @@ void GlsDictionary::loadArticle( uint32_t address,
     article += "</div>";
   }
 
-  if( isToLanguageRTL() )
+  if ( isToLanguageRTL() )
     article += R"(<div style="display:inline;" dir="rtl">)";
 
   QString text = QString::fromUtf8( articleBody.c_str(), articleBody.size() );
 
   article += filterResource( text );
 
-  if( isToLanguageRTL() )
+  if ( isToLanguageRTL() )
     article += "</div>";
 
-  article +="</div>";
+  article += "</div>";
 
   articleText = string( article.toUtf8().data() );
 }
@@ -733,14 +693,12 @@ void GlsDictionary::loadArticle( uint32_t address,
 QString & GlsDictionary::filterResource( QString & article )
 {
   QRegularExpression imgRe( R"((<\s*img\s+[^>]*src\s*=\s*["']+)(?!(?:data|https?|ftp|qrcx):))",
-                            QRegularExpression::CaseInsensitiveOption
-                            | QRegularExpression::InvertedGreedinessOption );
+                            QRegularExpression::CaseInsensitiveOption | QRegularExpression::InvertedGreedinessOption );
   QRegularExpression linkRe( R"((<\s*link\s+[^>]*href\s*=\s*["']+)(?!(?:data|https?|ftp):))",
-                             QRegularExpression::CaseInsensitiveOption
-                             | QRegularExpression::InvertedGreedinessOption );
+                             QRegularExpression::CaseInsensitiveOption | QRegularExpression::InvertedGreedinessOption );
 
-  article.replace( imgRe , "\\1bres://" + QString::fromStdString( getId() ) + "/" )
-         .replace( linkRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" );
+  article.replace( imgRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" )
+    .replace( linkRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" );
 
   // Handle links to articles
 
@@ -750,31 +708,27 @@ QString & GlsDictionary::filterResource( QString & article )
   int pos = 0;
   QString articleNewText;
   QRegularExpressionMatchIterator it = linksReg.globalMatch( article );
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
     articleNewText += article.mid( pos, match.capturedStart() - pos );
     pos = match.capturedEnd();
 
     QString link = match.captured( 3 );
 
-    if( link.indexOf( ':' ) < 0 )
-    {
+    if ( link.indexOf( ':' ) < 0 ) {
       QString newLink;
-      if( link.indexOf( '#' ) < 0 )
+      if ( link.indexOf( '#' ) < 0 )
         newLink = QString( "<a" ) + match.captured( 1 ) + "href=\"bword:" + link + "\"";
 
       // Anchors
 
-      if( link.indexOf( '#' ) > 0 )
-      {
+      if ( link.indexOf( '#' ) > 0 ) {
         newLink = QString( "<a" ) + match.captured( 1 ) + "href=\"gdlookup://localhost/" + link + "\"";
 
         newLink.replace( "#", "?gdanchor=" );
       }
 
-      if( !newLink.isEmpty() )
-      {
+      if ( !newLink.isEmpty() ) {
         articleNewText += newLink;
       }
       else
@@ -783,8 +737,7 @@ QString & GlsDictionary::filterResource( QString & article )
     else
       articleNewText += match.captured();
   }
-  if( pos )
-  {
+  if ( pos ) {
     articleNewText += article.mid( pos );
     article = articleNewText;
     articleNewText.clear();
@@ -793,38 +746,35 @@ QString & GlsDictionary::filterResource( QString & article )
   // Handle "audio" tags
 
   QRegularExpression audioRe( R"(<\s*audio\s+src\s*=\s*(["']+)([^"']+)(["'])\s*>(.*)</audio>)",
-                              QRegularExpression::CaseInsensitiveOption
-                              | QRegularExpression::DotMatchesEverythingOption
-                              | QRegularExpression::InvertedGreedinessOption );
+                              QRegularExpression::CaseInsensitiveOption | QRegularExpression::DotMatchesEverythingOption
+                                | QRegularExpression::InvertedGreedinessOption );
 
 
   pos = 0;
 
   it = audioRe.globalMatch( article );
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
     articleNewText += article.mid( pos, match.capturedStart() - pos );
     pos = match.capturedEnd();
 
     QString src = match.captured( 2 );
 
-    if( src.indexOf( "://" ) >= 0 )
+    if ( src.indexOf( "://" ) >= 0 )
       articleNewText += match.captured();
-    else
-    {
+    else {
       std::string href = "\"gdau://" + getId() + "/" + src.toUtf8().data() + "\"";
-      QString newTag = QString::fromUtf8( ( addAudioLink( href, getId() ) + "<span class=\"gls_wav\"><a href=" + href + ">" ).c_str() );
+      QString newTag   = QString::fromUtf8(
+        ( addAudioLink( href, getId() ) + "<span class=\"gls_wav\"><a href=" + href + ">" ).c_str() );
       newTag += match.captured( 4 );
-      if( match.captured( 4 ).indexOf( "<img " ) < 0 )
+      if ( match.captured( 4 ).indexOf( "<img " ) < 0 )
         newTag += R"( <img src="qrc:///icons/playsound.png" border="0" alt="Play">)";
       newTag += "</a></span>";
 
       articleNewText += newTag;
     }
   }
-  if( pos )
-  {
+  if ( pos ) {
     articleNewText += article.mid( pos );
     article = articleNewText;
     articleNewText.clear();
@@ -835,19 +785,17 @@ QString & GlsDictionary::filterResource( QString & article )
 
 void GlsDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     vector< string > headwords;
     string articleStr;
     loadArticleText( articleAddress, headwords, articleStr );
 
-    if( !headwords.empty() )
+    if ( !headwords.empty() )
       headword = QString::fromUtf8( headwords.front().data(), headwords.front().size() );
 
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Gls: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -865,7 +813,8 @@ class GlsHeadwordsRequest: public Dictionary::WordSearchRequest
 public:
 
   GlsHeadwordsRequest( wstring const & word_, GlsDictionary & dict_ ):
-    word( word_ ), dict( dict_ )
+    word( word_ ),
+    dict( dict_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -888,22 +837,18 @@ public:
 
 void GlsHeadwordsRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     vector< WordArticleLink > chain = dict.findArticles( word );
 
     wstring caseFolded = Folding::applySimpleCaseOnly( word );
 
-    for( unsigned x = 0; x < chain.size(); ++x )
-    {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-      {
+    for ( unsigned x = 0; x < chain.size(); ++x ) {
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
         finish();
         return;
       }
@@ -911,13 +856,11 @@ void GlsHeadwordsRequest::run()
       string articleText;
       vector< string > headwords;
 
-      dict.loadArticleText( chain[ x ].articleOffset,
-                            headwords, articleText );
+      dict.loadArticleText( chain[ x ].articleOffset, headwords, articleText );
 
       wstring headwordDecoded = Utf8::decode( headwords.front() );
 
-      if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) )
-      {
+      if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) ) {
         // The headword seems to differ from the input word, which makes the
         // input word its synonym.
         QMutexLocker _( &dataMutex );
@@ -926,20 +869,18 @@ void GlsHeadwordsRequest::run()
       }
     }
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     setErrorString( QString::fromUtf8( e.what() ) );
   }
 
   finish();
 }
 
-sptr< Dictionary::WordSearchRequest >
-  GlsDictionary::findHeadwordsForSynonym( wstring const & word )
-  
+sptr< Dictionary::WordSearchRequest > GlsDictionary::findHeadwordsForSynonym( wstring const & word )
+
 {
-  return synonymSearchEnabled ?  std::make_shared<GlsHeadwordsRequest>( word, *this ) :
-                                 Class::findHeadwordsForSynonym( word );
+  return synonymSearchEnabled ? std::make_shared< GlsHeadwordsRequest >( word, *this ) :
+                                Class::findHeadwordsForSynonym( word );
 }
 
 
@@ -960,8 +901,12 @@ public:
 
   GlsArticleRequest( wstring const & word_,
                      vector< wstring > const & alts_,
-                     GlsDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                     GlsDictionary & dict_,
+                     bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -984,17 +929,14 @@ public:
 
 void GlsArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
-  try
-  {
+  try {
     vector< WordArticleLink > chain = dict.findArticles( word, ignoreDiacritics );
 
-    for( unsigned x = 0; x < alts.size(); ++x )
-    {
+    for ( unsigned x = 0; x < alts.size(); ++x ) {
       /// Make an additional query for each alt
 
       vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
@@ -1009,13 +951,11 @@ void GlsArticleRequest::run()
                                       // by only allowing them to appear once.
 
     wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-    if( ignoreDiacritics )
+    if ( ignoreDiacritics )
       wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-    for( unsigned x = 0; x < chain.size(); ++x )
-    {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-      {
+    for ( unsigned x = 0; x < chain.size(); ++x ) {
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
         finish();
         return;
       }
@@ -1034,24 +974,20 @@ void GlsArticleRequest::run()
 
       // We do the case-folded comparison here.
 
-      wstring headwordStripped =
-        Folding::applySimpleCaseOnly( Utf8::decode( headword ) );
-      if( ignoreDiacritics )
+      wstring headwordStripped = Folding::applySimpleCaseOnly( Utf8::decode( headword ) );
+      if ( ignoreDiacritics )
         headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
       multimap< wstring, pair< string, string > > & mapToUse =
-        ( wordCaseFolded == headwordStripped ) ?
-          mainArticles : alternateArticles;
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-      mapToUse.insert( pair(
-        Folding::applySimpleCaseOnly( Utf8::decode( headword ) ),
-        pair( headword, articleText ) ) );
+      mapToUse.insert(
+        pair( Folding::applySimpleCaseOnly( Utf8::decode( headword ) ), pair( headword, articleText ) ) );
 
       articlesIncluded.insert( chain[ x ].articleOffset );
     }
 
-    if ( mainArticles.empty() && alternateArticles.empty() )
-    {
+    if ( mainArticles.empty() && alternateArticles.empty() ) {
       // No such word
       finish();
       return;
@@ -1061,26 +997,19 @@ void GlsArticleRequest::run()
 
     multimap< wstring, pair< string, string > >::const_iterator i;
 
-    for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-    {
-        result += i->second.second;
+    for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+      result += i->second.second;
     }
 
-    for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-    {
-        result += i->second.second;
+    for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+      result += i->second.second;
     }
 
-    QMutexLocker _( &dataMutex );
-
-    data.resize( result.size() );
-
-    memcpy( &data.front(), result.data(), result.size() );
+    appendString( result );
 
     hasAnyData = true;
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     setErrorString( QString::fromUtf8( e.what() ) );
   }
 
@@ -1091,9 +1020,9 @@ sptr< Dictionary::DataRequest > GlsDictionary::getArticle( wstring const & word,
                                                            vector< wstring > const & alts,
                                                            wstring const &,
                                                            bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<GlsArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< GlsArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 //////////////// GlsDictionary::getResource()
@@ -1110,8 +1039,7 @@ class GlsResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  GlsResourceRequest( GlsDictionary & dict_,
-                      string const & resourceName_ ):
+  GlsResourceRequest( GlsDictionary & dict_, string const & resourceName_ ):
     dict( dict_ ),
     resourceName( resourceName_ )
   {
@@ -1137,40 +1065,33 @@ public:
 void GlsResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     string n = dict.getContainingFolder().toStdString() + Utils::Fs::separator() + resourceName;
 
     GD_DPRINTF( "n is %s\n", n.c_str() );
 
-    try
-    {
-        QMutexLocker _( &dataMutex );
+    try {
+      QMutexLocker _( &dataMutex );
 
-        File::loadFromFile( n, data );
+      File::loadFromFile( n, data );
     }
-    catch( File::exCantOpen & )
-    {
+    catch ( File::exCantOpen & ) {
       n = dict.getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator() + resourceName;
 
-      try
-      {
+      try {
         QMutexLocker _( &dataMutex );
 
         File::loadFromFile( n, data );
       }
-      catch( File::exCantOpen & )
-      {
+      catch ( File::exCantOpen & ) {
         // Try reading from zip file
 
-        if ( dict.resourceZip.isOpen() )
-        {
+        if ( dict.resourceZip.isOpen() ) {
           QMutexLocker _( &dataMutex );
 
           if ( !dict.resourceZip.loadFile( Utf8::decode( resourceName ), data ) )
@@ -1181,16 +1102,14 @@ void GlsResourceRequest::run()
       }
     }
 
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
 
       QMutexLocker _( &dataMutex );
       GdTiff::tiff2img( data );
     }
 
-    if( Filetype::isNameOfCSS( resourceName ) )
-    {
+    if ( Filetype::isNameOfCSS( resourceName ) ) {
       QMutexLocker _( &dataMutex );
 
       QString css = QString::fromUtf8( data.data(), data.size() );
@@ -1198,34 +1117,30 @@ void GlsResourceRequest::run()
       // Correct some url's
 
       QString id = QString::fromUtf8( dict.getId().c_str() );
-      int pos = 0;
+      int pos    = 0;
 
-      QRegularExpression links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))",
-                                QRegularExpression::CaseInsensitiveOption );
+      QRegularExpression links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))", QRegularExpression::CaseInsensitiveOption );
 
       QString newCSS;
       QRegularExpressionMatchIterator it = links.globalMatch( css );
-      while( it.hasNext() )
-      {
+      while ( it.hasNext() ) {
         QRegularExpressionMatch match = it.next();
         newCSS += css.mid( pos, match.capturedStart() - pos );
         pos = match.capturedEnd();
 
         QString url = match.captured( 2 );
 
-        if( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0)
-        {
+        if ( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0 ) {
           // External link
           newCSS += match.captured();
           continue;
         }
 
-        QString newUrl = QString( "url(" ) + match.captured( 1 ) + "bres://"
-                                           + id + "/" + url + match.captured( 3 ) + ")";
+        QString newUrl =
+          QString( "url(" ) + match.captured( 1 ) + "bres://" + id + "/" + url + match.captured( 3 ) + ")";
         newCSS += newUrl;
       }
-      if( pos )
-      {
+      if ( pos ) {
         newCSS += css.mid( pos );
         css = newCSS;
         newCSS.clear();
@@ -1240,10 +1155,11 @@ void GlsResourceRequest::run()
     QMutexLocker _( &dataMutex );
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "GLS: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1251,9 +1167,9 @@ void GlsResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > GlsDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<GlsResourceRequest>( *this, name );
+  return std::make_shared< GlsResourceRequest >( *this, name );
 }
 
 sptr< Dictionary::DataRequest > GlsDictionary::getSearchResults( QString const & searchString,
@@ -1273,49 +1189,44 @@ sptr< Dictionary::DataRequest > GlsDictionary::getSearchResults( QString const &
 
 /// makeDictionaries
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
     // Try .gls and .gls.dz suffixes
 
-    if( !( i->size() >= 4 && strcasecmp( i->c_str() + ( i->size() - 4 ), ".gls" ) == 0 )
-        && !( i->size() >= 7 && strcasecmp( i->c_str() + ( i->size() - 7 ), ".gls.dz" ) == 0 ) )
+    if ( !( i->size() >= 4 && strcasecmp( i->c_str() + ( i->size() - 4 ), ".gls" ) == 0 )
+         && !( i->size() >= 7 && strcasecmp( i->c_str() + ( i->size() - 7 ), ".gls.dz" ) == 0 ) )
       continue;
 
     unsigned atLine = 0; // Indicates current line in .gls, for debug purposes
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, *i );
 
       string dictId = Dictionary::makeDictionaryId( dictFiles );
 
       // See if there's a zip file with resources present. If so, include it.
 
-      string baseName = ( (*i)[ i->size() - 4 ] == '.' ) ?
-               string( *i, 0, i->size() - 4 ) : string( *i, 0, i->size() - 7 );
+      string baseName =
+        ( ( *i )[ i->size() - 4 ] == '.' ) ? string( *i, 0, i->size() - 4 ) : string( *i, 0, i->size() - 7 );
 
       string zipFileName;
 
-      if ( File::tryPossibleZipName( baseName + ".gls.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".gls.dz.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".GLS.FILES.ZIP", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".GLS.DZ.FILES.ZIP", zipFileName ) )
+      if ( File::tryPossibleZipName( baseName + ".gls.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".gls.dz.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".GLS.FILES.ZIP", zipFileName )
+           || File::tryPossibleZipName( baseName + ".GLS.DZ.FILES.ZIP", zipFileName ) )
         dictFiles.push_back( zipFileName );
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile, zipFileName.size() ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile )
+           || indexIsOldOrBad( indexFile, zipFileName.size() ) ) {
         GlsScanner scanner( *i );
 
         try { // Here we intercept any errors during the read to save line at
@@ -1340,7 +1251,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           string dictionaryName = Utf8::encode( scanner.getDictionaryName() );
 
-          idx.write( (uint32_t) dictionaryName.size() );
+          idx.write( (uint32_t)dictionaryName.size() );
           idx.write( dictionaryName.data(), dictionaryName.size() );
 
           idxHeader.glsEncoding = scanner.getEncoding();
@@ -1354,14 +1265,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           uint32_t articleCount = 0, wordCount = 0;
 
-          for( ; ; )
-          {
+          for ( ;; ) {
             // Find the headwords
 
             if ( !scanner.readNextLine( curString, curOffset ) )
               break; // Clean end of file
 
-            if( curString.empty() )
+            if ( curString.empty() )
               continue;
 
             uint32_t articleOffset = curOffset;
@@ -1370,13 +1280,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
             list< wstring > allEntryWords;
             wstring::size_type start_pos = 0, end_pos = 0;
-            for( ; ; )
-            {
+            for ( ;; ) {
               end_pos = curString.find( '|', start_pos );
-              if( end_pos == wstring::npos )
-              {
+              if ( end_pos == wstring::npos ) {
                 wstring headword = curString.substr( start_pos );
-                if( !headword.empty() )
+                if ( !headword.empty() )
                   allEntryWords.push_back( headword );
                 break;
               }
@@ -1386,11 +1294,10 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
             // Skip article body
 
-            for( ; ; )
-            {
-              if( !scanner.readNextLine( curString, curOffset ) )
+            for ( ;; ) {
+              if ( !scanner.readNextLine( curString, curOffset ) )
                 break;
-              if( curString.empty() )
+              if ( curString.empty() )
                 break;
             }
 
@@ -1402,8 +1309,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
             uint32_t articleSize = curOffset - articleOffset;
             chunks.addToBlock( &articleSize, sizeof( articleSize ) );
 
-            for( list< wstring >::iterator j = allEntryWords.begin();
-                 j != allEntryWords.end(); ++j )
+            for ( list< wstring >::iterator j = allEntryWords.begin(); j != allEntryWords.end(); ++j )
               indexedWords.addWord( *j, descOffset );
 
             ++articleCount;
@@ -1419,14 +1325,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
           idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-          idxHeader.indexRootOffset = idxInfo.rootOffset;
+          idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
           indexedWords.clear(); // Release memory -- no need for this data
 
           // If there was a zip file, index it too
 
-          if ( zipFileName.size() )
-          {
+          if ( zipFileName.size() ) {
             GD_DPRINTF( "Indexing zip file\n" );
 
             idxHeader.hasZipFile = 1;
@@ -1436,21 +1341,19 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
             if ( zipFile.openZipFile( QDir::fromNativeSeparators( zipFileName.c_str() ) ) )
               zipFile.indexFile( zipFileNames );
 
-            if( !zipFileNames.empty() )
-            {
+            if ( !zipFileNames.empty() ) {
               // Build the resulting zip file index
 
               IndexInfo idxInfo = BtreeIndexing::buildIndex( zipFileNames, idx );
 
               idxHeader.zipIndexBtreeMaxElements = idxInfo.btreeMaxElements;
-              idxHeader.zipIndexRootOffset = idxInfo.rootOffset;
+              idxHeader.zipIndexRootOffset       = idxInfo.rootOffset;
             }
-            else
-            {
+            else {
               // Bad zip file -- no index (though the mark that we have one
               // remains)
               idxHeader.zipIndexBtreeMaxElements = 0;
-              idxHeader.zipIndexRootOffset = 0;
+              idxHeader.zipIndexRootOffset       = 0;
             }
           }
           else
@@ -1458,50 +1361,41 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           // That concludes it. Update the header.
 
-          idxHeader.signature = Signature;
-          idxHeader.formatVersion = CurrentFormatVersion;
+          idxHeader.signature         = Signature;
+          idxHeader.formatVersion     = CurrentFormatVersion;
           idxHeader.zipSupportVersion = CurrentZipSupportVersion;
 
           idxHeader.articleCount = articleCount;
-          idxHeader.wordCount = wordCount;
+          idxHeader.wordCount    = wordCount;
 
           idxHeader.langFrom = LangCoder::findIdForLanguage( scanner.getLangFrom() );
-          idxHeader.langTo = LangCoder::findIdForLanguage( scanner.getLangTo() );
-          if( idxHeader.langFrom == 0 && idxHeader.langTo == 0 )
-          {
+          idxHeader.langTo   = LangCoder::findIdForLanguage( scanner.getLangTo() );
+          if ( idxHeader.langFrom == 0 && idxHeader.langTo == 0 ) {
             // if no languages found, try dictionary's file name
-            QPair<quint32,quint32> langs =
-                LangCoder::findIdsForFilename( QString::fromStdString( dictFiles[ 0 ] ) );
+            QPair< quint32, quint32 > langs = LangCoder::findIdsForFilename( QString::fromStdString( dictFiles[ 0 ] ) );
 
             // if no languages found, try dictionary's name
-            if ( langs.first == 0 || langs.second == 0 )
-            {
-              langs =
-                LangCoder::findIdsForFilename( QString::fromStdString( dictionaryName ) );
+            if ( langs.first == 0 || langs.second == 0 ) {
+              langs = LangCoder::findIdsForFilename( QString::fromStdString( dictionaryName ) );
             }
             idxHeader.langFrom = langs.first;
-            idxHeader.langTo = langs.second;
+            idxHeader.langTo   = langs.second;
           }
 
           idx.rewind();
 
           idx.write( &idxHeader, sizeof( idxHeader ) );
         } // In-place try for saving line count
-        catch( ... )
-        {
+        catch ( ... ) {
           atLine = scanner.getLinesRead();
           throw;
         }
 
       } // if need to rebuild
-      dictionaries.push_back( std::make_shared<GlsDictionary>( dictId,
-                                                 indexFile,
-                                                 dictFiles ) );
+      dictionaries.push_back( std::make_shared< GlsDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "GLS dictionary reading failed: %s:%u, error: %s\n",
-                 i->c_str(), atLine, e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "GLS dictionary reading failed: %s:%u, error: %s\n", i->c_str(), atLine, e.what() );
     }
   }
 
diff --git a/src/dict/gls.hh b/src/dict/gls.hh
index b022d094..26244ea9 100644
--- a/src/dict/gls.hh
+++ b/src/dict/gls.hh
@@ -9,12 +9,9 @@ namespace Gls {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-    ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Gls
 
 #endif // __GLS_HH_INCLUDED__
diff --git a/src/dict/greektranslit.cc b/src/dict/greektranslit.cc
index 5b3deccf..d6d4dd21 100644
--- a/src/dict/greektranslit.cc
+++ b/src/dict/greektranslit.cc
@@ -18,826 +18,826 @@ GreekTable::GreekTable()
 {
   // Utf8
 
-    //I. LATIN -> MODERN & CLASSICAL GREEK (COMMON CHARACTERS)
-    ins("a",      "α");
-    ins("b",      "β");
-    ins("v",      "β");
-    ins("g",      "γ");
-    ins("d",      "δ");
-    ins("e",      "ε");
-    ins("z",      "ζ");
-    ins("h",      "η");
-    ins("q",      "θ");
-    ins("8",      "θ");
-    ins("i",      "ι");
-    ins("k",      "κ");
-    ins("l",      "λ");
-    ins("m",      "μ");
-    ins("n",      "ν");
-    ins("c",      "ξ");
-    ins("3",      "ξ");
-    ins("ks",     "ξ");
-    ins("o",      "ο");
-    ins("p",      "π");
-    ins("r",      "ρ");
-    ins("s",      "σ");
-    ins("s1",     "σ");
-    ins("j",      "ς");
-    ins("s2",     "ς");
-    ins("s\\n",   "ς");
-    ins("t",      "τ");
-    ins("u",      "υ");
-    ins("f",      "φ");
-    ins("x",      "χ");
-    ins("y",      "ψ");
-    ins("ps",     "ψ");
-    ins("w",      "ω");
-
-    ins("A",      "Α");
-    ins("B",      "Β");
-    ins("V",      "Β");
-    ins("G",      "Γ");
-    ins("D",      "Δ");
-    ins("E",      "Ε");
-    ins("Z",      "Ζ");
-    ins("H",      "Η");
-    ins("Q",      "Θ");
-    ins("I",      "Ι");
-    ins("K",      "Κ");
-    ins("L",      "Λ");
-    ins("M",      "Μ");
-    ins("N",      "Ν");
-    ins("C",      "Ξ");
-    ins("KS",     "Ξ");
-    ins("Ks",     "Ξ");
-    ins("O",      "Ο");
-    ins("P",      "Π");
-    ins("R",      "Τ");
-    ins("S",      "Σ");
-    ins("S1",     "Σ");
-    ins("J",      "Σ");
-    ins("S2",     "Σ");
-    ins("S\\n",   "Σ");
-    ins("T",      "Τ");
-    ins("U",      "Υ");
-    ins("F",      "Φ");
-    ins("X",      "Χ");
-    ins("Y",      "Ψ");
-    ins("PS",     "Ψ");
-    ins("Ps",     "Ψ");
-    ins("W",      "Ω");
-
-    //II. LATIN -> MODERN GREEK (DIACRITICS)
-    
-    ins("'a",      "ά");
-    ins("'e",      "έ");
-    ins("'h",      "ή");
-    ins("'i",      "ί");
-    ins("\"i",     "ϊ");
-    ins("\"'i",    "ΐ");
-    ins("'\"i",    "ΐ");
-    ins("'o",      "ό");
-    ins("'u",      "ύ");
-    ins("\"u",     "ϋ");
-    ins("\"'u",    "ΰ");
-    ins("'\"u",    "ΰ");
-    ins("'w",      "ώ");
-
-    ins("'A",      "Ά");
-    ins("'E",      "Έ");
-    ins("'H",      "Ή");
-    ins("'I",      "Ί");
-    ins("\"I",     "Ϊ");
-    ins("'O",      "Ό");
-    ins("'U",      "Ύ");
-    ins("\"U",     "Ϋ");
-    ins("'W",      "Ώ");
-
-    //IV. LATIN -> CLASSICAL GREEK (DIACRITICS - BETA CODE)
-    // Adapted from beta2unicode.py by James Tauber <http://jtauber.com/>
-
-	//ORDER: Breathing - Accent
-	
-    //uppercase (asterisk & capitals)
-    
-		//oceia - bareia
-    ins("*)A",     "Ἀ");
-    ins("*(A",     "Ἁ");
-    ins("*\\A",     "Ὰ");
-    ins("*/A",      "Ά");
-    ins("*)\\A",   "Ἂ");
-    ins("*(\\A",   "Ἃ");
-    ins("*)/A",    "Ἄ");
-    ins("*(/A",    "Ἅ");
-
-    ins("*)E",     "Ἐ");
-    ins("*(E",     "Ἑ");
-    ins("*\\E",     "Ὲ");
-    ins("*/E",      "Έ");
-    ins("*)\\E",   "Ἒ");
-    ins("*(\\E",   "Ἓ");
-    ins("*)/E",    "Ἔ");
-    ins("*(/E",    "Ἕ");
-
-    ins("*)H",     "Ἠ");
-    ins("*(H",     "Ἡ");
-    ins("*\\H",     "Ὴ");
-    ins("*/H",      "Ή");
-    ins("*)\\H",   "Ἢ");
-    ins("*(\\H",   "Ἣ");
-    ins("*)/H",    "Ἤ");
-    ins("*(/H",    "Ἥ");
-
-    ins("*)I",     "Ἰ");
-    ins("*(I",     "Ἱ");
-    ins("*\\I",     "Ὶ");
-    ins("*/I",      "Ί");
-    ins("*)\\I",   "Ἲ");
-    ins("*(\\I",   "Ἳ");
-    ins("*)/I",    "Ἴ");
-    ins("*(/I",    "Ἵ");
-
-    ins("*)O",     "Ὀ");
-    ins("*(O",     "Ὁ");
-    ins("*\\O",     "Ὸ");
-    ins("*/O",      "Ό");
-    ins("*)\\O",   "Ὂ");
-    ins("*(\\O",   "Ὃ");
-    ins("*)/O",    "Ὄ");
-    ins("*(/O",    "Ὅ");
-
-    ins("*(R",    "Ῥ");	
-
-    ins("*(U",     "Ὑ");
-    ins("*\\U",     "Ὺ");
-    ins("*/U",      "Ύ");
-    ins("*(\\U",   "Ὓ");
-    ins("*(/U",    "Ὕ");
-
-    ins("*)W",     "Ὠ");
-    ins("*(W",     "Ὡ");
-    ins("*\\W",     "Ὼ");
-    ins("*/W",      "Ώ");
-    ins("*)\\W",   "Ὢ");
-    ins("*(\\W",   "Ὣ");
-    ins("*)/W",    "Ὤ");
-    ins("*(/W",    "Ὥ");
-
-		//perispwmenh
-    ins("*)=A",    "Ἆ");
-    ins("*(=A",    "Ἇ");
-    
-    ins("*)=H",    "Ἦ");
-    ins("*(=H",    "Ἧ");
-    
-    ins("*)=I",    "Ἶ");
-    ins("*(=I",    "Ἷ");
-    
-    ins("*(=U",    "Ὗ");
-    
-    ins("*)=W",    "Ὦ");
-    ins("*(=W",    "Ὧ");
-
-		//upogegrammenh
-    ins("*A|",      "ᾼ");
-    ins("*)A|",    "ᾈ");
-    ins("*(A|",    "ᾉ");
-    ins("*)/A|",   "ᾌ");
-    ins("*(/A|",   "ᾍ");
-    ins("*)=A|",   "ᾎ");
-    ins("*(=A|",   "ᾏ");
-
-    ins("*H|",      "ῌ");
-    ins("*)H|",    "ᾘ");
-    ins("*(H|",    "ᾙ");
-    ins("*)/H|",   "ᾜ");
-    ins("*(/H|",   "ᾝ");
-    ins("*)=H|",   "ᾞ");
-    ins("*(=H|",   "ᾟ");
-
-    ins("*W|",      "ῼ"); 
-    ins("*)W|",    "ᾨ");
-    ins("*(W|",    "ᾩ");
-    ins("*)/W|",   "ᾬ");
-    ins("*(/W|",   "ᾭ");
-    ins("*)=W|",   "ᾮ");
-    ins("*(=W|",   "ᾯ");
-
-    ins("*|A",      "ᾼ");
-    ins("*)|A",    "ᾈ");
-    ins("*(|A",    "ᾉ");
-    ins("*)/|A",   "ᾌ");
-    ins("*(/|A",   "ᾍ");
-    ins("*)=|A",   "ᾎ");
-    ins("*(=|A",   "ᾏ");
-
-    ins("*|H",      "ῌ");
-    ins("*)|H",    "ᾘ");
-    ins("*(|H",    "ᾙ");
-    ins("*)/|H",   "ᾜ");
-    ins("*(/|H",   "ᾝ");
-    ins("*)=|H",   "ᾞ");
-    ins("*(=|H",   "ᾟ");
-
-    ins("*|W",      "ῼ"); 
-    ins("*)|W",    "ᾨ");
-    ins("*(|W",    "ᾩ");
-    ins("*)/|W",   "ᾬ");
-    ins("*(/|W",   "ᾭ");
-    ins("*)=|W",   "ᾮ");
-    ins("*(=|W",   "ᾯ");
-
-		//diairesis
-    ins("*+I",      "Ϊ");
-    ins("*+U",      "Ϋ");
-    
-    //uppercase (asterisk & small letters)
-    
-		//oceia - bareia
-    ins("*)a",     "Ἀ");
-    ins("*(a",     "Ἁ");
-    ins("*\\a",     "Ὰ");
-    ins("*/a",      "Ά");
-    ins("*)\\a",   "Ἂ");
-    ins("*(\\a",   "Ἃ");
-    ins("*)/a",    "Ἄ");
-    ins("*(/a",    "Ἅ");
-
-    ins("*)e",     "Ἐ");
-    ins("*(e",     "Ἑ");
-    ins("*\\e",     "Ὲ");
-    ins("*/e",      "Έ");
-    ins("*)\\e",   "Ἒ");
-    ins("*(\\e",   "Ἓ");
-    ins("*)/e",    "Ἔ");
-    ins("*(/e",    "Ἕ");
-
-    ins("*)h",     "Ἠ");
-    ins("*(h",     "Ἡ");
-    ins("*\\h",     "Ὴ");
-    ins("*/h",      "Ή");
-    ins("*)\\h",   "Ἢ");
-    ins("*(\\h",   "Ἣ");
-    ins("*)/h",    "Ἤ");
-    ins("*(/h",    "Ἥ");
-
-    ins("*)i",     "Ἰ");
-    ins("*(i",     "Ἱ");
-    ins("*\\i",     "Ὶ");
-    ins("*/i",      "Ί");
-    ins("*)\\i",   "Ἲ");
-    ins("*(\\i",   "Ἳ");
-    ins("*)/i",    "Ἴ");
-    ins("*(/i",    "Ἵ");
-
-    ins("*)o",     "Ὀ");
-    ins("*(o",     "Ὁ");
-    ins("*\\o",     "Ὸ");
-    ins("*/o",      "Ό");
-    ins("*)\\o",   "Ὂ");
-    ins("*(\\o",   "Ὃ");
-    ins("*)/o",    "Ὄ");
-    ins("*(/o",    "Ὅ");
-
-    ins("*(r",     "Ῥ");	
-
-    ins("*(u",     "Ὑ");
-    ins("*\\u",     "Ὺ");
-    ins("*/u",      "Ύ");
-    ins("*(\\u",   "Ὓ");
-    ins("*(/u",    "Ὕ");
-
-    ins("*)w",     "Ὠ");
-    ins("*(w",     "Ὡ");
-    ins("*\\w",     "Ὼ");
-    ins("*/w",      "Ώ");
-    ins("*)\\w",   "Ὢ");
-    ins("*(\\w",   "Ὣ");
-    ins("*)/w",    "Ὤ");
-    ins("*(/w",    "Ὥ");
-
-		//perispwmenh
-    ins("*)=a",    "Ἆ");
-    ins("*(=a",    "Ἇ");
-    
-    ins("*)=h",    "Ἦ");
-    ins("*(=h",    "Ἧ");
-    
-    ins("*)=i",    "Ἶ");
-    ins("*(=i",    "Ἷ");
-    
-    ins("*(=u",    "Ὗ");
-    
-    ins("*)=w",    "Ὦ");
-    ins("*(=w",    "Ὧ");
-
-		//upogegrammenh
-    ins("*a|",      "ᾼ");
-    ins("*)a|",    "ᾈ");
-    ins("*(a|",    "ᾉ");
-    ins("*)/a|",   "ᾌ");
-    ins("*(/a|",   "ᾍ");
-    ins("*)=a|",   "ᾎ");
-    ins("*(=a|",   "ᾏ");
-
-    ins("*h|",      "ῌ");
-    ins("*)h|",    "ᾘ");
-    ins("*(h|",    "ᾙ");
-    ins("*)/h|",   "ᾜ");
-    ins("*(/h|",   "ᾝ");
-    ins("*)=h|",   "ᾞ");
-    ins("*(=h|",   "ᾟ");
-
-    ins("*w|",      "ῼ"); 
-    ins("*)w|",    "ᾨ");
-    ins("*(w|",    "ᾩ");
-    ins("*)/w|",   "ᾬ");
-    ins("*(/w|",   "ᾭ");
-    ins("*)=w|",   "ᾮ");
-    ins("*(=w|",   "ᾯ");
-
-    ins("*|a",      "ᾼ");
-    ins("*)|a",    "ᾈ");
-    ins("*(|a",    "ᾉ");
-    ins("*)/|a",   "ᾌ");
-    ins("*(/|a",   "ᾍ");
-    ins("*)=|a",   "ᾎ");
-    ins("*(=|a",   "ᾏ");
-
-    ins("*|h",      "ῌ");
-    ins("*)|h",    "ᾘ");
-    ins("*(|h",    "ᾙ");
-    ins("*)/|h",   "ᾜ");
-    ins("*(/|h",   "ᾝ");
-    ins("*)=|h",   "ᾞ");
-    ins("*(=|h",   "ᾟ");
-
-    ins("*|w",      "ῼ"); 
-    ins("*)|w",    "ᾨ");
-    ins("*(|w",    "ᾩ");
-    ins("*)/|w",   "ᾬ");
-    ins("*(/|w",   "ᾭ");
-    ins("*)=|w",   "ᾮ");
-    ins("*(=|w",   "ᾯ");
-
-		//diairesis
-    ins("*+i",      "Ϊ");
-    ins("*+u",      "Ϋ");
-    
-    //uppercase (capitals)
-    
-		//oceia - bareia
-    ins("A)",     "Ἀ");
-    ins("A(",     "Ἁ");
-    ins("A\\",     "Ὰ");
-    ins("A/",      "Ά");
-    ins("A)\\",   "Ἂ");
-    ins("A(\\",   "Ἃ");
-    ins("A)/",    "Ἄ");
-    ins("A(/",    "Ἅ");
-
-    ins("E)",     "Ἐ");
-    ins("E(",     "Ἑ");
-    ins("E\\",     "Ὲ");
-    ins("E/",      "Έ");
-    ins("E)\\",   "Ἒ");
-    ins("E(\\",   "Ἓ");
-    ins("E)/",    "Ἔ");
-    ins("E(/",    "Ἕ");
-
-    ins("H)",     "Ἠ");
-    ins("H(",     "Ἡ");
-    ins("H\\",     "Ὴ");
-    ins("H/",      "Ή");
-    ins("H)\\",   "Ἢ");
-    ins("H(\\",   "Ἣ");
-    ins("H)/",    "Ἤ");
-    ins("H(/",    "Ἥ");
-
-    ins("I)",     "Ἰ");
-    ins("I(",     "Ἱ");
-    ins("I\\",     "Ὶ");
-    ins("I/",      "Ί");
-    ins("I)\\",   "Ἲ");
-    ins("I(\\",   "Ἳ");
-    ins("I)/",    "Ἴ");
-    ins("I(/",    "Ἵ");
-
-    ins("O)",     "Ὀ");
-    ins("O(",     "Ὁ");
-    ins("O\\",     "Ὸ");
-    ins("O/",      "Ό");
-    ins("O)\\",   "Ὂ");
-    ins("O(\\",   "Ὃ");
-    ins("O)/",    "Ὄ");
-    ins("O(/",    "Ὅ");
-
-    ins("R(",     "Ῥ");
-
-    ins("U)",     "ὐ");
-    ins("U(",     "Ὑ");
-    ins("U\\",     "Ὺ");
-    ins("U/",      "Ύ");
-    ins("U)\\",   "ὒ");
-    ins("U(\\",   "Ὓ");
-    ins("U)/",    "ὔ");
-    ins("U(/",    "Ὕ");
-
-    ins("W)",     "Ὠ");
-    ins("W(",     "Ὡ");
-    ins("W\\",     "Ὼ");
-    ins("W/",      "Ώ");
-    ins("W)\\",   "Ὢ");
-    ins("W(\\",   "Ὣ");
-    ins("W)/",    "Ὤ");
-    ins("W(/",    "Ὥ");
-
-		//perispwmenh
-    ins("A=",      "ᾶ");
-    ins("A)=",    "Ἆ");
-    ins("A(=",    "Ἇ");
-    
-    ins("H=",      "ῆ");
-    ins("H)=",    "Ἦ");
-    ins("H(=",    "Ἧ");
-    
-    ins("I=",      "ῖ");
-    ins("I)=",    "Ἶ");
-    ins("I(=",    "Ἷ");
-    
-    ins("U=",      "ῦ");
-    ins("U)=",    "ὖ");
-    ins("U(=",    "Ὗ");
-    
-    ins("W=",      "ῶ");
-    ins("W)=",    "Ὦ");
-    ins("W(=",    "Ὧ");
-
-		//upogegrammenh
-    ins("A|",      "ᾼ");
-    ins("A)|",    "ᾈ");
-    ins("A(|",    "ᾉ");
-    ins("A/|",     "ᾴ");
-    ins("A)/|",   "ᾌ");
-    ins("A(/|",   "ᾍ");
-    ins("A=|",     "ᾷ");
-    ins("A)=|",   "ᾎ");
-    ins("A(=|",   "ᾏ");
-
-    ins("H|",      "ῌ");
-    ins("H)|",    "ᾘ");
-    ins("H(|",    "ᾙ");
-    ins("H/|",     "ῄ");
-    ins("H)/|",   "ᾜ");
-    ins("H(/|",   "ᾝ");
-    ins("H=|",     "ῇ");
-    ins("H)=|",   "ᾞ");
-    ins("H(=|",   "ᾟ");
-
-    ins("W|",      "ῼ"); 
-    ins("W)|",    "ᾨ");
-    ins("W(|",    "ᾩ");
-    ins("W/|",     "ῴ");
-    ins("W)/|",   "ᾬ");
-    ins("W(/|",   "ᾭ");
-    ins("W=|",     "ῷ");
-    ins("W)=|",   "ᾮ");
-    ins("W(=|",   "ᾯ");
-
-		//diairesis
-    ins("I+",      "Ϊ");
-    ins("I+\\",    "ῒ");
-    ins("I+/",     "ΐ");
-    ins("U+",      "Ϋ");
-    ins("U+\\",    "ῢ");
-    ins("U+/",     "ΰ");    
-
-    //lowercase (small letters)
-    
-		//oceia - bareia
-    ins("a)",     "ἀ");
-    ins("a(",     "ἁ");
-    ins("a\\",     "ὰ");
-    ins("a/",      "ά");
-    ins("a)\\",   "ἂ");
-    ins("a(\\",   "ἃ");
-    ins("a)/",    "ἄ");
-    ins("a(/",    "ἅ");
-
-    ins("e)",     "ἐ");
-    ins("e(",     "ἑ");
-    ins("e\\",     "ὲ");
-    ins("e/",      "έ");
-    ins("e)\\",   "ἒ");
-    ins("e(\\",   "ἓ");
-    ins("e)/",    "ἔ");
-    ins("e(/",    "ἕ");
-
-    ins("h)",     "ἠ");
-    ins("h(",     "ἡ");
-    ins("h\\",     "ὴ");
-    ins("h/",      "ή");
-    ins("h)\\",   "ἢ");
-    ins("h(\\",   "ἣ");
-    ins("h)/",    "ἤ");
-    ins("h(/",    "ἥ");
-
-    ins("i)",     "ἰ");
-    ins("i(",     "ἱ");
-    ins("i\\",     "ὶ");
-    ins("i/",      "ί");
-    ins("i)\\",   "ἲ");
-    ins("i(\\",   "ἳ");
-    ins("i)/",    "ἴ");
-    ins("i(/",    "ἵ");
-
-    ins("o)",     "ὀ");
-    ins("o(",     "ὁ");
-    ins("o\\",     "ὸ");
-    ins("o/",      "ό");
-    ins("o)\\",   "ὂ");
-    ins("o(\\",   "ὃ");
-    ins("o)/",    "ὄ");
-    ins("o(/",    "ὅ");
-
-    ins("r(",      "ῤ");
-
-    ins("u)",     "ὐ");
-    ins("u(",     "ὑ");
-    ins("u\\",     "ὺ");
-    ins("u/",      "ύ");
-    ins("u)\\",   "ὒ");
-    ins("u(\\",   "ὓ");
-    ins("u)/",    "ὔ");
-    ins("u(/",    "ὕ");
-
-    ins("w)",     "ὠ");
-    ins("w(",     "ὡ");
-    ins("w\\",     "ὼ");
-    ins("w/",      "ώ");
-    ins("w)\\",   "ὢ");
-    ins("w(\\",   "ὣ");
-    ins("w)/",    "ὤ");
-    ins("w(/",    "ὥ");
-
-		//perispwmenh
-    ins("a=",      "ᾶ");
-    ins("a)=",    "ἆ");
-    ins("a(=",    "ἇ");
-    
-    ins("h=",      "ῆ");
-    ins("h)=",    "ἦ");
-    ins("h(=",    "ἧ");
-    
-    ins("i=",      "ῖ");
-    ins("i)=",    "ἶ");
-    ins("i(=",    "ἷ");
-    
-    ins("u=",      "ῦ");
-    ins("u)=",    "ὖ");
-    ins("u(=",    "ὗ");
-    
-    ins("w=",      "ῶ");
-    ins("w)=",    "ὦ");
-    ins("w(=",    "ὧ");
-
-		//upogegrammenh
-    ins("a|",      "ᾳ");
-    ins("a)|",    "ᾀ");
-    ins("a(|",    "ᾁ");
-    ins("a/|",     "ᾴ");
-    ins("a)/|",   "ᾄ");
-    ins("a(/|",   "ᾅ");
-    ins("a=|",     "ᾷ");
-    ins("a)=|",   "ᾆ");
-    ins("a(=|",   "ᾇ");
-
-    ins("h|",      "ῃ");
-    ins("h)|",    "ᾐ");
-    ins("h(|",    "ᾑ");
-    ins("h/|",     "ῄ");
-    ins("h)/|",   "ᾔ");
-    ins("h(/|",   "ᾕ");
-    ins("h=|",     "ῇ");
-    ins("h)=|",   "ᾖ");
-    ins("h(=|",   "ᾗ");
-
-    ins("w|",      "ῳ"); 
-    ins("w)|",    "ᾠ");
-    ins("w(|",    "ᾡ");
-    ins("w/|",     "ῴ");
-    ins("w)/|",   "ᾤ");
-    ins("w(/|",   "ᾥ");
-    ins("w=|",     "ῷ");
-    ins("w)=|",   "ᾦ");
-    ins("w(=|",   "ᾧ");
-
-		//diairesis
-    ins("i+",      "ϊ");
-    ins("i+\\",    "ῒ");
-    ins("i+/",     "ΐ");
-    ins("u+",      "ϋ");
-    ins("u+\\",    "ῢ");
-    ins("u+/",     "ΰ");
-    
-
-	//ORDER: ACCENT - BREATHING (UNOFFICIAL)
-	
-    //uppercase (capitals)
-    
-		//oceia - bareia
-    ins("A\\)",   "Ἂ");
-    ins("A\\(",   "Ἃ");
-    ins("A/)",    "Ἄ");
-    ins("A/(",    "Ἅ");
-
-    ins("E\\)",   "Ἒ");
-    ins("E\\(",   "Ἓ");
-    ins("E/)",    "Ἔ");
-    ins("E/(",    "Ἕ");
-
-    ins("H\\)",   "Ἢ");
-    ins("H\\(",   "Ἣ");
-    ins("H/)",    "Ἤ");
-    ins("H/(",    "Ἥ");
-
-    ins("I\\)",   "Ἲ");
-    ins("I\\(",   "Ἳ");
-    ins("I/)",    "Ἴ");
-    ins("I/(",    "Ἵ");
-
-    ins("O\\)",   "Ὂ");
-    ins("O\\(",   "Ὃ");
-    ins("O/)",    "Ὄ");
-    ins("O/(",    "Ὅ");
-
-    ins("U\\(",   "Ὓ");
-    ins("U/(",    "Ὕ");
-
-    ins("W\\)",   "Ὢ");
-    ins("W\\(",   "Ὣ");
-    ins("W/)",    "Ὤ");
-    ins("W/(",    "Ὥ");
-
-		//perispwmenh
-    ins("A=)",    "Ἆ");
-    ins("A=(",    "Ἇ");
-    
-    ins("H=)",    "Ἦ");
-    ins("H=(",    "Ἧ");
-    
-    ins("I=)",    "Ἶ");
-    ins("I=(",    "Ἷ");
-    
-    ins("U=(",    "Ὗ");
-    
-    ins("W=)",    "Ὦ");
-    ins("W=(",    "Ὧ");
-
-		//upogegrammenh
-    ins("A/)|",   "ᾌ");
-    ins("A/(|",   "ᾍ");
-    ins("A=)|",   "ᾎ");
-    ins("A=(|",   "ᾏ");
-
-    ins("H/)|",   "ᾜ");
-    ins("H/(|",   "ᾝ");
-    ins("H=)|",   "ᾞ");
-    ins("H=(|",   "ᾟ");
-
-    ins("W/)|",   "ᾬ");
-    ins("W/(|",   "ᾭ");
-    ins("W=)|",   "ᾮ");
-    ins("W=(|",   "ᾯ");
-
-    //lowercase (small letters)
-    
-		//oceia - bareia
-    ins("a\\)",   "ἂ");
-    ins("a\\(",   "ἃ");
-    ins("a/)",    "ἄ");
-    ins("a/(",    "ἅ");
-
-
-    ins("e\\)",   "ἒ");
-    ins("e\\(",   "ἓ");
-    ins("e/)",    "ἔ");
-    ins("e/(",    "ἕ");
-
-    ins("h\\)",   "ἢ");
-    ins("h\\(",   "ἣ");
-    ins("h/)",    "ἤ");
-    ins("h/(",    "ἥ");
-
-    ins("i\\)",   "ἲ");
-    ins("i\\(",   "ἳ");
-    ins("i/)",    "ἴ");
-    ins("i/(",    "ἵ");
-
-    ins("o\\)",   "ὂ");
-    ins("o\\(",   "ὃ");
-    ins("o/)",    "ὄ");
-    ins("o/(",    "ὅ");
-
-    ins("u\\)",   "ὒ");
-    ins("u\\(",   "ὓ");
-    ins("u/)",    "ὔ");
-    ins("u/(",    "ὕ");
-
-    ins("w\\)",   "ὢ");
-    ins("w\\(",   "ὣ");
-    ins("w/)",    "ὤ");
-    ins("w/(",    "ὥ");
-
-		//perispwmenh
-    ins("a=)",    "ἆ");
-    ins("a=(",    "ἇ");
-    
-    ins("h=)",    "ἦ");
-    ins("h=(",    "ἧ");
-    
-    ins("i=)",    "ἶ");
-    ins("i=(",    "ἷ");
-    
-    ins("u=)",    "ὖ");
-    ins("u=(",    "ὗ");
-    
-    ins("w=)",    "ὦ");
-    ins("w=(",    "ὧ");
-
-		//upogegrammenh
-    ins("a/)|",   "ᾄ");
-    ins("a/(|",   "ᾅ");
-    ins("a=)|",   "ᾆ");
-    ins("a=(|",   "ᾇ");
-
-    ins("h/)|",   "ᾔ");
-    ins("h/(|",   "ᾕ");
-    ins("h=)|",   "ᾖ");
-    ins("h=(|",   "ᾗ");
-
-    ins("w/)|",   "ᾤ");
-    ins("w/(|",   "ᾥ");
-    ins("w=)|",   "ᾦ");
-    ins("w=(|",   "ᾧ");
-
-		//diairesis
-    ins("i\\+",    "ῒ");
-    ins("i/+",     "ΐ");
-    ins("u\\+",    "ῢ");
-    ins("u/+",     "ΰ");
-	
-	//IΙI. MODERN GREEK <-> CLASSICAL GREEK
-		//convert tonos to oceia
-  
-    ins("ά",      "ά");
-    ins("έ",      "έ");
-    ins("ή",      "ή");
-    ins("ί",      "ί");
-    ins("ΐ",      "ΐ");
-    ins("ό",      "ό");
-    ins("ύ",      "ύ");
-    ins("ΰ",      "ΰ");
-    ins("ώ",      "ώ");
-
-    ins("Ά",      "Ά");
-    ins("Έ",      "Έ");
-    ins("Ή",      "Ή");
-    ins("Ί",      "Ί");
-    ins("Ό",      "Ό");
-    ins("Ύ",      "Ύ");
-    ins("Ώ",      "Ώ");
-
-		//convert oceia to tonos
-  
-    ins("ά",      "ά");
-    ins("έ",      "έ");
-    ins("ή",      "ή");
-    ins("ί",      "ί");
-    ins("ΐ",      "ΐ");
-    ins("ό",      "ό");
-    ins("ύ",      "ύ");
-    ins("ΰ",      "ΰ");
-    ins("ώ",      "ώ");
-
-    ins("Ά",      "Ά");
-    ins("Έ",      "Έ");
-    ins("Ή",      "Ή");
-    ins("Ί",      "Ί");
-    ins("Ό",      "Ό");
-    ins("Ύ",      "Ύ");
-    ins("Ώ",      "Ώ");
-
-
+  //I. LATIN -> MODERN & CLASSICAL GREEK (COMMON CHARACTERS)
+  ins( "a", "α" );
+  ins( "b", "β" );
+  ins( "v", "β" );
+  ins( "g", "γ" );
+  ins( "d", "δ" );
+  ins( "e", "ε" );
+  ins( "z", "ζ" );
+  ins( "h", "η" );
+  ins( "q", "θ" );
+  ins( "8", "θ" );
+  ins( "i", "ι" );
+  ins( "k", "κ" );
+  ins( "l", "λ" );
+  ins( "m", "μ" );
+  ins( "n", "ν" );
+  ins( "c", "ξ" );
+  ins( "3", "ξ" );
+  ins( "ks", "ξ" );
+  ins( "o", "ο" );
+  ins( "p", "π" );
+  ins( "r", "ρ" );
+  ins( "s", "σ" );
+  ins( "s1", "σ" );
+  ins( "j", "ς" );
+  ins( "s2", "ς" );
+  ins( "s\\n", "ς" );
+  ins( "t", "τ" );
+  ins( "u", "υ" );
+  ins( "f", "φ" );
+  ins( "x", "χ" );
+  ins( "y", "ψ" );
+  ins( "ps", "ψ" );
+  ins( "w", "ω" );
+
+  ins( "A", "Α" );
+  ins( "B", "Β" );
+  ins( "V", "Β" );
+  ins( "G", "Γ" );
+  ins( "D", "Δ" );
+  ins( "E", "Ε" );
+  ins( "Z", "Ζ" );
+  ins( "H", "Η" );
+  ins( "Q", "Θ" );
+  ins( "I", "Ι" );
+  ins( "K", "Κ" );
+  ins( "L", "Λ" );
+  ins( "M", "Μ" );
+  ins( "N", "Ν" );
+  ins( "C", "Ξ" );
+  ins( "KS", "Ξ" );
+  ins( "Ks", "Ξ" );
+  ins( "O", "Ο" );
+  ins( "P", "Π" );
+  ins( "R", "Τ" );
+  ins( "S", "Σ" );
+  ins( "S1", "Σ" );
+  ins( "J", "Σ" );
+  ins( "S2", "Σ" );
+  ins( "S\\n", "Σ" );
+  ins( "T", "Τ" );
+  ins( "U", "Υ" );
+  ins( "F", "Φ" );
+  ins( "X", "Χ" );
+  ins( "Y", "Ψ" );
+  ins( "PS", "Ψ" );
+  ins( "Ps", "Ψ" );
+  ins( "W", "Ω" );
+
+  //II. LATIN -> MODERN GREEK (DIACRITICS)
+
+  ins( "'a", "ά" );
+  ins( "'e", "έ" );
+  ins( "'h", "ή" );
+  ins( "'i", "ί" );
+  ins( "\"i", "ϊ" );
+  ins( "\"'i", "ΐ" );
+  ins( "'\"i", "ΐ" );
+  ins( "'o", "ό" );
+  ins( "'u", "ύ" );
+  ins( "\"u", "ϋ" );
+  ins( "\"'u", "ΰ" );
+  ins( "'\"u", "ΰ" );
+  ins( "'w", "ώ" );
+
+  ins( "'A", "Ά" );
+  ins( "'E", "Έ" );
+  ins( "'H", "Ή" );
+  ins( "'I", "Ί" );
+  ins( "\"I", "Ϊ" );
+  ins( "'O", "Ό" );
+  ins( "'U", "Ύ" );
+  ins( "\"U", "Ϋ" );
+  ins( "'W", "Ώ" );
+
+  //IV. LATIN -> CLASSICAL GREEK (DIACRITICS - BETA CODE)
+  // Adapted from beta2unicode.py by James Tauber <http://jtauber.com/>
+
+  //ORDER: Breathing - Accent
+
+  //uppercase (asterisk & capitals)
+
+  //oceia - bareia
+  ins( "*)A", "Ἀ" );
+  ins( "*(A", "Ἁ" );
+  ins( "*\\A", "Ὰ" );
+  ins( "*/A", "Ά" );
+  ins( "*)\\A", "Ἂ" );
+  ins( "*(\\A", "Ἃ" );
+  ins( "*)/A", "Ἄ" );
+  ins( "*(/A", "Ἅ" );
+
+  ins( "*)E", "Ἐ" );
+  ins( "*(E", "Ἑ" );
+  ins( "*\\E", "Ὲ" );
+  ins( "*/E", "Έ" );
+  ins( "*)\\E", "Ἒ" );
+  ins( "*(\\E", "Ἓ" );
+  ins( "*)/E", "Ἔ" );
+  ins( "*(/E", "Ἕ" );
+
+  ins( "*)H", "Ἠ" );
+  ins( "*(H", "Ἡ" );
+  ins( "*\\H", "Ὴ" );
+  ins( "*/H", "Ή" );
+  ins( "*)\\H", "Ἢ" );
+  ins( "*(\\H", "Ἣ" );
+  ins( "*)/H", "Ἤ" );
+  ins( "*(/H", "Ἥ" );
+
+  ins( "*)I", "Ἰ" );
+  ins( "*(I", "Ἱ" );
+  ins( "*\\I", "Ὶ" );
+  ins( "*/I", "Ί" );
+  ins( "*)\\I", "Ἲ" );
+  ins( "*(\\I", "Ἳ" );
+  ins( "*)/I", "Ἴ" );
+  ins( "*(/I", "Ἵ" );
+
+  ins( "*)O", "Ὀ" );
+  ins( "*(O", "Ὁ" );
+  ins( "*\\O", "Ὸ" );
+  ins( "*/O", "Ό" );
+  ins( "*)\\O", "Ὂ" );
+  ins( "*(\\O", "Ὃ" );
+  ins( "*)/O", "Ὄ" );
+  ins( "*(/O", "Ὅ" );
+
+  ins( "*(R", "Ῥ" );
+
+  ins( "*(U", "Ὑ" );
+  ins( "*\\U", "Ὺ" );
+  ins( "*/U", "Ύ" );
+  ins( "*(\\U", "Ὓ" );
+  ins( "*(/U", "Ὕ" );
+
+  ins( "*)W", "Ὠ" );
+  ins( "*(W", "Ὡ" );
+  ins( "*\\W", "Ὼ" );
+  ins( "*/W", "Ώ" );
+  ins( "*)\\W", "Ὢ" );
+  ins( "*(\\W", "Ὣ" );
+  ins( "*)/W", "Ὤ" );
+  ins( "*(/W", "Ὥ" );
+
+  //perispwmenh
+  ins( "*)=A", "Ἆ" );
+  ins( "*(=A", "Ἇ" );
+
+  ins( "*)=H", "Ἦ" );
+  ins( "*(=H", "Ἧ" );
+
+  ins( "*)=I", "Ἶ" );
+  ins( "*(=I", "Ἷ" );
+
+  ins( "*(=U", "Ὗ" );
+
+  ins( "*)=W", "Ὦ" );
+  ins( "*(=W", "Ὧ" );
+
+  //upogegrammenh
+  ins( "*A|", "ᾼ" );
+  ins( "*)A|", "ᾈ" );
+  ins( "*(A|", "ᾉ" );
+  ins( "*)/A|", "ᾌ" );
+  ins( "*(/A|", "ᾍ" );
+  ins( "*)=A|", "ᾎ" );
+  ins( "*(=A|", "ᾏ" );
+
+  ins( "*H|", "ῌ" );
+  ins( "*)H|", "ᾘ" );
+  ins( "*(H|", "ᾙ" );
+  ins( "*)/H|", "ᾜ" );
+  ins( "*(/H|", "ᾝ" );
+  ins( "*)=H|", "ᾞ" );
+  ins( "*(=H|", "ᾟ" );
+
+  ins( "*W|", "ῼ" );
+  ins( "*)W|", "ᾨ" );
+  ins( "*(W|", "ᾩ" );
+  ins( "*)/W|", "ᾬ" );
+  ins( "*(/W|", "ᾭ" );
+  ins( "*)=W|", "ᾮ" );
+  ins( "*(=W|", "ᾯ" );
+
+  ins( "*|A", "ᾼ" );
+  ins( "*)|A", "ᾈ" );
+  ins( "*(|A", "ᾉ" );
+  ins( "*)/|A", "ᾌ" );
+  ins( "*(/|A", "ᾍ" );
+  ins( "*)=|A", "ᾎ" );
+  ins( "*(=|A", "ᾏ" );
+
+  ins( "*|H", "ῌ" );
+  ins( "*)|H", "ᾘ" );
+  ins( "*(|H", "ᾙ" );
+  ins( "*)/|H", "ᾜ" );
+  ins( "*(/|H", "ᾝ" );
+  ins( "*)=|H", "ᾞ" );
+  ins( "*(=|H", "ᾟ" );
+
+  ins( "*|W", "ῼ" );
+  ins( "*)|W", "ᾨ" );
+  ins( "*(|W", "ᾩ" );
+  ins( "*)/|W", "ᾬ" );
+  ins( "*(/|W", "ᾭ" );
+  ins( "*)=|W", "ᾮ" );
+  ins( "*(=|W", "ᾯ" );
+
+  //diairesis
+  ins( "*+I", "Ϊ" );
+  ins( "*+U", "Ϋ" );
+
+  //uppercase (asterisk & small letters)
+
+  //oceia - bareia
+  ins( "*)a", "Ἀ" );
+  ins( "*(a", "Ἁ" );
+  ins( "*\\a", "Ὰ" );
+  ins( "*/a", "Ά" );
+  ins( "*)\\a", "Ἂ" );
+  ins( "*(\\a", "Ἃ" );
+  ins( "*)/a", "Ἄ" );
+  ins( "*(/a", "Ἅ" );
+
+  ins( "*)e", "Ἐ" );
+  ins( "*(e", "Ἑ" );
+  ins( "*\\e", "Ὲ" );
+  ins( "*/e", "Έ" );
+  ins( "*)\\e", "Ἒ" );
+  ins( "*(\\e", "Ἓ" );
+  ins( "*)/e", "Ἔ" );
+  ins( "*(/e", "Ἕ" );
+
+  ins( "*)h", "Ἠ" );
+  ins( "*(h", "Ἡ" );
+  ins( "*\\h", "Ὴ" );
+  ins( "*/h", "Ή" );
+  ins( "*)\\h", "Ἢ" );
+  ins( "*(\\h", "Ἣ" );
+  ins( "*)/h", "Ἤ" );
+  ins( "*(/h", "Ἥ" );
+
+  ins( "*)i", "Ἰ" );
+  ins( "*(i", "Ἱ" );
+  ins( "*\\i", "Ὶ" );
+  ins( "*/i", "Ί" );
+  ins( "*)\\i", "Ἲ" );
+  ins( "*(\\i", "Ἳ" );
+  ins( "*)/i", "Ἴ" );
+  ins( "*(/i", "Ἵ" );
+
+  ins( "*)o", "Ὀ" );
+  ins( "*(o", "Ὁ" );
+  ins( "*\\o", "Ὸ" );
+  ins( "*/o", "Ό" );
+  ins( "*)\\o", "Ὂ" );
+  ins( "*(\\o", "Ὃ" );
+  ins( "*)/o", "Ὄ" );
+  ins( "*(/o", "Ὅ" );
+
+  ins( "*(r", "Ῥ" );
+
+  ins( "*(u", "Ὑ" );
+  ins( "*\\u", "Ὺ" );
+  ins( "*/u", "Ύ" );
+  ins( "*(\\u", "Ὓ" );
+  ins( "*(/u", "Ὕ" );
+
+  ins( "*)w", "Ὠ" );
+  ins( "*(w", "Ὡ" );
+  ins( "*\\w", "Ὼ" );
+  ins( "*/w", "Ώ" );
+  ins( "*)\\w", "Ὢ" );
+  ins( "*(\\w", "Ὣ" );
+  ins( "*)/w", "Ὤ" );
+  ins( "*(/w", "Ὥ" );
+
+  //perispwmenh
+  ins( "*)=a", "Ἆ" );
+  ins( "*(=a", "Ἇ" );
+
+  ins( "*)=h", "Ἦ" );
+  ins( "*(=h", "Ἧ" );
+
+  ins( "*)=i", "Ἶ" );
+  ins( "*(=i", "Ἷ" );
+
+  ins( "*(=u", "Ὗ" );
+
+  ins( "*)=w", "Ὦ" );
+  ins( "*(=w", "Ὧ" );
+
+  //upogegrammenh
+  ins( "*a|", "ᾼ" );
+  ins( "*)a|", "ᾈ" );
+  ins( "*(a|", "ᾉ" );
+  ins( "*)/a|", "ᾌ" );
+  ins( "*(/a|", "ᾍ" );
+  ins( "*)=a|", "ᾎ" );
+  ins( "*(=a|", "ᾏ" );
+
+  ins( "*h|", "ῌ" );
+  ins( "*)h|", "ᾘ" );
+  ins( "*(h|", "ᾙ" );
+  ins( "*)/h|", "ᾜ" );
+  ins( "*(/h|", "ᾝ" );
+  ins( "*)=h|", "ᾞ" );
+  ins( "*(=h|", "ᾟ" );
+
+  ins( "*w|", "ῼ" );
+  ins( "*)w|", "ᾨ" );
+  ins( "*(w|", "ᾩ" );
+  ins( "*)/w|", "ᾬ" );
+  ins( "*(/w|", "ᾭ" );
+  ins( "*)=w|", "ᾮ" );
+  ins( "*(=w|", "ᾯ" );
+
+  ins( "*|a", "ᾼ" );
+  ins( "*)|a", "ᾈ" );
+  ins( "*(|a", "ᾉ" );
+  ins( "*)/|a", "ᾌ" );
+  ins( "*(/|a", "ᾍ" );
+  ins( "*)=|a", "ᾎ" );
+  ins( "*(=|a", "ᾏ" );
+
+  ins( "*|h", "ῌ" );
+  ins( "*)|h", "ᾘ" );
+  ins( "*(|h", "ᾙ" );
+  ins( "*)/|h", "ᾜ" );
+  ins( "*(/|h", "ᾝ" );
+  ins( "*)=|h", "ᾞ" );
+  ins( "*(=|h", "ᾟ" );
+
+  ins( "*|w", "ῼ" );
+  ins( "*)|w", "ᾨ" );
+  ins( "*(|w", "ᾩ" );
+  ins( "*)/|w", "ᾬ" );
+  ins( "*(/|w", "ᾭ" );
+  ins( "*)=|w", "ᾮ" );
+  ins( "*(=|w", "ᾯ" );
+
+  //diairesis
+  ins( "*+i", "Ϊ" );
+  ins( "*+u", "Ϋ" );
+
+  //uppercase (capitals)
+
+  //oceia - bareia
+  ins( "A)", "Ἀ" );
+  ins( "A(", "Ἁ" );
+  ins( "A\\", "Ὰ" );
+  ins( "A/", "Ά" );
+  ins( "A)\\", "Ἂ" );
+  ins( "A(\\", "Ἃ" );
+  ins( "A)/", "Ἄ" );
+  ins( "A(/", "Ἅ" );
+
+  ins( "E)", "Ἐ" );
+  ins( "E(", "Ἑ" );
+  ins( "E\\", "Ὲ" );
+  ins( "E/", "Έ" );
+  ins( "E)\\", "Ἒ" );
+  ins( "E(\\", "Ἓ" );
+  ins( "E)/", "Ἔ" );
+  ins( "E(/", "Ἕ" );
+
+  ins( "H)", "Ἠ" );
+  ins( "H(", "Ἡ" );
+  ins( "H\\", "Ὴ" );
+  ins( "H/", "Ή" );
+  ins( "H)\\", "Ἢ" );
+  ins( "H(\\", "Ἣ" );
+  ins( "H)/", "Ἤ" );
+  ins( "H(/", "Ἥ" );
+
+  ins( "I)", "Ἰ" );
+  ins( "I(", "Ἱ" );
+  ins( "I\\", "Ὶ" );
+  ins( "I/", "Ί" );
+  ins( "I)\\", "Ἲ" );
+  ins( "I(\\", "Ἳ" );
+  ins( "I)/", "Ἴ" );
+  ins( "I(/", "Ἵ" );
+
+  ins( "O)", "Ὀ" );
+  ins( "O(", "Ὁ" );
+  ins( "O\\", "Ὸ" );
+  ins( "O/", "Ό" );
+  ins( "O)\\", "Ὂ" );
+  ins( "O(\\", "Ὃ" );
+  ins( "O)/", "Ὄ" );
+  ins( "O(/", "Ὅ" );
+
+  ins( "R(", "Ῥ" );
+
+  ins( "U)", "ὐ" );
+  ins( "U(", "Ὑ" );
+  ins( "U\\", "Ὺ" );
+  ins( "U/", "Ύ" );
+  ins( "U)\\", "ὒ" );
+  ins( "U(\\", "Ὓ" );
+  ins( "U)/", "ὔ" );
+  ins( "U(/", "Ὕ" );
+
+  ins( "W)", "Ὠ" );
+  ins( "W(", "Ὡ" );
+  ins( "W\\", "Ὼ" );
+  ins( "W/", "Ώ" );
+  ins( "W)\\", "Ὢ" );
+  ins( "W(\\", "Ὣ" );
+  ins( "W)/", "Ὤ" );
+  ins( "W(/", "Ὥ" );
+
+  //perispwmenh
+  ins( "A=", "ᾶ" );
+  ins( "A)=", "Ἆ" );
+  ins( "A(=", "Ἇ" );
+
+  ins( "H=", "ῆ" );
+  ins( "H)=", "Ἦ" );
+  ins( "H(=", "Ἧ" );
+
+  ins( "I=", "ῖ" );
+  ins( "I)=", "Ἶ" );
+  ins( "I(=", "Ἷ" );
+
+  ins( "U=", "ῦ" );
+  ins( "U)=", "ὖ" );
+  ins( "U(=", "Ὗ" );
+
+  ins( "W=", "ῶ" );
+  ins( "W)=", "Ὦ" );
+  ins( "W(=", "Ὧ" );
+
+  //upogegrammenh
+  ins( "A|", "ᾼ" );
+  ins( "A)|", "ᾈ" );
+  ins( "A(|", "ᾉ" );
+  ins( "A/|", "ᾴ" );
+  ins( "A)/|", "ᾌ" );
+  ins( "A(/|", "ᾍ" );
+  ins( "A=|", "ᾷ" );
+  ins( "A)=|", "ᾎ" );
+  ins( "A(=|", "ᾏ" );
+
+  ins( "H|", "ῌ" );
+  ins( "H)|", "ᾘ" );
+  ins( "H(|", "ᾙ" );
+  ins( "H/|", "ῄ" );
+  ins( "H)/|", "ᾜ" );
+  ins( "H(/|", "ᾝ" );
+  ins( "H=|", "ῇ" );
+  ins( "H)=|", "ᾞ" );
+  ins( "H(=|", "ᾟ" );
+
+  ins( "W|", "ῼ" );
+  ins( "W)|", "ᾨ" );
+  ins( "W(|", "ᾩ" );
+  ins( "W/|", "ῴ" );
+  ins( "W)/|", "ᾬ" );
+  ins( "W(/|", "ᾭ" );
+  ins( "W=|", "ῷ" );
+  ins( "W)=|", "ᾮ" );
+  ins( "W(=|", "ᾯ" );
+
+  //diairesis
+  ins( "I+", "Ϊ" );
+  ins( "I+\\", "ῒ" );
+  ins( "I+/", "ΐ" );
+  ins( "U+", "Ϋ" );
+  ins( "U+\\", "ῢ" );
+  ins( "U+/", "ΰ" );
+
+  //lowercase (small letters)
+
+  //oceia - bareia
+  ins( "a)", "ἀ" );
+  ins( "a(", "ἁ" );
+  ins( "a\\", "ὰ" );
+  ins( "a/", "ά" );
+  ins( "a)\\", "ἂ" );
+  ins( "a(\\", "ἃ" );
+  ins( "a)/", "ἄ" );
+  ins( "a(/", "ἅ" );
+
+  ins( "e)", "ἐ" );
+  ins( "e(", "ἑ" );
+  ins( "e\\", "ὲ" );
+  ins( "e/", "έ" );
+  ins( "e)\\", "ἒ" );
+  ins( "e(\\", "ἓ" );
+  ins( "e)/", "ἔ" );
+  ins( "e(/", "ἕ" );
+
+  ins( "h)", "ἠ" );
+  ins( "h(", "ἡ" );
+  ins( "h\\", "ὴ" );
+  ins( "h/", "ή" );
+  ins( "h)\\", "ἢ" );
+  ins( "h(\\", "ἣ" );
+  ins( "h)/", "ἤ" );
+  ins( "h(/", "ἥ" );
+
+  ins( "i)", "ἰ" );
+  ins( "i(", "ἱ" );
+  ins( "i\\", "ὶ" );
+  ins( "i/", "ί" );
+  ins( "i)\\", "ἲ" );
+  ins( "i(\\", "ἳ" );
+  ins( "i)/", "ἴ" );
+  ins( "i(/", "ἵ" );
+
+  ins( "o)", "ὀ" );
+  ins( "o(", "ὁ" );
+  ins( "o\\", "ὸ" );
+  ins( "o/", "ό" );
+  ins( "o)\\", "ὂ" );
+  ins( "o(\\", "ὃ" );
+  ins( "o)/", "ὄ" );
+  ins( "o(/", "ὅ" );
+
+  ins( "r(", "ῤ" );
+
+  ins( "u)", "ὐ" );
+  ins( "u(", "ὑ" );
+  ins( "u\\", "ὺ" );
+  ins( "u/", "ύ" );
+  ins( "u)\\", "ὒ" );
+  ins( "u(\\", "ὓ" );
+  ins( "u)/", "ὔ" );
+  ins( "u(/", "ὕ" );
+
+  ins( "w)", "ὠ" );
+  ins( "w(", "ὡ" );
+  ins( "w\\", "ὼ" );
+  ins( "w/", "ώ" );
+  ins( "w)\\", "ὢ" );
+  ins( "w(\\", "ὣ" );
+  ins( "w)/", "ὤ" );
+  ins( "w(/", "ὥ" );
+
+  //perispwmenh
+  ins( "a=", "ᾶ" );
+  ins( "a)=", "ἆ" );
+  ins( "a(=", "ἇ" );
+
+  ins( "h=", "ῆ" );
+  ins( "h)=", "ἦ" );
+  ins( "h(=", "ἧ" );
+
+  ins( "i=", "ῖ" );
+  ins( "i)=", "ἶ" );
+  ins( "i(=", "ἷ" );
+
+  ins( "u=", "ῦ" );
+  ins( "u)=", "ὖ" );
+  ins( "u(=", "ὗ" );
+
+  ins( "w=", "ῶ" );
+  ins( "w)=", "ὦ" );
+  ins( "w(=", "ὧ" );
+
+  //upogegrammenh
+  ins( "a|", "ᾳ" );
+  ins( "a)|", "ᾀ" );
+  ins( "a(|", "ᾁ" );
+  ins( "a/|", "ᾴ" );
+  ins( "a)/|", "ᾄ" );
+  ins( "a(/|", "ᾅ" );
+  ins( "a=|", "ᾷ" );
+  ins( "a)=|", "ᾆ" );
+  ins( "a(=|", "ᾇ" );
+
+  ins( "h|", "ῃ" );
+  ins( "h)|", "ᾐ" );
+  ins( "h(|", "ᾑ" );
+  ins( "h/|", "ῄ" );
+  ins( "h)/|", "ᾔ" );
+  ins( "h(/|", "ᾕ" );
+  ins( "h=|", "ῇ" );
+  ins( "h)=|", "ᾖ" );
+  ins( "h(=|", "ᾗ" );
+
+  ins( "w|", "ῳ" );
+  ins( "w)|", "ᾠ" );
+  ins( "w(|", "ᾡ" );
+  ins( "w/|", "ῴ" );
+  ins( "w)/|", "ᾤ" );
+  ins( "w(/|", "ᾥ" );
+  ins( "w=|", "ῷ" );
+  ins( "w)=|", "ᾦ" );
+  ins( "w(=|", "ᾧ" );
+
+  //diairesis
+  ins( "i+", "ϊ" );
+  ins( "i+\\", "ῒ" );
+  ins( "i+/", "ΐ" );
+  ins( "u+", "ϋ" );
+  ins( "u+\\", "ῢ" );
+  ins( "u+/", "ΰ" );
+
+
+  //ORDER: ACCENT - BREATHING (UNOFFICIAL)
+
+  //uppercase (capitals)
+
+  //oceia - bareia
+  ins( "A\\)", "Ἂ" );
+  ins( "A\\(", "Ἃ" );
+  ins( "A/)", "Ἄ" );
+  ins( "A/(", "Ἅ" );
+
+  ins( "E\\)", "Ἒ" );
+  ins( "E\\(", "Ἓ" );
+  ins( "E/)", "Ἔ" );
+  ins( "E/(", "Ἕ" );
+
+  ins( "H\\)", "Ἢ" );
+  ins( "H\\(", "Ἣ" );
+  ins( "H/)", "Ἤ" );
+  ins( "H/(", "Ἥ" );
+
+  ins( "I\\)", "Ἲ" );
+  ins( "I\\(", "Ἳ" );
+  ins( "I/)", "Ἴ" );
+  ins( "I/(", "Ἵ" );
+
+  ins( "O\\)", "Ὂ" );
+  ins( "O\\(", "Ὃ" );
+  ins( "O/)", "Ὄ" );
+  ins( "O/(", "Ὅ" );
+
+  ins( "U\\(", "Ὓ" );
+  ins( "U/(", "Ὕ" );
+
+  ins( "W\\)", "Ὢ" );
+  ins( "W\\(", "Ὣ" );
+  ins( "W/)", "Ὤ" );
+  ins( "W/(", "Ὥ" );
+
+  //perispwmenh
+  ins( "A=)", "Ἆ" );
+  ins( "A=(", "Ἇ" );
+
+  ins( "H=)", "Ἦ" );
+  ins( "H=(", "Ἧ" );
+
+  ins( "I=)", "Ἶ" );
+  ins( "I=(", "Ἷ" );
+
+  ins( "U=(", "Ὗ" );
+
+  ins( "W=)", "Ὦ" );
+  ins( "W=(", "Ὧ" );
+
+  //upogegrammenh
+  ins( "A/)|", "ᾌ" );
+  ins( "A/(|", "ᾍ" );
+  ins( "A=)|", "ᾎ" );
+  ins( "A=(|", "ᾏ" );
+
+  ins( "H/)|", "ᾜ" );
+  ins( "H/(|", "ᾝ" );
+  ins( "H=)|", "ᾞ" );
+  ins( "H=(|", "ᾟ" );
+
+  ins( "W/)|", "ᾬ" );
+  ins( "W/(|", "ᾭ" );
+  ins( "W=)|", "ᾮ" );
+  ins( "W=(|", "ᾯ" );
+
+  //lowercase (small letters)
+
+  //oceia - bareia
+  ins( "a\\)", "ἂ" );
+  ins( "a\\(", "ἃ" );
+  ins( "a/)", "ἄ" );
+  ins( "a/(", "ἅ" );
+
+
+  ins( "e\\)", "ἒ" );
+  ins( "e\\(", "ἓ" );
+  ins( "e/)", "ἔ" );
+  ins( "e/(", "ἕ" );
+
+  ins( "h\\)", "ἢ" );
+  ins( "h\\(", "ἣ" );
+  ins( "h/)", "ἤ" );
+  ins( "h/(", "ἥ" );
+
+  ins( "i\\)", "ἲ" );
+  ins( "i\\(", "ἳ" );
+  ins( "i/)", "ἴ" );
+  ins( "i/(", "ἵ" );
+
+  ins( "o\\)", "ὂ" );
+  ins( "o\\(", "ὃ" );
+  ins( "o/)", "ὄ" );
+  ins( "o/(", "ὅ" );
+
+  ins( "u\\)", "ὒ" );
+  ins( "u\\(", "ὓ" );
+  ins( "u/)", "ὔ" );
+  ins( "u/(", "ὕ" );
+
+  ins( "w\\)", "ὢ" );
+  ins( "w\\(", "ὣ" );
+  ins( "w/)", "ὤ" );
+  ins( "w/(", "ὥ" );
+
+  //perispwmenh
+  ins( "a=)", "ἆ" );
+  ins( "a=(", "ἇ" );
+
+  ins( "h=)", "ἦ" );
+  ins( "h=(", "ἧ" );
+
+  ins( "i=)", "ἶ" );
+  ins( "i=(", "ἷ" );
+
+  ins( "u=)", "ὖ" );
+  ins( "u=(", "ὗ" );
+
+  ins( "w=)", "ὦ" );
+  ins( "w=(", "ὧ" );
+
+  //upogegrammenh
+  ins( "a/)|", "ᾄ" );
+  ins( "a/(|", "ᾅ" );
+  ins( "a=)|", "ᾆ" );
+  ins( "a=(|", "ᾇ" );
+
+  ins( "h/)|", "ᾔ" );
+  ins( "h/(|", "ᾕ" );
+  ins( "h=)|", "ᾖ" );
+  ins( "h=(|", "ᾗ" );
+
+  ins( "w/)|", "ᾤ" );
+  ins( "w/(|", "ᾥ" );
+  ins( "w=)|", "ᾦ" );
+  ins( "w=(|", "ᾧ" );
+
+  //diairesis
+  ins( "i\\+", "ῒ" );
+  ins( "i/+", "ΐ" );
+  ins( "u\\+", "ῢ" );
+  ins( "u/+", "ΰ" );
+
+  //IΙI. MODERN GREEK <-> CLASSICAL GREEK
+  //convert tonos to oceia
+
+  ins( "ά", "ά" );
+  ins( "έ", "έ" );
+  ins( "ή", "ή" );
+  ins( "ί", "ί" );
+  ins( "ΐ", "ΐ" );
+  ins( "ό", "ό" );
+  ins( "ύ", "ύ" );
+  ins( "ΰ", "ΰ" );
+  ins( "ώ", "ώ" );
+
+  ins( "Ά", "Ά" );
+  ins( "Έ", "Έ" );
+  ins( "Ή", "Ή" );
+  ins( "Ί", "Ί" );
+  ins( "Ό", "Ό" );
+  ins( "Ύ", "Ύ" );
+  ins( "Ώ", "Ώ" );
+
+  //convert oceia to tonos
+
+  ins( "ά", "ά" );
+  ins( "έ", "έ" );
+  ins( "ή", "ή" );
+  ins( "ί", "ί" );
+  ins( "ΐ", "ΐ" );
+  ins( "ό", "ό" );
+  ins( "ύ", "ύ" );
+  ins( "ΰ", "ΰ" );
+  ins( "ώ", "ώ" );
+
+  ins( "Ά", "Ά" );
+  ins( "Έ", "Έ" );
+  ins( "Ή", "Ή" );
+  ins( "Ί", "Ί" );
+  ins( "Ό", "Ό" );
+  ins( "Ύ", "Ύ" );
+  ins( "Ώ", "Ώ" );
 }
 
-sptr< Dictionary::Class > makeDictionary() 
+sptr< Dictionary::Class > makeDictionary()
 {
   static GreekTable t;
 
-  return std::make_shared<Transliteration::TransliterationDictionary>( "baa9e37a1aa69cdb5daca14a48ffe5ae",
-                      QCoreApplication::translate( "GreekTranslit", "Greek Transliteration" ).toUtf8().data(),
-                      QIcon( ":/flags/gr.png" ), t );
+  return std::make_shared< Transliteration::TransliterationDictionary >(
+    "baa9e37a1aa69cdb5daca14a48ffe5ae",
+    QCoreApplication::translate( "GreekTranslit", "Greek Transliteration" ).toUtf8().data(),
+    QIcon( ":/flags/gr.png" ),
+    t );
 }
 
-}
+} // namespace GreekTranslit
diff --git a/src/dict/greektranslit.hh b/src/dict/greektranslit.hh
index 184f4220..b6fe3f39 100644
--- a/src/dict/greektranslit.hh
+++ b/src/dict/greektranslit.hh
@@ -9,8 +9,7 @@
 // Support for Greek transliteration
 namespace GreekTranslit {
 
-sptr< Dictionary::Class > makeDictionary() ;
-
+sptr< Dictionary::Class > makeDictionary();
 }
 
 #endif // GREEKTRANSLIT_HH
diff --git a/src/dict/hunspell.cc b/src/dict/hunspell.cc
index 903cf943..ccb59f35 100644
--- a/src/dict/hunspell.cc
+++ b/src/dict/hunspell.cc
@@ -13,10 +13,10 @@
 #include <QRunnable>
 #include <QThreadPool>
 #include <QSemaphore>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #else
-#include <QRegExp>
+  #include <QRegExp>
 #endif
 #include <QDir>
 #include <QCoreApplication>
@@ -24,9 +24,9 @@
 
 #include <set>
 #ifndef INCLUDE_LIBRARY_PATH
-#include <hunspell.hxx>
+  #include <hunspell.hxx>
 #else
-#include <hunspell/hunspell.hxx>
+  #include <hunspell/hunspell.hxx>
 #endif
 #include "gddebug.hh"
 
@@ -56,8 +56,7 @@ class HunspellDictionary: public Dictionary::Class
 public:
 
   /// files[ 0 ] should be .aff file, files[ 1 ] should be .dic file.
-  HunspellDictionary( string const & id, string const & name_,
-                      vector< string > const & files ):
+  HunspellDictionary( string const & id, string const & name_, vector< string > const & files ):
     Dictionary::Class( id, files ),
     name( name_ ),
 #ifdef Q_OS_WIN32
@@ -69,32 +68,35 @@ public:
   }
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const &,
-                                                 unsigned long maxResults ) override
-    ;
+  sptr< WordSearchRequest > prefixMatch( wstring const &, unsigned long maxResults ) override;
 
-  sptr< WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override
-    ;
+  sptr< WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override;
 
-  sptr< DataRequest > getArticle( wstring const &,
-                                          vector< wstring > const & alts,
-                                          wstring const &,
-                                          bool ) override
-    ;
+  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ) override;
 
   bool isLocalDictionary() override
-  { return true; }
+  {
+    return true;
+  }
 
   vector< wstring > getAlternateWritings( const wstring & word ) noexcept override;
 
@@ -139,7 +141,7 @@ bool containsWhitespace( wstring const & str )
 {
   wchar const * next = str.c_str();
 
-  for( ; *next; ++next )
+  for ( ; *next; ++next )
     if ( Folding::isWhitespace( *next ) )
       return true;
 
@@ -156,10 +158,9 @@ void HunspellDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 3 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_hunspell.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_hunspell.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -169,8 +170,7 @@ vector< wstring > HunspellDictionary::getAlternateWritings( wstring const & word
 {
   vector< wstring > results;
 
-  if( containsWhitespace( word ) )
-  {
+  if ( containsWhitespace( word ) ) {
     getSuggestionsForExpression( word, results, getHunspellMutex(), hunspell );
   }
 
@@ -217,20 +217,17 @@ public:
 
 void HunspellArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   vector< string > suggestions;
 
-  try
-  {
+  try {
     wstring trimmedWord = Folding::trimWhitespaceOrPunct( word );
 
-    if ( containsWhitespace( trimmedWord ) )
-    {
+    if ( containsWhitespace( trimmedWord ) ) {
       // For now we don't analyze whitespace-containing phrases
       finish();
       return;
@@ -240,29 +237,25 @@ void HunspellArticleRequest::run()
 
     string encodedWord = encodeToHunspell( hunspell, trimmedWord );
 
-    if ( hunspell.spell( encodedWord ) )
-    {
+    if ( hunspell.spell( encodedWord ) ) {
       // Good word -- no spelling suggestions then.
       finish();
       return;
     }
 
     suggestions = hunspell.suggest( encodedWord );
-    if ( !suggestions.empty() )
-    {
+    if ( !suggestions.empty() ) {
       // There were some suggestions made for us. Make an appropriate output.
 
-      string result = "<div class=\"gdspellsuggestion\">" +
-        Html::escape( QCoreApplication::translate( "Hunspell", "Spelling suggestions: " ).toUtf8().data() );
+      string result = "<div class=\"gdspellsuggestion\">"
+        + Html::escape( QCoreApplication::translate( "Hunspell", "Spelling suggestions: " ).toUtf8().data() );
 
       wstring lowercasedWord = Folding::applySimpleCaseOnly( word );
 
-      for( vector< string >::size_type x = 0; x < suggestions.size(); ++x )
-      {
+      for ( vector< string >::size_type x = 0; x < suggestions.size(); ++x ) {
         wstring suggestion = decodeFromHunspell( hunspell, suggestions[ x ].c_str() );
 
-        if ( Folding::applySimpleCaseOnly( suggestion ) == lowercasedWord )
-        {
+        if ( Folding::applySimpleCaseOnly( suggestion ) == lowercasedWord ) {
           // If among suggestions we see the same word just with the different
           // case, we botch the search -- our searches are case-insensitive, and
           // there's no need for suggestions on a good word.
@@ -283,33 +276,26 @@ void HunspellArticleRequest::run()
 
       result += "</div>";
 
-      QMutexLocker _( &dataMutex );
-
-      data.resize( result.size() );
-
-      memcpy( &data.front(), result.data(), result.size() );
+      appendString( result );
 
       hasAnyData = true;
     }
   }
-  catch( Iconv::Ex & e )
-  {
+  catch ( Iconv::Ex & e ) {
     gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     gdWarning( "Hunspell: error: %s\n", e.what() );
   }
 
   finish();
 }
 
-sptr< DataRequest > HunspellDictionary::getArticle( wstring const & word,
-                                                    vector< wstring > const &,
-                                                    wstring const &, bool )
-  
+sptr< DataRequest >
+HunspellDictionary::getArticle( wstring const & word, vector< wstring > const &, wstring const &, bool )
+
 {
-  return std::make_shared<HunspellArticleRequest>( word, getHunspellMutex(), hunspell );
+  return std::make_shared< HunspellArticleRequest >( word, getHunspellMutex(), hunspell );
 }
 
 /// HunspellDictionary::findHeadwordsForSynonym()
@@ -335,7 +321,6 @@ public:
     f = QtConcurrent::run( [ this ]() {
       this->run();
     } );
-
   }
 
   void run();
@@ -355,42 +340,36 @@ public:
 
 void HunspellHeadwordsRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   wstring trimmedWord = Folding::trimWhitespaceOrPunct( word );
 
-  if ( trimmedWord.size() > 80 )
-  {
+  if ( trimmedWord.size() > 80 ) {
     // We won't do anything for overly long sentences since that would probably
     // only waste time.
     finish();
     return;
   }
 
-  if ( containsWhitespace( trimmedWord ) )
-  {
+  if ( containsWhitespace( trimmedWord ) ) {
     vector< wstring > results;
 
     getSuggestionsForExpression( trimmedWord, results, hunspellMutex, hunspell );
 
     QMutexLocker _( &dataMutex );
-    for( unsigned i = 0; i < results.size(); i++ )
+    for ( unsigned i = 0; i < results.size(); i++ )
       matches.push_back( results[ i ] );
-
   }
-  else
-  {
+  else {
     QVector< wstring > suggestions = suggest( trimmedWord, hunspellMutex, hunspell );
 
-    if ( !suggestions.empty() )
-    {
+    if ( !suggestions.empty() ) {
       QMutexLocker _( &dataMutex );
 
-      for( int x = 0; x < suggestions.size(); ++x )
+      for ( int x = 0; x < suggestions.size(); ++x )
         matches.push_back( suggestions[ x ] );
     }
   }
@@ -410,27 +389,24 @@ QVector< wstring > suggest( wstring & word, QMutex & hunspellMutex, Hunspell & h
     string encodedWord = encodeToHunspell( hunspell, word );
 
     suggestions = hunspell.analyze( encodedWord );
-    if ( !suggestions.empty() )
-    {
+    if ( !suggestions.empty() ) {
       // There were some suggestions made for us. Make an appropriate output.
 
       wstring lowercasedWord = Folding::applySimpleCaseOnly( word );
 
       static QRegExp cutStem( R"(^\s*st:(((\s+(?!\w{2}:)(?!-)(?!\+))|\S+)+))" );
 
-      for( vector< string >::size_type x = 0; x < suggestions.size(); ++x )
-      {
+      for ( vector< string >::size_type x = 0; x < suggestions.size(); ++x ) {
         QString suggestion = QString::fromStdU32String( decodeFromHunspell( hunspell, suggestions[ x ].c_str() ) );
 
         // Strip comments
         int n = suggestion.indexOf( '#' );
-        if( n >= 0 )
+        if ( n >= 0 )
           suggestion.chop( suggestion.length() - n );
 
         GD_DPRINTF( ">>>Sugg: %s\n", suggestion.toLocal8Bit().data() );
 
-        if ( cutStem.indexIn( suggestion.trimmed() ) != -1 )
-        {
+        if ( cutStem.indexIn( suggestion.trimmed() ) != -1 ) {
           wstring alt = gd::toWString( cutStem.cap( 1 ) );
 
           if ( Folding::applySimpleCaseOnly( alt ) != lowercasedWord ) // No point in providing same word
@@ -444,8 +420,7 @@ QVector< wstring > suggest( wstring & word, QMutex & hunspellMutex, Hunspell & h
       }
     }
   }
-  catch( Iconv::Ex & e )
-  {
+  catch ( Iconv::Ex & e ) {
     gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
   }
 
@@ -454,9 +429,9 @@ QVector< wstring > suggest( wstring & word, QMutex & hunspellMutex, Hunspell & h
 
 
 sptr< WordSearchRequest > HunspellDictionary::findHeadwordsForSynonym( wstring const & word )
-  
+
 {
-  return std::make_shared<HunspellHeadwordsRequest>( word, getHunspellMutex(), hunspell );
+  return std::make_shared< HunspellHeadwordsRequest >( word, getHunspellMutex(), hunspell );
 }
 
 
@@ -501,18 +476,15 @@ public:
 
 void HunspellPrefixMatchRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     wstring trimmedWord = Folding::trimWhitespaceOrPunct( word );
 
-    if ( trimmedWord.empty() || containsWhitespace( trimmedWord ) )
-    {
+    if ( trimmedWord.empty() || containsWhitespace( trimmedWord ) ) {
       // For now we don't analyze whitespace-containing phrases
       finish();
       return;
@@ -522,8 +494,7 @@ void HunspellPrefixMatchRequest::run()
 
     string encodedWord = encodeToHunspell( hunspell, trimmedWord );
 
-    if ( hunspell.spell( encodedWord ) )
-    {
+    if ( hunspell.spell( encodedWord ) ) {
       // Known word -- add it to the result
 
       QMutexLocker _( &dataMutex );
@@ -531,19 +502,17 @@ void HunspellPrefixMatchRequest::run()
       matches.push_back( WordMatch( trimmedWord, 1 ) );
     }
   }
-  catch( Iconv::Ex & e )
-  {
+  catch ( Iconv::Ex & e ) {
     gdWarning( "Hunspell: charset conversion error, no processing's done: %s\n", e.what() );
   }
 
   finish();
 }
 
-sptr< WordSearchRequest > HunspellDictionary::prefixMatch( wstring const & word,
-                                                           unsigned long /*maxResults*/ )
-  
+sptr< WordSearchRequest > HunspellDictionary::prefixMatch( wstring const & word, unsigned long /*maxResults*/ )
+
 {
-  return std::make_shared<HunspellPrefixMatchRequest>( word, getHunspellMutex(), hunspell );
+  return std::make_shared< HunspellPrefixMatchRequest >( word, getHunspellMutex(), hunspell );
 }
 
 void getSuggestionsForExpression( wstring const & expression,
@@ -563,34 +532,28 @@ void getSuggestionsForExpression( wstring const & expression,
 
   // Parse string to separate words
 
-  for( wchar const * c = trimmedWord.c_str(); ; ++c )
-  {
-    if ( !*c || Folding::isPunct( *c ) || Folding::isWhitespace( * c ) )
-    {
-      if ( word.size() )
-      {
+  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() )
-      {
+    else {
+      if ( punct.size() ) {
         words.push_back( punct );
         punct.clear();
       }
-      if( *c )
+      if ( *c )
         word.push_back( *c );
     }
-    if( !*c )
+    if ( !*c )
       break;
   }
 
-  if( words.size() > 21 )
-  {
+  if ( words.size() > 21 ) {
     // Too many words - no suggestions
     return;
   }
@@ -599,36 +562,29 @@ void getSuggestionsForExpression( wstring const & expression,
 
   QVector< wstring > results;
 
-  for( int i = 0; i < words.size(); i++ )
-  {
+  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++ )
+    if ( Folding::isPunct( word[ 0 ] ) || Folding::isWhitespace( word[ 0 ] ) ) {
+      for ( int j = 0; j < results.size(); j++ )
         results[ j ].append( word );
     }
-    else
-    {
+    else {
       QVector< wstring > sugg = suggest( word, hunspellMutex, hunspell );
-      int suggNum = sugg.size() + 1;
-      if( suggNum > 3 )
+      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++ )
+      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++ )
-        {
+      else {
+        for ( int j = 0; j < resNum; j++ ) {
           resultStr = results.at( j );
-          for( int k = 0; k < suggNum; k++ )
-          {
-            if( k == 0)
+          for ( int k = 0; k < suggNum; k++ ) {
+            if ( k == 0 )
               results[ j ].append( word );
             else
               results.push_back( resultStr + sugg.at( k - 1 ) );
@@ -638,60 +594,57 @@ void getSuggestionsForExpression( wstring const & expression,
     }
   }
 
-  for( int i = 0; i < results.size(); i++ )
-    if( results.at( i ) != trimmedWord )
+  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 )
 {
-  Iconv conv( hunspell.get_dic_encoding(), Iconv::GdWchar );
+  Iconv conv( Iconv::GdWchar );
 
   void const * in = str.data();
-  size_t inLeft = str.size() * sizeof( wchar );
+  size_t inLeft   = str.size() * sizeof( wchar );
 
   vector< char > result( str.size() * 4 + 1 ); // +1 isn't actually needed,
                                                // but then iconv complains on empty
                                                // words
 
-  void * out = &result.front();
+  void * out     = &result.front();
   size_t outLeft = result.size();
 
-  QString convStr= conv.convert( in, inLeft);
+  QString convStr = conv.convert( in, inLeft );
   return convStr.toStdString();
 }
 
 wstring decodeFromHunspell( Hunspell & hunspell, char const * str )
 {
-  Iconv conv( Iconv::GdWchar, hunspell.get_dic_encoding() );
+  Iconv conv( hunspell.get_dic_encoding() );
 
   void const * in = str;
-  size_t inLeft = strlen( str );
+  size_t inLeft   = strlen( str );
 
   vector< wchar > result( inLeft + 1 ); // +1 isn't needed, but see above
 
-  void * out = &result.front();
+  void * out     = &result.front();
   size_t outLeft = result.size() * sizeof( wchar );
 
-  QString convStr= conv.convert( in, inLeft);
-  return gd::toWString(convStr);
-}
+  QString convStr = conv.convert( in, inLeft );
+  return gd::toWString( convStr );
 }
+} // namespace
 
 vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & cfg )
-    
+
 {
   vector< sptr< Dictionary::Class > > result;
 
   vector< DataFiles > dataFiles = findDataFiles( cfg.dictionariesPath );
 
 
-  for( int x = 0; x < cfg.enabledDictionaries.size(); ++x )
-  {
-    for( unsigned d = dataFiles.size(); d--; )
-    {
-      if ( dataFiles[ d ].dictId == cfg.enabledDictionaries[ x ] )
-      {
+  for ( int x = 0; x < cfg.enabledDictionaries.size(); ++x ) {
+    for ( unsigned d = dataFiles.size(); d--; ) {
+      if ( dataFiles[ d ].dictId == cfg.enabledDictionaries[ x ] ) {
         // Found it
 
         vector< string > dictFiles;
@@ -699,10 +652,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & c
         dictFiles.push_back( QDir::toNativeSeparators( dataFiles[ d ].affFileName ).toStdString() );
         dictFiles.push_back( QDir::toNativeSeparators( dataFiles[ d ].dicFileName ).toStdString() );
 
-        result.push_back(
-            std::make_shared<HunspellDictionary>( Dictionary::makeDictionaryId( dictFiles ),
-                                  dataFiles[ d ].dictName.toUtf8().data(),
-                                  dictFiles ) );
+        result.push_back( std::make_shared< HunspellDictionary >( Dictionary::makeDictionaryId( dictFiles ),
+                                                                  dataFiles[ d ].dictName.toUtf8().data(),
+                                                                  dictFiles ) );
         break;
       }
     }
@@ -721,14 +673,14 @@ vector< DataFiles > findDataFiles( QString const & path )
 
   // Find all affix files
 
-  QFileInfoList affixFiles = dir.entryInfoList( ( QStringList() << "*.aff" << "*.AFF" ), QDir::Files );
+  QFileInfoList affixFiles = dir.entryInfoList( ( QStringList() << "*.aff"
+                                                                << "*.AFF" ),
+                                                QDir::Files );
 
   vector< DataFiles > result;
   std::set< QString > presentNames;
 
-  for( QFileInfoList::const_iterator i = affixFiles.constBegin();
-       i != affixFiles.constEnd(); ++i )
-  {
+  for ( QFileInfoList::const_iterator i = affixFiles.constBegin(); i != affixFiles.constEnd(); ++i ) {
     QString affFileName = i->absoluteFilePath();
 
     // See if there's a corresponding .dic file
@@ -736,8 +688,7 @@ vector< DataFiles > findDataFiles( QString const & path )
 
     QString dicFileName = dicFileNameBase + "dic";
 
-    if ( !QFile( dicFileName ).exists() )
-    {
+    if ( !QFile( dicFileName ).exists() ) {
       dicFileName = dicFileNameBase + "DIC";
       if ( !QFile( dicFileName ).exists() )
         continue; // No dic file
@@ -746,8 +697,8 @@ vector< DataFiles > findDataFiles( QString const & path )
     QString dictId = i->fileName();
     dictId.chop( 4 );
 
-    QString dictBaseId = dictId.size() < 3 ? dictId :
-      ( ( dictId[ 2 ] == '-' || dictId[ 2 ] == '_' ) ? dictId.mid( 0, 2 ) : QString() );
+    QString dictBaseId =
+      dictId.size() < 3 ? dictId : ( ( dictId[ 2 ] == '-' || dictId[ 2 ] == '_' ) ? dictId.mid( 0, 2 ) : QString() );
 
     dictBaseId = dictBaseId.toLower();
 
@@ -760,19 +711,17 @@ vector< DataFiles > findDataFiles( QString const & path )
 
     QString dictName = dictId;
 
-    if ( localizedName.size() )
-    {
+    if ( localizedName.size() ) {
       dictName = localizedName;
 
-      if ( dictId.size() > 2 && ( dictId[ 2 ] == '-' || dictId[ 2 ] == '_' ) &&
-           dictId.mid( 3 ).toLower() != dictBaseId )
+      if ( dictId.size() > 2 && ( dictId[ 2 ] == '-' || dictId[ 2 ] == '_' )
+           && dictId.mid( 3 ).toLower() != dictBaseId )
         dictName += " (" + dictId.mid( 3 ) + ")";
     }
 
     dictName = QCoreApplication::translate( "Hunspell", "%1 Morphology" ).arg( dictName );
 
-    if ( presentNames.insert( dictName ).second )
-    {
+    if ( presentNames.insert( dictName ).second ) {
       // Only include dictionaries with unique names. This combats stuff
       // like symlinks en-US->en_US and such
 
@@ -783,4 +732,4 @@ vector< DataFiles > findDataFiles( QString const & path )
   return result;
 }
 
-}
+} // namespace HunspellMorpho
diff --git a/src/dict/hunspell.hh b/src/dict/hunspell.hh
index ee52b81d..5c8237c7 100644
--- a/src/dict/hunspell.hh
+++ b/src/dict/hunspell.hh
@@ -5,7 +5,7 @@
 #define __HUNSPELL_HH_INCLUDED__
 
 #ifdef _MSC_VER
-#define HUNSPELL_STATIC
+  #define HUNSPELL_STATIC
 #endif
 
 #include "dictionary.hh"
@@ -20,22 +20,26 @@ using std::string;
 struct DataFiles
 {
   QString affFileName, dicFileName; // Absolute, with Qt separators
-  QString dictId; // Dictionary id, e.g. "en_US"
-  QString dictName; // Localized dictionary name to be displayed, e.g. "English(US) Morphology"
+  QString dictId;                   // Dictionary id, e.g. "en_US"
+  QString dictName;                 // Localized dictionary name to be displayed, e.g. "English(US) Morphology"
 
-  DataFiles( QString const & affFileName_, QString const & dicFileName_,
-             QString const & dictId_, QString const & dictName_ ):
-    affFileName( affFileName_ ), dicFileName( dicFileName_ ),
-    dictId( dictId_ ), dictName( dictName_ )
-  {}
+  DataFiles( QString const & affFileName_,
+             QString const & dicFileName_,
+             QString const & dictId_,
+             QString const & dictName_ ):
+    affFileName( affFileName_ ),
+    dicFileName( dicFileName_ ),
+    dictId( dictId_ ),
+    dictName( dictName_ )
+  {
+  }
 };
 
 /// Finds all the DataFiles it can at the given path (with Qt separators).
 vector< DataFiles > findDataFiles( QString const & path );
 
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::Hunspell const & );
 
-}
+} // namespace HunspellMorpho
 
 #endif
diff --git a/src/dict/lingualibre.cc b/src/dict/lingualibre.cc
index 03bec760..dc965237 100644
--- a/src/dict/lingualibre.cc
+++ b/src/dict/lingualibre.cc
@@ -15,22 +15,22 @@ using namespace Dictionary;
 namespace {
 
 
-  class LinguaDictionary: public Dictionary::Class
+class LinguaDictionary: public Dictionary::Class
+{
+
+  string name;
+  QString languageCode;
+  QString langWikipediaID;
+  QNetworkAccessManager & netMgr;
+
+public:
+  LinguaDictionary( string const & id, string name_, QString languageCode_, QNetworkAccessManager & netMgr_ ):
+    Dictionary::Class( id, vector< string >() ),
+    name( std::move( name_ ) ),
+    languageCode( std::move( languageCode_ ) ),
+    netMgr( netMgr_ )
   {
-
-    string name;
-    QString languageCode;
-    QString langWikipediaID;
-    QNetworkAccessManager & netMgr;
-
-   public:
-    LinguaDictionary( string const & id, string name_, QString languageCode_, QNetworkAccessManager & netMgr_ ):
-        Dictionary::Class( id, vector< string >() ),
-        name( std::move( name_ ) ),
-        languageCode( std::move( languageCode_ ) ),
-        netMgr( netMgr_ )
-    {
-      /* map of iso lang code to wikipedia lang id
+    /* map of iso lang code to wikipedia lang id
 
 Data was obtained by this query on https://commons-query.wikimedia.org/
 SELECT ?language ?languageLabel ?iso ?audios
@@ -58,313 +58,155 @@ WHERE {
 
       */
 
-      const map< string, string > iso_to_wikipedia_id = { { "grc", "Q35497" },
-        { "non", "Q35505" },
-        { "ken", "Q35650" },
-        { "got", "Q35722" },
-        { "gsc", "Q35735" },
-        { "ldn", "Q35757" },
-        { "csc", "Q35768" },
-        { "lns", "Q35788" },
-        { "kab", "Q35853" },
-        { "ina", "Q35934" },
-        { "jam", "Q35939" },
-        { "mua", "Q36032" },
-        { "mhk", "Q36068" },
-        { "mos", "Q36096" },
-        { "kmr", "Q36163" },
-        { "num", "Q36173" },
-        { "mad", "Q36213" },
-        { "lin", "Q36217" },
-        { "mal", "Q36236" },
-        { "srr", "Q36284" },
-        { "jbo", "Q36350" },
-        { "yas", "Q36358" },
-        { "kur", "Q36368" },
-        { "ell", "Q36510" },
-        { "swl", "Q36558" },
-        { "gya", "Q36594" },
-        { "tvu", "Q36632" },
-        { "mlu", "Q36645" },
-        { "tui", "Q36646" },
-        { "ota", "Q36730" },
-        { "rar", "Q36745" },
-        { "ckb", "Q36811" },
-        { "tok", "Q36846" },
-        { "twi", "Q36850" },
-        { "vut", "Q36897" },
-        { "ybb", "Q36917" },
-        { "bse", "Q36973" },
-        { "wls", "Q36979" },
-        { "lzh", "Q37041" },
-        { "ang", "Q42365" },
-        { "ker", "Q56251" },
-        { "ary", "Q56426" },
-        { "sjn", "Q56437" },
-        { "hau", "Q56475" },
-        { "arq", "Q56499" },
-        { "atj", "Q56590" },
-        { "mcn", "Q56668" },
-        { "tpw", "Q56944" },
-        { "vls", "Q100103" },
-        { "gsw", "Q131339" },
-        { "hrx", "Q304049" },
-        { "lms", "Q427614" },
-        { "sxu", "Q699284" },
-        { "pwn", "Q715755" },
-        { "tay", "Q715766" },
-        { "guc", "Q891085" },
-        { "lnc", "Q942602" },
-        { "blc", "Q977808" },
-        { "avk", "Q1377116" },
-        { "sba", "Q2372207" },
-        { "gcf", "Q3006280" },
-        { "far", "Q3067168" },
-        { "kld", "Q3111818" },
-        { "swh", "Q3197533" },
-        { "rhg", "Q3241177" },
-        { "vsl", "Q3322064" },
-        { "xzh", "Q3437292" },
-        { "ane", "Q3571097" },
-        { "kcg", "Q3912765" },
-        { "hav", "Q5684097" },
-        { "isu", "Q6089423" },
-        { "mdl", "Q6744816" },
-        { "duf", "Q6983819" },
-        { "sru", "Q7646993" },
-        { "yat", "Q8048020" },
-        { "lem", "Q13479983" },
-        { "mul", "Q20923490" },
-        { "cmn", "Q9192" },
-        { "vie", "Q9199" },
-        { "tha", "Q9217" },
-        { "msa", "Q9237" },
-        { "ind", "Q9240" },
-        { "mon", "Q9246" },
-        { "tgk", "Q9260" },
-        { "uzb", "Q9264" },
-        { "heb", "Q9288" },
-        { "aze", "Q9292" },
-        { "mkd", "Q9296" },
-        { "bos", "Q9303" },
-        { "glg", "Q9307" },
-        { "cym", "Q9309" },
-        { "gla", "Q9314" },
-        { "ben", "Q9610" },
-        { "tlh", "Q10134" },
-        { "bre", "Q12107" },
-        { "rcf", "Q13198" },
-        { "xho", "Q13218" },
-        { "hsb", "Q13248" },
-        { "sms", "Q13271" },
-        { "nav", "Q13310" },
-        { "min", "Q13324" },
-        { "mnw", "Q13349" },
-        { "ara", "Q13955" },
-        { "oci", "Q14185" },
-        { "afr", "Q14196" },
-        { "sco", "Q14549" },
-        { "ase", "Q14759" },
-        { "pms", "Q15085" },
-        { "fao", "Q25258" },
-        { "tat", "Q25285" },
-        { "cor", "Q25289" },
-        { "kal", "Q25355" },
-        { "nds", "Q25433" },
-        { "fry", "Q27175" },
-        { "ace", "Q27683" },
-        { "ain", "Q27969" },
-        { "aka", "Q28026" },
-        { "amh", "Q28244" },
-        { "anp", "Q28378" },
-        { "rup", "Q29316" },
-        { "arz", "Q29919" },
-        { "myv", "Q29952" },
-        { "dag", "Q32238" },
-        { "dyu", "Q32706" },
-        { "bfi", "Q33000" },
-        { "dua", "Q33013" },
-        { "ban", "Q33070" },
-        { "bas", "Q33093" },
-        { "cos", "Q33111" },
-        { "bam", "Q33243" },
-        { "chy", "Q33265" },
-        { "shy", "Q33274" },
-        { "bcl", "Q33284" },
-        { "gaa", "Q33287" },
-        { "fon", "Q33291" },
-        { "fil", "Q33298" },
-        { "fsl", "Q33302" },
-        { "che", "Q33350" },
-        { "chr", "Q33388" },
-        { "fur", "Q33441" },
-        { "smn", "Q33462" },
-        { "hat", "Q33491" },
-        { "syc", "Q33538" },
-        { "jav", "Q33549" },
-        { "kas", "Q33552" },
-        { "haw", "Q33569" },
-        { "ibo", "Q33578" },
-        { "kik", "Q33587" },
-        { "mnc", "Q33638" },
-        { "kan", "Q33673" },
-        { "krc", "Q33714" },
-        { "ory", "Q33810" },
-        { "orm", "Q33864" },
-        { "mni", "Q33868" },
-        { "nso", "Q33890" },
-        { "sat", "Q33965" },
-        { "scn", "Q33973" },
-        { "srd", "Q33976" },
-        { "srn", "Q33989" },
-        { "snd", "Q33997" },
-        { "sun", "Q34002" },
-        { "pcd", "Q34024" },
-        { "ddo", "Q34033" },
-        { "tvl", "Q34055" },
-        { "tgl", "Q34057" },
-        { "nmg", "Q34098" },
-        { "tsn", "Q34137" },
-        { "shi", "Q34152" },
-        { "lua", "Q34173" },
-        { "rif", "Q34174" },
-        { "wln", "Q34219" },
-        { "wol", "Q34257" },
-        { "bci", "Q35107" },
-        { "cak", "Q35115" },
-        { "ido", "Q35224" },
-        { "bbj", "Q35271" },
-        { "bik", "Q35455" },
-        { "epo", "Q143" },
-        { "fra", "Q150" },
-        { "deu", "Q188" },
-        { "tur", "Q256" },
-        { "isl", "Q294" },
-        { "lat", "Q397" },
-        { "ita", "Q652" },
-        { "pol", "Q809" },
-        { "spa", "Q1321" },
-        { "fin", "Q1412" },
-        { "hin", "Q1568" },
-        { "mar", "Q1571" },
-        { "eng", "Q1860" },
-        { "aym", "Q4627" },
-        { "guj", "Q5137" },
-        { "por", "Q5146" },
-        { "que", "Q5218" },
-        { "jpn", "Q5287" },
-        { "tam", "Q5885" },
-        { "hrv", "Q6654" },
-        { "cat", "Q7026" },
-        { "nld", "Q7411" },
-        { "rus", "Q7737" },
-        { "swa", "Q7838" },
-        { "zho", "Q7850" },
-        { "ron", "Q7913" },
-        { "bul", "Q7918" },
-        { "mlg", "Q7930" },
-        { "tel", "Q8097" },
-        { "yid", "Q8641" },
-        { "sqi", "Q8748" },
-        { "eus", "Q8752" },
-        { "hye", "Q8785" },
-        { "ukr", "Q8798" },
-        { "swe", "Q9027" },
-        { "dan", "Q9035" },
-        { "nor", "Q9043" },
-        { "ltz", "Q9051" },
-        { "ces", "Q9056" },
-        { "slv", "Q9063" },
-        { "hun", "Q9067" },
-        { "est", "Q9072" },
-        { "bel", "Q9091" },
-        { "ell", "Q9129" },
-        { "gle", "Q9142" },
-        { "mlt", "Q9166" },
-        { "fas", "Q9168" },
-        { "kor", "Q9176" },
-        { "yue", "Q9186" } };
+    const map< string, string > iso_to_wikipedia_id = {
+      { "grc", "Q35497" },    { "non", "Q35505" },   { "ken", "Q35650" },   { "got", "Q35722" },
+      { "gsc", "Q35735" },    { "ldn", "Q35757" },   { "csc", "Q35768" },   { "lns", "Q35788" },
+      { "kab", "Q35853" },    { "ina", "Q35934" },   { "jam", "Q35939" },   { "mua", "Q36032" },
+      { "mhk", "Q36068" },    { "mos", "Q36096" },   { "kmr", "Q36163" },   { "num", "Q36173" },
+      { "mad", "Q36213" },    { "lin", "Q36217" },   { "mal", "Q36236" },   { "srr", "Q36284" },
+      { "jbo", "Q36350" },    { "yas", "Q36358" },   { "kur", "Q36368" },   { "ell", "Q36510" },
+      { "swl", "Q36558" },    { "gya", "Q36594" },   { "tvu", "Q36632" },   { "mlu", "Q36645" },
+      { "tui", "Q36646" },    { "ota", "Q36730" },   { "rar", "Q36745" },   { "ckb", "Q36811" },
+      { "tok", "Q36846" },    { "twi", "Q36850" },   { "vut", "Q36897" },   { "ybb", "Q36917" },
+      { "bse", "Q36973" },    { "wls", "Q36979" },   { "lzh", "Q37041" },   { "ang", "Q42365" },
+      { "ker", "Q56251" },    { "ary", "Q56426" },   { "sjn", "Q56437" },   { "hau", "Q56475" },
+      { "arq", "Q56499" },    { "atj", "Q56590" },   { "mcn", "Q56668" },   { "tpw", "Q56944" },
+      { "vls", "Q100103" },   { "gsw", "Q131339" },  { "hrx", "Q304049" },  { "lms", "Q427614" },
+      { "sxu", "Q699284" },   { "pwn", "Q715755" },  { "tay", "Q715766" },  { "guc", "Q891085" },
+      { "lnc", "Q942602" },   { "blc", "Q977808" },  { "avk", "Q1377116" }, { "sba", "Q2372207" },
+      { "gcf", "Q3006280" },  { "far", "Q3067168" }, { "kld", "Q3111818" }, { "swh", "Q3197533" },
+      { "rhg", "Q3241177" },  { "vsl", "Q3322064" }, { "xzh", "Q3437292" }, { "ane", "Q3571097" },
+      { "kcg", "Q3912765" },  { "hav", "Q5684097" }, { "isu", "Q6089423" }, { "mdl", "Q6744816" },
+      { "duf", "Q6983819" },  { "sru", "Q7646993" }, { "yat", "Q8048020" }, { "lem", "Q13479983" },
+      { "mul", "Q20923490" }, { "cmn", "Q9192" },    { "vie", "Q9199" },    { "tha", "Q9217" },
+      { "msa", "Q9237" },     { "ind", "Q9240" },    { "mon", "Q9246" },    { "tgk", "Q9260" },
+      { "uzb", "Q9264" },     { "heb", "Q9288" },    { "aze", "Q9292" },    { "mkd", "Q9296" },
+      { "bos", "Q9303" },     { "glg", "Q9307" },    { "cym", "Q9309" },    { "gla", "Q9314" },
+      { "ben", "Q9610" },     { "tlh", "Q10134" },   { "bre", "Q12107" },   { "rcf", "Q13198" },
+      { "xho", "Q13218" },    { "hsb", "Q13248" },   { "sms", "Q13271" },   { "nav", "Q13310" },
+      { "min", "Q13324" },    { "mnw", "Q13349" },   { "ara", "Q13955" },   { "oci", "Q14185" },
+      { "afr", "Q14196" },    { "sco", "Q14549" },   { "ase", "Q14759" },   { "pms", "Q15085" },
+      { "fao", "Q25258" },    { "tat", "Q25285" },   { "cor", "Q25289" },   { "kal", "Q25355" },
+      { "nds", "Q25433" },    { "fry", "Q27175" },   { "ace", "Q27683" },   { "ain", "Q27969" },
+      { "aka", "Q28026" },    { "amh", "Q28244" },   { "anp", "Q28378" },   { "rup", "Q29316" },
+      { "arz", "Q29919" },    { "myv", "Q29952" },   { "dag", "Q32238" },   { "dyu", "Q32706" },
+      { "bfi", "Q33000" },    { "dua", "Q33013" },   { "ban", "Q33070" },   { "bas", "Q33093" },
+      { "cos", "Q33111" },    { "bam", "Q33243" },   { "chy", "Q33265" },   { "shy", "Q33274" },
+      { "bcl", "Q33284" },    { "gaa", "Q33287" },   { "fon", "Q33291" },   { "fil", "Q33298" },
+      { "fsl", "Q33302" },    { "che", "Q33350" },   { "chr", "Q33388" },   { "fur", "Q33441" },
+      { "smn", "Q33462" },    { "hat", "Q33491" },   { "syc", "Q33538" },   { "jav", "Q33549" },
+      { "kas", "Q33552" },    { "haw", "Q33569" },   { "ibo", "Q33578" },   { "kik", "Q33587" },
+      { "mnc", "Q33638" },    { "kan", "Q33673" },   { "krc", "Q33714" },   { "ory", "Q33810" },
+      { "orm", "Q33864" },    { "mni", "Q33868" },   { "nso", "Q33890" },   { "sat", "Q33965" },
+      { "scn", "Q33973" },    { "srd", "Q33976" },   { "srn", "Q33989" },   { "snd", "Q33997" },
+      { "sun", "Q34002" },    { "pcd", "Q34024" },   { "ddo", "Q34033" },   { "tvl", "Q34055" },
+      { "tgl", "Q34057" },    { "nmg", "Q34098" },   { "tsn", "Q34137" },   { "shi", "Q34152" },
+      { "lua", "Q34173" },    { "rif", "Q34174" },   { "wln", "Q34219" },   { "wol", "Q34257" },
+      { "bci", "Q35107" },    { "cak", "Q35115" },   { "ido", "Q35224" },   { "bbj", "Q35271" },
+      { "bik", "Q35455" },    { "epo", "Q143" },     { "fra", "Q150" },     { "deu", "Q188" },
+      { "tur", "Q256" },      { "isl", "Q294" },     { "lat", "Q397" },     { "ita", "Q652" },
+      { "pol", "Q809" },      { "spa", "Q1321" },    { "fin", "Q1412" },    { "hin", "Q1568" },
+      { "mar", "Q1571" },     { "eng", "Q1860" },    { "aym", "Q4627" },    { "guj", "Q5137" },
+      { "por", "Q5146" },     { "que", "Q5218" },    { "jpn", "Q5287" },    { "tam", "Q5885" },
+      { "hrv", "Q6654" },     { "cat", "Q7026" },    { "nld", "Q7411" },    { "rus", "Q7737" },
+      { "swa", "Q7838" },     { "zho", "Q7850" },    { "ron", "Q7913" },    { "bul", "Q7918" },
+      { "mlg", "Q7930" },     { "tel", "Q8097" },    { "yid", "Q8641" },    { "sqi", "Q8748" },
+      { "eus", "Q8752" },     { "hye", "Q8785" },    { "ukr", "Q8798" },    { "swe", "Q9027" },
+      { "dan", "Q9035" },     { "nor", "Q9043" },    { "ltz", "Q9051" },    { "ces", "Q9056" },
+      { "slv", "Q9063" },     { "hun", "Q9067" },    { "est", "Q9072" },    { "bel", "Q9091" },
+      { "ell", "Q9129" },     { "gle", "Q9142" },    { "mlt", "Q9166" },    { "fas", "Q9168" },
+      { "kor", "Q9176" },     { "yue", "Q9186" } };
     // END OF iso_to_wikipedia_id
 
-      auto it = iso_to_wikipedia_id.find(languageCode.toStdString());
-      if (it != iso_to_wikipedia_id.end()){
-        langWikipediaID = QString::fromStdString(it->second);
-      }
+    auto it = iso_to_wikipedia_id.find( languageCode.toStdString() );
+    if ( it != iso_to_wikipedia_id.end() ) {
+      langWikipediaID = QString::fromStdString( it->second );
     }
+  }
 
-    string getName() noexcept override { return name; }
+  string getName() noexcept override
+  {
+    return name;
+  }
 
-    map< Property, string > getProperties() noexcept override { return {}; }
+  map< Property, string > getProperties() noexcept override
+  {
+    return {};
+  }
 
-    unsigned long getArticleCount() noexcept override { return 0; }
+  unsigned long getArticleCount() noexcept override
+  {
+    return 0;
+  }
 
-    unsigned long getWordCount() noexcept override { return 0; }
+  unsigned long getWordCount() noexcept override
+  {
+    return 0;
+  }
 
-    sptr< WordSearchRequest > prefixMatch( wstring const & /*word*/, unsigned long /*maxResults*/ ) override
-    {
-      sptr< WordSearchRequestInstant > sr = std::make_shared< WordSearchRequestInstant >();
+  sptr< WordSearchRequest > prefixMatch( wstring const & /*word*/, unsigned long /*maxResults*/ ) override
+  {
+    sptr< WordSearchRequestInstant > sr = std::make_shared< WordSearchRequestInstant >();
 
-      sr->setUncertain( true );
+    sr->setUncertain( true );
 
-      return sr;
+    return sr;
+  }
+
+  sptr< DataRequest > getArticle( wstring const & word, vector< wstring > const & alts, wstring const &, bool ) override
+  {
+    if ( word.size() < 50 ) {
+      return std::make_shared< LinguaArticleRequest >( word, alts, languageCode, langWikipediaID, getId(), netMgr );
     }
-
-    sptr< DataRequest > getArticle(
-      wstring const & word, vector< wstring > const & alts, wstring const &, bool ) override
-    {
-      if( word.size() < 50 )
-      {
-        return std::make_shared< LinguaArticleRequest >( word, alts, languageCode,langWikipediaID, getId(), netMgr );
-
-      } else {
-        return std::make_shared< DataRequestInstant >( false );
-      }
+    else {
+      return std::make_shared< DataRequestInstant >( false );
     }
+  }
 
-   protected:
-    void loadIcon() noexcept override
-    {
-      if( dictionaryIconLoaded )
-        return;
+protected:
+  void loadIcon() noexcept override
+  {
+    if ( dictionaryIconLoaded )
+      return;
 
-      dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/lingualibre.svg" );
-      dictionaryIconLoaded                  = true;
-    }
-  };
+    dictionaryIcon       = QIcon( ":/icons/lingualibre.svg" );
+    dictionaryIconLoaded = true;
+  }
+};
 
-}  // namespace
+} // namespace
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-  Dictionary::Initializing &, Config::Lingua const & lingua, QNetworkAccessManager & mgr )
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::Lingua const & lingua, QNetworkAccessManager & mgr )
 {
   vector< sptr< Dictionary::Class > > result;
-  if( lingua.enable and !lingua.languageCodes.isEmpty() )
-  {
+  if ( lingua.enable and !lingua.languageCodes.isEmpty() ) {
     QCryptographicHash hash( QCryptographicHash::Md5 );
 
     hash.addData( "Lingua libre via Wiki Commons" );
 
     result.push_back( std::make_shared< LinguaDictionary >( hash.result().toHex().data(),
-      QString( "LinguaLibre" ).toUtf8().data(),
-      lingua.languageCodes,
-      mgr ) );
+                                                            QString( "LinguaLibre" ).toUtf8().data(),
+                                                            lingua.languageCodes,
+                                                            mgr ) );
   }
   return result;
 };
 
 
-void LinguaArticleRequest::cancel() {
+void LinguaArticleRequest::cancel()
+{
   finish();
 }
 
 LinguaArticleRequest::LinguaArticleRequest( const wstring & str,
-  const vector< wstring > & alts,
-  const QString & languageCode_,
-  const QString & langWikipediaID,
-  const string & dictionaryId_,
-  QNetworkAccessManager & mgr ):
-    languageCode(languageCode_),
-    langWikipediaID(langWikipediaID)
+                                            const vector< wstring > & alts,
+                                            const QString & languageCode_,
+                                            const QString & langWikipediaID,
+                                            const string & dictionaryId_,
+                                            QNetworkAccessManager & mgr ):
+  languageCode( languageCode_ ),
+  langWikipediaID( langWikipediaID )
 {
   connect( &mgr, &QNetworkAccessManager::finished, this, &LinguaArticleRequest::requestFinished, Qt::QueuedConnection );
 
@@ -375,28 +217,28 @@ void LinguaArticleRequest::addQuery( QNetworkAccessManager & mgr, const wstring
 {
 
   // Doc of the <https://www.mediawiki.org/wiki/API:Query>
-  QString reqUrl = R"(https://commons.wikimedia.org/w/api.php?)"
-                   R"(action=query)"
-                   R"(&format=json)"
-                   R"(&prop=imageinfo)"
-                   R"(&generator=search)"
-                   R"(&iiprop=url)"
-                   R"(&iimetadataversion=1)"
-                   R"(&iiextmetadatafilter=Categories)"
-                   R"(&gsrsearch=intitle:LL-%1 \(%2\)-.*-%3\.wav/)" // https://en.wikipedia.org/wiki/Help:Searching/Regex
-                   R"(&gsrnamespace=6)"
-                   R"(&gsrlimit=10)"
-                   R"(&gsrwhat=text)";
+  QString reqUrl =
+    R"(https://commons.wikimedia.org/w/api.php?)"
+    R"(action=query)"
+    R"(&format=json)"
+    R"(&prop=imageinfo)"
+    R"(&generator=search)"
+    R"(&iiprop=url)"
+    R"(&iimetadataversion=1)"
+    R"(&iiextmetadatafilter=Categories)"
+    R"(&gsrsearch=intitle:LL-%1 \(%2\)-.*-%3\.wav/)" // https://en.wikipedia.org/wiki/Help:Searching/Regex
+    R"(&gsrnamespace=6)"
+    R"(&gsrlimit=10)"
+    R"(&gsrwhat=text)";
 
-  reqUrl =  reqUrl.arg(langWikipediaID,languageCode,QString::fromStdU32String( word ) );
+  reqUrl = reqUrl.arg( langWikipediaID, languageCode, QString::fromStdU32String( word ) );
 
-  qDebug()<< "lingualibre query " << reqUrl;
+  qDebug() << "lingualibre query " << reqUrl;
 
   auto netRequest = QNetworkRequest( reqUrl );
-  netRequest.setTransferTimeout(3000);
+  netRequest.setTransferTimeout( 3000 );
 
-  auto netReply =
-  std::shared_ptr< QNetworkReply >( mgr.get(netRequest));
+  auto netReply = std::shared_ptr< QNetworkReply >( mgr.get( netRequest ) );
 
 
   netReplies.emplace_back( netReply, Utf8::encode( word ) );
@@ -414,7 +256,7 @@ void LinguaArticleRequest::requestFinished( QNetworkReply * r )
     return;
   }
   if ( !netReply->isFinished() || netReply->error() != QNetworkReply::NoError ) {
-    qWarning()<< "Lingua query failed: " << netReply->error();
+    qWarning() << "Lingua query failed: " << netReply->error();
     cancel();
     return;
   }
@@ -463,18 +305,16 @@ void LinguaArticleRequest::requestFinished( QNetworkReply * r )
 
 */
 
-  if( resultJson.contains( "query" ) )
-  {
+  if ( resultJson.contains( "query" ) ) {
 
     string articleBody = "<p>";
 
-    for( auto pageJsonVal : resultJson[ "query" ].toObject()[ "pages" ].toObject() )
-    {
+    for ( auto pageJsonVal : resultJson[ "query" ].toObject()[ "pages" ].toObject() ) {
       auto pageJsonObj = pageJsonVal.toObject();
       string title     = pageJsonObj[ "title" ].toString().toHtmlEscaped().toStdString();
       string audiolink =
         pageJsonObj[ "imageinfo" ].toArray().at( 0 ).toObject()[ "url" ].toString().toHtmlEscaped().toStdString();
-      articleBody += addAudioLink( "\""+audiolink+"\"", dictionaryId );
+      articleBody += addAudioLink( "\"" + audiolink + "\"", dictionaryId );
       articleBody += R"(<a href=")";
       articleBody += audiolink;
       articleBody += R"(">)";
@@ -485,19 +325,14 @@ void LinguaArticleRequest::requestFinished( QNetworkReply * r )
 
     articleBody += "</p>";
 
-    QMutexLocker _( &dataMutex );
+    appendString( articleBody );
 
-    size_t prevSize = data.size();
-    data.resize( prevSize + articleBody.size() );
-
-    memcpy( &data.front() + prevSize, articleBody.data(), articleBody.size() );
 
     hasAnyData = true;
 
     finish();
   }
-  else
-  {
+  else {
     hasAnyData = false;
     finish();
   }
diff --git a/src/dict/lingualibre.hh b/src/dict/lingualibre.hh
index 99d54c51..4c404d7f 100644
--- a/src/dict/lingualibre.hh
+++ b/src/dict/lingualibre.hh
@@ -8,16 +8,14 @@
 #include <QNetworkReply>
 
 
-namespace Lingua{
+namespace Lingua {
 
 using std::vector;
 using std::string;
 using gd::wstring;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-  Dictionary::Initializing &,
-  Config::Lingua const &,
-  QNetworkAccessManager & );
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::Lingua const &, QNetworkAccessManager & );
 
 
 /// Exposed here for moc
@@ -32,16 +30,19 @@ class LinguaArticleRequest: public Dictionary::DataRequest
     bool finished;
 
     NetReply( sptr< QNetworkReply > const & reply_, string const & word_ ):
-        reply( reply_ ), word( word_ ), finished( false )
-    {}
+      reply( reply_ ),
+      word( word_ ),
+      finished( false )
+    {
+    }
   };
 
   typedef std::list< NetReply > NetReplies;
   NetReplies netReplies;
-  QString languageCode,langWikipediaID;
+  QString languageCode, langWikipediaID;
   string dictionaryId;
 
- public:
+public:
 
   LinguaArticleRequest( wstring const & word,
                         vector< wstring > const & alts,
@@ -52,14 +53,14 @@ class LinguaArticleRequest: public Dictionary::DataRequest
 
   virtual void cancel();
 
- private:
+private:
 
   void addQuery( QNetworkAccessManager & mgr, wstring const & word );
 
- private slots:
+private slots:
   virtual void requestFinished( QNetworkReply * );
 };
 
-}
+} // namespace Lingua
 
 #endif //GOLDENDICT_LINGUALIBRE_H
diff --git a/src/dict/loaddictionaries.cc b/src/dict/loaddictionaries.cc
index 7dc0ef6d..202f08a5 100644
--- a/src/dict/loaddictionaries.cc
+++ b/src/dict/loaddictionaries.cc
@@ -35,11 +35,11 @@
 #include "metadata.hh"
 
 #ifndef NO_EPWING_SUPPORT
-#include "dict/epwing.hh"
+  #include "dict/epwing.hh"
 #endif
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-#include "dict/chinese.hh"
+  #include "dict/chinese.hh"
 #endif
 
 #include <QMessageBox>
@@ -53,7 +53,9 @@ using std::string;
 using std::vector;
 
 LoadDictionaries::LoadDictionaries( Config::Class const & cfg ):
-  paths( cfg.paths ), soundDirs( cfg.soundDirs ), hunspell( cfg.hunspell ),
+  paths( cfg.paths ),
+  soundDirs( cfg.soundDirs ),
+  hunspell( cfg.hunspell ),
   transliteration( cfg.transliteration ),
   exceptionText( "Load did not finish" ), // Will be cleared upon success
   maxPictureWidth( cfg.maxPictureWidth ),
@@ -62,24 +64,36 @@ LoadDictionaries::LoadDictionaries( Config::Class const & cfg ):
 {
   // Populate name filters
 
-  nameFilters << "*.bgl" << "*.ifo" << "*.lsa" << "*.dat"
-              << "*.dsl" << "*.dsl.dz"  << "*.index" << "*.xdxf"
-              << "*.xdxf.dz" << "*.dct" << "*.aar" << "*.zips"
-              << "*.mdx" << "*.gls" << "*.gls.dz"
+  nameFilters << "*.bgl"
+              << "*.ifo"
+              << "*.lsa"
+              << "*.dat"
+              << "*.dsl"
+              << "*.dsl.dz"
+              << "*.index"
+              << "*.xdxf"
+              << "*.xdxf.dz"
+              << "*.dct"
+              << "*.aar"
+              << "*.zips"
+              << "*.mdx"
+              << "*.gls"
+              << "*.gls.dz"
 #ifdef MAKE_ZIM_SUPPORT
-              << "*.zim" << "*.zimaa" << "*.slob"
+              << "*.zim"
+              << "*.zimaa"
+              << "*.slob"
 #endif
 #ifndef NO_EPWING_SUPPORT
               << "*catalogs"
 #endif
-;
+    ;
 }
 
 void LoadDictionaries::run()
 {
-  try
-  {
-    for(const auto & path : paths)
+  try {
+    for ( const auto & path : paths )
       handlePath( path );
 
     // Make soundDirs
@@ -87,29 +101,26 @@ void LoadDictionaries::run()
       vector< sptr< Dictionary::Class > > soundDirDictionaries =
         SoundDir::makeDictionaries( soundDirs, Config::getIndexDir().toStdString(), *this );
 
-      dictionaries.insert( dictionaries.end(), soundDirDictionaries.begin(),
-                           soundDirDictionaries.end() );
+      dictionaries.insert( dictionaries.end(), soundDirDictionaries.begin(), soundDirDictionaries.end() );
     }
 
     // Make hunspells
     {
-      vector< sptr< Dictionary::Class > > hunspellDictionaries =
-        HunspellMorpho::makeDictionaries( hunspell );
+      vector< sptr< Dictionary::Class > > hunspellDictionaries = HunspellMorpho::makeDictionaries( hunspell );
 
-      dictionaries.insert( dictionaries.end(), hunspellDictionaries.begin(),
-                           hunspellDictionaries.end() );
+      dictionaries.insert( dictionaries.end(), hunspellDictionaries.begin(), hunspellDictionaries.end() );
     }
 
     exceptionText.clear();
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     exceptionText = e.what();
   }
 }
 
-void LoadDictionaries::addDicts( const std::vector< sptr< Dictionary::Class > >& dicts ) {
-  std::move(dicts.begin(), dicts.end(), std::back_inserter(dictionaries));
+void LoadDictionaries::addDicts( const std::vector< sptr< Dictionary::Class > > & dicts )
+{
+  std::move( dicts.begin(), dicts.end(), std::back_inserter( dictionaries ) );
 }
 
 void LoadDictionaries::handlePath( Config::Path const & path )
@@ -120,16 +131,13 @@ void LoadDictionaries::handlePath( Config::Path const & path )
 
   QFileInfoList entries = dir.entryInfoList( nameFilters, QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot );
 
-  for( QFileInfoList::const_iterator i = entries.constBegin();
-       i != entries.constEnd(); ++i )
-  {
+  for ( QFileInfoList::const_iterator i = entries.constBegin(); i != entries.constEnd(); ++i ) {
     QString fullName = i->absoluteFilePath();
 
-    if ( path.recursive && i->isDir() )
-    {
+    if ( path.recursive && i->isDir() ) {
       // Make sure the path doesn't look like with dsl resources
-      if ( !fullName.endsWith( ".dsl.files", Qt::CaseInsensitive ) &&
-           !fullName.endsWith( ".dsl.dz.files", Qt::CaseInsensitive ) )
+      if ( !fullName.endsWith( ".dsl.files", Qt::CaseInsensitive )
+           && !fullName.endsWith( ".dsl.dz.files", Qt::CaseInsensitive ) )
         handlePath( Config::Path( fullName, true ) );
     }
 
@@ -179,7 +187,8 @@ void LoadDictionaries::indexingDictionary( string const & dictionaryName ) noexc
 }
 
 
-void loadDictionaries( QWidget * parent, bool showInitially,
+void loadDictionaries( QWidget * parent,
+                       bool showInitially,
                        Config::Class const & cfg,
                        std::vector< sptr< Dictionary::Class > > & dictionaries,
                        QNetworkAccessManager & dictNetMgr,
@@ -205,9 +214,9 @@ void loadDictionaries( QWidget * parent, bool showInitially,
 
   loadDicts.wait();
 
-  if ( loadDicts.getExceptionText().size() )
-  {
-    QMessageBox::critical( parent, QCoreApplication::translate( "LoadDictionaries", "Error loading dictionaries" ),
+  if ( loadDicts.getExceptionText().size() ) {
+    QMessageBox::critical( parent,
+                           QCoreApplication::translate( "LoadDictionaries", "Error loading dictionaries" ),
                            QString::fromUtf8( loadDicts.getExceptionText().c_str() ) );
 
     return;
@@ -217,18 +226,18 @@ void loadDictionaries( QWidget * parent, bool showInitially,
 
   // Helper function that will add a vector of dictionary::Class to the dictionary list
   // Implemented as lambda to access method's `dictionaries` variable
-  auto  static addDicts = [&dictionaries](const vector< sptr< Dictionary::Class >> &dicts) {
-    std::move(dicts.begin(), dicts.end(), std::back_inserter(dictionaries));
+  auto static addDicts = [ &dictionaries ]( const vector< sptr< Dictionary::Class > > & dicts ) {
+    std::move( dicts.begin(), dicts.end(), std::back_inserter( dictionaries ) );
   };
 
   ///// We create transliterations synchronously since they are very simple
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-  addDicts(Chinese::makeDictionaries( cfg.transliteration.chinese ));
+  addDicts( Chinese::makeDictionaries( cfg.transliteration.chinese ) );
 #endif
 
-  addDicts(Romaji::makeDictionaries( cfg.transliteration.romaji ));
-  addDicts(CustomTranslit::makeDictionaries( cfg.transliteration.customTrans));
+  addDicts( Romaji::makeDictionaries( cfg.transliteration.romaji ) );
+  addDicts( CustomTranslit::makeDictionaries( cfg.transliteration.customTrans ) );
 
   // Make Russian transliteration
   if ( cfg.transliteration.enableRussianTransliteration )
@@ -243,18 +252,17 @@ void loadDictionaries( QWidget * parent, bool showInitially,
     dictionaries.push_back( GreekTranslit::makeDictionary() );
 
   // Make Belarusian transliteration
-  if ( cfg.transliteration.enableBelarusianTransliteration )
-  {
-    addDicts(BelarusianTranslit::makeDictionaries());
+  if ( cfg.transliteration.enableBelarusianTransliteration ) {
+    addDicts( BelarusianTranslit::makeDictionaries() );
   }
 
-  addDicts(MediaWiki::makeDictionaries( loadDicts, cfg.mediawikis, dictNetMgr ));
-  addDicts(WebSite::makeDictionaries( cfg.webSites, dictNetMgr ));
-  addDicts(Forvo::makeDictionaries( loadDicts, cfg.forvo, dictNetMgr ));
-  addDicts(Lingua::makeDictionaries( loadDicts, cfg.lingua, dictNetMgr ));
-  addDicts(Programs::makeDictionaries( cfg.programs ));
-  addDicts(VoiceEngines::makeDictionaries( cfg.voiceEngines ));
-  addDicts(DictServer::makeDictionaries( cfg.dictServers ));
+  addDicts( MediaWiki::makeDictionaries( loadDicts, cfg.mediawikis, dictNetMgr ) );
+  addDicts( WebSite::makeDictionaries( cfg.webSites, dictNetMgr ) );
+  addDicts( Forvo::makeDictionaries( loadDicts, cfg.forvo, dictNetMgr ) );
+  addDicts( Lingua::makeDictionaries( loadDicts, cfg.lingua, dictNetMgr ) );
+  addDicts( Programs::makeDictionaries( cfg.programs ) );
+  addDicts( VoiceEngines::makeDictionaries( cfg.voiceEngines ) );
+  addDicts( DictServer::makeDictionaries( cfg.dictServers ) );
 
 
   GD_DPRINTF( "Load done\n" );
@@ -264,17 +272,15 @@ void loadDictionaries( QWidget * parent, bool showInitially,
   set< string > ids;
   std::pair< std::set< string >::iterator, bool > ret;
 
-  for( unsigned x = dictionaries.size(); x--; )
-  {
+  for ( unsigned x = dictionaries.size(); x--; ) {
     ret = ids.insert( dictionaries[ x ]->getId() );
-    if( !ret.second )
-    {
+    if ( !ret.second ) {
       gdWarning( R"(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()
-                );
+                   "" :
+                   dictionaries[ x ]->getDictionaryFilenames()[ 0 ].c_str() );
     }
   }
 
@@ -282,15 +288,12 @@ void loadDictionaries( QWidget * parent, bool showInitially,
 
   QStringList allIdxFiles = indexDir.entryList( QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks );
 
-  for( const auto & file : allIdxFiles)
-  {
+  for ( const auto & file : allIdxFiles ) {
     if ( file.size() >= 32 && ids.find( file.left( 32 ).toStdString() ) == ids.end() ) {
-      if( QFile::exists( file ) )
-      {
+      if ( QFile::exists( file ) ) {
         indexDir.remove( file );
       }
-      else
-      {
+      else {
         // must be folder .
         auto dirPath = Utils::Path::combine( Config::getIndexDir(), file );
         QDir t( dirPath );
@@ -307,6 +310,6 @@ void loadDictionaries( QWidget * parent, bool showInitially,
 
 void doDeferredInit( std::vector< sptr< Dictionary::Class > > & dictionaries )
 {
-  for( unsigned x = 0; x < dictionaries.size(); ++x )
+  for ( unsigned x = 0; x < dictionaries.size(); ++x )
     dictionaries[ x ]->deferredInit();
 }
diff --git a/src/dict/loaddictionaries.hh b/src/dict/loaddictionaries.hh
index 83ad097e..7d659e01 100644
--- a/src/dict/loaddictionaries.hh
+++ b/src/dict/loaddictionaries.hh
@@ -34,12 +34,15 @@ public:
   virtual void run();
 
   std::vector< sptr< Dictionary::Class > > const & getDictionaries() const
-  { return dictionaries; }
+  {
+    return dictionaries;
+  }
 
   /// Empty string means to exception occurred
   std::string const & getExceptionText() const
-  { return exceptionText; }
-
+  {
+    return exceptionText;
+  }
 
 
 public:
@@ -51,7 +54,7 @@ private:
   void handlePath( Config::Path const & );
 
   // Helper function that will add a vector of dictionary::Class to the dictionary list
-  void addDicts(const std::vector< sptr< Dictionary::Class > >& dicts);
+  void addDicts( const std::vector< sptr< Dictionary::Class > > & dicts );
 
 signals:
   void indexingDictionarySignal( QString const & dictionaryName );
@@ -62,7 +65,8 @@ signals:
 /// If showInitially is passed as true, the window will always popup.
 /// If doDeferredInit is true (default), doDeferredInit() is done on all
 /// dictionaries at the end.
-void loadDictionaries( QWidget * parent, bool showInitially,
+void loadDictionaries( QWidget * parent,
+                       bool showInitially,
                        Config::Class const & cfg,
                        std::vector< sptr< Dictionary::Class > > &,
                        QNetworkAccessManager & dictNetMgr,
@@ -72,4 +76,3 @@ void loadDictionaries( QWidget * parent, bool showInitially,
 /// loadDictionaries() was previously called with doDeferredInit = false.
 void doDeferredInit( std::vector< sptr< Dictionary::Class > > & );
 #endif
-
diff --git a/src/dict/lsa.cc b/src/dict/lsa.cc
index 2e8f25f1..78ba5d99 100644
--- a/src/dict/lsa.cc
+++ b/src/dict/lsa.cc
@@ -15,7 +15,7 @@
 #include <string>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #define OV_EXCLUDE_STATIC_CALLBACKS
@@ -44,23 +44,22 @@ DEF_EX( exFailedToOpenVorbisData, "Failed to open Vorbis data", Dictionary::Ex )
 DEF_EX( exFailedToSeekInVorbisData, "Failed to seek in Vorbis data", Dictionary::Ex )
 DEF_EX( exFailedToRetrieveVorbisInfo, "Failed to retrieve Vorbis info", Dictionary::Ex )
 
-enum
-{
-  Signature = 0x5841534c, // LSAX on little-endian, XASL on big-endian
+enum {
+  Signature            = 0x5841534c, // LSAX on little-endian, XASL on big-endian
   CurrentFormatVersion = 5
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, BGLX
-  uint32_t formatVersion; // File format version, currently 1.
-  uint32_t soundsCount; // Total number of sounds, for informative purposes only
-  uint32_t vorbisOffset; // Offset of the vorbis file which contains all snds
+  uint32_t signature;             // First comes the signature, BGLX
+  uint32_t formatVersion;         // File format version, currently 1.
+  uint32_t soundsCount;           // Total number of sounds, for informative purposes only
+  uint32_t vorbisOffset;          // Offset of the vorbis file which contains all snds
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-} 
+}
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -70,15 +69,13 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 string stripExtension( string const & str )
 {
-  if ( str.size() > 3 &&
-      ( strcasecmp( str.c_str() + ( str.size() - 4 ), ".wav" ) == 0 ) )
+  if ( str.size() > 3 && ( strcasecmp( str.c_str() + ( str.size() - 4 ), ".wav" ) == 0 ) )
     return string( str, 0, str.size() - 4 );
   else
     return str;
@@ -90,6 +87,7 @@ struct Entry
 
   uint32_t samplesLength;
   uint32_t samplesOffset;
+
 public:
 
   // Reads an entry from the file's current position
@@ -104,15 +102,13 @@ Entry::Entry( File::Class & f )
 
   vector< uint16_t > filenameBuffer( 64 );
 
-  for( ; ; ++read )
-  {
+  for ( ;; ++read ) {
     if ( filenameBuffer.size() <= read )
       filenameBuffer.resize( read + 64 );
 
     f.read( &filenameBuffer[ read ], 2 );
 
-    if ( filenameBuffer[ read ] == 0xD )
-    {
+    if ( filenameBuffer[ read ] == 0xD ) {
       if ( f.read< uint16_t >() != 0xA )
         throw exInvalidData();
 
@@ -123,21 +119,18 @@ Entry::Entry( File::Class & f )
 
   // Skip zero or ff, or just ff.
 
-  if ( uint8_t x = f.read< uint8_t >() )
-  {
+  if ( uint8_t x = f.read< uint8_t >() ) {
     if ( x != 0xFF )
       throw exInvalidData();
   }
-  else
-  if ( f.read< uint8_t >() != 0xFF )
+  else if ( f.read< uint8_t >() != 0xFF )
     throw exInvalidData();
 
 
-  if ( !firstEntry )
-  {
+  if ( !firstEntry ) {
     // For all entries but the first one, read its offset in
     // samples.
-    samplesOffset  = f.read< uint32_t >();
+    samplesOffset = f.read< uint32_t >();
 
     if ( f.read< uint8_t >() != 0xFF )
       throw exInvalidData();
@@ -148,8 +141,7 @@ Entry::Entry( File::Class & f )
   // Read the size of the recording, in samples
   samplesLength = f.read< uint32_t >();
 
-  name = Iconv::toUtf8( Iconv::Utf16Le, &filenameBuffer.front(),
-                        read * sizeof( uint16_t ) );
+  name = Iconv::toUtf8( Iconv::Utf16Le, &filenameBuffer.front(), read * sizeof( uint16_t ) );
 }
 
 class LsaDictionary: public BtreeIndexing::BtreeDictionary
@@ -160,28 +152,29 @@ class LsaDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  LsaDictionary( string const & id, string const & indexFile,
-                 vector< string > const & dictionaryFiles );
+  LsaDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   string getName() noexcept override;
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.soundsCount; }
+  {
+    return idxHeader.soundsCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return getArticleCount(); }
+  {
+    return getArticleCount();
+  }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
 protected:
 
@@ -198,30 +191,25 @@ string LsaDictionary::getName() noexcept
   return result;
 }
 
-LsaDictionary::LsaDictionary( string const & id,
-                              string const & indexFile,
-                              vector< string > const & dictionaryFiles ):
+LsaDictionary::LsaDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
   BtreeDictionary( id, dictionaryFiles ),
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() )
 {
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 }
 
 sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
                                                            vector< wstring > const & alts,
                                                            wstring const &,
                                                            bool ignoreDiacritics )
-  
+
 {
   vector< WordArticleLink > chain = findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = findArticles( alts[ x ], ignoreDiacritics );
@@ -236,11 +224,10 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
                                     // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
     if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
       continue; // We already have this article in the body.
 
@@ -249,31 +236,26 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( chain[ x ].word );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( chain[ x ].word );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
-    multimap< wstring, string > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+    multimap< wstring, string > & mapToUse = ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( std::pair(
-      Folding::applySimpleCaseOnly( chain[ x ].word ), chain[ x ].word ) );
+    mapToUse.insert( std::pair( Folding::applySimpleCaseOnly( chain[ x ].word ), chain[ x ].word ) );
 
     articlesIncluded.insert( chain[ x ].articleOffset );
   }
 
   if ( mainArticles.empty() && alternateArticles.empty() )
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such word
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such word
 
   string result;
 
   multimap< wstring, string >::const_iterator i;
 
   result += "<table class=\"lsa_play\">";
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
     result += "<tr>";
 
     QUrl url;
@@ -290,8 +272,7 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
     result += "</tr>";
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
     result += "<tr>";
 
     QUrl url;
@@ -310,14 +291,13 @@ sptr< Dictionary::DataRequest > LsaDictionary::getArticle( wstring const & word,
 
   result += "</table>";
 
-  Dictionary::DataRequestInstant * ret =
-    new Dictionary::DataRequestInstant( true );
+  Dictionary::DataRequestInstant * ret = new Dictionary::DataRequestInstant( true );
 
   ret->getData().resize( result.size() );
 
-  memcpy( &(ret->getData().front()), result.data(), result.size() );
+  memcpy( &( ret->getData().front() ), result.data(), result.size() );
 
-  return std::shared_ptr<Dictionary::DataRequestInstant>(ret);
+  return std::shared_ptr< Dictionary::DataRequestInstant >( ret );
 }
 
 /// This wraps around file operations
@@ -326,8 +306,11 @@ struct ShiftedVorbis
   QFile & f;
   size_t shift;
 
-  ShiftedVorbis( QFile & 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 );
   static int seek( void * datasource, ogg_int64_t offset, int whence );
@@ -336,25 +319,24 @@ struct ShiftedVorbis
   static ov_callbacks callbacks;
 };
 
-size_t ShiftedVorbis::read( void * ptr, size_t size, size_t nmemb,
-                            void * datasource )
+size_t ShiftedVorbis::read( void * ptr, size_t size, size_t nmemb, void * datasource )
 {
-  ShiftedVorbis * sv = ( ShiftedVorbis * ) datasource;
+  ShiftedVorbis * sv = (ShiftedVorbis *)datasource;
 
-  return sv->f.read( reinterpret_cast<char *>( ptr ), size * nmemb );
+  return sv->f.read( reinterpret_cast< char * >( ptr ), size * nmemb );
 }
 
 int ShiftedVorbis::seek( void * datasource, ogg_int64_t offset, int whence )
 {
-  ShiftedVorbis * sv = ( ShiftedVorbis * ) datasource;
+  ShiftedVorbis * sv = (ShiftedVorbis *)datasource;
 
   if ( whence == SEEK_SET )
     offset += sv->shift;
 
-  if( whence == SEEK_CUR )
+  if ( whence == SEEK_CUR )
     offset += sv->f.pos();
 
-  if( whence == SEEK_END )
+  if ( whence == SEEK_END )
     offset += sv->f.size();
 
   return sv->f.seek( offset );
@@ -362,8 +344,8 @@ int ShiftedVorbis::seek( void * datasource, ogg_int64_t offset, int whence )
 
 long ShiftedVorbis::tell( void * datasource )
 {
-  ShiftedVorbis * sv = ( ShiftedVorbis * ) datasource;
-  long result = sv->f.pos();
+  ShiftedVorbis * sv = (ShiftedVorbis *)datasource;
+  long result        = sv->f.pos();
 
   if ( result != -1 )
     result -= sv->shift;
@@ -371,10 +353,7 @@ long ShiftedVorbis::tell( void * datasource )
   return result;
 }
 
-ov_callbacks ShiftedVorbis::callbacks = { ShiftedVorbis::read,
-                                          ShiftedVorbis::seek,
-                                          NULL,
-                                          ShiftedVorbis::tell };
+ov_callbacks ShiftedVorbis::callbacks = { ShiftedVorbis::read, ShiftedVorbis::seek, NULL, ShiftedVorbis::tell };
 
 // A crude .wav header which is sufficient for our needs
 struct WavHeader
@@ -382,34 +361,34 @@ struct WavHeader
   char riff[ 4 ]; // RIFF
   uint32_t riffLength;
   char waveAndFmt[ 8 ]; // WAVEfmt%20
-  uint32_t fmtLength; // 16
-  uint16_t formatTag; // 1
-  uint16_t channels; // 1 or 2
+  uint32_t fmtLength;   // 16
+  uint16_t formatTag;   // 1
+  uint16_t channels;    // 1 or 2
   uint32_t samplesPerSec;
   uint32_t bytesPerSec;
   uint16_t blockAlign;
   uint16_t bitsPerSample; // 16
-  char data[ 4 ]; // data
+  char data[ 4 ];         // data
   uint32_t dataLength;
-} 
+}
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
 sptr< Dictionary::DataRequest > LsaDictionary::getResource( string const & name )
-  
+
 {
   // See if the name ends in .wav. Remove that extension then
 
-  string strippedName =
-    ( name.size() > 3 && ( name.compare( name.size() - 4, 4, ".wav" ) == 0 ) ) ?
-      string( name, 0, name.size() - 4 ) : name;
+  string strippedName = ( name.size() > 3 && ( name.compare( name.size() - 4, 4, ".wav" ) == 0 ) ) ?
+    string( name, 0, name.size() - 4 ) :
+    name;
 
   vector< WordArticleLink > chain = findArticles( Utf8::decode( strippedName ) );
 
   if ( chain.empty() )
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such resource
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such resource
 
   File::Class f( getDictionaryFilenames()[ 0 ], "rb" );
 
@@ -432,15 +411,13 @@ sptr< Dictionary::DataRequest > LsaDictionary::getResource( string const & name
 
   vorbis_info * vi = ov_info( &vf, -1 );
 
-  if ( !vi )
-  {
+  if ( !vi ) {
     ov_clear( &vf );
 
     throw exFailedToRetrieveVorbisInfo();
   }
 
-  sptr< Dictionary::DataRequestInstant > dr = std::make_shared<
-    Dictionary::DataRequestInstant>( true );
+  sptr< Dictionary::DataRequestInstant > dr = std::make_shared< Dictionary::DataRequestInstant >( true );
 
   vector< char > & data = dr->getData();
 
@@ -454,35 +431,32 @@ sptr< Dictionary::DataRequest > LsaDictionary::getResource( string const & name
   wh->riffLength = data.size() - 8;
 
   memcpy( wh->waveAndFmt, "WAVEfmt ", 8 );
-  wh->fmtLength = 16;
-  wh->formatTag = 1;
-  wh->channels = vi->channels;
+  wh->fmtLength     = 16;
+  wh->formatTag     = 1;
+  wh->channels      = vi->channels;
   wh->samplesPerSec = vi->rate;
-  wh->bytesPerSec = vi->channels * vi->rate * 2;
-  wh->blockAlign = vi->channels * 2;
+  wh->bytesPerSec   = vi->channels * vi->rate * 2;
+  wh->blockAlign    = vi->channels * 2;
   wh->bitsPerSample = 16;
   memcpy( wh->data, "data", 4 );
   wh->dataLength = data.size() - sizeof( *wh );
 
   // Now decode vorbis to the rest of the block
 
-  char * ptr = &data.front() + sizeof( *wh );
-  int left = data.size() - sizeof( *wh );
+  char * ptr    = &data.front() + sizeof( *wh );
+  int left      = data.size() - sizeof( *wh );
   int bitstream = 0;
 
-  while( left )
-  {
+  while ( left ) {
     long result = ov_read( &vf, ptr, left, 0, 2, 1, &bitstream );
 
-    if ( result <= 0 )
-    {
+    if ( result <= 0 ) {
       gdWarning( "Failed to read Vorbis data (code = %ld)\n", result );
       memset( ptr, 0, left );
       break;
     }
 
-    if ( result > left )
-    {
+    if ( result > left ) {
       GD_FDPRINTF( stderr, "Warning: Vorbis decode returned more data than requested.\n" );
 
       result = left;
@@ -507,44 +481,38 @@ void LsaDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 3 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/playsound_full.png");
+    dictionaryIcon = QIcon( ":/icons/lsasound.svg" );
   }
 
   dictionaryIconLoaded = true;
 }
 
-}
+} // namespace
+
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
     /// Only allow .dat and .lsa extensions to save scanning time
-    if ( i->size() < 4 ||
-        ( strcasecmp( i->c_str() + ( i->size() - 4 ), ".dat" ) != 0 &&
-          strcasecmp( i->c_str() + ( i->size() - 4 ), ".lsa" ) != 0 ) )
+    if ( i->size() < 4
+         || ( strcasecmp( i->c_str() + ( i->size() - 4 ), ".dat" ) != 0
+              && strcasecmp( i->c_str() + ( i->size() - 4 ), ".lsa" ) != 0 ) )
       continue;
 
-    try
-    {
+    try {
       File::Class f( *i, "rb" );
 
       /// Check the signature
 
       char buf[ 9 ];
 
-      if ( f.readRecords( buf, 9, 1 ) != 1 || memcmp( buf, "L\09\0S\0A\0\xff", 9 ) != 0 )
-      {
+      if ( f.readRecords( buf, 9, 1 ) != 1 || memcmp( buf, "L\09\0S\0A\0\xff", 9 ) != 0 ) {
         // The file is too short or the signature doesn't match -- skip this
         // file
         continue;
@@ -556,8 +524,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
 
         gdDebug( "Lsa: Building the index for dictionary: %s\n", i->c_str() );
@@ -586,8 +553,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         vector< uint16_t > filenameBuffer;
 
-        while( entriesCount-- )
-        {
+        while ( entriesCount-- ) {
           uint32_t offset = f.tell();
 
           Entry e( f );
@@ -619,11 +585,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
         idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-        idxHeader.indexRootOffset = idxInfo.rootOffset;
+        idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
-         // That concludes it. Update the header.
+        // That concludes it. Update the header.
 
-        idxHeader.signature = Signature;
+        idxHeader.signature     = Signature;
         idxHeader.formatVersion = CurrentFormatVersion;
 
         idx.rewind();
@@ -631,14 +597,10 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
 
-      dictionaries.push_back( std::make_shared<LsaDictionary>( dictId,
-                                                 indexFile,
-                                                 dictFiles ) );
+      dictionaries.push_back( std::make_shared< LsaDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "Lingvo's LSA reading failed: %s, error: %s\n",
-                 i->c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "Lingvo's LSA reading failed: %s, error: %s\n", i->c_str(), e.what() );
     }
   }
 
@@ -646,4 +608,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 }
 
 
-}
+} // namespace Lsa
diff --git a/src/dict/lsa.hh b/src/dict/lsa.hh
index 96751f71..cfece681 100644
--- a/src/dict/lsa.hh
+++ b/src/dict/lsa.hh
@@ -12,12 +12,9 @@ namespace Lsa {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-  ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Lsa
 
 #endif
diff --git a/src/dict/mdictparser.cc b/src/dict/mdictparser.cc
index 36832f8d..61a5c042 100644
--- a/src/dict/mdictparser.cc
+++ b/src/dict/mdictparser.cc
@@ -32,10 +32,10 @@
 #include <QDomDocument>
 #include <QTextDocumentFragment>
 #include <QDataStream>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 #include "decompress.hh"
 #include "gddebug.hh"
@@ -43,21 +43,18 @@
 #include "utils.hh"
 #include "htmlescape.hh"
 
-namespace Mdict
-{
+namespace Mdict {
 
-enum EncryptedSection
-{
+enum EncryptedSection {
   EcryptedHeadWordHeader = 1,
-  EcryptedHeadWordIndex = 2
+  EcryptedHeadWordIndex  = 2
 };
 
 static inline int u16StrSize( const ushort * unicode )
 {
   int size = 0;
-  if ( unicode )
-  {
-    while ( unicode[size] != 0 )
+  if ( unicode ) {
+    while ( unicode[ size ] != 0 )
       size++;
   }
   return size;
@@ -70,24 +67,23 @@ static QDomNamedNodeMap parseHeaderAttributes( const QString & headerText )
   doc.setContent( headerText );
 
   QDomElement docElem = doc.documentElement();
-  attributes = docElem.attributes();
+  attributes          = docElem.attributes();
 
 
   return attributes;
 }
 
-size_t MdictParser::RecordIndex::bsearch( const vector<MdictParser::RecordIndex> & offsets, qint64 val )
+size_t MdictParser::RecordIndex::bsearch( const vector< MdictParser::RecordIndex > & offsets, qint64 val )
 {
   if ( offsets.size() == 0 )
-    return ( size_t ) ( -1 );
+    return (size_t)( -1 );
 
   size_t lo = 0;
   size_t hi = offsets.size() - 1;
 
-  while ( lo <= hi )
-  {
-    size_t mid = ( lo + hi ) >> 1;
-    RecordIndex const & p = offsets[mid];
+  while ( lo <= hi ) {
+    size_t mid            = ( lo + hi ) >> 1;
+    RecordIndex const & p = offsets[ mid ];
     if ( p == val )
       return mid;
     else if ( p < val )
@@ -96,10 +92,10 @@ size_t MdictParser::RecordIndex::bsearch( const vector<MdictParser::RecordIndex>
       hi = mid - 1;
   }
 
-  return ( size_t ) ( -1 );
+  return (size_t)( -1 );
 }
 
-MdictParser::MdictParser() :
+MdictParser::MdictParser():
   version_( 0 ),
   numHeadWordBlocks_( 0 ),
   headWordBlockInfoSize_( 0 ),
@@ -118,7 +114,7 @@ MdictParser::MdictParser() :
 bool MdictParser::open( const char * filename )
 {
   filename_ = QString::fromUtf8( filename );
-  file_ = new QFile( filename_ );
+  file_     = new QFile( filename_ );
 
   gdDebug( "MdictParser: open %s", filename );
 
@@ -148,7 +144,7 @@ bool MdictParser::readNextHeadWordIndex( MdictParser::HeadWordIndex & headWordIn
   if ( headWordBlockInfosIter_ == headWordBlockInfos_.end() )
     return false;
 
-  qint64 compressedSize = headWordBlockInfosIter_->first;
+  qint64 compressedSize   = headWordBlockInfosIter_->first;
   qint64 decompressedSize = headWordBlockInfosIter_->second;
 
   if ( compressedSize < 8 )
@@ -160,8 +156,7 @@ bool MdictParser::readNextHeadWordIndex( MdictParser::HeadWordIndex & headWordIn
 
   headWordPos_ += compressedSize;
   QByteArray decompressed;
-  if ( !parseCompressedBlock( compressedSize, ( char * )compressed.startAddress(),
-                              decompressedSize, decompressed ) )
+  if ( !parseCompressedBlock( compressedSize, (char *)compressed.startAddress(), decompressedSize, decompressed ) )
     return false;
 
   headWordIndex = splitHeadWordBlock( decompressed );
@@ -169,11 +164,11 @@ bool MdictParser::readNextHeadWordIndex( MdictParser::HeadWordIndex & headWordIn
   return true;
 }
 
-bool MdictParser::checkAdler32(const char * buffer, unsigned int len, quint32 checksum)
+bool MdictParser::checkAdler32( const char * buffer, unsigned int len, quint32 checksum )
 {
   uLong adler = adler32( 0L, Z_NULL, 0 );
-  adler = adler32( adler, ( const Bytef * ) buffer, len );
-  return (adler & 0xFFFFFFFF) == checksum;
+  adler       = adler32( adler, (const Bytef *)buffer, len );
+  return ( adler & 0xFFFFFFFF ) == checksum;
 }
 
 QString MdictParser::toUtf16( const char * fromCode, const char * from, size_t fromSize )
@@ -181,29 +176,28 @@ QString MdictParser::toUtf16( const char * fromCode, const char * from, size_t f
   if ( !fromCode || !from )
     return QString();
 
-  QTextCodec *codec =QTextCodec::codecForName(fromCode);
-  return codec->toUnicode(from,fromSize);
+  QTextCodec * codec = QTextCodec::codecForName( fromCode );
+  return codec->toUnicode( from, fromSize );
 }
 
-bool MdictParser::decryptHeadWordIndex(char * buffer, qint64 len)
+bool MdictParser::decryptHeadWordIndex( char * buffer, qint64 len )
 {
   RIPEMD128 ripemd;
-  ripemd.update( ( const uchar * ) buffer + 4, 4 );
-  ripemd.update( ( const uchar * ) "\x95\x36\x00\x00", 4 );
+  ripemd.update( (const uchar *)buffer + 4, 4 );
+  ripemd.update( (const uchar *)"\x95\x36\x00\x00", 4 );
 
-  uint8_t key[16];
+  uint8_t key[ 16 ];
   ripemd.digest( key );
 
   buffer += 8;
   len -= 8;
   uint8_t prev = 0x36;
-  for (qint64 i = 0; i < len; ++i)
-  {
-    uint8_t byte = buffer[i];
-    byte = (byte >> 4) | (byte << 4);
-    byte = byte ^ prev ^ (i & 0xFF) ^ key[i % 16];
-    prev = buffer[i];
-    buffer[i] = byte;
+  for ( qint64 i = 0; i < len; ++i ) {
+    uint8_t byte = buffer[ i ];
+    byte         = ( byte >> 4 ) | ( byte << 4 );
+    byte         = byte ^ prev ^ ( i & 0xFF ) ^ key[ i % 16 ];
+    prev         = buffer[ i ];
+    buffer[ i ]  = byte;
   }
   return true;
 }
@@ -217,17 +211,15 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
     return false;
 
   // compression type
-  quint32 type = qFromBigEndian<quint32>( ( const uchar * ) compressedBlockPtr );
-  quint32 checksum = qFromBigEndian<quint32>( ( const uchar * )compressedBlockPtr + 4 );
+  quint32 type     = qFromBigEndian< quint32 >( (const uchar *)compressedBlockPtr );
+  quint32 checksum = qFromBigEndian< quint32 >( (const uchar *)compressedBlockPtr + 4 );
   const char * buf = compressedBlockPtr + 8;
-  qint64 size = compressedBlockSize - 8;
+  qint64 size      = compressedBlockSize - 8;
 
-  switch ( type )
-  {
+  switch ( type ) {
     case 0x00000000:
       // No compression
-      if ( !checkAdler32( buf, size, checksum ) )
-      {
+      if ( !checkAdler32( buf, size, checksum ) ) {
         gdWarning( "MDict: parseCompressedBlock: plain: checksum not match" );
         return false;
       }
@@ -235,39 +227,30 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
       decompressedBlock = QByteArray( buf, size );
       return true;
 
-    case 0x01000000:
-      {
-        // LZO compression
-        int result;
-        lzo_uint blockSize = ( lzo_uint )decompressedBlockSize;
-        decompressedBlock.resize( blockSize );
-        result = lzo1x_decompress_safe( ( const uchar * ) buf, size,
-                                        ( uchar * )decompressedBlock.data(),
-                                        &blockSize, NULL );
+    case 0x01000000: {
+      // LZO compression
+      int result;
+      lzo_uint blockSize = (lzo_uint)decompressedBlockSize;
+      decompressedBlock.resize( blockSize );
+      result = lzo1x_decompress_safe( (const uchar *)buf, size, (uchar *)decompressedBlock.data(), &blockSize, NULL );
 
-        if ( result != LZO_E_OK || blockSize != ( lzo_uint )decompressedBlockSize )
-        {
-          gdWarning( "MDict: parseCompressedBlock: decompression failed" );
-          return false;
-        }
-
-        if ( checksum != lzo_adler32( lzo_adler32( 0, NULL, 0 ),
-                                      ( const uchar * )decompressedBlock.constData(),
-                                      blockSize ) )
-        {
-          gdWarning( "MDict: parseCompressedBlock: lzo: checksum does not match" );
-          return false;
-        }
+      if ( result != LZO_E_OK || blockSize != (lzo_uint)decompressedBlockSize ) {
+        gdWarning( "MDict: parseCompressedBlock: decompression failed" );
+        return false;
       }
-      break;
+
+      if ( checksum
+           != lzo_adler32( lzo_adler32( 0, NULL, 0 ), (const uchar *)decompressedBlock.constData(), blockSize ) ) {
+        gdWarning( "MDict: parseCompressedBlock: lzo: checksum does not match" );
+        return false;
+      }
+    } break;
 
     case 0x02000000:
       // zlib compression
       decompressedBlock = zlibDecompress( buf, size );
 
-      if ( !checkAdler32( decompressedBlock.constData(), decompressedBlock.size(),
-                          checksum ) )
-      {
+      if ( !checkAdler32( decompressedBlock.constData(), decompressedBlock.size(), checksum ) ) {
         gdWarning( "MDict: parseCompressedBlock: zlib: checksum does not match" );
         return false;
       }
@@ -283,14 +266,12 @@ bool MdictParser::parseCompressedBlock( qint64 compressedBlockSize,
 
 qint64 MdictParser::readNumber( QDataStream & in )
 {
-  if ( numberTypeSize_ == 8 )
-  {
+  if ( numberTypeSize_ == 8 ) {
     qint64 val;
     in >> val;
     return val;
   }
-  else
-  {
+  else {
     quint32 val;
     in >> val;
     return val;
@@ -299,14 +280,12 @@ qint64 MdictParser::readNumber( QDataStream & in )
 
 quint32 MdictParser::readU8OrU16( QDataStream & in, bool isU16 )
 {
-  if ( isU16 )
-  {
+  if ( isU16 ) {
     quint16 val;
     in >> val;
     return val;
   }
-  else
-  {
+  else {
     quint8 val;
     in >> val;
     return val;
@@ -328,8 +307,7 @@ bool MdictParser::readHeader( QDataStream & in )
   quint32 checksum;
   in.setByteOrder( QDataStream::LittleEndian );
   in >> checksum;
-  if ( !checkAdler32( headerTextUtf16.constData(), headerTextUtf16.size(), checksum ) )
-  {
+  if ( !checkAdler32( headerTextUtf16.constData(), headerTextUtf16.size(), checksum ) ) {
     gdWarning( "MDict: readHeader: checksum does not match" );
     return false;
   }
@@ -340,31 +318,27 @@ bool MdictParser::readHeader( QDataStream & in )
   //parse stylesheet
   QString styleSheets;
 
-  if( headerText.contains( "StyleSheet" ) )
-  {
+  if ( headerText.contains( "StyleSheet" ) ) {
     // a workaround to bypass https://bugreports.qt.io/browse/QTBUG-102612
     QRegularExpression rx( "StyleSheet=\"([^\"]*?)\"", QRegularExpression::CaseInsensitiveOption );
 
     auto match = rx.match( headerText );
 
-    if( match.hasMatch() || match.hasPartialMatch() )
-    {
+    if ( match.hasMatch() || match.hasPartialMatch() ) {
       styleSheets = match.captured( 1 );
     }
   }
 
   //with this control character ,qt6.x can not parse attribute value.
-  headerText.remove(QRegularExpression("\\p{C}"));
+  headerText.remove( QRegularExpression( "\\p{C}", QRegularExpression::UseUnicodePropertiesOption ) );
 
   QDomNamedNodeMap headerAttributes = parseHeaderAttributes( headerText );
 
   encoding_ = headerAttributes.namedItem( "Encoding" ).toAttr().value();
-  if ( encoding_ == "GBK" || encoding_ == "GB2312" )
-  {
+  if ( encoding_ == "GBK" || encoding_ == "GB2312" ) {
     encoding_ = "GB18030";
   }
-  else if ( encoding_.isEmpty() || encoding_ == "UTF-16" )
-  {
+  else if ( encoding_.isEmpty() || encoding_ == "UTF-16" ) {
     encoding_ = "UTF-16LE";
   }
 
@@ -372,14 +346,12 @@ bool MdictParser::readHeader( QDataStream & in )
   //   styleId # 1-255
   //   style.prefix
   //   style.suffix
-  if ( !styleSheets.isEmpty() )
-  {
+  if ( !styleSheets.isEmpty() ) {
     QStringList lines = styleSheets.split( QRegularExpression( "[\r\n]" ), Qt::KeepEmptyParts );
 
-    for( int i = 0; i < lines.size() - 3; i += 3 )
-    {
+    for ( int i = 0; i < lines.size() - 3; i += 3 ) {
       styleSheets_[ lines[ i ].toInt() ] =
-        pair( Html::fromHtmlEscaped( lines[ i + 1 ] ),  Html::fromHtmlEscaped( lines[ i + 2 ] ) );
+        pair( Html::fromHtmlEscaped( lines[ i + 1 ] ), Html::fromHtmlEscaped( lines[ i + 2 ] ) );
     }
   }
 
@@ -392,33 +364,30 @@ bool MdictParser::readHeader( QDataStream & in )
     numberTypeSize_ = 8;
 
   // Encrypted ?
-  encrypted_ = headerAttributes.namedItem("Encrypted").toAttr().value().toInt();
+  encrypted_ = headerAttributes.namedItem( "Encrypted" ).toAttr().value().toInt();
 
   // Read metadata
-  rtl_ = headerAttributes.namedItem( "Left2Right" ).toAttr().value() != "Yes";
+  rtl_          = headerAttributes.namedItem( "Left2Right" ).toAttr().value() != "Yes";
   QString title = headerAttributes.namedItem( "Title" ).toAttr().value();
-  if ( title.isEmpty() || title.length() < 5 || title == "Title (No HTML code allowed)" )
-  {
+  if ( title.isEmpty() || title.length() < 5 || title == "Title (No HTML code allowed)" ) {
     // Use filename instead
     QFileInfo fi( filename_ );
     title_ = fi.baseName();
   }
-  else
-  {
+  else {
     if ( title.contains( '<' ) || title.contains( '>' ) )
       title_ = QTextDocumentFragment::fromHtml( title ).toPlainText();
     else
       title_ = title;
   }
   QString description = headerAttributes.namedItem( "Description" ).toAttr().value();
-  description_ = description; //QTextDocumentFragment::fromHtml( description ).toPlainText();
+  description_        = description; //QTextDocumentFragment::fromHtml( description ).toPlainText();
   return true;
 }
 
 bool MdictParser::readHeadWordBlockInfos( QDataStream & in )
 {
-  QByteArray header = file_->read( version_ >= 2.0 ? ( numberTypeSize_ * 5 )
-                                                   : ( numberTypeSize_ * 4 ) );
+  QByteArray header = file_->read( version_ >= 2.0 ? ( numberTypeSize_ * 5 ) : ( numberTypeSize_ * 4 ) );
   QDataStream stream( header );
 
   // number of headword blocks
@@ -438,8 +407,7 @@ bool MdictParser::readHeadWordBlockInfos( QDataStream & in )
 
   // Adler-32 checksum of the header. If those are encrypted, it is
   // the checksum of the decrypted version
-  if ( version_ >= 2.0 )
-  {
+  if ( version_ >= 2.0 ) {
     quint32 checksum;
     in >> checksum;
     if ( !checkAdler32( header.constData(), numberTypeSize_ * 5, checksum ) )
@@ -453,60 +421,53 @@ bool MdictParser::readHeadWordBlockInfos( QDataStream & in )
   if ( headWordBlockInfo.size() != headWordBlockInfoSize_ )
     return false;
 
-  if ( version_ >= 2.0 )
-  {
+  if ( version_ >= 2.0 ) {
     // decrypt
-    if ( encrypted_ & EcryptedHeadWordIndex )
-    {
-      if ( !decryptHeadWordIndex( headWordBlockInfo.data(),
-                                  headWordBlockInfo.size() ) )
+    if ( encrypted_ & EcryptedHeadWordIndex ) {
+      if ( !decryptHeadWordIndex( headWordBlockInfo.data(), headWordBlockInfo.size() ) )
         return false;
     }
 
     QByteArray decompressed;
-    if ( !parseCompressedBlock( headWordBlockInfo.size(), headWordBlockInfo.data(),
-                                decompressedSize, decompressed) )
+    if ( !parseCompressedBlock( headWordBlockInfo.size(), headWordBlockInfo.data(), decompressedSize, decompressed ) )
       return false;
 
     headWordBlockInfos_ = decodeHeadWordBlockInfo( decompressed );
   }
-  else
-  {
+  else {
     headWordBlockInfos_ = decodeHeadWordBlockInfo( headWordBlockInfo );
   }
 
-  headWordPos_ = file_->pos();
+  headWordPos_            = file_->pos();
   headWordBlockInfosIter_ = headWordBlockInfos_.begin();
   return true;
 }
 
 bool MdictParser::readRecordBlockInfos()
 {
-  file_->seek( headWordBlockInfoPos_ + headWordBlockInfoSize_ +
-               headWordBlockSize_ );
+  file_->seek( headWordBlockInfoPos_ + headWordBlockInfoSize_ + headWordBlockSize_ );
 
   QDataStream in( file_ );
   in.setByteOrder( QDataStream::BigEndian );
   qint64 numRecordBlocks = readNumber( in );
   readNumber( in ); // total number of records, skip
   qint64 recordInfoSize = readNumber( in );
-  totalRecordsSize_ = readNumber( in );
-  recordPos_ = file_->pos() + recordInfoSize;
+  totalRecordsSize_     = readNumber( in );
+  recordPos_            = file_->pos() + recordInfoSize;
 
   // Build record block index
   recordBlockInfos_.reserve( numRecordBlocks );
 
   qint64 acc1 = 0;
   qint64 acc2 = 0;
-  for ( qint64 i = 0; i < numRecordBlocks; i++ )
-  {
+  for ( qint64 i = 0; i < numRecordBlocks; i++ ) {
     RecordIndex r;
-    r.compressedSize = readNumber( in );
+    r.compressedSize   = readNumber( in );
     r.decompressedSize = readNumber( in );
-    r.startPos = acc1;
-    r.endPos = acc1 + r.compressedSize;
-    r.shadowStartPos = acc2;
-    r.shadowEndPos = acc2 + r.decompressedSize;
+    r.startPos         = acc1;
+    r.endPos           = acc1 + r.compressedSize;
+    r.shadowStartPos   = acc2;
+    r.shadowEndPos     = acc2 + r.decompressedSize;
     recordBlockInfos_.push_back( r );
 
     acc1 = r.endPos;
@@ -523,17 +484,15 @@ MdictParser::BlockInfoVector MdictParser::decodeHeadWordBlockInfo( QByteArray co
   QDataStream s( headWordBlockInfo );
   s.setByteOrder( QDataStream::BigEndian );
 
-  bool isU16 = false;
+  bool isU16       = false;
   int textTermSize = 0;
 
-  if ( version_ >= 2.0 )
-  {
-    isU16 = true;
+  if ( version_ >= 2.0 ) {
+    isU16        = true;
     textTermSize = 1;
   }
 
-  while ( !s.atEnd() )
-  {
+  while ( !s.atEnd() ) {
     // Number of keywords in the block
     s.skipRawData( numberTypeSize_ );
     // Size of the first headword in the block
@@ -555,7 +514,7 @@ MdictParser::BlockInfoVector MdictParser::decodeHeadWordBlockInfo( QByteArray co
     qint64 compressedSize = readNumber( s );
     // headword block decompressed size
     qint64 decompressedSize = readNumber( s );
-    headWordBlockInfos.emplace_back(compressedSize, decompressedSize);
+    headWordBlockInfos.emplace_back( compressedSize, decompressedSize );
   }
 
   return headWordBlockInfos;
@@ -565,30 +524,26 @@ MdictParser::HeadWordIndex MdictParser::splitHeadWordBlock( QByteArray const & b
 {
   HeadWordIndex index;
 
-  const char * p = block.constData();
+  const char * p   = block.constData();
   const char * end = p + block.size();
 
-  while ( p < end )
-  {
-    qint64 headWordId = ( numberTypeSize_ == 8 ) ?
-                        qFromBigEndian<qint64>( ( const uchar * )p ) :
-                        qFromBigEndian<quint32>( ( const uchar * )p );
+  while ( p < end ) {
+    qint64 headWordId = ( numberTypeSize_ == 8 ) ? qFromBigEndian< qint64 >( (const uchar *)p ) :
+                                                   qFromBigEndian< quint32 >( (const uchar *)p );
     p += numberTypeSize_;
     QByteArray headWordBuf;
 
-    if ( encoding_ == "UTF-16LE" )
-    {
-      int headWordLength = u16StrSize( ( const ushort * )p );
-      headWordBuf = QByteArray( p, ( headWordLength + 1 ) * 2 );
+    if ( encoding_ == "UTF-16LE" ) {
+      int headWordLength = u16StrSize( (const ushort *)p );
+      headWordBuf        = QByteArray( p, ( headWordLength + 1 ) * 2 );
     }
-    else
-    {
+    else {
       int headWordLength = strlen( p );
-      headWordBuf = QByteArray( p, headWordLength + 1 );
+      headWordBuf        = QByteArray( p, headWordLength + 1 );
     }
     p += headWordBuf.size();
     QString headWord = toUtf16( encoding_, headWordBuf.constBegin(), headWordBuf.size() );
-    index.emplace_back(headWordId, headWord);
+    index.emplace_back( headWordId, headWord );
   }
 
   return index;
@@ -600,15 +555,14 @@ bool MdictParser::readRecordBlock( MdictParser::HeadWordIndex & headWordIndex,
   // cache the index, the headWordIndex is already sorted
   size_t idx = 0;
 
-  for ( HeadWordIndex::const_iterator i = headWordIndex.begin(); i != headWordIndex.end(); ++i )
-  {
-    if (recordBlockInfos_[idx].shadowEndPos <= i->first)
+  for ( HeadWordIndex::const_iterator i = headWordIndex.begin(); i != headWordIndex.end(); ++i ) {
+    if ( recordBlockInfos_[ idx ].shadowEndPos <= i->first )
       idx = RecordIndex::bsearch( recordBlockInfos_, i->first );
 
-    if ( idx == ( size_t )( -1 ) )
+    if ( idx == (size_t)( -1 ) )
       return false;
 
-    RecordIndex const & recordIndex = recordBlockInfos_[idx];
+    RecordIndex const & recordIndex     = recordBlockInfos_[ idx ];
     HeadWordIndex::const_iterator iNext = i + 1;
     qint64 recordSize;
     if ( iNext == headWordIndex.end() )
@@ -617,11 +571,11 @@ bool MdictParser::readRecordBlock( MdictParser::HeadWordIndex & headWordIndex,
       recordSize = iNext->first - i->first;
 
     RecordInfo recordInfo;
-    recordInfo.compressedBlockPos = recordPos_ + recordIndex.startPos;
-    recordInfo.recordOffset = i->first - recordIndex.shadowStartPos;
+    recordInfo.compressedBlockPos    = recordPos_ + recordIndex.startPos;
+    recordInfo.recordOffset          = i->first - recordIndex.shadowStartPos;
     recordInfo.decompressedBlockSize = recordIndex.decompressedSize;
-    recordInfo.compressedBlockSize = recordIndex.compressedSize;
-    recordInfo.recordSize = recordSize;
+    recordInfo.compressedBlockSize   = recordIndex.compressedSize;
+    recordInfo.recordSize            = recordSize;
 
     recordHandler.handleRecord( i->second, recordInfo );
   }
@@ -638,32 +592,28 @@ QString & MdictParser::substituteStylesheet( QString & article, MdictParser::Sty
   int pos = 0;
 
   QRegularExpressionMatchIterator it = rx.globalMatch( article );
-  while ( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
-    int styleId = match.captured( 1 ).toInt();
+    int styleId                   = match.captured( 1 ).toInt();
     articleNewText += article.mid( pos, match.capturedStart() - pos );
     pos = match.capturedEnd();
 
     StyleSheets::const_iterator iter = styleSheets.find( styleId );
 
-    if ( iter != styleSheets.end() )
-    {
+    if ( iter != styleSheets.end() ) {
       QString rep = endStyle + iter->second.first;
       articleNewText += rep;
 
       endStyle = iter->second.second;
     }
-    else
-    {
+    else {
       articleNewText += endStyle;
 
       endStyle = "";
     }
   }
-  if( pos )
-  {
-    articleNewText += Utils::rstripnull( article.mid( pos ));
+  if ( pos ) {
+    articleNewText += Utils::rstripnull( article.mid( pos ) );
     article = articleNewText;
     articleNewText.clear();
   }
@@ -671,4 +621,4 @@ QString & MdictParser::substituteStylesheet( QString & article, MdictParser::Sty
   return article;
 }
 
-}
+} // namespace Mdict
diff --git a/src/dict/mdictparser.hh b/src/dict/mdictparser.hh
index bd754f56..a4d44edd 100644
--- a/src/dict/mdictparser.hh
+++ b/src/dict/mdictparser.hh
@@ -29,8 +29,7 @@
 #include <QPointer>
 #include <QFile>
 
-namespace Mdict
-{
+namespace Mdict {
 
 using std::string;
 using std::vector;
@@ -44,7 +43,7 @@ class ScopedMemMap
   uchar * address;
 
 public:
-  ScopedMemMap( QFile & file, qint64 offset, qint64 size ) :
+  ScopedMemMap( QFile & file, qint64 offset, qint64 size ):
     file( file ),
     address( file.map( offset, size ) )
   {
@@ -66,8 +65,7 @@ class MdictParser
 {
 public:
 
-  enum
-  {
+  enum {
     kParserVersion = 0x000000d
   };
 
@@ -95,7 +93,7 @@ public:
       return shadowStartPos > rhs;
     }
 
-    static size_t bsearch( vector<RecordIndex> const & offsets, qint64 val );
+    static size_t bsearch( vector< RecordIndex > const & offsets, qint64 val );
   };
 
   struct RecordInfo
@@ -114,9 +112,9 @@ public:
     virtual void handleRecord( QString const & name, RecordInfo const & recordInfo ) = 0;
   };
 
-  typedef vector< pair<qint64, qint64> > BlockInfoVector;
-  typedef vector< pair<qint64, QString> > HeadWordIndex;
-  typedef map<qint32, pair<QString, QString> > StyleSheets;
+  typedef vector< pair< qint64, qint64 > > BlockInfoVector;
+  typedef vector< pair< qint64, QString > > HeadWordIndex;
+  typedef map< qint32, pair< QString, QString > > StyleSheets;
 
   inline QString const & title() const
   {
@@ -166,8 +164,10 @@ public:
   {
     return toUtf16( fromCode.toLatin1().constData(), from, fromSize );
   }
-  static bool parseCompressedBlock( qint64 compressedBlockSize, const char * compressedBlockPtr,
-                                    qint64 decompressedBlockSize, QByteArray & decompressedBlock);
+  static bool parseCompressedBlock( qint64 compressedBlockSize,
+                                    const char * compressedBlockPtr,
+                                    qint64 decompressedBlockSize,
+                                    QByteArray & decompressedBlock );
   static QString & substituteStylesheet( QString & article, StyleSheets const & styleSheets );
   static inline string substituteStylesheet( string const & article, StyleSheets const & styleSheets )
   {
@@ -179,8 +179,8 @@ public:
 protected:
   qint64 readNumber( QDataStream & in );
   static quint32 readU8OrU16( QDataStream & in, bool isU16 );
-  static bool checkAdler32(const char * buffer, unsigned int len, quint32 checksum);
-  static bool decryptHeadWordIndex(char * buffer, qint64 len);
+  static bool checkAdler32( const char * buffer, unsigned int len, quint32 checksum );
+  static bool decryptHeadWordIndex( char * buffer, qint64 len );
   bool readHeader( QDataStream & in );
   bool readHeadWordBlockInfos( QDataStream & in );
   bool readRecordBlockInfos();
@@ -189,11 +189,11 @@ protected:
 
 protected:
   QString filename_;
-  QPointer<QFile> file_;
+  QPointer< QFile > file_;
   StyleSheets styleSheets_;
   BlockInfoVector headWordBlockInfos_;
   BlockInfoVector::iterator headWordBlockInfosIter_;
-  vector<RecordIndex> recordBlockInfos_;
+  vector< RecordIndex > recordBlockInfos_;
 
   QString encoding_;
   QString title_;
@@ -214,6 +214,6 @@ protected:
   bool rtl_;
 };
 
-}
+} // namespace Mdict
 
 #endif // __MDICTPARSER_HH_INCLUDED__
diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc
index 57c8764e..a80a1d1a 100644
--- a/src/dict/mdx.cc
+++ b/src/dict/mdx.cc
@@ -38,8 +38,7 @@
 #include <QThreadPool>
 #include <QtConcurrent>
 
-namespace Mdx
-{
+namespace Mdx {
 
 using std::map;
 using std::multimap;
@@ -56,9 +55,8 @@ using BtreeIndexing::IndexInfo;
 
 using namespace Mdict;
 
-enum
-{
-  kSignature = 0x4349444d,  // MDIC
+enum {
+  kSignature            = 0x4349444d, // MDIC
   kCurrentFormatVersion = 11 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
@@ -66,7 +64,7 @@ DEF_EX( exCorruptDictionary, "dictionary file was tampered or corrupted", std::e
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, MDIC
+  uint32_t signature;     // First comes the signature, MDIC
   uint32_t formatVersion; // File format version, currently 1.
   uint32_t parserVersion; // Version of the parser used to parse the MDIC file.
   // Version of the folding algorithm used when building
@@ -75,13 +73,13 @@ struct IdxHeader
   uint32_t foldingVersion;
 
   uint32_t articleCount; // Total number of articles, for informative purposes only
-  uint32_t wordCount; // Total number of words, for informative purposes only
+  uint32_t wordCount;    // Total number of words, for informative purposes only
 
   uint32_t isRightToLeft; // Right to left
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t chunksOffset;  // The offset to chunks' storage
 
   uint32_t descriptionAddress; // Address of the dictionary description in the chunks' storage
-  uint32_t descriptionSize; // Size of the description in the chunks' storage, 0 = no description
+  uint32_t descriptionSize;    // Size of the description in the chunks' storage, 0 = no description
 
   uint32_t styleSheetAddress;
   uint32_t styleSheetCount;
@@ -90,10 +88,10 @@ struct IdxHeader
   uint32_t indexRootOffset;
 
   uint32_t langFrom; // Source language
-  uint32_t langTo; // Target language
+  uint32_t langTo;   // Target language
 
   uint32_t mddIndexInfosOffset; // address of IndexInfos for resource files (.mdd)
-  uint32_t mddIndexInfosCount; // count of IndexInfos for resource files
+  uint32_t mddIndexInfosCount;  // count of IndexInfos for resource files
 }
 #ifndef _MSC_VER
 __attribute__( ( packed ) )
@@ -115,7 +113,8 @@ public:
     idxMutex( idxMutex ),
     chunks( chunks ),
     isFileOpen( false )
-  {}
+  {
+  }
 
   /// Opens the index. The values are those previously returned by buildIndex().
   using BtreeIndexing::BtreeIndex::openIndex;
@@ -162,8 +161,7 @@ public:
     memcpy( &indexEntry, indexEntryPtr, sizeof( indexEntry ) );
 
     //corrupted file or broken entry.
-    if (indexEntry.decompressedBlockSize < indexEntry.recordOffset + indexEntry.recordSize)
-    {
+    if ( indexEntry.decompressedBlockSize < indexEntry.recordOffset + indexEntry.recordSize ) {
       return false;
     }
 
@@ -172,16 +170,14 @@ public:
     {
       QMutexLocker _( &idxMutex );
       ScopedMemMap compressed( mddFile, indexEntry.compressedBlockPos, indexEntry.compressedBlockSize );
-      if( !compressed.startAddress() )
-      {
+      if ( !compressed.startAddress() ) {
         return false;
       }
 
-      if( !MdictParser::parseCompressedBlock( indexEntry.compressedBlockSize,
-                                              (char *)compressed.startAddress(),
-                                              indexEntry.decompressedBlockSize,
-                                              decompressed ) )
-      {
+      if ( !MdictParser::parseCompressedBlock( indexEntry.compressedBlockSize,
+                                               (char *)compressed.startAddress(),
+                                               indexEntry.decompressedBlockSize,
+                                               decompressed ) ) {
         return false;
       }
     }
@@ -190,7 +186,6 @@ public:
     memcpy( &result.front(), decompressed.constData() + indexEntry.recordOffset, indexEntry.recordSize );
     return true;
   }
-
 };
 
 class MdxDictionary: public BtreeIndexing::BtreeDictionary
@@ -214,7 +209,7 @@ class MdxDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  MdxDictionary( string const & id, string const & indexFile, vector<string> const & dictionaryFiles );
+  MdxDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   ~MdxDictionary() override;
 
@@ -250,27 +245,24 @@ public:
     return idxHeader.langTo;
   }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const & word,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override ;
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const & word, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
   QString const & getDescription() override;
 
   sptr< Dictionary::DataRequest >
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
     if ( !ensureInitDone().empty() )
       return;
 
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "MDICT", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "MDICT", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
 
   QString getCachedFileName( QString name );
@@ -314,16 +306,14 @@ MdxDictionary::MdxDictionary( string const & id, string const & indexFile, vecto
   idx.seek( sizeof( idxHeader ) );
   size_t len = idx.read< uint32_t >();
   vector< char > buf( len );
-  if( len > 0 )
-  {
+  if ( len > 0 ) {
     idx.read( &buf.front(), len );
     dictionaryName = string( &buf.front(), len );
   }
 
   // then read the dictionary's encoding
   len = idx.read< uint32_t >();
-  if( len > 0 )
-  {
+  if ( len > 0 ) {
     buf.resize( len );
     idx.read( &buf.front(), len );
     encoding = string( &buf.front(), len );
@@ -338,13 +328,10 @@ MdxDictionary::MdxDictionary( string const & id, string const & indexFile, vecto
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 
-  cacheDirName = QDir::tempPath() + QDir::separator()
-                 + QString::fromUtf8( getId().c_str() )
-                 + ".cache";
+  cacheDirName = QDir::tempPath() + QDir::separator() + QString::fromUtf8( getId().c_str() ) + ".cache";
 }
 
 MdxDictionary::~MdxDictionary()
@@ -360,16 +347,18 @@ MdxDictionary::~MdxDictionary()
 
 void MdxDictionary::deferredInit()
 {
-  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) )
-  {
+  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) ) {
     QMutexLocker _( &deferredInitMutex );
 
     if ( Utils::AtomicInt::loadAcquire( deferredInitDone ) )
       return;
 
-    if ( !deferredInitRunnableStarted )
-    {
-      QThreadPool::globalInstance()->start( [ this ]() { this->doDeferredInit(); },-1000 );
+    if ( !deferredInitRunnableStarted ) {
+      QThreadPool::globalInstance()->start(
+        [ this ]() {
+          this->doDeferredInit();
+        },
+        -1000 );
       deferredInitRunnableStarted = true;
     }
   }
@@ -383,8 +372,7 @@ string const & MdxDictionary::ensureInitDone()
 
 void MdxDictionary::doDeferredInit()
 {
-  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) )
-  {
+  if ( !Utils::AtomicInt::loadAcquire( deferredInitDone ) ) {
     QMutexLocker _( &deferredInitMutex );
 
     if ( Utils::AtomicInt::loadAcquire( deferredInitDone ) )
@@ -392,12 +380,10 @@ void MdxDictionary::doDeferredInit()
 
     // Do deferred init
 
-    try
-    {
+    try {
       // Retrieve stylesheets
       idx.seek( idxHeader.styleSheetAddress );
-      for ( uint32_t i = 0; i < idxHeader.styleSheetCount; i++ )
-      {
+      for ( uint32_t i = 0; i < idxHeader.styleSheetCount; i++ ) {
         qint32 key = idx.read< qint32 >();
         vector< char > buf;
         quint32 sz;
@@ -412,48 +398,43 @@ void MdxDictionary::doDeferredInit()
         idx.read( &buf.front(), sz );
         QString styleEnd = QString::fromUtf8( buf.data() );
 
-        styleSheets[ key ] = pair<QString, QString>( styleBegin, styleEnd );
+        styleSheets[ key ] = pair< QString, QString >( styleBegin, styleEnd );
       }
 
       // Initialize the index
-      openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                            idxHeader.indexRootOffset ), idx, idxMutex );
+      openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
       vector< string > mddFileNames;
       vector< IndexInfo > mddIndexInfos;
       idx.seek( idxHeader.mddIndexInfosOffset );
-      for ( uint32_t i = 0; i < idxHeader.mddIndexInfosCount; i++ )
-      {
+      for ( uint32_t i = 0; i < idxHeader.mddIndexInfosCount; i++ ) {
         quint32 sz = idx.read< quint32 >();
         vector< char > buf( sz );
         idx.read( &buf.front(), sz );
-        uint32_t btreeMaxElements = idx.read<uint32_t>();
-        uint32_t rootOffset = idx.read<uint32_t>();
-        mddFileNames.emplace_back(&buf.front());
-        mddIndexInfos.emplace_back(btreeMaxElements, rootOffset);
+        uint32_t btreeMaxElements = idx.read< uint32_t >();
+        uint32_t rootOffset       = idx.read< uint32_t >();
+        mddFileNames.emplace_back( &buf.front() );
+        mddIndexInfos.emplace_back( btreeMaxElements, rootOffset );
       }
 
       vector< string > const dictFiles = getDictionaryFilenames();
-      for ( uint32_t i = 1; i < dictFiles.size() && i < mddFileNames.size() + 1; i++ )
-      {
+      for ( uint32_t i = 1; i < dictFiles.size() && i < mddFileNames.size() + 1; i++ ) {
         QFileInfo fi( QString::fromUtf8( dictFiles[ i ].c_str() ) );
         QString mddFileName = QString::fromUtf8( mddFileNames[ i - 1 ].c_str() );
 
         if ( fi.fileName() != mddFileName || !fi.exists() )
           continue;
 
-        sptr< IndexedMdd > mdd =  std::make_shared<IndexedMdd>( idxMutex, chunks );
+        sptr< IndexedMdd > mdd = std::make_shared< IndexedMdd >( idxMutex, chunks );
         mdd->openIndex( mddIndexInfos[ i - 1 ], idx, idxMutex );
         mdd->open( dictFiles[ i ].c_str() );
         mddResources.push_back( mdd );
       }
     }
-    catch ( std::exception & e )
-    {
+    catch ( std::exception & e ) {
       initError = e.what();
     }
-    catch ( ... )
-    {
+    catch ( ... ) {
       initError = "Unknown error";
     }
 
@@ -463,32 +444,29 @@ void MdxDictionary::doDeferredInit()
 
 void MdxDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-//  if( !ensureInitDone().empty() )
-//    return;
+  //  if( !ensureInitDone().empty() )
+  //    return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "MDict: Building the full-text index for dictionary: %s",
-           getName().c_str() );
+  gdDebug( "MDict: Building the full-text index for dictionary: %s", getName().c_str() );
 
-  try
-  {
+  try {
     auto _dict = std::make_shared< MdxDictionary >( this->getId(), idxFileName, this->getDictionaryFilenames() );
-    if( !_dict->ensureInitDone().empty() )
+    if ( !_dict->ensureInitDone().empty() )
       return;
     FtsHelpers::makeFTSIndex( _dict.get(), isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "MDict: Failed building full-text search index for \"%s\", reason: %s", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
@@ -496,16 +474,14 @@ void MdxDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
 
 void MdxDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     headword.clear();
     string articleText;
 
     loadArticle( articleAddress, articleText, true );
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "MDict: Failed retrieving article from \"%s\", reason: %s", getName().c_str(), ex.what() );
   }
 }
@@ -546,7 +522,9 @@ public:
     dict( dict_ ),
     ignoreDiacritics( ignoreDiacritics_ )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -566,8 +544,7 @@ public:
 
 void MdxArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -594,10 +571,8 @@ void MdxArticleRequest::run()
   set< QByteArray > articleBodiesIncluded;
   string articleText;
 
-  for ( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -610,25 +585,21 @@ void MdxArticleRequest::run()
     bool hasError = false;
     QString errorMessage;
 
-    try
-    {
+    try {
       dict.loadArticle( chain[ x ].articleOffset, articleBody );
     }
-    catch ( exCorruptDictionary & )
-    {
+    catch ( exCorruptDictionary & ) {
       errorMessage = tr( "Dictionary file was tampered or corrupted" );
-      hasError = true;
+      hasError     = true;
     }
-    catch ( std::exception & e )
-    {
+    catch ( std::exception & e ) {
       errorMessage = e.what();
-      hasError = true;
+      hasError     = true;
     }
 
-    if ( hasError )
-    {
+    if ( hasError ) {
       setErrorString( tr( "Failed loading article from %1, reason: %2" )
-                      .arg( QString::fromUtf8( dict.getDictionaryFilenames()[ 0 ].c_str() ), errorMessage ) );
+                        .arg( QString::fromUtf8( dict.getDictionaryFilenames()[ 0 ].c_str() ), errorMessage ) );
       finish();
       return;
     }
@@ -642,10 +613,9 @@ void MdxArticleRequest::run()
       continue; // Already had this body
 
     // Handle internal redirects
-    if ( strncmp( articleBody.c_str(), "@@@LINK=", 8 ) == 0 )
-    {
+    if ( strncmp( articleBody.c_str(), "@@@LINK=", 8 ) == 0 ) {
       wstring target = Utf8::decode( articleBody.c_str() + 8 );
-      target = Folding::trimWhitespace( target );
+      target         = Folding::trimWhitespace( target );
       // Make an additional query for this redirection
       vector< WordArticleLink > altChain = dict.findArticles( target );
       chain.insert( chain.end(), altChain.begin(), altChain.end() );
@@ -657,9 +627,8 @@ void MdxArticleRequest::run()
     articleText += "<div class=\"mdict\">" + articleBody + cleaner + "</div>\n";
   }
 
-  if ( !articleText.empty() )
-  {
-    articleText+="</div></div></div></div></div></div></div></div></div>";
+  if ( !articleText.empty() ) {
+    articleText += "</div></div></div></div></div></div></div></div></div>";
 
     QMutexLocker _( &dataMutex );
     data.insert( data.end(), articleText.begin(), articleText.end() );
@@ -669,10 +638,12 @@ void MdxArticleRequest::run()
   finish();
 }
 
-sptr<Dictionary::DataRequest> MdxDictionary::getArticle( const wstring & word, const vector<wstring> & alts,
-                                                         const wstring &, bool ignoreDiacritics ) 
+sptr< Dictionary::DataRequest > MdxDictionary::getArticle( const wstring & word,
+                                                           const vector< wstring > & alts,
+                                                           const wstring &,
+                                                           bool ignoreDiacritics )
 {
-  return  std::make_shared<MdxArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< MdxArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 /// MdxDictionary::getResource
@@ -685,12 +656,17 @@ class MddResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  MddResourceRequest( MdxDictionary & dict_, string const & resourceName_ ) :
-    Dictionary::DataRequest( &dict_ ), dict( dict_ ), resourceName( Utf8::decode( resourceName_ ) )
+  MddResourceRequest( MdxDictionary & dict_, string const & resourceName_ ):
+    Dictionary::DataRequest( &dict_ ),
+    dict( dict_ ),
+    resourceName( Utf8::decode( resourceName_ ) )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
+  QByteArray isolate_css();
   void run();
 
   void cancel() override
@@ -705,16 +681,53 @@ public:
   }
 };
 
+QByteArray MddResourceRequest::isolate_css()
+{
+
+  const QString id = QString::fromUtf8( dict.getId().c_str() );
+
+  QString css = QString::fromUtf8( data.data(), data.size() );
+
+  int pos = 0;
+
+  QString newCSS;
+  QRegularExpressionMatchIterator it = RX::Mdx::links.globalMatch( css );
+  while ( it.hasNext() ) {
+    QRegularExpressionMatch match = it.next();
+    newCSS += css.mid( pos, match.capturedStart() - pos );
+    pos         = match.capturedEnd();
+    QString url = match.captured( 2 );
+
+
+    if ( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0 ) {
+      // External link or base64-encoded data
+      newCSS += match.captured();
+
+      continue;
+    }
+
+    QString newUrl = QString( "url(" ) + match.captured( 1 ) + "bres://" + id + "/" + url + match.captured( 3 ) + ")";
+    newCSS += newUrl;
+  }
+  if ( pos ) {
+    newCSS += css.mid( pos );
+    css = newCSS;
+    newCSS.clear();
+  }
+  dict.isolateCSS( css, ".mdict" );
+  auto bytes = css.toUtf8();
+
+  return bytes;
+}
+
 void MddResourceRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
@@ -723,16 +736,14 @@ void MddResourceRequest::run()
   // In order to prevent recursive internal redirection...
   set< wstring, std::less<> > resourceIncluded;
 
-  for ( ;; )
-  {
+  for ( ;; ) {
     // Some runnables linger enough that they are cancelled before they start
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
     string u8ResourceName = Utf8::encode( resourceName );
-    if( !resourceIncluded.insert( resourceName ).second ) {
+    if ( !resourceIncluded.insert( resourceName ).second ) {
       finish();
       return;
     }
@@ -740,78 +751,55 @@ void MddResourceRequest::run()
     QMutexLocker _( &dataMutex );
     data.clear();
 
+    //check the global cache
+    //generate resource unique key
+    const QString id = QString::fromUtf8( dict.getId().c_str() );
+
+    const QString unique_key = id + QString::fromStdString( u8ResourceName );
+    if ( GlobalBroadcaster::instance()->cache.contains( unique_key ) ) {
+      //take first ,then insert again . the object() method may become null anytime.
+      auto bytes = GlobalBroadcaster::instance()->cache.take( unique_key );
+      if ( bytes ) {
+        hasAnyData = true;
+        data.resize( bytes->size() );
+        memcpy( &data.front(), bytes->constData(), bytes->size() );
+        GlobalBroadcaster::instance()->cache.insert( unique_key, bytes );
+        break;
+      }
+    }
+
+
     dict.loadResourceFile( resourceName, data );
 
     // Check if this file has a redirection
     // Always encoded in UTF16-LE
     // L"@@@LINK="
-    static const char pattern[16] =
-    {
-      '@', '\0', '@', '\0', '@', '\0', 'L', '\0', 'I', '\0', 'N', '\0', 'K', '\0', '=', '\0'
-    };
+    static const char pattern[ 16 ] =
+      { '@', '\0', '@', '\0', '@', '\0', 'L', '\0', 'I', '\0', 'N', '\0', 'K', '\0', '=', '\0' };
 
-    if ( data.size() > sizeof( pattern ) )
-    {
-      if ( memcmp( &data.front(),  pattern, sizeof( pattern ) ) == 0 )
-      {
+    if ( data.size() > sizeof( pattern ) ) {
+      if ( memcmp( &data.front(), pattern, sizeof( pattern ) ) == 0 ) {
         data.push_back( '\0' );
         data.push_back( '\0' );
-        QString target = MdictParser::toUtf16( "UTF-16LE", &data.front() + sizeof( pattern ),
-                                               data.size() - sizeof( pattern ) );
+        QString target =
+          MdictParser::toUtf16( "UTF-16LE", &data.front() + sizeof( pattern ), data.size() - sizeof( pattern ) );
         resourceName = gd::toWString( target.trimmed() );
         continue;
       }
     }
 
-    if ( data.size() > 0 )
-    {
+    if ( data.size() > 0 ) {
       hasAnyData = true;
 
-      if ( Filetype::isNameOfCSS( u8ResourceName ) )
-      {
-        QString css = QString::fromUtf8( data.data(), data.size() );
+      if ( Filetype::isNameOfCSS( u8ResourceName ) ) {
+        QByteArray bytes = isolate_css();
 
-        // QRegularExpression links( "url\\(\\s*(['\"]?)([^'\"]*)(['\"]?)\\s*\\)",
-        //                           QRegularExpression::CaseInsensitiveOption );
-
-        QString id = QString::fromUtf8( dict.getId().c_str() );
-        int pos = 0;
-
-        QString newCSS;
-        QRegularExpressionMatchIterator it = RX::Mdx::links.globalMatch( css );
-        while ( it.hasNext() )
-        {
-          QRegularExpressionMatch match = it.next();
-          newCSS += css.mid( pos, match.capturedStart() - pos );
-          pos = match.capturedEnd();
-          QString url = match.captured( 2 );
-
-
-          if( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0)
-          {
-            // External link or base64-encoded data
-            newCSS += match.captured();
-
-            continue;
-          }
-
-          QString newUrl = QString( "url(" ) + match.captured( 1 ) + "bres://"
-                                             + id + "/" + url + match.captured( 3 ) + ")";
-          newCSS += newUrl;
-        }
-        if( pos )
-        {
-          newCSS += css.mid( pos );
-          css = newCSS;
-          newCSS.clear();
-        }
-        dict.isolateCSS( css, ".mdict" );
-        QByteArray bytes = css.toUtf8();
         data.resize( bytes.size() );
         memcpy( &data.front(), bytes.constData(), bytes.size() );
+        //cache the processed css result to avoid process again.
+        GlobalBroadcaster::instance()->cache.insert( unique_key, new QByteArray( bytes ) );
       }
-      if( Filetype::isNameOfTiff( u8ResourceName ) )
-      {
+      if ( Filetype::isNameOfTiff( u8ResourceName ) ) {
         // Convert it
         GdTiff::tiff2img( data );
       }
@@ -822,9 +810,9 @@ void MddResourceRequest::run()
   finish();
 }
 
-sptr<Dictionary::DataRequest> MdxDictionary::getResource( const string & name ) 
+sptr< Dictionary::DataRequest > MdxDictionary::getResource( const string & name )
 {
-  return std::make_shared<MddResourceRequest>( *this, name );
+  return std::make_shared< MddResourceRequest >( *this, name );
 }
 
 const QString & MdxDictionary::getDescription()
@@ -832,12 +820,10 @@ const QString & MdxDictionary::getDescription()
   if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
 
-  if ( idxHeader.descriptionSize == 0 )
-  {
+  if ( idxHeader.descriptionSize == 0 ) {
     dictionaryDescription = "NONE";
   }
-  else
-  {
+  else {
     // QMutexLocker _( &idxMutex );
     vector< char > chunk;
     char * dictDescription = chunks.getBlock( idxHeader.descriptionAddress, chunk );
@@ -859,10 +845,9 @@ void MdxDictionary::loadIcon() noexcept
   fileName.chop( 3 );
   QString text = QString::fromStdString( dictionaryName );
 
-  if( !loadIconFromFile( fileName ) && !loadIconFromText(":/icons/mdict-bg.png", text ) )
-  {
+  if ( !loadIconFromFile( fileName ) && !loadIconFromText( ":/icons/mdict-bg.png", text ) ) {
     // Use default icons
-    dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/mdict.png" );
+    dictionaryIcon = QIcon( ":/icons/mdict.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -883,22 +868,20 @@ void MdxDictionary::loadArticle( uint32_t offset, string & articleText, bool noF
   {
     QMutexLocker _( &idxMutex );
     ScopedMemMap compressed( dictFile, recordInfo.compressedBlockPos, recordInfo.compressedBlockSize );
-    if( !compressed.startAddress() )
+    if ( !compressed.startAddress() )
       throw exCorruptDictionary();
 
-    if( !MdictParser::parseCompressedBlock( recordInfo.compressedBlockSize,
-                                            (char *)compressed.startAddress(),
-                                            recordInfo.decompressedBlockSize,
-                                            decompressed ) )
+    if ( !MdictParser::parseCompressedBlock( recordInfo.compressedBlockSize,
+                                             (char *)compressed.startAddress(),
+                                             recordInfo.decompressedBlockSize,
+                                             decompressed ) )
       throw exCorruptDictionary();
   }
 
-  QString article = MdictParser::toUtf16( encoding.c_str(),
-                                          decompressed.constData() + recordInfo.recordOffset,
-                                          recordInfo.recordSize );
+  QString article =
+    MdictParser::toUtf16( encoding.c_str(), decompressed.constData() + recordInfo.recordOffset, recordInfo.recordSize );
 
-  if( !noFilter )
-  {
+  if ( !noFilter ) {
     article = MdictParser::substituteStylesheet( article, styleSheets );
     article = filterResource( article );
   }
@@ -910,7 +893,7 @@ QString & MdxDictionary::filterResource( QString & article )
 {
   QString id = QString::fromStdString( getId() );
   replaceLinks( id, article );
-  replaceStyleInHtml( id, article);
+  replaceStyleInHtml( id, article );
   return article;
 }
 
@@ -919,11 +902,10 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
   QString articleNewText;
   int linkPos                        = 0;
   QRegularExpressionMatchIterator it = RX::Mdx::allLinksRe.globalMatch( article );
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch allLinksMatch = it.next();
 
-    if( allLinksMatch.capturedEnd() < linkPos )
+    if ( allLinksMatch.capturedEnd() < linkPos )
       continue;
 
     articleNewText += article.mid( linkPos, allLinksMatch.capturedStart() - linkPos );
@@ -933,13 +915,11 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
     QString linkType = allLinksMatch.captured( 1 ).toLower();
     QString newLink;
 
-    if( !linkType.isEmpty() && linkType.at( 0 ) == 'a' )
-    {
+    if ( !linkType.isEmpty() && linkType.at( 0 ) == 'a' ) {
       newLink = linkTxt;
 
       QRegularExpressionMatch match = RX::Mdx::audioRe.match( newLink );
-      if( match.hasMatch() )
-      {
+      if ( match.hasMatch() ) {
         // sounds and audio link script
         QString newTxt =
           match.captured( 1 ) + match.captured( 2 ) + "gdau://" + id + "/" + match.captured( 3 ) + match.captured( 2 );
@@ -950,8 +930,7 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
       }
 
       match = RX::Mdx::wordCrossLink.match( newLink );
-      if( match.hasMatch() )
-      {
+      if ( match.hasMatch() ) {
         if ( !match.captured( 3 ).isEmpty() ) {
           QString newTxt = match.captured( 1 ) + match.captured( 2 ) + "gdlookup://localhost/" + match.captured( 3 );
 
@@ -973,12 +952,10 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
         }
       }
     }
-    else if( linkType.compare( "link" ) == 0 )
-    {
+    else if ( linkType.compare( "link" ) == 0 ) {
       // stylesheets
       QRegularExpressionMatch match = RX::Mdx::stylesRe.match( linkTxt );
-      if( match.hasMatch() )
-      {
+      if ( match.hasMatch() ) {
         QString newText =
           match.captured( 1 ) + match.captured( 2 ) + "bres://" + id + "/" + match.captured( 3 ) + match.captured( 2 );
         newLink = linkTxt.replace( match.capturedStart(), match.capturedLength(), newText );
@@ -986,40 +963,35 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
       else
         newLink = linkTxt.replace( RX::Mdx::stylesRe2, R"(\1"bres://)" + id + R"(/\2")" );
     }
-    else if( linkType.compare( "script" ) == 0 || linkType.compare( "img" ) == 0 || linkType.compare( "source" ) == 0 )
-    {
+    else if ( linkType.compare( "script" ) == 0 || linkType.compare( "img" ) == 0
+              || linkType.compare( "source" ) == 0 ) {
       // javascripts and images
       QRegularExpressionMatch match = RX::Mdx::inlineScriptRe.match( linkTxt );
-      if( linkType.at( 1 ) == 'c' // "script" tag
-          && match.hasMatch() && match.capturedLength() == linkTxt.length() )
-      {
+      if ( linkType.at( 1 ) == 'c' // "script" tag
+           && match.hasMatch() && match.capturedLength() == linkTxt.length() ) {
         // skip inline scripts
         articleNewText += linkTxt;
         match = RX::Mdx::closeScriptTagRe.match( article, linkPos );
-        if( match.hasMatch() )
-        {
+        if ( match.hasMatch() ) {
           articleNewText += article.mid( linkPos, match.capturedEnd() - linkPos );
           linkPos = match.capturedEnd();
         }
         continue;
       }
-      else
-      {
+      else {
         match = RX::Mdx::srcRe.match( linkTxt );
-        if( match.hasMatch() )
-        {
+        if ( match.hasMatch() ) {
           QString newText;
-          if( linkType.at( 1 ) == 'o' ) // "source" tag
+          if ( linkType.at( 1 ) == 'o' ) // "source" tag
           {
             QString filename = match.captured( 3 );
             QString newName  = getCachedFileName( filename );
             newName.replace( '\\', '/' );
             newText = match.captured( 1 ) + match.captured( 2 ) + "file:///" + newName + match.captured( 2 );
           }
-          else
-          {
+          else {
             newText = match.captured( 1 ) + match.captured( 2 ) + "bres://" + id + "/" + match.captured( 3 )
-                      + match.captured( 2 );
+              + match.captured( 2 );
           }
           newLink = linkTxt.replace( match.capturedStart(), match.capturedLength(), newText );
         }
@@ -1027,15 +999,13 @@ void MdxDictionary::replaceLinks( QString & id, QString & article )
           newLink = linkTxt.replace( RX::Mdx::srcRe2, R"(\1"bres://)" + id + R"(/\2")" );
       }
     }
-    if( !newLink.isEmpty() )
-    {
+    if ( !newLink.isEmpty() ) {
       articleNewText += newLink;
     }
     else
       articleNewText += allLinksMatch.captured();
   }
-  if( linkPos )
-  {
+  if ( linkPos ) {
     articleNewText += article.mid( linkPos );
     article = articleNewText;
   }
@@ -1047,26 +1017,24 @@ void MdxDictionary::replaceStyleInHtml( QString & id, QString & article )
   QString articleNewText;
   int linkPos                        = 0;
   QRegularExpressionMatchIterator it = RX::Mdx::styleElement.globalMatch( article );
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch allLinksMatch = it.next();
 
-    if( allLinksMatch.capturedEnd() < linkPos )
+    if ( allLinksMatch.capturedEnd() < linkPos )
       continue;
 
     articleNewText += article.mid( linkPos, allLinksMatch.capturedStart() - linkPos );
     linkPos = allLinksMatch.capturedEnd();
 
-    articleNewText+=allLinksMatch.captured(1);
+    articleNewText += allLinksMatch.captured( 1 );
 
     // the style
-    auto style = allLinksMatch.captured(2);
-    replaceFontLinks(id, style);
-    articleNewText+=style;
-    articleNewText+=allLinksMatch.captured(3);
+    auto style = allLinksMatch.captured( 2 );
+    replaceFontLinks( id, style );
+    articleNewText += style;
+    articleNewText += allLinksMatch.captured( 3 );
   }
-  if( linkPos )
-  {
+  if ( linkPos ) {
     articleNewText += article.mid( linkPos );
     article = articleNewText;
   }
@@ -1078,28 +1046,25 @@ void MdxDictionary::replaceFontLinks( QString & id, QString & article )
   QString articleNewText;
   int linkPos                        = 0;
   QRegularExpressionMatchIterator it = RX::Mdx::fontFace.globalMatch( article );
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch allLinksMatch = it.next();
 
-    if( allLinksMatch.capturedEnd() < linkPos )
+    if ( allLinksMatch.capturedEnd() < linkPos )
       continue;
 
     articleNewText += article.mid( linkPos, allLinksMatch.capturedStart() - linkPos );
-    linkPos = allLinksMatch.capturedEnd();
+    linkPos          = allLinksMatch.capturedEnd();
     QString linkTxt  = allLinksMatch.captured();
     QString linkType = allLinksMatch.captured( 1 );
     QString newLink  = linkTxt;
 
     //skip remote url
-    if( !linkType.contains( ":" ) )
-    {
+    if ( !linkType.contains( ":" ) ) {
       newLink = QString( "url(\"bres://%1/%2\")" ).arg( id, linkType );
     }
     articleNewText += newLink;
   }
-  if( linkPos )
-  {
+  if ( linkPos ) {
     articleNewText += article.mid( linkPos );
     article = articleNewText;
   }
@@ -1110,10 +1075,8 @@ QString MdxDictionary::getCachedFileName( QString filename )
 {
   QDir dir;
   QFileInfo info( cacheDirName );
-  if( !info.exists() || !info.isDir() )
-  {
-    if( !dir.mkdir( cacheDirName ) )
-    {
+  if ( !info.exists() || !info.isDir() ) {
+    if ( !dir.mkdir( cacheDirName ) ) {
       gdWarning( "Mdx: can't create cache directory \"%s\"", cacheDirName.toUtf8().data() );
       return QString();
     }
@@ -1124,18 +1087,14 @@ QString MdxDictionary::getCachedFileName( QString filename )
   QString name = filename;
   name.replace( '/', '\\' );
   QStringList list = name.split( '\\' );
-  int subFolders = list.size() - 1;
-  if( subFolders > 0 )
-  {
+  int subFolders   = list.size() - 1;
+  if ( subFolders > 0 ) {
     QString dirName = cacheDirName;
-    for( int i = 0; i < subFolders; i++ )
-    {
+    for ( int i = 0; i < subFolders; i++ ) {
       dirName += QDir::separator() + list.at( i );
       QFileInfo dirInfo( dirName );
-      if( !dirInfo.exists() )
-      {
-        if( !dir.mkdir( dirName ) )
-        {
+      if ( !dirInfo.exists() ) {
+        if ( !dir.mkdir( dirName ) ) {
           gdWarning( "Mdx: can't create cache directory \"%s\"", dirName.toUtf8().data() );
           return QString();
         }
@@ -1146,10 +1105,10 @@ QString MdxDictionary::getCachedFileName( QString filename )
   QString fullName = cacheDirName + QDir::separator() + filename;
 
   info.setFile( fullName );
-  if( info.exists() )
+  if ( info.exists() )
     return fullName;
   QFile f( fullName );
-  if( !f.open( QFile::WriteOnly ) ) {
+  if ( !f.open( QFile::WriteOnly ) ) {
     gdWarning( R"(Mdx: file "%s" creating error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
     return QString();
   }
@@ -1159,8 +1118,8 @@ QString MdxDictionary::getCachedFileName( QString filename )
   // In order to prevent recursive internal redirection...
   set< wstring, std::less<> > resourceIncluded;
 
-  for( ;; ) {
-    if( !resourceIncluded.insert( resourceName ).second )
+  for ( ;; ) {
+    if ( !resourceIncluded.insert( resourceName ).second )
       continue;
 
     loadResourceFile( resourceName, data );
@@ -1168,9 +1127,9 @@ QString MdxDictionary::getCachedFileName( QString filename )
     // Check if this file has a redirection
     // Always encoded in UTF16-LE
     // L"@@@LINK="
-    if( static const char pattern[ 16 ] =
-          { '@', '\0', '@', '\0', '@', '\0', 'L', '\0', 'I', '\0', 'N', '\0', 'K', '\0', '=', '\0' };
-        data.size() > sizeof( pattern ) && memcmp( &data.front(), pattern, sizeof( pattern ) ) == 0 ) {
+    if ( static const char pattern[ 16 ] =
+           { '@', '\0', '@', '\0', '@', '\0', 'L', '\0', 'I', '\0', 'N', '\0', 'K', '\0', '=', '\0' };
+         data.size() > sizeof( pattern ) && memcmp( &data.front(), pattern, sizeof( pattern ) ) == 0 ) {
       data.push_back( '\0' );
       data.push_back( '\0' );
       QString target =
@@ -1182,12 +1141,12 @@ QString MdxDictionary::getCachedFileName( QString filename )
   }
 
   qint64 n = 0;
-  if( !data.empty() )
+  if ( !data.empty() )
     n = f.write( data.data(), data.size() );
 
   f.close();
 
-  if( n < (qint64) data.size() ) {
+  if ( n < (qint64)data.size() ) {
     gdWarning( R"(Mdx: file "%s" writing error: "%s")", fullName.toUtf8().data(), f.errorString().toUtf8().data() );
     return QString();
   }
@@ -1201,20 +1160,19 @@ void MdxDictionary::loadResourceFile( const wstring & resourceName, vector< char
 
   // Convert to the Windows separator
   std::replace( newResourceName.begin(), newResourceName.end(), '/', '\\' );
-  if( newResourceName[ 0 ] == '.' ) {
+  if ( newResourceName[ 0 ] == '.' ) {
     newResourceName.erase( 0, 1 );
   }
-  if( newResourceName[ 0 ] != '\\' ) {
+  if ( newResourceName[ 0 ] != '\\' ) {
     newResourceName.insert( 0, 1, '\\' );
   }
   // local file takes precedence
-  if ( string fn = getContainingFolder().toStdString() + Utils::Fs::separator() + u8ResourceName;
-       File::exists( fn ) ) {
+  if ( string fn = getContainingFolder().toStdString() + Utils::Fs::separator() + u8ResourceName; File::exists( fn ) ) {
     File::loadFromFile( fn, data );
     return;
   }
-  for( auto mddResource : mddResources ) {
-    if( mddResource->loadFile( newResourceName, data ) )
+  for ( auto mddResource : mddResources ) {
+    if ( mddResource->loadFile( newResourceName, data ) )
       break;
   }
 }
@@ -1222,12 +1180,9 @@ void MdxDictionary::loadResourceFile( const wstring & resourceName, vector< char
 void MdxDictionary::removeDirectory( QString const & directory )
 {
   QDir dir( directory );
-  Q_FOREACH( QFileInfo info, dir.entryInfoList( QDir::NoDotAndDotDot
-                                                | QDir::AllDirs
-                                                | QDir::Files,
-                                                QDir::DirsFirst))
-  {
-    if( info.isDir() )
+  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() );
@@ -1253,7 +1208,7 @@ static void addEntryToIndexSingle( QString const & word, uint32_t offset, Indexe
 class ArticleHandler: public MdictParser::RecordHandler
 {
 public:
-  ArticleHandler( ChunkedStorage::Writer & chunks, IndexedWords & indexedWords ) :
+  ArticleHandler( ChunkedStorage::Writer & chunks, IndexedWords & indexedWords ):
     chunks( chunks ),
     indexedWords( indexedWords )
   {
@@ -1301,12 +1256,9 @@ static bool indexIsOldOrBad( vector< string > const & dictFiles, string const &
   File::Class idx( indexFile, "rb" );
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != kSignature ||
-         header.formatVersion != kCurrentFormatVersion ||
-         header.parserVersion != MdictParser::kParserVersion ||
-         header.foldingVersion != Folding::Version ||
-         header.mddIndexInfosCount != dictFiles.size() - 1;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != kSignature
+    || header.formatVersion != kCurrentFormatVersion || header.parserVersion != MdictParser::kParserVersion
+    || header.foldingVersion != Folding::Version || header.mddIndexInfosCount != dictFiles.size() - 1;
 }
 
 static void findResourceFiles( string const & mdx, vector< string > & dictFiles )
@@ -1314,8 +1266,7 @@ static void findResourceFiles( string const & mdx, vector< string > & dictFiles
   string base( mdx, 0, mdx.size() - 4 );
   // Check if there' is any file end with .mdd, which is the resource file for the dictionary
   string resFile;
-  if ( File::tryPossibleName( base + ".mdd", resFile ) )
-  {
+  if ( File::tryPossibleName( base + ".mdd", resFile ) ) {
     dictFiles.push_back( resFile );
     // Find complementary .mdd file (volumes), like follows:
     //   demo.mdx   <- main dictionary file
@@ -1324,10 +1275,9 @@ static void findResourceFiles( string const & mdx, vector< string > & dictFiles
     //   ...
     //   demo.n.mdd <- nth volume
     QString baseU8 = QString::fromUtf8( base.c_str() );
-    int vol = 1;
-    while ( File::tryPossibleName( string( QString( "%1.%2.mdd" ).arg( baseU8 ).arg( vol )
-                                           .toUtf8().constBegin() ), resFile ) )
-    {
+    int vol        = 1;
+    while ( File::tryPossibleName( string( QString( "%1.%2.mdd" ).arg( baseU8 ).arg( vol ).toUtf8().constBegin() ),
+                                   resFile ) ) {
       dictFiles.push_back( resFile );
       vol++;
     }
@@ -1336,7 +1286,7 @@ static void findResourceFiles( string const & mdx, vector< string > & dictFiles
 
 vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
                                                       string const & indicesDir,
-                                                      Dictionary::Initializing & initializing ) 
+                                                      Dictionary::Initializing & initializing )
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
@@ -1366,14 +1316,10 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       string title = parser.title().toStdString();
       initializing.indexingDictionary( title );
 
-      for ( vector< string >::const_iterator mddIter = dictFiles.begin() + 1;
-            mddIter != dictFiles.end(); ++mddIter )
-      {
-        if ( File::exists( *mddIter ) )
-        {
-          sptr< MdictParser > mddParser = std::make_shared<MdictParser>();
-          if ( !mddParser->open( mddIter->c_str() ) )
-          {
+      for ( vector< string >::const_iterator mddIter = dictFiles.begin() + 1; mddIter != dictFiles.end(); ++mddIter ) {
+        if ( File::exists( *mddIter ) ) {
+          sptr< MdictParser > mddParser = std::make_shared< MdictParser >();
+          if ( !mddParser->open( mddIter->c_str() ) ) {
             gdWarning( "Broken mdd (resource) file: %s\n", mddIter->c_str() );
             continue;
           }
@@ -1411,7 +1357,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
 
       // Save dictionary description if there's one
       {
-        string description = parser.description().toStdString();
+        string description           = parser.description().toStdString();
         idxHeader.descriptionAddress = chunks.startNewBlock();
         chunks.addToBlock( description.c_str(), description.size() + 1 );
         idxHeader.descriptionSize = description.size() + 1;
@@ -1421,23 +1367,20 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       MdictParser::HeadWordIndex headWordIndex;
 
       // enumerating word and its definition
-      while ( parser.readNextHeadWordIndex( headWordIndex ) )
-      {
+      while ( parser.readNextHeadWordIndex( headWordIndex ) ) {
         parser.readRecordBlock( headWordIndex, articleHandler );
       }
 
       // enumerating resources if there's any
       vector< sptr< IndexedWords > > mddIndices;
       vector< string > mddFileNames;
-      while ( !mddParsers.empty() )
-      {
-        sptr< MdictParser > mddParser = mddParsers.front();
-        sptr< IndexedWords > mddIndexedWords =  std::make_shared<IndexedWords>();
+      while ( !mddParsers.empty() ) {
+        sptr< MdictParser > mddParser        = mddParsers.front();
+        sptr< IndexedWords > mddIndexedWords = std::make_shared< IndexedWords >();
         MdictParser::HeadWordIndex resourcesIndex;
         ResourceHandler resourceHandler( chunks, *mddIndexedWords );
 
-        while ( mddParser->readNextHeadWordIndex( headWordIndex ) )
-        {
+        while ( mddParser->readNextHeadWordIndex( headWordIndex ) ) {
           resourcesIndex.insert( resourcesIndex.end(), headWordIndex.begin(), headWordIndex.end() );
         }
         mddParser->readRecordBlock( resourcesIndex, resourceHandler );
@@ -1455,9 +1398,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       GD_DPRINTF( "Writing index...\n" );
 
       // Good. Now build the index
-      IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
+      IndexInfo idxInfo               = BtreeIndexing::buildIndex( indexedWords, idx );
       idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-      idxHeader.indexRootOffset = idxInfo.rootOffset;
+      idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
       // Save dictionary stylesheets
       {
@@ -1504,28 +1447,28 @@ vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & f
       for ( uint32_t mi = 0; mi < mddIndexInfos.size(); mi++ ) {
         const string & mddfile = mddFileNames[ mi ];
 
-        idx.write<quint32>( ( quint32 )mddfile.size() + 1 );
+        idx.write< quint32 >( (quint32)mddfile.size() + 1 );
         idx.write( mddfile.c_str(), mddfile.size() + 1 );
-        idx.write<uint32_t>( mddIndexInfos[ mi ].btreeMaxElements );
-        idx.write<uint32_t>( mddIndexInfos[ mi ].rootOffset );
+        idx.write< uint32_t >( mddIndexInfos[ mi ].btreeMaxElements );
+        idx.write< uint32_t >( mddIndexInfos[ mi ].rootOffset );
       }
 
       // That concludes it. Update the header.
-      idxHeader.signature = kSignature;
-      idxHeader.formatVersion = kCurrentFormatVersion;
-      idxHeader.parserVersion = MdictParser::kParserVersion;
+      idxHeader.signature      = kSignature;
+      idxHeader.formatVersion  = kCurrentFormatVersion;
+      idxHeader.parserVersion  = MdictParser::kParserVersion;
       idxHeader.foldingVersion = Folding::Version;
-      idxHeader.articleCount = parser.wordCount();
-      idxHeader.wordCount = parser.wordCount();
+      idxHeader.articleCount   = parser.wordCount();
+      idxHeader.wordCount      = parser.wordCount();
 
       idx.rewind();
       idx.write( &idxHeader, sizeof( idxHeader ) );
     }
 
-    dictionaries.push_back( std::make_shared<MdxDictionary>( dictId, indexFile, dictFiles ) );
+    dictionaries.push_back( std::make_shared< MdxDictionary >( dictId, indexFile, dictFiles ) );
   }
 
   return dictionaries;
 }
 
-}
+} // namespace Mdx
diff --git a/src/dict/mdx.hh b/src/dict/mdx.hh
index e8f56ce2..f2d09c64 100644
--- a/src/dict/mdx.hh
+++ b/src/dict/mdx.hh
@@ -6,16 +6,14 @@
 
 #include "dictionary.hh"
 
-namespace Mdx
-{
+namespace Mdx {
 
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
-                                                      string const & indicesDir,
-                                                      Dictionary::Initializing & ) ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Mdx
 
 #endif // __MDX_HH_INCLUDED__
diff --git a/src/dict/mediawiki.cc b/src/dict/mediawiki.cc
index 944bd033..e38a102b 100644
--- a/src/dict/mediawiki.cc
+++ b/src/dict/mediawiki.cc
@@ -32,7 +32,8 @@ class MediaWikiDictionary: public Dictionary::Class
 
 public:
 
-  MediaWikiDictionary( string const & id, string const & name_,
+  MediaWikiDictionary( string const & id,
+                       string const & name_,
                        QString const & url_,
                        QString const & icon_,
                        QNetworkAccessManager & netMgr_ ):
@@ -44,38 +45,47 @@ public:
     langId( 0 )
   {
     int n = url.indexOf( "." );
-    if( n == 2 || ( n > 3 && url[ n-3 ] == '/' ) )
+    if ( n == 2 || ( n > 3 && url[ n - 3 ] == '/' ) )
       langId = LangCoder::code2toInt( url.mid( n - 2, 2 ).toLatin1().data() );
   }
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const &,
-                                                 unsigned long maxResults ) override ;
+  sptr< WordSearchRequest > prefixMatch( wstring const &, unsigned long maxResults ) override;
 
-  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts,
-                                          wstring const &, bool ) override;
+  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ) override;
 
   quint32 getLangFrom() const override
-  { return langId; }
+  {
+    return langId;
+  }
 
   quint32 getLangTo() const override
-  { return langId; }
+  {
+    return langId;
+  }
 
 protected:
 
   void loadIcon() noexcept override;
-
 };
 
 void MediaWikiDictionary::loadIcon() noexcept
@@ -83,18 +93,16 @@ void MediaWikiDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if( !icon.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), icon );
-    if( fInfo.isFile() )
+  if ( !icon.isEmpty() ) {
+    QFileInfo fInfo( QDir( Config::getConfigDir() ), icon );
+    if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
-  if( dictionaryIcon.isNull() )
-  {
-    if( url.contains( "tionary" ) )
-      dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/wiktionary.png" );
+  if ( dictionaryIcon.isNull() ) {
+    if ( url.contains( "tionary" ) )
+      dictionaryIcon = QIcon( ":/icons/wiktionary.png" );
     else
-      dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/icon32_wiki.png" );
+      dictionaryIcon = QIcon( ":/icons/icon32_wiki.png" );
   }
   dictionaryIconLoaded = true;
 }
@@ -106,8 +114,7 @@ class MediaWikiWordSearchRequest: public MediaWikiWordSearchRequestSlots
 
 public:
 
-  MediaWikiWordSearchRequest( wstring const &,
-                              QString const & url, QNetworkAccessManager & mgr );
+  MediaWikiWordSearchRequest( wstring const &, QString const & url, QNetworkAccessManager & mgr );
 
   ~MediaWikiWordSearchRequest();
 
@@ -120,25 +127,23 @@ private:
 
 MediaWikiWordSearchRequest::MediaWikiWordSearchRequest( wstring const & str,
                                                         QString const & url,
-                                                        QNetworkAccessManager & mgr ) :
+                                                        QNetworkAccessManager & mgr ):
   isCancelling( false )
 {
-  GD_DPRINTF( "request begin\n" );
+  GD_DPRINTF( "wiki request begin\n" );
   QUrl reqUrl( url + "/api.php?action=query&list=allpages&aplimit=40&format=xml" );
 
   GlobalBroadcaster::instance()->addWhitelist( reqUrl.host() );
 
-  Utils::Url::addQueryItem( reqUrl, "apfrom", QString::fromStdU32String( str ).replace( '+', "%2B" ) );
+  Utils::Url::addQueryItem( reqUrl, "apprefix", QString::fromStdU32String( str ).replace( '+', "%2B" ) );
 
-  netReply = std::shared_ptr<QNetworkReply>(mgr.get( QNetworkRequest( reqUrl ) ));
+  netReply = std::shared_ptr< QNetworkReply >( mgr.get( QNetworkRequest( reqUrl ) ) );
 
-  connect( netReply.get(), SIGNAL( finished() ),
-           this, SLOT( downloadFinished() ) );
+  connect( netReply.get(), SIGNAL( finished() ), this, SLOT( downloadFinished() ) );
 
 #ifndef QT_NO_SSL
 
-  connect( netReply.get(), SIGNAL( sslErrors( QList< QSslError > ) ),
-           netReply.get(), SLOT( ignoreSslErrors() ) );
+  connect( netReply.get(), SIGNAL( sslErrors( QList< QSslError > ) ), netReply.get(), SLOT( ignoreSslErrors() ) );
 
 #endif
 }
@@ -153,7 +158,7 @@ void MediaWikiWordSearchRequest::cancel()
   // We either finish it in place, or in the timer handler
   isCancelling = true;
 
-  if( netReply.get() )
+  if ( netReply.get() )
     netReply.reset();
 
   finish();
@@ -166,30 +171,27 @@ void MediaWikiWordSearchRequest::downloadFinished()
   if ( isCancelling || isFinished() ) // Was cancelled
     return;
 
-  if ( netReply->error() == QNetworkReply::NoError )
-  {
+  if ( netReply->error() == QNetworkReply::NoError ) {
     QDomDocument dd;
 
     QString errorStr;
     int errorLine, errorColumn;
 
-    if ( !dd.setContent( netReply.get(), false, &errorStr, &errorLine, &errorColumn  ) )
-    {
-      setErrorString( QString( tr( "XML parse error: %1 at %2,%3" ).
-                               arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
+    if ( !dd.setContent( netReply.get(), false, &errorStr, &errorLine, &errorColumn ) ) {
+      setErrorString(
+        QString( tr( "XML parse error: %1 at %2,%3" ).arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
     }
-    else
-    {
+    else {
       QDomNode pages = dd.namedItem( "api" ).namedItem( "query" ).namedItem( "allpages" );
 
-      if ( !pages.isNull() )
-      {
+      if ( !pages.isNull() ) {
         QDomNodeList nl = pages.toElement().elementsByTagName( "p" );
 
         QMutexLocker _( &dataMutex );
 
-        for( int x = 0; x < nl.length(); ++x )
-          matches.push_back( gd::toWString( nl.item( x ).toElement().attribute( "title" ) ) );
+        qDebug() << "matches" << matches.size();
+        for ( int x = 0; x < nl.length(); ++x )
+          matches.emplace_back( gd::toWString( nl.item( x ).toElement().attribute( "title" ) ) );
       }
     }
     GD_DPRINTF( "done.\n" );
@@ -215,13 +217,12 @@ public:
   static void generateTableOfContentsIfEmpty( QDomNode const & parseNode, QString & articleString )
   {
     QString const emptyTocIndicator = "<meta property=\"mw:PageProp/toc\" />";
-    int const emptyTocPos = articleString.indexOf( emptyTocIndicator );
-    if( emptyTocPos == -1 )
+    int const emptyTocPos           = articleString.indexOf( emptyTocIndicator );
+    if ( emptyTocPos == -1 )
       return; // The ToC must be absent or nonempty => nothing to do.
 
     QDomElement const sectionsElement = parseNode.firstChildElement( "sections" );
-    if( sectionsElement.isNull() )
-    {
+    if ( sectionsElement.isNull() ) {
       gdWarning( "MediaWiki: empty table of contents and missing sections element." );
       return;
     }
@@ -233,7 +234,10 @@ public:
   }
 
 private:
-  MediaWikiSectionsParser() : previousLevel( 0 ) {}
+  MediaWikiSectionsParser():
+    previousLevel( 0 )
+  {
+  }
   void generateTableOfContents( QDomElement const & sectionsElement );
 
   bool addListLevel( QString const & levelString );
@@ -253,8 +257,8 @@ void MediaWikiSectionsParser::generateTableOfContents( QDomElement const & secti
   // Replace double quotes with single quotes to avoid escaping " within string literals.
 
   QString const elTagName = "s";
-  QDomElement el = sectionsElement.firstChildElement( elTagName );
-  if( el.isNull() )
+  QDomElement el          = sectionsElement.firstChildElement( elTagName );
+  if ( el.isNull() )
     return;
 
   // Omit invisible and useless toctogglecheckbox, toctogglespan and toctogglelabel elements.
@@ -263,13 +267,12 @@ void MediaWikiSectionsParser::generateTableOfContents( QDomElement const & secti
   // TODO: the "Contents" string should be translated to the article's language, but I don't know how
   // to implement this. Should "Contents" be enclosed in tr() to at least translate it to GoldenDict's
   // interface language? Is there a language-agnostic Unicode symbol that stands for "Contents"?
-  tableOfContents = "<div id='toc' class='toc' role='navigation' aria-labelledby='mw-toc-heading'>"
-                    "<div class='toctitle'><h2 id='mw-toc-heading'>Contents</h2></div>";
+  tableOfContents =
+    "<div id='toc' class='toc' role='navigation' aria-labelledby='mw-toc-heading'>"
+    "<div class='toctitle'><h2 id='mw-toc-heading'>Contents</h2></div>";
 
-  do
-  {
-    if( !addListLevel( el.attribute( "toclevel" ) ) )
-    {
+  do {
+    if ( !addListLevel( el.attribute( "toclevel" ) ) ) {
       tableOfContents.clear();
       return;
     }
@@ -291,7 +294,7 @@ void MediaWikiSectionsParser::generateTableOfContents( QDomElement const & secti
     tableOfContents += "</a>";
 
     el = el.nextSiblingElement( elTagName );
-  } while( !el.isNull() );
+  } while ( !el.isNull() );
 
   closeListTags( 1 );
   // Close the first-level list tag and the toc div tag.
@@ -303,25 +306,22 @@ bool MediaWikiSectionsParser::addListLevel( QString const & levelString )
   bool convertedToInt;
   int const level = levelString.toInt( &convertedToInt );
 
-  if( !convertedToInt )
-  {
+  if ( !convertedToInt ) {
     gdWarning( "MediaWiki: sections level is not an integer: %s", levelString.toUtf8().constData() );
     return false;
   }
-  if( level <= 0 )
-  {
+  if ( level <= 0 ) {
     gdWarning( "MediaWiki: unsupported nonpositive sections level: %s", levelString.toUtf8().constData() );
     return false;
   }
-  if( level > previousLevel + 1 )
-  {
+  if ( level > previousLevel + 1 ) {
     gdWarning( "MediaWiki: unsupported sections level increase by more than one: from %d to %s",
-               previousLevel, levelString.toUtf8().constData() );
+               previousLevel,
+               levelString.toUtf8().constData() );
     return false;
   }
 
-  if( level == previousLevel + 1 )
-  {
+  if ( level == previousLevel + 1 ) {
     // Don't close the previous list item tag to nest the current deeper level's list in it.
     tableOfContents += "\n<ul>\n";
     previousLevel = level;
@@ -344,8 +344,7 @@ void MediaWikiSectionsParser::closeListTags( int currentLevel )
   // Close the previous list item tag.
   tableOfContents += "</li>\n";
   // Close list and list item tags of deeper levels, if any.
-  while( currentLevel < previousLevel )
-  {
+  while ( currentLevel < previousLevel ) {
     tableOfContents += "</ul>\n</li>\n";
     --previousLevel;
   }
@@ -359,8 +358,10 @@ class MediaWikiArticleRequest: public MediaWikiDataRequestSlots
 
 public:
 
-  MediaWikiArticleRequest( wstring const & word, vector< wstring > const & alts,
-                           QString const & url, QNetworkAccessManager & mgr,
+  MediaWikiArticleRequest( wstring const & word,
+                           vector< wstring > const & alts,
+                           QString const & url,
+                           QNetworkAccessManager & mgr,
                            Class * dictPtr_ );
 
   void cancel() override;
@@ -374,15 +375,17 @@ private:
   /// This simple set implementation should be much more efficient than tree-
   /// and hash-based standard/Qt containers when there are very few elements.
   template< typename T >
-  class SmallSet {
+  class SmallSet
+  {
   public:
     bool insert( T x )
     {
-      if( std::find( elements.begin(), elements.end(), x ) != elements.end() )
+      if ( std::find( elements.begin(), elements.end(), x ) != elements.end() )
         return false;
       elements.push_back( x );
       return true;
     }
+
   private:
     std::vector< T > elements;
   };
@@ -403,37 +406,38 @@ MediaWikiArticleRequest::MediaWikiArticleRequest( wstring const & str,
                                                   QString const & url_,
                                                   QNetworkAccessManager & mgr,
                                                   Class * dictPtr_ ):
-  url( url_ ), dictPtr( dictPtr_ )
+  url( url_ ),
+  dictPtr( dictPtr_ )
 {
-  connect( &mgr, SIGNAL( finished( QNetworkReply * ) ),
-           this, SLOT( requestFinished( QNetworkReply * ) ),
+  connect( &mgr,
+           SIGNAL( finished( QNetworkReply * ) ),
+           this,
+           SLOT( requestFinished( QNetworkReply * ) ),
            Qt::QueuedConnection );
-  
-  addQuery(  mgr, str );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
+  addQuery( mgr, str );
+
+  for ( unsigned x = 0; x < alts.size(); ++x )
     addQuery( mgr, alts[ x ] );
 }
 
-void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr,
-                                        wstring const & str )
+void MediaWikiArticleRequest::addQuery( QNetworkAccessManager & mgr, wstring const & str )
 {
   gdDebug( "MediaWiki: requesting article %s\n", QString::fromStdU32String( str ).toUtf8().data() );
 
   QUrl reqUrl( url + "/api.php?action=parse&prop=text|revid|sections&format=xml&redirects" );
 
   Utils::Url::addQueryItem( reqUrl, "page", QString::fromStdU32String( str ).replace( '+', "%2B" ) );
-  QNetworkRequest req( reqUrl ) ;
+  QNetworkRequest req( reqUrl );
   //millseconds.
-  req.setTransferTimeout(3000);
-  QNetworkReply * netReply = mgr.get(req);
-  connect( netReply, &QNetworkReply::errorOccurred, this, [=](QNetworkReply::NetworkError e){
-            qDebug()<<  "error:"<<e;
-   } );
+  req.setTransferTimeout( 3000 );
+  QNetworkReply * netReply = mgr.get( req );
+  connect( netReply, &QNetworkReply::errorOccurred, this, [ = ]( QNetworkReply::NetworkError e ) {
+    qDebug() << "error:" << e;
+  } );
 #ifndef QT_NO_SSL
 
-  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ),
-           netReply, SLOT( ignoreSslErrors() ) );
+  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) );
 
 #endif
 
@@ -450,53 +454,45 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
   // Find this reply
 
   bool found = false;
-  
-  for( NetReplies::iterator i = netReplies.begin(); i != netReplies.end(); ++i )
-  {
-    if ( i->first == r )
-    {
+
+  for ( NetReplies::iterator i = netReplies.begin(); i != netReplies.end(); ++i ) {
+    if ( i->first == r ) {
       i->second = true; // Mark as finished
-      found = true;
+      found     = true;
       break;
     }
   }
 
-  if ( !found )
-  {
+  if ( !found ) {
     // Well, that's not our reply, don't do anything
     return;
   }
-  
+
   bool updated = false;
 
-  for( ; netReplies.size() && netReplies.front().second; netReplies.pop_front() )
-  {
+  for ( ; netReplies.size() && netReplies.front().second; netReplies.pop_front() ) {
     QNetworkReply * netReply = netReplies.front().first;
-    
-    if ( netReply->error() == QNetworkReply::NoError )
-    {
+
+    if ( netReply->error() == QNetworkReply::NoError ) {
       QDomDocument dd;
-  
+
       QString errorStr;
       int errorLine, errorColumn;
-  
-      if ( !dd.setContent( netReply, false, &errorStr, &errorLine, &errorColumn  ) )
-      {
-        setErrorString( QString( tr( "XML parse error: %1 at %2,%3" ).
-                                 arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
+
+      if ( !dd.setContent( netReply, false, &errorStr, &errorLine, &errorColumn ) ) {
+        setErrorString(
+          QString( tr( "XML parse error: %1 at %2,%3" ).arg( errorStr ).arg( errorLine ).arg( errorColumn ) ) );
       }
-      else
-      {
+      else {
         QDomNode parseNode = dd.namedItem( "api" ).namedItem( "parse" );
-  
-        if ( !parseNode.isNull() && parseNode.toElement().attribute( "revid" ) != "0"
+
+        if ( !parseNode.isNull()
+             && parseNode.toElement().attribute( "revid" ) != "0"
              // Don't show the same article more than once:
-             && addedPageIds.insert( parseNode.toElement().attribute( "pageid" ).toLongLong() ) )
-        {
+             && addedPageIds.insert( parseNode.toElement().attribute( "pageid" ).toLongLong() ) ) {
           QDomNode textNode = parseNode.namedItem( "text" );
-  
-          if ( !textNode.isNull() )
-          {
+
+          if ( !textNode.isNull() ) {
             QString articleString = textNode.toElement().text();
 
             // Replace all ":" in links, remove '#' part in links to other articles
@@ -504,28 +500,25 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
             QRegularExpression regLinks( "<a\\s+href=\"/([^\"]+)\"" );
             QString articleNewString;
             QRegularExpressionMatchIterator it = regLinks.globalMatch( articleString );
-            while( it.hasNext() )
-            {
+            while ( it.hasNext() ) {
               QRegularExpressionMatch match = it.next();
               articleNewString += articleString.mid( pos, match.capturedStart() - pos );
               pos = match.capturedEnd();
 
               QString link = match.captured( 1 );
 
-              if( link.indexOf( "://" ) >= 0 )
-              {
+              if ( link.indexOf( "://" ) >= 0 ) {
                 // External link
                 articleNewString += match.captured();
 
                 continue;
               }
 
-              if( link.indexOf( ':' ) >= 0 )
+              if ( link.indexOf( ':' ) >= 0 )
                 link.replace( ':', "%3A" );
 
               int n = link.indexOf( '#', 1 );
-              if( n > 0 )
-              {
+              if ( n > 0 ) {
                 QString anchor = link.mid( n + 1 ).replace( '_', "%5F" );
                 link.truncate( n );
                 link += QString( "?gdanchor=%1" ).arg( anchor );
@@ -534,8 +527,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
               QString newLink = QString( "<a href=\"/%1\"" ).arg( link );
               articleNewString += newLink;
             }
-            if( pos )
-            {
+            if ( pos ) {
               articleNewString += articleString.mid( pos );
               articleString = articleNewString;
               articleNewString.clear();
@@ -544,7 +536,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
 
             QUrl wikiUrl( url );
             wikiUrl.setPath( "/" );
-  
+
             // Update any special index.php pages to be absolute
             articleString.replace( QRegularExpression( R"(<a\shref="(/([\w]*/)*index.php\?))" ),
                                    QString( "<a href=\"%1\\1" ).arg( wikiUrl.toString() ) );
@@ -553,41 +545,40 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
             // audio tag
             QRegularExpression reg1( "<audio\\s.+?</audio>",
                                      QRegularExpression::CaseInsensitiveOption
-                                     | QRegularExpression::DotMatchesEverythingOption );
-            QRegularExpression reg2( R"(<source\s+src="([^"]+))",
-                                     QRegularExpression::CaseInsensitiveOption );
+                                       | QRegularExpression::DotMatchesEverythingOption );
+            QRegularExpression reg2( R"(<source\s+src="([^"]+))", QRegularExpression::CaseInsensitiveOption );
             pos = 0;
-            it = reg1.globalMatch( articleString );
-            while( it.hasNext() )
-            {
+            it  = reg1.globalMatch( articleString );
+            while ( it.hasNext() ) {
               QRegularExpressionMatch match = it.next();
               articleNewString += articleString.mid( pos, match.capturedStart() - pos );
               pos = match.capturedEnd();
 
-              QString tag = match.captured();
+              QString tag                    = match.captured();
               QRegularExpressionMatch match2 = reg2.match( tag );
-              if( match2.hasMatch() )
-              {
-                QString ref = match2.captured( 1 );
+              if ( match2.hasMatch() ) {
+                QString ref       = match2.captured( 1 );
                 QString audio_url = "<a href=\"" + ref
-                                    + R"("><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a>)";
+                  + R"("><img src="qrc:///icons/playsound.png" border="0" align="absmiddle" alt="Play"/></a>)";
                 articleNewString += audio_url;
               }
               else
                 articleNewString += match.captured();
             }
-            if( pos )
-            {
+            if ( pos ) {
               articleNewString += articleString.mid( pos );
               articleString = articleNewString;
               articleNewString.clear();
             }
 
             // audio url
-            articleString.replace( QRegularExpression( "<a\\s+href=\"(//upload\\.wikimedia\\.org/wikipedia/[^\"'&]*\\.og[ga](?:\\.mp3|))\"" ),
+            articleString.replace(
+              QRegularExpression(
+                "<a\\s+href=\"(//upload\\.wikimedia\\.org/wikipedia/[^\"'&]*\\.og[ga](?:\\.mp3|))\"" ),
 
-                                   QString::fromStdString( addAudioLink( string( "\"" ) + wikiUrl.scheme().toStdString() + ":\\1\"",
-                                                                         this->dictPtr->getId() ) + "<a href=\"" + wikiUrl.scheme().toStdString() + ":\\1\"" ) );
+              QString::fromStdString(
+                addAudioLink( string( "\"" ) + wikiUrl.scheme().toStdString() + ":\\1\"", this->dictPtr->getId() )
+                + "<a href=\"" + wikiUrl.scheme().toStdString() + ":\\1\"" ) );
 
             // Add url scheme to image source urls
             articleString.replace( " src=\"//", " src=\"" + wikiUrl.scheme() + "://" );
@@ -600,19 +591,18 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
             // In those strings, change any underscores to spaces
             QRegularExpression rxLink( R"(<a\s+href="[^/:">#]+)" );
             it = rxLink.globalMatch( articleString );
-            while( it.hasNext() )
-            {
+            while ( it.hasNext() ) {
               QRegularExpressionMatch match = it.next();
-              for( int i = match.capturedStart() + 9; i < match.capturedEnd(); i++ )
-                if( articleString.at( i ) == QChar( '_') )
+              for ( int i = match.capturedStart() + 9; i < match.capturedEnd(); i++ )
+                if ( articleString.at( i ) == QChar( '_' ) )
                   articleString[ i ] = ' ';
             }
 
             //fix file: url
-            articleString.replace( QRegularExpression( R"(<a\s+href="([^:/"]*file%3A[^/"]+"))",
-                                                       QRegularExpression::CaseInsensitiveOption ),
+            articleString.replace(
+              QRegularExpression( R"(<a\s+href="([^:/"]*file%3A[^/"]+"))", QRegularExpression::CaseInsensitiveOption ),
 
-                                   QString( "<a href=\"%1/index.php?title=\\1" ).arg( url ));
+              QString( "<a href=\"%1/index.php?title=\\1" ).arg( url ) );
 
             // Add url scheme to other urls like  "//xxx"
             articleString.replace( " href=\"//", " href=\"" + wikiUrl.scheme() + "://" );
@@ -625,8 +615,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
             pos = 0;
             QRegularExpression regSrcset( R"( srcset\s*=\s*"/[^"]+")" );
             it = regSrcset.globalMatch( articleString );
-            while( it.hasNext() )
-            {
+            while ( it.hasNext() ) {
               QRegularExpressionMatch match = it.next();
               articleNewString += articleString.mid( pos, match.capturedStart() - pos );
               pos = match.capturedEnd();
@@ -636,8 +625,7 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
               QString newSrcset = srcset.replace( "//", wikiUrl.scheme() + "://" );
               articleNewString += newSrcset;
             }
-            if( pos )
-            {
+            if ( pos ) {
               articleNewString += articleString.mid( pos );
               articleString = articleNewString;
               articleNewString.clear();
@@ -647,20 +635,12 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
             // Insert the ToC in the end to improve performance because no replacements are needed in the generated ToC.
             MediaWikiSectionsParser::generateTableOfContentsIfEmpty( parseNode, articleString );
 
-            QByteArray articleBody = articleString.toUtf8();
+            articleString.prepend( dictPtr->isToLanguageRTL() ? R"(<div class="mwiki" dir="rtl">)" :
+                                                                "<div class=\"mwiki\">" );
+            articleString.append( "</div>" );
 
-            articleBody.prepend( dictPtr->isToLanguageRTL() ? R"(<div class="mwiki" dir="rtl">)" :
-                                                              "<div class=\"mwiki\">" );
-            articleBody.append( "</div>" );
+            appendString( articleString.toStdString() );
 
-            QMutexLocker _( &dataMutex );
-
-            size_t prevSize = data.size();
-            
-            data.resize( prevSize + articleBody.size() );
-  
-            memcpy( &data.front() + prevSize, articleBody.data(), articleBody.size() );
-  
             hasAnyData = true;
 
             updated = true;
@@ -678,62 +658,54 @@ void MediaWikiArticleRequest::requestFinished( QNetworkReply * r )
 
   if ( netReplies.empty() )
     finish();
-  else
-  if ( updated )
+  else if ( updated )
     update();
 }
 
-sptr< WordSearchRequest > MediaWikiDictionary::prefixMatch( wstring const & word,
-                                                            unsigned long maxResults )
-  
+sptr< WordSearchRequest > MediaWikiDictionary::prefixMatch( wstring const & word, unsigned long maxResults )
+
 {
-  (void) maxResults;
-  if ( word.size() > 80 )
-  {
+  (void)maxResults;
+  if ( word.size() > 80 ) {
     // Don't make excessively large queries -- they're fruitless anyway
 
-    return std::make_shared<WordSearchRequestInstant>();
+    return std::make_shared< WordSearchRequestInstant >();
   }
   else
-    return std::make_shared< MediaWikiWordSearchRequest>( word, url, netMgr );
+    return std::make_shared< MediaWikiWordSearchRequest >( word, url, netMgr );
 }
 
-sptr< DataRequest > MediaWikiDictionary::getArticle( wstring const & word,
-                                                     vector< wstring > const & alts,
-                                                     wstring const &, bool )
-  
+sptr< DataRequest >
+MediaWikiDictionary::getArticle( wstring const & word, vector< wstring > const & alts, wstring const &, bool )
+
 {
-  if ( word.size() > 80 )
-  {
+  if ( word.size() > 80 ) {
     // Don't make excessively large queries -- they're fruitless anyway
 
-    return  std::make_shared<DataRequestInstant>( false );
+    return std::make_shared< DataRequestInstant >( false );
   }
   else
-    return  std::make_shared<MediaWikiArticleRequest>( word, alts, url, netMgr, this );
+    return std::make_shared< MediaWikiArticleRequest >( word, alts, url, netMgr, this );
 }
 
-}
+} // namespace
+
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::MediaWikis const & wikis, QNetworkAccessManager & mgr )
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      Dictionary::Initializing &,
-                                      Config::MediaWikis const & wikis,
-                                      QNetworkAccessManager & mgr )
-  
 {
   vector< sptr< Dictionary::Class > > result;
 
-  for( int x = 0; x < wikis.size(); ++x )
-  {
+  for ( int x = 0; x < wikis.size(); ++x ) {
     if ( wikis[ x ].enabled )
-      result.push_back(  std::make_shared<MediaWikiDictionary>( wikis[ x ].id.toStdString(),
-                                                 wikis[ x ].name.toUtf8().data(),
-                                                 wikis[ x ].url,
-                                                 wikis[ x ].icon,
-                                                 mgr ) );
+      result.push_back( std::make_shared< MediaWikiDictionary >( wikis[ x ].id.toStdString(),
+                                                                 wikis[ x ].name.toUtf8().data(),
+                                                                 wikis[ x ].url,
+                                                                 wikis[ x ].icon,
+                                                                 mgr ) );
   }
 
   return result;
 }
 
-}
+} // namespace MediaWiki
diff --git a/src/dict/mediawiki.hh b/src/dict/mediawiki.hh
index 54164a4a..b3163817 100644
--- a/src/dict/mediawiki.hh
+++ b/src/dict/mediawiki.hh
@@ -14,11 +14,8 @@ namespace MediaWiki {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      Dictionary::Initializing &,
-                                      Config::MediaWikis const & wikis,
-                                      QNetworkAccessManager & )
-    ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Dictionary::Initializing &, Config::MediaWikis const & wikis, QNetworkAccessManager & );
 
 /// Exposed here for moc
 class MediaWikiWordSearchRequestSlots: public Dictionary::WordSearchRequest
@@ -27,8 +24,7 @@ class MediaWikiWordSearchRequestSlots: public Dictionary::WordSearchRequest
 
 protected slots:
 
-  virtual void downloadFinished()
-  {}
+  virtual void downloadFinished() {}
 };
 
 /// Exposed here for moc
@@ -38,10 +34,9 @@ class MediaWikiDataRequestSlots: public Dictionary::DataRequest
 
 protected slots:
 
-  virtual void requestFinished( QNetworkReply * )
-  {}
+  virtual void requestFinished( QNetworkReply * ) {}
 };
 
-}
+} // namespace MediaWiki
 
 #endif
diff --git a/src/dict/programs.cc b/src/dict/programs.cc
index bec8a225..961cd5ff 100644
--- a/src/dict/programs.cc
+++ b/src/dict/programs.cc
@@ -23,6 +23,7 @@ namespace {
 class ProgramsDictionary: public Dictionary::Class
 {
   Config::Program prg;
+
 public:
 
   ProgramsDictionary( Config::Program const & prg_ ):
@@ -32,40 +33,41 @@ public:
   }
 
   string getName() noexcept override
-  { return prg.name.toUtf8().data(); }
+  {
+    return prg.name.toUtf8().data();
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const & word,
-                                                 unsigned long maxResults ) override
-    ;
+  sptr< WordSearchRequest > prefixMatch( wstring const & word, unsigned long maxResults ) override;
 
-  sptr< DataRequest > getArticle( wstring const &,
-                                          vector< wstring > const & alts,
-                                          wstring const &, bool ) override
-    ;
+  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ) override;
 
 protected:
 
   void loadIcon() noexcept override;
 };
 
-sptr< WordSearchRequest > ProgramsDictionary::prefixMatch( wstring const & word,
-                                                           unsigned long /*maxResults*/ )
-  
+sptr< WordSearchRequest > ProgramsDictionary::prefixMatch( wstring const & word, unsigned long /*maxResults*/ )
+
 {
   if ( prg.type == Config::Program::PrefixMatch )
-    return  std::make_shared<ProgramWordSearchRequest>( QString::fromStdU32String( word ), prg );
-  else
-  {
-    sptr< WordSearchRequestInstant > sr =  std::make_shared<WordSearchRequestInstant>();
+    return std::make_shared< ProgramWordSearchRequest >( QString::fromStdU32String( word ), prg );
+  else {
+    sptr< WordSearchRequestInstant > sr = std::make_shared< WordSearchRequestInstant >();
 
     sr->setUncertain( true );
 
@@ -73,14 +75,12 @@ sptr< WordSearchRequest > ProgramsDictionary::prefixMatch( wstring const & word,
   }
 }
 
-sptr< Dictionary::DataRequest > ProgramsDictionary::getArticle(
-  wstring const & word, vector< wstring > const &, wstring const &, bool )
-  
+sptr< Dictionary::DataRequest >
+ProgramsDictionary::getArticle( wstring const & word, vector< wstring > const &, wstring const &, bool )
+
 {
-  switch( prg.type )
-  {
-    case Config::Program::Audio:
-    {
+  switch ( prg.type ) {
+    case Config::Program::Audio: {
       // Audio results are instantaneous
       string result;
 
@@ -98,24 +98,20 @@ sptr< Dictionary::DataRequest > ProgramsDictionary::getArticle(
       result += addAudioLink( ref, getId() );
 
       result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
-      result += "<td><a href=" + ref + ">" +
-                Html::escape( wordUtf8 ) + "</a></td>";
+      result += "<td><a href=" + ref + ">" + Html::escape( wordUtf8 ) + "</a></td>";
       result += "</tr></table>";
 
-      sptr< DataRequestInstant > ret =  std::make_shared<DataRequestInstant>( true );
-
-      ret->getData().resize( result.size() );
-
-      memcpy( &(ret->getData().front()), result.data(), result.size() );
+      auto ret = std::make_shared< DataRequestInstant >( true );
+      ret->appendString( result );
       return ret;
     }
 
     case Config::Program::Html:
     case Config::Program::PlainText:
-      return  std::make_shared<ProgramDataRequest>( QString::fromStdU32String( word ), prg );
+      return std::make_shared< ProgramDataRequest >( QString::fromStdU32String( word ), prg );
 
     default:
-      return  std::make_shared<DataRequestInstant>( false );
+      return std::make_shared< DataRequestInstant >( false );
   }
 }
 
@@ -124,61 +120,57 @@ void ProgramsDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if( !prg.iconFilename.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), prg.iconFilename );
-    if( fInfo.isFile() )
+  if ( !prg.iconFilename.isEmpty() ) {
+    QFileInfo fInfo( QDir( Config::getConfigDir() ), prg.iconFilename );
+    if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
-  if( dictionaryIcon.isNull() )
-    dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/programs.svg");
+  if ( dictionaryIcon.isNull() )
+    dictionaryIcon = QIcon( ":/icons/programdict.svg" );
   dictionaryIconLoaded = true;
 }
 
-}
+} // namespace
 
-RunInstance::RunInstance(): process( this )
+RunInstance::RunInstance():
+  process( this )
 {
   connect( this, &RunInstance::processFinished, this, &RunInstance::handleProcessFinished, Qt::QueuedConnection );
   connect( &process, &QProcess::finished, this, &RunInstance::processFinished );
   connect( &process, &QProcess::errorOccurred, this, &RunInstance::processFinished );
 }
 
-bool RunInstance::start( Config::Program const & prg, QString const & word,
-                         QString & error )
+bool RunInstance::start( Config::Program const & prg, QString const & word, QString & error )
 {
   QStringList args = parseCommandLine( prg.commandLine );
 
-  if ( !args.empty() )
-  {
+  if ( !args.empty() ) {
     QString programName = args.first();
     args.pop_front();
 
-    bool writeToStdInput = true;
+    bool writeToStdInput       = true;
     auto const & search_string = GlobalBroadcaster::instance()->translateLineText;
 
-    for( auto & arg : args ) {
-      if( arg.indexOf( "%GDWORD%" ) >= 0 ) {
+    for ( auto & arg : args ) {
+      if ( arg.indexOf( "%GDWORD%" ) >= 0 ) {
         writeToStdInput = false;
         arg.replace( "%GDWORD%", word );
       }
-      if( arg.indexOf( "%GDSEARCH%" ) >= 0 ) {
+      if ( arg.indexOf( "%GDSEARCH%" ) >= 0 ) {
         writeToStdInput = false;
         arg.replace( "%GDSEARCH%", search_string );
       }
     }
 
     process.start( programName, args );
-    if( writeToStdInput )
-    {
+    if ( writeToStdInput ) {
       process.write( word.toLocal8Bit() );
       process.closeWriteChannel();
     }
 
     return true;
   }
-  else
-  {
+  else {
     error = tr( "No program name was given." );
     return false;
   }
@@ -196,12 +188,10 @@ void RunInstance::handleProcessFinished()
   QString error;
   if ( process.exitStatus() != QProcess::NormalExit )
     error = tr( "The program has crashed." );
-  else
-  if ( int code = process.exitCode() )
+  else if ( int code = process.exitCode() )
     error = tr( "The program has returned exit code %1." ).arg( code );
 
-  if ( !error.isEmpty() )
-  {
+  if ( !error.isEmpty() ) {
     QByteArray err = process.readAllStandardError();
 
     if ( !err.isEmpty() )
@@ -211,15 +201,13 @@ void RunInstance::handleProcessFinished()
   emit finished( output, error );
 }
 
-ProgramDataRequest::ProgramDataRequest( QString const & word,
-                                        Config::Program const & prg_ ):
+ProgramDataRequest::ProgramDataRequest( QString const & word, Config::Program const & prg_ ):
   prg( prg_ )
 {
   connect( &instance, &RunInstance::finished, this, &ProgramDataRequest::instanceFinished );
 
   QString error;
-  if ( !instance.start( prg, word, error ) )
-  {
+  if ( !instance.start( prg, word, error ) ) {
     setErrorString( error );
     finish();
   }
@@ -228,90 +216,71 @@ ProgramDataRequest::ProgramDataRequest( QString const & word,
 void ProgramDataRequest::instanceFinished( QByteArray output, QString error )
 {
   QString prog_output;
-  if ( !isFinished() )
-  {
-    if ( !output.isEmpty() )
-    {
+  if ( !isFinished() ) {
+    if ( !output.isEmpty() ) {
       string result = "<div class='programs_";
 
-      switch( prg.type )
-      {
-      case Config::Program::PlainText:
-        result += "plaintext'>";
-        try
-        {
-          // Check BOM if present
-          unsigned char * uchars = reinterpret_cast< unsigned char * >( output.data() );
-          if( output.length() >= 2 && uchars[ 0 ] == 0xFF && uchars[ 1 ] == 0xFE )
-          {
-            int size = output.length() - 2;
-            if( size & 1 )
-              size -= 1;
-            string res= Iconv::toUtf8( "UTF-16LE", output.data() + 2, size );
-            prog_output = QString::fromUtf8( res.c_str(), res.size() );
+      switch ( prg.type ) {
+        case Config::Program::PlainText:
+          result += "plaintext'>";
+          try {
+            // Check BOM if present
+            unsigned char * uchars = reinterpret_cast< unsigned char * >( output.data() );
+            if ( output.length() >= 2 && uchars[ 0 ] == 0xFF && uchars[ 1 ] == 0xFE ) {
+              int size = output.length() - 2;
+              if ( size & 1 )
+                size -= 1;
+              string res  = Iconv::toUtf8( "UTF-16LE", output.data() + 2, size );
+              prog_output = QString::fromUtf8( res.c_str(), res.size() );
+            }
+            else if ( output.length() >= 2 && uchars[ 0 ] == 0xFE && uchars[ 1 ] == 0xFF ) {
+              int size = output.length() - 2;
+              if ( size & 1 )
+                size -= 1;
+              string res  = Iconv::toUtf8( "UTF-16BE", output.data() + 2, size );
+              prog_output = QString::fromUtf8( res.c_str(), res.size() );
+            }
+            else if ( output.length() >= 3 && uchars[ 0 ] == 0xEF && uchars[ 1 ] == 0xBB && uchars[ 2 ] == 0xBF ) {
+              prog_output = QString::fromUtf8( output.data() + 3, output.length() - 3 );
+            }
+            else {
+              // No BOM, assume local 8-bit encoding
+              prog_output = QString::fromLocal8Bit( output );
+            }
           }
-          else
-          if( output.length() >= 2 && uchars[ 0 ] == 0xFE && uchars[ 1 ] == 0xFF )
-          {
-            int size = output.length() - 2;
-            if( size & 1 )
-              size -= 1;
-            string res = Iconv::toUtf8( "UTF-16BE", output.data() + 2, size );
-            prog_output = QString::fromUtf8( res.c_str(), res.size() );
+          catch ( std::exception & e ) {
+            error = e.what();
           }
-          else
-          if( output.length() >= 3 && uchars[ 0 ] == 0xEF && uchars[ 1 ] == 0xBB && uchars[ 2 ] == 0xBF )
-          {
-            prog_output = QString::fromUtf8( output.data() + 3, output.length() - 3 );
+          result += Html::preformat( prog_output.toUtf8().data() );
+          break;
+        default:
+          result += "html'>";
+          try {
+            // Check BOM if present
+            unsigned char * uchars = reinterpret_cast< unsigned char * >( output.data() );
+            if ( output.length() >= 2 && uchars[ 0 ] == 0xFF && uchars[ 1 ] == 0xFE ) {
+              int size = output.length() - 2;
+              if ( size & 1 )
+                size -= 1;
+              result += Iconv::toUtf8( "UTF-16LE", output.data() + 2, size );
+            }
+            else if ( output.length() >= 2 && uchars[ 0 ] == 0xFE && uchars[ 1 ] == 0xFF ) {
+              int size = output.length() - 2;
+              if ( size & 1 )
+                size -= 1;
+              result += Iconv::toUtf8( "UTF-16BE", output.data() + 2, size );
+            }
+            else if ( output.length() >= 3 && uchars[ 0 ] == 0xEF && uchars[ 1 ] == 0xBB && uchars[ 2 ] == 0xBF ) {
+              result += output.data() + 3;
+            }
+            else {
+              // We assume html data is in utf8 encoding already.
+              result += output.data();
+            }
           }
-          else
-          {
-            // No BOM, assume local 8-bit encoding
-            prog_output = QString::fromLocal8Bit( output );
+          catch ( std::exception & e ) {
+            error = e.what();
           }
-        }
-        catch( std::exception & e )
-        {
-          error = e.what();
-        }
-        result += Html::preformat( prog_output.toUtf8().data() );
-        break;
-      default:
-        result += "html'>";
-        try
-        {
-          // Check BOM if present
-          unsigned char * uchars = reinterpret_cast< unsigned char * >( output.data() );
-          if( output.length() >= 2 && uchars[ 0 ] == 0xFF && uchars[ 1 ] == 0xFE )
-          {
-            int size = output.length() - 2;
-            if( size & 1 )
-              size -= 1;
-            result += Iconv::toUtf8( "UTF-16LE", output.data() + 2, size );
-          }
-          else
-          if( output.length() >= 2 && uchars[ 0 ] == 0xFE && uchars[ 1 ] == 0xFF )
-          {
-            int size = output.length() - 2;
-            if( size & 1 )
-              size -= 1;
-            result += Iconv::toUtf8( "UTF-16BE", output.data() + 2, size );
-          }
-          else
-          if( output.length() >= 3 && uchars[ 0 ] == 0xEF && uchars[ 1 ] == 0xBB && uchars[ 2 ] == 0xBF )
-          {
-            result += output.data() + 3;
-          }
-          else
-          {
-            // We assume html data is in utf8 encoding already.
-            result += output.data();
-          }
-        }
-        catch( std::exception & e )
-        {
-          error = e.what();
-        }
       }
 
       result += "</div>";
@@ -334,15 +303,13 @@ void ProgramDataRequest::cancel()
   finish();
 }
 
-ProgramWordSearchRequest::ProgramWordSearchRequest( QString const & word,
-                                                    Config::Program const & prg_ ):
+ProgramWordSearchRequest::ProgramWordSearchRequest( QString const & word, Config::Program const & prg_ ):
   prg( prg_ )
 {
   connect( &instance, &RunInstance::finished, this, &ProgramWordSearchRequest::instanceFinished );
 
   QString error;
-  if ( !instance.start( prg, word, error ) )
-  {
+  if ( !instance.start( prg, word, error ) ) {
     setErrorString( error );
     finish();
   }
@@ -350,14 +317,12 @@ ProgramWordSearchRequest::ProgramWordSearchRequest( QString const & word,
 
 void ProgramWordSearchRequest::instanceFinished( QByteArray output, QString error )
 {
-  if ( !isFinished() )
-  {
+  if ( !isFinished() ) {
     // Handle any Windows artifacts
     output.replace( "\r\n", "\n" );
-    QStringList result =
-      QString::fromUtf8( output ).split( "\n", Qt::SkipEmptyParts );
+    QStringList result = QString::fromUtf8( output ).split( "\n", Qt::SkipEmptyParts );
 
-    for( int x = 0; x < result.size(); ++x )
+    for ( int x = 0; x < result.size(); ++x )
       matches.push_back( Dictionary::WordMatch( gd::toWString( result[ x ] ) ) );
 
     if ( !error.isEmpty() )
@@ -372,18 +337,16 @@ void ProgramWordSearchRequest::cancel()
   finish();
 }
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-  Config::Programs const & programs )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::Programs const & programs )
+
 {
   vector< sptr< Dictionary::Class > > result;
 
-  for( Config::Programs::const_iterator i = programs.begin();
-       i != programs.end(); ++i )
+  for ( Config::Programs::const_iterator i = programs.begin(); i != programs.end(); ++i )
     if ( i->enabled )
-      result.push_back( std::make_shared<ProgramsDictionary>( *i ) );
+      result.push_back( std::make_shared< ProgramsDictionary >( *i ) );
 
   return result;
 }
 
-}
+} // namespace Programs
diff --git a/src/dict/programs.hh b/src/dict/programs.hh
index 2e53a186..60e37baf 100644
--- a/src/dict/programs.hh
+++ b/src/dict/programs.hh
@@ -16,8 +16,7 @@ using std::vector;
 using std::string;
 using gd::wstring;
 
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::Programs const & )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::Programs const & );
 
 class RunInstance: public QObject
 {
@@ -79,6 +78,6 @@ private slots:
   void instanceFinished( QByteArray output, QString error );
 };
 
-}
+} // namespace Programs
 
 #endif
diff --git a/src/dict/ripemd.cc b/src/dict/ripemd.cc
index 044535f0..fb7da1eb 100644
--- a/src/dict/ripemd.cc
+++ b/src/dict/ripemd.cc
@@ -23,132 +23,128 @@
 #include <QtEndian>
 
 
-static const quint32 KA[4] = {
-    0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xa953fd4e
-};
+static const quint32 KA[ 4 ] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xa953fd4e };
 
-static const quint32 KB[4] = {
-    0x50a28be6, 0x5c4dd124, 0x6d703ef3, 0x7a6d76e9
-};
+static const quint32 KB[ 4 ] = { 0x50a28be6, 0x5c4dd124, 0x6d703ef3, 0x7a6d76e9 };
 
-static const int ROTA[80] = {
-    11, 14, 15, 12,  5,  8,  7 , 9, 11, 13, 14, 15,  6,  7,  9,  8,
-     7 , 6,  8, 13, 11,  9,  7, 15,  7, 12, 15,  9, 11,  7, 13, 12,
-    11, 13,  6,  7, 14,  9, 13, 15, 14,  8, 13,  6,  5, 12,  7,  5,
-    11, 12, 14, 15, 14, 15,  9,  8,  9, 14,  5,  6,  8,  6,  5, 12,
-     9, 15,  5, 11,  6,  8, 13, 12,  5, 12, 13, 14, 11,  8,  5,  6
-};
+static const int ROTA[ 80 ] = { 11, 14, 15, 12, 5, 8,  7,  9,  11, 13, 14, 15, 6,  7,  9,  8,  7,  6,  8,  13,
+                                11, 9,  7,  15, 7, 12, 15, 9,  11, 7,  13, 12, 11, 13, 6,  7,  14, 9,  13, 15,
+                                14, 8,  13, 6,  5, 12, 7,  5,  11, 12, 14, 15, 14, 15, 9,  8,  9,  14, 5,  6,
+                                8,  6,  5,  12, 9, 15, 5,  11, 6,  8,  13, 12, 5,  12, 13, 14, 11, 8,  5,  6 };
 
-static const int ROTB[80] = {
-     8,  9,  9, 11, 13, 15, 15,  5,  7,  7,  8, 11, 14, 14, 12,  6,
-     9, 13, 15,  7, 12,  8,  9, 11,  7,  7, 12,  7,  6, 15, 13, 11,
-     9,  7, 15, 11,  8,  6,  6, 14, 12, 13,  5, 14, 13, 13,  7,  5,
-    15,  5,  8, 11, 14, 14,  6, 14,  6,  9, 12,  9, 12,  5, 15,  8,
-     8,  5, 12,  9, 12,  5, 14,  6,  8, 13,  6,  5, 15, 13, 11, 11
-};
+static const int ROTB[ 80 ] = { 8,  9,  9,  11, 13, 15, 15, 5, 7,  7,  8,  11, 14, 14, 12, 6,  9,  13, 15, 7,
+                                12, 8,  9,  11, 7,  7,  12, 7, 6,  15, 13, 11, 9,  7,  15, 11, 8,  6,  6,  14,
+                                12, 13, 5,  14, 13, 13, 7,  5, 15, 5,  8,  11, 14, 14, 6,  14, 6,  9,  12, 9,
+                                12, 5,  15, 8,  8,  5,  12, 9, 12, 5,  14, 6,  8,  13, 6,  5,  15, 13, 11, 11 };
 
-static const int WA[80] = {
-     0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
-     7,  4, 13,  1, 10,  6, 15,  3, 12,  0,  9,  5,  2, 14, 11,  8,
-     3, 10, 14,  4,  9, 15,  8,  1,  2,  7,  0,  6, 13, 11,  5, 12,
-     1,  9, 11, 10,  0,  8, 12,  4, 13,  3,  7, 15, 14,  5,  6,  2,
-     4,  0,  5,  9,  7, 12,  2, 10, 14,  1,  3,  8, 11,  6, 15, 13
-};
+static const int WA[ 80 ] = { 0,  1, 2,  3, 4,  5,  6, 7,  8, 9,  10, 11, 12, 13, 14, 15, 7,  4,  13, 1,
+                              10, 6, 15, 3, 12, 0,  9, 5,  2, 14, 11, 8,  3,  10, 14, 4,  9,  15, 8,  1,
+                              2,  7, 0,  6, 13, 11, 5, 12, 1, 9,  11, 10, 0,  8,  12, 4,  13, 3,  7,  15,
+                              14, 5, 6,  2, 4,  0,  5, 9,  7, 12, 2,  10, 14, 1,  3,  8,  11, 6,  15, 13 };
 
-static const int WB[80] = {
-     5, 14,  7,  0,  9,  2, 11,  4, 13,  6, 15,  8,  1, 10,  3, 12,
-     6, 11,  3,  7,  0, 13,  5, 10, 14, 15,  8, 12,  4,  9,  1,  2,
-    15,  5,  1,  3,  7, 14,  6,  9, 11,  8, 12,  2, 10,  0,  4, 13,
-     8,  6,  4,  1,  3, 11, 15,  0,  5, 12,  2, 13,  9,  7, 10, 14,
-    12, 15, 10,  4,  1,  5,  8,  7,  6,  2, 13, 14,  0,  3,  9, 11
-};
+static const int WB[ 80 ] = { 5,  14, 7,  0,  9,  2,  11, 4,  13, 6, 15, 8, 1,  10, 3,  12, 6, 11, 3, 7,
+                              0,  13, 5,  10, 14, 15, 8,  12, 4,  9, 1,  2, 15, 5,  1,  3,  7, 14, 6, 9,
+                              11, 8,  12, 2,  10, 0,  4,  13, 8,  6, 4,  1, 3,  11, 15, 0,  5, 12, 2, 13,
+                              9,  7,  10, 14, 12, 15, 10, 4,  1,  5, 8,  7, 6,  2,  13, 14, 0, 3,  9, 11 };
 
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+#define rol( value, bits ) ( ( ( value ) << ( bits ) ) | ( ( value ) >> ( 32 - ( bits ) ) ) )
 
-#define ROUND128_0_TO_15(a,b,c,d,e,f,g,h)                               \
-    a = rol(a + ((  b ^ c  ^ d)      + block[WA[n]]),         ROTA[n]); \
-    e = rol(e + ((((f ^ g) & h) ^ g) + block[WB[n]] + KB[0]), ROTB[n]); \
-    n++
+#define ROUND128_0_TO_15( a, b, c, d, e, f, g, h )                                      \
+  a = rol( a + ( ( b ^ c ^ d ) + block[ WA[ n ] ] ), ROTA[ n ] );                       \
+  e = rol( e + ( ( ( ( f ^ g ) & h ) ^ g ) + block[ WB[ n ] ] + KB[ 0 ] ), ROTB[ n ] ); \
+  n++
 
-#define ROUND128_16_TO_31(a,b,c,d,e,f,g,h)                              \
-    a = rol(a + ((((c ^ d) & b) ^ d) + block[WA[n]] + KA[0]), ROTA[n]); \
-    e = rol(e + (((~g | f) ^ h)      + block[WB[n]] + KB[1]), ROTB[n]); \
-    n++
+#define ROUND128_16_TO_31( a, b, c, d, e, f, g, h )                                     \
+  a = rol( a + ( ( ( ( c ^ d ) & b ) ^ d ) + block[ WA[ n ] ] + KA[ 0 ] ), ROTA[ n ] ); \
+  e = rol( e + ( ( ( ~g | f ) ^ h ) + block[ WB[ n ] ] + KB[ 1 ] ), ROTB[ n ] );        \
+  n++
 
-#define ROUND128_32_TO_47(a,b,c,d,e,f,g,h)                              \
-    a = rol(a + (((~c | b) ^ d)      + block[WA[n]] + KA[1]), ROTA[n]); \
-    e = rol(e + ((((g ^ h) & f) ^ h) + block[WB[n]] + KB[2]), ROTB[n]); \
-    n++
+#define ROUND128_32_TO_47( a, b, c, d, e, f, g, h )                                     \
+  a = rol( a + ( ( ( ~c | b ) ^ d ) + block[ WA[ n ] ] + KA[ 1 ] ), ROTA[ n ] );        \
+  e = rol( e + ( ( ( ( g ^ h ) & f ) ^ h ) + block[ WB[ n ] ] + KB[ 2 ] ), ROTB[ n ] ); \
+  n++
 
-#define ROUND128_48_TO_63(a,b,c,d,e,f,g,h)                              \
-    a = rol(a + ((((b ^ c) & d) ^ c) + block[WA[n]] + KA[2]), ROTA[n]); \
-    e = rol(e + ((  f ^ g  ^ h)      + block[WB[n]]),         ROTB[n]); \
-    n++
+#define ROUND128_48_TO_63( a, b, c, d, e, f, g, h )                                     \
+  a = rol( a + ( ( ( ( b ^ c ) & d ) ^ c ) + block[ WA[ n ] ] + KA[ 2 ] ), ROTA[ n ] ); \
+  e = rol( e + ( ( f ^ g ^ h ) + block[ WB[ n ] ] ), ROTB[ n ] );                       \
+  n++
 
-#define R128_0                          \
-    ROUND128_0_TO_15(a,b,c,d,e,f,g,h);  \
-    ROUND128_0_TO_15(d,a,b,c,h,e,f,g);  \
-    ROUND128_0_TO_15(c,d,a,b,g,h,e,f);  \
-    ROUND128_0_TO_15(b,c,d,a,f,g,h,e)
+#define R128_0                                \
+  ROUND128_0_TO_15( a, b, c, d, e, f, g, h ); \
+  ROUND128_0_TO_15( d, a, b, c, h, e, f, g ); \
+  ROUND128_0_TO_15( c, d, a, b, g, h, e, f ); \
+  ROUND128_0_TO_15( b, c, d, a, f, g, h, e )
 
-#define R128_16                         \
-    ROUND128_16_TO_31(a,b,c,d,e,f,g,h); \
-    ROUND128_16_TO_31(d,a,b,c,h,e,f,g); \
-    ROUND128_16_TO_31(c,d,a,b,g,h,e,f); \
-    ROUND128_16_TO_31(b,c,d,a,f,g,h,e)
+#define R128_16                                \
+  ROUND128_16_TO_31( a, b, c, d, e, f, g, h ); \
+  ROUND128_16_TO_31( d, a, b, c, h, e, f, g ); \
+  ROUND128_16_TO_31( c, d, a, b, g, h, e, f ); \
+  ROUND128_16_TO_31( b, c, d, a, f, g, h, e )
 
-#define R128_32                         \
-    ROUND128_32_TO_47(a,b,c,d,e,f,g,h); \
-    ROUND128_32_TO_47(d,a,b,c,h,e,f,g); \
-    ROUND128_32_TO_47(c,d,a,b,g,h,e,f); \
-    ROUND128_32_TO_47(b,c,d,a,f,g,h,e)
+#define R128_32                                \
+  ROUND128_32_TO_47( a, b, c, d, e, f, g, h ); \
+  ROUND128_32_TO_47( d, a, b, c, h, e, f, g ); \
+  ROUND128_32_TO_47( c, d, a, b, g, h, e, f ); \
+  ROUND128_32_TO_47( b, c, d, a, f, g, h, e )
 
-#define R128_48                         \
-    ROUND128_48_TO_63(a,b,c,d,e,f,g,h); \
-    ROUND128_48_TO_63(d,a,b,c,h,e,f,g); \
-    ROUND128_48_TO_63(c,d,a,b,g,h,e,f); \
-    ROUND128_48_TO_63(b,c,d,a,f,g,h,e)
+#define R128_48                                \
+  ROUND128_48_TO_63( a, b, c, d, e, f, g, h ); \
+  ROUND128_48_TO_63( d, a, b, c, h, e, f, g ); \
+  ROUND128_48_TO_63( c, d, a, b, g, h, e, f ); \
+  ROUND128_48_TO_63( b, c, d, a, f, g, h, e )
 
 
-RIPEMD128::RIPEMD128()
-  : count(0)
-  , buffer()
-  , state()
+RIPEMD128::RIPEMD128():
+  count( 0 ),
+  buffer(),
+  state()
 {
-  state[0] = 0x67452301;
-  state[1] = 0xEFCDAB89;
-  state[2] = 0x98BADCFE;
-  state[3] = 0x10325476;
+  state[ 0 ] = 0x67452301;
+  state[ 1 ] = 0xEFCDAB89;
+  state[ 2 ] = 0x98BADCFE;
+  state[ 3 ] = 0x10325476;
 }
 
-void RIPEMD128::transform( const uchar buffer[64] )
+void RIPEMD128::transform( const uchar buffer[ 64 ] )
 {
-    quint32 a, b, c, d, e, f, g, h;
-    quint32 block[16];
-    int n;
+  quint32 a, b, c, d, e, f, g, h;
+  quint32 block[ 16 ];
+  int n;
 
-    a = e = state[0];
-    b = f = state[1];
-    c = g = state[2];
-    d = h = state[3];
+  a = e = state[ 0 ];
+  b = f = state[ 1 ];
+  c = g = state[ 2 ];
+  d = h = state[ 3 ];
 
-    for (n = 0; n < 16; n++)
-      block[n] = qFromLittleEndian<quint32>( buffer + 4 * n );
-    n = 0;
+  for ( n = 0; n < 16; n++ )
+    block[ n ] = qFromLittleEndian< quint32 >( buffer + 4 * n );
+  n = 0;
 
-    R128_0; R128_0; R128_0; R128_0;
+  R128_0;
+  R128_0;
+  R128_0;
+  R128_0;
 
-    R128_16; R128_16; R128_16; R128_16;
+  R128_16;
+  R128_16;
+  R128_16;
+  R128_16;
 
-    R128_32; R128_32; R128_32; R128_32;
+  R128_32;
+  R128_32;
+  R128_32;
+  R128_32;
 
-    R128_48; R128_48; R128_48; R128_48;
+  R128_48;
+  R128_48;
+  R128_48;
+  R128_48;
 
-    h += c + state[1];
-    state[1] = state[2] + d + e;
-    state[2] = state[3] + a + f;
-    state[3] = state[0] + b + g;
-    state[0] = h;
+  h += c + state[ 1 ];
+  state[ 1 ] = state[ 2 ] + d + e;
+  state[ 2 ] = state[ 3 ] + a + f;
+  state[ 3 ] = state[ 0 ] + b + g;
+  state[ 0 ] = h;
 }
 
 void RIPEMD128::update( const uchar * data, size_t len )
@@ -157,28 +153,26 @@ void RIPEMD128::update( const uchar * data, size_t len )
 
   j = count & 63;
   count += len;
-  if ( ( j + len ) > 63 )
-  {
-    memcpy( &buffer[j], data, ( i = 64 - j ) );
+  if ( ( j + len ) > 63 ) {
+    memcpy( &buffer[ j ], data, ( i = 64 - j ) );
     transform( buffer );
     for ( ; i + 63 < len; i += 64 )
-      transform( &data[i] );
+      transform( &data[ i ] );
     j = 0;
   }
-  else
-  {
+  else {
     i = 0;
   }
-  memcpy( &buffer[j], &data[i], len - i );
+  memcpy( &buffer[ j ], &data[ i ], len - i );
 }
 
 void RIPEMD128::digest( uchar * digest )
 {
   quint64 finalcount = qFromLittleEndian( count << 3 );
-  update( (const uchar *) "\200", 1 );
+  update( (const uchar *)"\200", 1 );
   while ( ( count & 63 ) != 56 )
-    update( ( const uchar * ) "", 1 );
-  update( ( uchar * ) &finalcount, 8 ); /* Should cause a transform() */
+    update( (const uchar *)"", 1 );
+  update( (uchar *)&finalcount, 8 ); /* Should cause a transform() */
   for ( int i = 0; i < 4; i++ )
-    qToLittleEndian( state[i], digest + i*4 );
+    qToLittleEndian( state[ i ], digest + i * 4 );
 }
diff --git a/src/dict/ripemd.hh b/src/dict/ripemd.hh
index fe801763..2863a021 100644
--- a/src/dict/ripemd.hh
+++ b/src/dict/ripemd.hh
@@ -37,10 +37,10 @@ public:
 
 private:
   quint64 count;       // number of bytes in buffer
-  uchar  buffer[64];  // 512-bit buffer of input values used in hash updating
-  quint32 state[10];   // current hash value
+  uchar buffer[ 64 ];  // 512-bit buffer of input values used in hash updating
+  quint32 state[ 10 ]; // current hash value
 
-  void transform( const uchar buffer[64] );
+  void transform( const uchar buffer[ 64 ] );
 };
 
 #endif // __RIPEMD_HH_INCLUDED__
diff --git a/src/dict/romaji.cc b/src/dict/romaji.cc
index 2238e28b..7b129d40 100644
--- a/src/dict/romaji.cc
+++ b/src/dict/romaji.cc
@@ -13,31 +13,149 @@ public:
 HepburnHiragana::HepburnHiragana()
 {
   // Raw UTF8 -- handle with care. We'd better remap those to \xAB hex encoding
-  ins( "a", "あ" ); ins( "i", "い" ); ins( "u", "う" ); ins( "e", "え" ); ins( "o", "お" ); 
+  ins( "a", "あ" );
+  ins( "i", "い" );
+  ins( "u", "う" );
+  ins( "e", "え" );
+  ins( "o", "お" );
 
-  ins( "ka", "か" ); ins( "ki", "き" ); ins( "ku", "く" ); ins( "ke", "け" ); ins( "ko", "こ" ); ins( "kya", "きゃ" ); ins( "kyu", "きゅ" ); ins( "kyo", "きょ" ); 
-  ins( "sa", "さ" ); ins( "shi", "し" ); ins( "su", "す" ); ins( "se", "せ" ); ins( "so", "そ" ); ins( "sha", "しゃ" ); ins( "shu", "しゅ" ); ins( "sho", "しょ" ); 
-  ins( "ta", "た" ); ins( "chi", "ち" ); ins( "tsu", "つ" ); ins( "te", "て" ); ins( "to", "と" ); ins( "cha", "ちゃ" ); ins( "chu", "ちゅ" ); ins( "cho", "ちょ" ); 
-  ins( "na", "な" ); ins( "ni", "に" ); ins( "nu", "ぬ" ); ins( "ne", "ね" ); ins( "no", "の" ); ins( "nya", "にゃ" ); ins( "nyu", "にゅ" ); ins( "nyo", "にょ" ); 
-  ins( "ha", "は" ); ins( "hi", "ひ" ); ins( "fu", "ふ" ); ins( "he", "へ" ); ins( "ho", "ほ" ); ins( "hya", "ひゃ" ); ins( "hyu", "ひゅ" ); ins( "hyo", "ひょ" ); 
-  ins( "ma", "ま" ); ins( "mi", "み" ); ins( "mu", "む" ); ins( "me", "め" ); ins( "mo", "も" ); ins( "mya", "みゃ" ); ins( "myu", "みゅ" ); ins( "myo", "みょ" ); 
-  ins( "ya", "や" ); ins( "yu", "ゆ" ); ins( "yo", "よ" ); 
-  ins( "ra", "ら" ); ins( "ri", "り" ); ins( "ru", "る" ); ins( "re", "れ" ); ins( "ro", "ろ" ); ins( "rya", "りゃ" ); ins( "ryu", "りゅ" ); ins( "ryo", "りょ" ); 
-  ins( "wa", "わ" ); /*ゐ wi† 		ゑ we† */ ins( "wo", "を" );
+  ins( "ka", "か" );
+  ins( "ki", "き" );
+  ins( "ku", "く" );
+  ins( "ke", "け" );
+  ins( "ko", "こ" );
+  ins( "kya", "きゃ" );
+  ins( "kyu", "きゅ" );
+  ins( "kyo", "きょ" );
+  ins( "sa", "さ" );
+  ins( "shi", "し" );
+  ins( "su", "す" );
+  ins( "se", "せ" );
+  ins( "so", "そ" );
+  ins( "sha", "しゃ" );
+  ins( "shu", "しゅ" );
+  ins( "sho", "しょ" );
+  ins( "ta", "た" );
+  ins( "chi", "ち" );
+  ins( "tsu", "つ" );
+  ins( "te", "て" );
+  ins( "to", "と" );
+  ins( "cha", "ちゃ" );
+  ins( "chu", "ちゅ" );
+  ins( "cho", "ちょ" );
+  ins( "na", "な" );
+  ins( "ni", "に" );
+  ins( "nu", "ぬ" );
+  ins( "ne", "ね" );
+  ins( "no", "の" );
+  ins( "nya", "にゃ" );
+  ins( "nyu", "にゅ" );
+  ins( "nyo", "にょ" );
+  ins( "ha", "は" );
+  ins( "hi", "ひ" );
+  ins( "fu", "ふ" );
+  ins( "he", "へ" );
+  ins( "ho", "ほ" );
+  ins( "hya", "ひゃ" );
+  ins( "hyu", "ひゅ" );
+  ins( "hyo", "ひょ" );
+  ins( "ma", "ま" );
+  ins( "mi", "み" );
+  ins( "mu", "む" );
+  ins( "me", "め" );
+  ins( "mo", "も" );
+  ins( "mya", "みゃ" );
+  ins( "myu", "みゅ" );
+  ins( "myo", "みょ" );
+  ins( "ya", "や" );
+  ins( "yu", "ゆ" );
+  ins( "yo", "よ" );
+  ins( "ra", "ら" );
+  ins( "ri", "り" );
+  ins( "ru", "る" );
+  ins( "re", "れ" );
+  ins( "ro", "ろ" );
+  ins( "rya", "りゃ" );
+  ins( "ryu", "りゅ" );
+  ins( "ryo", "りょ" );
+  ins( "wa", "わ" ); /*ゐ wi† 		ゑ we† */
+  ins( "wo", "を" );
   ins( "n", "ん" );
-  ins( "ga", "が" ); ins( "gi", "ぎ" ); ins( "gu", "ぐ" ); ins( "ge", "げ" ); ins( "go", "ご" ); ins( "gya", "ぎゃ" ); ins( "gyu", "ぎゅ" ); ins( "gyo", "ぎょ" ); 
-  ins( "za", "ざ" ); ins( "ji", "じ" ); ins( "zu", "ず" ); ins( "ze", "ぜ" ); ins( "zo", "ぞ" ); ins( "ja", "じゃ" ); ins( "ju", "じゅ" ); ins( "jo", "じょ" ); 
-  ins( "da", "だ" ); ins( "(ji)", "ぢ" ); ins( "(zu)", "づ" ); ins( "de", "で" ); ins( "do", "ど" ); ins( "(ja)", "ぢゃ" ); ins( "(ju)", "ぢゅ" ); ins( "(jo)", "ぢょ" ); 
-  ins( "ba", "ば" ); ins( "bi", "び" ); ins( "bu", "ぶ" ); ins( "be", "べ" ); ins( "bo", "ぼ" ); ins( "bya", "びゃ" ); ins( "byu", "びゅ" ); ins( "byo", "びょ" ); 
-  ins( "pa", "ぱ" ); ins( "pi", "ぴ" ); ins( "pu", "ぷ" ); ins( "pe", "ぺ" ); ins( "po", "ぽ" ); ins( "pya", "ぴゃ" ); ins( "pyu", "ぴゅ" ); ins( "pyo", "ぴょ" ); 
+  ins( "ga", "が" );
+  ins( "gi", "ぎ" );
+  ins( "gu", "ぐ" );
+  ins( "ge", "げ" );
+  ins( "go", "ご" );
+  ins( "gya", "ぎゃ" );
+  ins( "gyu", "ぎゅ" );
+  ins( "gyo", "ぎょ" );
+  ins( "za", "ざ" );
+  ins( "ji", "じ" );
+  ins( "zu", "ず" );
+  ins( "ze", "ぜ" );
+  ins( "zo", "ぞ" );
+  ins( "ja", "じゃ" );
+  ins( "ju", "じゅ" );
+  ins( "jo", "じょ" );
+  ins( "da", "だ" );
+  ins( "(ji)", "ぢ" );
+  ins( "(zu)", "づ" );
+  ins( "de", "で" );
+  ins( "do", "ど" );
+  ins( "(ja)", "ぢゃ" );
+  ins( "(ju)", "ぢゅ" );
+  ins( "(jo)", "ぢょ" );
+  ins( "ba", "ば" );
+  ins( "bi", "び" );
+  ins( "bu", "ぶ" );
+  ins( "be", "べ" );
+  ins( "bo", "ぼ" );
+  ins( "bya", "びゃ" );
+  ins( "byu", "びゅ" );
+  ins( "byo", "びょ" );
+  ins( "pa", "ぱ" );
+  ins( "pi", "ぴ" );
+  ins( "pu", "ぷ" );
+  ins( "pe", "ぺ" );
+  ins( "po", "ぽ" );
+  ins( "pya", "ぴゃ" );
+  ins( "pyu", "ぴゅ" );
+  ins( "pyo", "ぴょ" );
 
-// Double consonants
-
-  ins( "kka", "っか" ); ins( "kki", "っき" ); ins( "kku", "っく" ); ins( "kke", "っけ" ); ins( "kko", "っこ" ); ins( "kkya", "っきゃ" ); ins( "kkyu", "っきゅ" ); ins( "kkyo", "っきょ" );
-  ins( "ssa", "っさ" ); ins( "sshi", "っし" ); ins( "ssu", "っす" ); ins( "sse", "っせ" ); ins( "sso", "っそ" ); ins( "ssha", "っしゃ" ); ins( "sshu", "っしゅ" ); ins( "ssho", "っしょ" );
-  ins( "tta", "った" ); ins( "tchi", "っち" ); ins( "ttsu", "っつ" ); ins( "tte", "って" ); ins( "tto", "っと" ); ins( "tcha", "っちゃ" ); ins( "tchu", "っちゅ" ); ins( "tcho", "っちょ" );
-  ins( "ppa", "っぱ" ); ins( "ppi", "っぴ" ); ins( "ppu", "っぷ" ); ins( "ppe", "っぺ" ); ins( "ppo", "っぽ" ); ins( "ppya", "っぴゃ" ); ins( "ppyu", "っぴゅ" ); ins( "ppyo", "っぴょ" );
+  // Double consonants
 
+  ins( "kka", "っか" );
+  ins( "kki", "っき" );
+  ins( "kku", "っく" );
+  ins( "kke", "っけ" );
+  ins( "kko", "っこ" );
+  ins( "kkya", "っきゃ" );
+  ins( "kkyu", "っきゅ" );
+  ins( "kkyo", "っきょ" );
+  ins( "ssa", "っさ" );
+  ins( "sshi", "っし" );
+  ins( "ssu", "っす" );
+  ins( "sse", "っせ" );
+  ins( "sso", "っそ" );
+  ins( "ssha", "っしゃ" );
+  ins( "sshu", "っしゅ" );
+  ins( "ssho", "っしょ" );
+  ins( "tta", "った" );
+  ins( "tchi", "っち" );
+  ins( "ttsu", "っつ" );
+  ins( "tte", "って" );
+  ins( "tto", "っと" );
+  ins( "tcha", "っちゃ" );
+  ins( "tchu", "っちゅ" );
+  ins( "tcho", "っちょ" );
+  ins( "ppa", "っぱ" );
+  ins( "ppi", "っぴ" );
+  ins( "ppu", "っぷ" );
+  ins( "ppe", "っぺ" );
+  ins( "ppo", "っぽ" );
+  ins( "ppya", "っぴゃ" );
+  ins( "ppyu", "っぴゅ" );
+  ins( "ppyo", "っぴょ" );
 }
 
 class HepburnKatakana: public Transliteration::Table
@@ -50,72 +168,206 @@ public:
 HepburnKatakana::HepburnKatakana()
 {
   // Raw UTF8 -- handle with care. We'd better remap those to \xAB hex encoding
-  ins( "a", "ア" ); ins( "i", "イ" ); ins( "u", "ウ" ); ins( "e", "エ" ); ins( "o", "オ" ); 
+  ins( "a", "ア" );
+  ins( "i", "イ" );
+  ins( "u", "ウ" );
+  ins( "e", "エ" );
+  ins( "o", "オ" );
 
-  ins( "ka", "カ" ); ins( "ki", "キ" ); ins( "ku", "ク" ); ins( "ke", "ケ" ); ins( "ko", "コ" ); ins( "kya", "キャ" ); ins( "kyu", "キュ" ); ins( "kyo", "キョ" ); 
-  ins( "sa", "サ" ); ins( "shi", "シ" ); ins( "su", "ス" ); ins( "se", "セ" ); ins( "so", "ソ" ); ins( "sha", "シャ" ); ins( "shu", "シュ" ); ins( "sho", "ショ" ); 
-  ins( "ta", "タ" ); ins( "chi", "チ" ); ins( "tsu", "ツ" ); ins( "te", "テ" ); ins( "to", "ト" ); ins( "cha", "チャ" ); ins( "chu", "チュ" ); ins( "cho", "チョ" ); 
-  ins( "na", "ナ" ); ins( "ni", "ニ" ); ins( "nu", "ヌ" ); ins( "ne", "ネ" ); ins( "no", "ノ" ); ins( "nya", "ニャ" ); ins( "nyu", "ニュ" ); ins( "nyo", "ニョ" ); 
-  ins( "ha", "ハ" ); ins( "hi", "ヒ" ); ins( "fu", "フ" ); ins( "he", "ヘ" ); ins( "ho", "ホ" ); ins( "hya", "ヒャ" ); ins( "hyu", "ヒュ" ); ins( "hyo", "ヒョ" ); 
-  ins( "ma", "マ" ); ins( "mi", "ミ" ); ins( "mu", "ム" ); ins( "me", "メ" ); ins( "mo", "モ" ); ins( "mya", "ミャ" ); ins( "myu", "ミュ" ); ins( "myo", "ミョ" ); 
-  ins( "ya", "ヤ" ); ins( "yu", "ユ" ); ins( "yo", "ヨ" ); 
-  ins( "ra", "ラ" ); ins( "ri", "リ" ); ins( "ru", "ル" ); ins( "re", "レ" ); ins( "ro", "ロ" ); ins( "rya", "リャ" ); ins( "ryu", "リュ" ); ins( "ryo", "リョ" ); 
+  ins( "ka", "カ" );
+  ins( "ki", "キ" );
+  ins( "ku", "ク" );
+  ins( "ke", "ケ" );
+  ins( "ko", "コ" );
+  ins( "kya", "キャ" );
+  ins( "kyu", "キュ" );
+  ins( "kyo", "キョ" );
+  ins( "sa", "サ" );
+  ins( "shi", "シ" );
+  ins( "su", "ス" );
+  ins( "se", "セ" );
+  ins( "so", "ソ" );
+  ins( "sha", "シャ" );
+  ins( "shu", "シュ" );
+  ins( "sho", "ショ" );
+  ins( "ta", "タ" );
+  ins( "chi", "チ" );
+  ins( "tsu", "ツ" );
+  ins( "te", "テ" );
+  ins( "to", "ト" );
+  ins( "cha", "チャ" );
+  ins( "chu", "チュ" );
+  ins( "cho", "チョ" );
+  ins( "na", "ナ" );
+  ins( "ni", "ニ" );
+  ins( "nu", "ヌ" );
+  ins( "ne", "ネ" );
+  ins( "no", "ノ" );
+  ins( "nya", "ニャ" );
+  ins( "nyu", "ニュ" );
+  ins( "nyo", "ニョ" );
+  ins( "ha", "ハ" );
+  ins( "hi", "ヒ" );
+  ins( "fu", "フ" );
+  ins( "he", "ヘ" );
+  ins( "ho", "ホ" );
+  ins( "hya", "ヒャ" );
+  ins( "hyu", "ヒュ" );
+  ins( "hyo", "ヒョ" );
+  ins( "ma", "マ" );
+  ins( "mi", "ミ" );
+  ins( "mu", "ム" );
+  ins( "me", "メ" );
+  ins( "mo", "モ" );
+  ins( "mya", "ミャ" );
+  ins( "myu", "ミュ" );
+  ins( "myo", "ミョ" );
+  ins( "ya", "ヤ" );
+  ins( "yu", "ユ" );
+  ins( "yo", "ヨ" );
+  ins( "ra", "ラ" );
+  ins( "ri", "リ" );
+  ins( "ru", "ル" );
+  ins( "re", "レ" );
+  ins( "ro", "ロ" );
+  ins( "rya", "リャ" );
+  ins( "ryu", "リュ" );
+  ins( "ryo", "リョ" );
   ins( "wa", "ワ" ); /*ヰ wi† 		ヱ we† 	ヲ wo‡ 	*/
-  ins( "n", "ン" ); 
-  ins( "ga", "ガ" ); ins( "gi", "ギ" ); ins( "gu", "グ" ); ins( "ge", "ゲ" ); ins( "go", "ゴ" ); ins( "gya", "ギャ" ); ins( "gyu", "ギュ" ); ins( "gyo", "ギョ" ); 
-  ins( "za", "ザ" ); ins( "ji", "ジ" ); ins( "zu", "ズ" ); ins( "ze", "ゼ" ); ins( "zo", "ゾ" ); ins( "ja", "ジャ" ); ins( "ju", "ジュ" ); ins( "jo", "ジョ" ); 
-  ins( "da", "ダ" ); ins( "(ji)", "ヂ" ); ins( "(zu)", "ヅ" ); ins( "de", "デ" ); ins( "do", "ド" ); ins( "(ja)", "ヂャ" ); ins( "(ju)", "ヂュ" ); ins( "(jo)", "ヂョ" ); 
-  ins( "ba", "バ" ); ins( "bi", "ビ" ); ins( "bu", "ブ" ); ins( "be", "ベ" ); ins( "bo", "ボ" ); ins( "bya", "ビャ" ); ins( "byu", "ビュ" ); ins( "byo", "ビョ" ); 
-  ins( "pa", "パ" ); ins( "pi", "ピ" ); ins( "pu", "プ" ); ins( "pe", "ペ" ); ins( "po", "ポ" ); ins( "pya", "ピャ" ); ins( "pyu", "ピュ" ); ins( "pyo", "ピョ" ); 
-  ins( "ye", "イェ" ); 
-  ins( "wi", "ウィ" ); ins( "we", "ウェ" ); ins( "wo", "ウォ" ); 
-  ins( "va", "ヷ" ); /*ヸ vi† 		ヹ ve†*/ ins( "vo", "ヺ" ); 
-  ins( "va", "ヴァ" ); ins( "vi", "ヴィ" ); ins( "vu", "ヴ" ); ins( "ve", "ヴェ" ); ins( "vo", "ヴォ" ); 
-  ins( "she", "シェ" ); 
-  ins( "je", "ジェ" ); 
-  ins( "che", "チェ" ); 
-  ins( "ti", "ティ" ); ins( "tu", "トゥ" ); 
-  ins( "tyu", "テュ" ); 
-  ins( "di", "ディ" ); ins( "du", "ドゥ" ); 
-  ins( "dyu", "デュ" ); 
-  ins( "tsa", "ツァ" ); ins( "tse", "ツェ" ); ins( "tso", "ツォ" ); 
-  ins( "fa", "ファ" ); ins( "fi", "フィ" ); ins( "fe", "フェ" ); ins( "fo", "フォ" ); 
-  ins( "fyu", "フュ" ); 
+  ins( "n", "ン" );
+  ins( "ga", "ガ" );
+  ins( "gi", "ギ" );
+  ins( "gu", "グ" );
+  ins( "ge", "ゲ" );
+  ins( "go", "ゴ" );
+  ins( "gya", "ギャ" );
+  ins( "gyu", "ギュ" );
+  ins( "gyo", "ギョ" );
+  ins( "za", "ザ" );
+  ins( "ji", "ジ" );
+  ins( "zu", "ズ" );
+  ins( "ze", "ゼ" );
+  ins( "zo", "ゾ" );
+  ins( "ja", "ジャ" );
+  ins( "ju", "ジュ" );
+  ins( "jo", "ジョ" );
+  ins( "da", "ダ" );
+  ins( "(ji)", "ヂ" );
+  ins( "(zu)", "ヅ" );
+  ins( "de", "デ" );
+  ins( "do", "ド" );
+  ins( "(ja)", "ヂャ" );
+  ins( "(ju)", "ヂュ" );
+  ins( "(jo)", "ヂョ" );
+  ins( "ba", "バ" );
+  ins( "bi", "ビ" );
+  ins( "bu", "ブ" );
+  ins( "be", "ベ" );
+  ins( "bo", "ボ" );
+  ins( "bya", "ビャ" );
+  ins( "byu", "ビュ" );
+  ins( "byo", "ビョ" );
+  ins( "pa", "パ" );
+  ins( "pi", "ピ" );
+  ins( "pu", "プ" );
+  ins( "pe", "ペ" );
+  ins( "po", "ポ" );
+  ins( "pya", "ピャ" );
+  ins( "pyu", "ピュ" );
+  ins( "pyo", "ピョ" );
+  ins( "ye", "イェ" );
+  ins( "wi", "ウィ" );
+  ins( "we", "ウェ" );
+  ins( "wo", "ウォ" );
+  ins( "va", "ヷ" ); /*ヸ vi† 		ヹ ve†*/
+  ins( "vo", "ヺ" );
+  ins( "va", "ヴァ" );
+  ins( "vi", "ヴィ" );
+  ins( "vu", "ヴ" );
+  ins( "ve", "ヴェ" );
+  ins( "vo", "ヴォ" );
+  ins( "she", "シェ" );
+  ins( "je", "ジェ" );
+  ins( "che", "チェ" );
+  ins( "ti", "ティ" );
+  ins( "tu", "トゥ" );
+  ins( "tyu", "テュ" );
+  ins( "di", "ディ" );
+  ins( "du", "ドゥ" );
+  ins( "dyu", "デュ" );
+  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", "ッキョ" );
-  ins( "ssa", "ッサ" ); ins( "sshi", "ッシ" ); ins( "ssu", "ッス" ); ins( "sse", "ッセ" ); ins( "sso", "ッソ" ); ins( "ssha", "ッシャ" ); ins( "sshu", "ッシュ" ); ins( "ssho", "ッショ" );
-  ins( "tta", "ッタ" ); ins( "tchi", "ッチ" ); ins( "ttsu", "ッツ" ); ins( "tte", "ッテ" ); ins( "tto", "ット" ); ins( "tcha", "ッチャ" ); ins( "tchu", "ッチュ" ); ins( "tcho", "ッチョ" );
-  ins( "ppa", "ッパ" ); ins( "ppi", "ッピ" ); ins( "ppu", "ップ" ); ins( "ppe", "ッペ" ); ins( "ppo", "ッポ" ); ins( "ppya", "ッピャ" ); ins( "ppyu", "ッピュ" ); ins( "ppyo", "ッピョ" );
+  ins( "kka", "ッカ" );
+  ins( "kki", "ッキ" );
+  ins( "kku", "ック" );
+  ins( "kke", "ッケ" );
+  ins( "kko", "ッコ" );
+  ins( "kkya", "ッキャ" );
+  ins( "kkyu", "ッキュ" );
+  ins( "kkyo", "ッキョ" );
+  ins( "ssa", "ッサ" );
+  ins( "sshi", "ッシ" );
+  ins( "ssu", "ッス" );
+  ins( "sse", "ッセ" );
+  ins( "sso", "ッソ" );
+  ins( "ssha", "ッシャ" );
+  ins( "sshu", "ッシュ" );
+  ins( "ssho", "ッショ" );
+  ins( "tta", "ッタ" );
+  ins( "tchi", "ッチ" );
+  ins( "ttsu", "ッツ" );
+  ins( "tte", "ッテ" );
+  ins( "tto", "ット" );
+  ins( "tcha", "ッチャ" );
+  ins( "tchu", "ッチュ" );
+  ins( "tcho", "ッチョ" );
+  ins( "ppa", "ッパ" );
+  ins( "ppi", "ッピ" );
+  ins( "ppu", "ップ" );
+  ins( "ppe", "ッペ" );
+  ins( "ppo", "ッポ" );
+  ins( "ppya", "ッピャ" );
+  ins( "ppyu", "ッピュ" );
+  ins( "ppyo", "ッピョ" );
 }
 
 vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & r )
-  
+
 {
   vector< sptr< Dictionary::Class > > result;
-  
-  if ( r.enable )
-  {
-    if ( r.enableHepburn )
-    {
-      if ( r.enableHiragana )
-      {
+
+  if ( r.enable ) {
+    if ( r.enableHepburn ) {
+      if ( r.enableHiragana ) {
         static HepburnHiragana t;
 
-        result.push_back( std::make_shared<Transliteration::TransliterationDictionary>( "94eae5a5aaf5b0a900490f4d6b36aac0",
-                            QCoreApplication::translate( "Romaji", "Hepburn Romaji for Hiragana" ).toUtf8().data(),
-                            QIcon( ":/flags/jp.png" ), t, false ) );
+        result.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+          "94eae5a5aaf5b0a900490f4d6b36aac0",
+          QCoreApplication::translate( "Romaji", "Hepburn Romaji for Hiragana" ).toUtf8().data(),
+          QIcon( ":/flags/jp.png" ),
+          t,
+          false ) );
       }
-      
-      if ( r.enableKatakana )
-      {
+
+      if ( r.enableKatakana ) {
         static HepburnKatakana t;
 
-        result.push_back( std::make_shared< Transliteration::TransliterationDictionary>( "3252a35767d3f6e85e3e39069800dd2f",
-                            QCoreApplication::translate( "Romaji", "Hepburn Romaji for Katakana" ).toUtf8().data(),
-                            QIcon( ":/flags/jp.png" ), t, false ) );
+        result.push_back( std::make_shared< Transliteration::TransliterationDictionary >(
+          "3252a35767d3f6e85e3e39069800dd2f",
+          QCoreApplication::translate( "Romaji", "Hepburn Romaji for Katakana" ).toUtf8().data(),
+          QIcon( ":/flags/jp.png" ),
+          t,
+          false ) );
       }
     }
   }
@@ -123,4 +375,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & r )
   return result;
 }
 
-}
+} // namespace Romaji
diff --git a/src/dict/romaji.hh b/src/dict/romaji.hh
index 1a49a061..2de2f3cc 100644
--- a/src/dict/romaji.hh
+++ b/src/dict/romaji.hh
@@ -13,6 +13,6 @@ namespace Romaji {
 using std::vector;
 
 vector< sptr< Dictionary::Class > > makeDictionaries( Config::Romaji const & );
-}
+} // namespace Romaji
 
 #endif
diff --git a/src/dict/russiantranslit.cc b/src/dict/russiantranslit.cc
index ba181612..e132f8a5 100644
--- a/src/dict/russiantranslit.cc
+++ b/src/dict/russiantranslit.cc
@@ -98,15 +98,16 @@ RussianTable::RussianTable()
   ins( "YA", "Я" );
   ins( "Ya", "Я" );
 }
-  
-sptr< Dictionary::Class > makeDictionary() 
+
+sptr< Dictionary::Class > makeDictionary()
 {
   static RussianTable t;
 
-  return std::make_shared<Transliteration::TransliterationDictionary>( "cf1b74acd98adea9b2bba16af38f1086",
-                      QCoreApplication::translate( "RussianTranslit", "Russian Transliteration" ).toUtf8().data(),
-                      QIcon( ":/flags/ru.png" ), t );
-}
-
+  return std::make_shared< Transliteration::TransliterationDictionary >(
+    "cf1b74acd98adea9b2bba16af38f1086",
+    QCoreApplication::translate( "RussianTranslit", "Russian Transliteration" ).toUtf8().data(),
+    QIcon( ":/flags/ru.png" ),
+    t );
 }
 
+} // namespace RussianTranslit
diff --git a/src/dict/russiantranslit.hh b/src/dict/russiantranslit.hh
index 63dffdf1..b3cd93c3 100644
--- a/src/dict/russiantranslit.hh
+++ b/src/dict/russiantranslit.hh
@@ -9,9 +9,7 @@
 // Support for Russian transliteration
 namespace RussianTranslit {
 
-sptr< Dictionary::Class > makeDictionary() ;
-
+sptr< Dictionary::Class > makeDictionary();
 }
 
 #endif
-
diff --git a/src/dict/sdict.cc b/src/dict/sdict.cc
index ea2c8342..67eb7116 100644
--- a/src/dict/sdict.cc
+++ b/src/dict/sdict.cc
@@ -18,14 +18,14 @@
 #include <string>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QString>
 #include <QSemaphore>
 #include <QAtomicInt>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat>
 #endif
 #include <QRegularExpression>
 
@@ -47,7 +47,7 @@ using BtreeIndexing::IndexInfo;
 namespace {
 
 DEF_EX_STR( exNotDctFile, "Not an Sdictionary file", Dictionary::Ex )
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 DEF_EX_STR( exWordIsTooLarge, "Enountered a word that is too large:", Dictionary::Ex )
 DEF_EX_STR( exSuddenEndOfFile, "Sudden end of file", Dictionary::Ex )
 
@@ -56,56 +56,55 @@ DEF_EX_STR( exSuddenEndOfFile, "Sudden end of file", Dictionary::Ex )
 /// DCT file header
 struct DCT_header
 {
-    char signature[4];
-    char inputLang[3];
-    char outputLang[3];
-    uint8_t compression;
-    uint32_t wordCount;
-    uint32_t shortIndexLength;
-    uint32_t titleOffset;
-    uint32_t copyrightOffset;
-    uint32_t versionOffset;
-    uint32_t shortIndexOffset;
-    uint32_t fullIndexOffset;
-    uint32_t articlesOffset;
+  char signature[ 4 ];
+  char inputLang[ 3 ];
+  char outputLang[ 3 ];
+  uint8_t compression;
+  uint32_t wordCount;
+  uint32_t shortIndexLength;
+  uint32_t titleOffset;
+  uint32_t copyrightOffset;
+  uint32_t versionOffset;
+  uint32_t shortIndexOffset;
+  uint32_t fullIndexOffset;
+  uint32_t articlesOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
 struct IndexElement
 {
-    uint16_t nextWord;
-    uint16_t previousWord;
-    uint32_t articleOffset;
+  uint16_t nextWord;
+  uint16_t previousWord;
+  uint32_t articleOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
-enum
-{
-  Signature = 0x43494453, // SDIC on little-endian, CIDS on big-endian
+enum {
+  Signature            = 0x43494453, // SDIC on little-endian, CIDS on big-endian
   CurrentFormatVersion = 1 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, SDIC
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t signature;             // First comes the signature, SDIC
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t chunksOffset;          // The offset to chunks' storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
   uint32_t wordCount;
   uint32_t articleCount;
   uint32_t compressionType; // Data compression in file. 0 - no compression, 1 - zip, 2 - bzip2
-  uint32_t langFrom;  // Source language
-  uint32_t langTo;    // Target language
+  uint32_t langFrom;        // Source language
+  uint32_t langTo;          // Target language
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -117,9 +116,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 class SdictDictionary: public BtreeIndexing::BtreeDictionary
@@ -127,107 +125,110 @@ class SdictDictionary: public BtreeIndexing::BtreeDictionary
   QMutex idxMutex, sdictMutex;
   File::Class idx;
   IdxHeader idxHeader;
-    ChunkedStorage::Reader chunks;
-    File::Class df;
+  ChunkedStorage::Reader chunks;
+  File::Class df;
 
-  public:
+public:
 
-    SdictDictionary( string const & id, string const & indexFile,
-                     vector< string > const & dictionaryFiles );
+  SdictDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
-    ~SdictDictionary();
+  ~SdictDictionary();
 
-    string getName() noexcept override
-    { return dictionaryName; }
+  string getName() noexcept override
+  {
+    return dictionaryName;
+  }
 
-    map< Dictionary::Property, string > getProperties() noexcept override
-    { return map< Dictionary::Property, string >(); }
+  map< Dictionary::Property, string > getProperties() noexcept override
+  {
+    return map< Dictionary::Property, string >();
+  }
 
-    unsigned long getArticleCount() noexcept override
-    { return idxHeader.articleCount; }
+  unsigned long getArticleCount() noexcept override
+  {
+    return idxHeader.articleCount;
+  }
 
-    unsigned long getWordCount() noexcept override
-    { return idxHeader.wordCount; }
+  unsigned long getWordCount() noexcept override
+  {
+    return idxHeader.wordCount;
+  }
 
-    inline quint32 getLangFrom() const override
-    { return idxHeader.langFrom; }
+  inline quint32 getLangFrom() const override
+  {
+    return idxHeader.langFrom;
+  }
 
-    inline quint32 getLangTo() const override
-    { return idxHeader.langTo; }
+  inline quint32 getLangTo() const override
+  {
+    return idxHeader.langTo;
+  }
 
-    sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                        vector< wstring > const & alts,
-                                                        wstring const &,
-                                                        bool ignoreDiacritics ) override
-      ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-    QString const & getDescription() override;
+  QString const & getDescription() override;
 
-    sptr< Dictionary::DataRequest >
-    getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
-    void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
+  sptr< Dictionary::DataRequest >
+  getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
+  void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-    void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
+
+  void setFTSParameters( Config::FullTextSearch const & fts ) override
+  {
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "SDICT", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 
-    void setFTSParameters( Config::FullTextSearch const & fts ) override
-    {
-      can_FTS = fts.enabled
-                && !fts.disabledTypes.contains( "SDICT", Qt::CaseInsensitive )
-                && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
-    }
 protected:
 
-    void loadIcon() noexcept override;
+  void loadIcon() noexcept override;
 
 private:
 
-    /// Loads the article.
-    void loadArticle( uint32_t address,
-                      string & articleText );
-    string convert( string const & in_data );
+  /// Loads the article.
+  void loadArticle( uint32_t address, string & articleText );
+  string convert( string const & in_data );
 
-    friend class SdictArticleRequest;
+  friend class SdictArticleRequest;
 };
 
 SdictDictionary::SdictDictionary( string const & id,
                                   string const & indexFile,
                                   vector< string > const & dictionaryFiles ):
-    BtreeDictionary( id, dictionaryFiles ),
-    idx( indexFile, "rb" ),
-    idxHeader( idx.read< IdxHeader >() ),
-    chunks( idx, idxHeader.chunksOffset ),
-    df( dictionaryFiles[ 0 ], "rb" )
+  BtreeDictionary( id, dictionaryFiles ),
+  idx( indexFile, "rb" ),
+  idxHeader( idx.read< IdxHeader >() ),
+  chunks( idx, idxHeader.chunksOffset ),
+  df( dictionaryFiles[ 0 ], "rb" )
 {
-    // Read dictionary name
+  // Read dictionary name
 
-    idx.seek( sizeof( idxHeader ) );
-    vector< char > dName( idx.read< uint32_t >() );
-    if( dName.size() > 0 )
-    {
-      idx.read( &dName.front(), dName.size() );
-      dictionaryName = string( &dName.front(), dName.size() );
-    }
+  idx.seek( sizeof( idxHeader ) );
+  vector< char > dName( idx.read< uint32_t >() );
+  if ( dName.size() > 0 ) {
+    idx.read( &dName.front(), dName.size() );
+    dictionaryName = string( &dName.front(), dName.size() );
+  }
 
-    // Initialize the index
+  // Initialize the index
 
-    openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                          idxHeader.indexRootOffset ),
-               idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
-    // Full-text search parameters
+  // Full-text search parameters
 
-    can_FTS = true;
+  can_FTS = true;
 
-    ftsIdxName = indexFile + Dictionary::getFtsSuffix();
+  ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
-      FTS_index_completed.ref();
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
+    FTS_index_completed.ref();
 }
 
 SdictDictionary::~SdictDictionary()
 {
-    df.close();
+  df.close();
 }
 
 void SdictDictionary::loadIcon() noexcept
@@ -240,10 +241,9 @@ void SdictDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 3 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_sdict.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_sdict.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -251,183 +251,156 @@ void SdictDictionary::loadIcon() noexcept
 
 string SdictDictionary::convert( string const & in )
 {
-//    GD_DPRINTF( "Source>>>>>>>>>>: %s\n\n\n", in.c_str() );
+  //    GD_DPRINTF( "Source>>>>>>>>>>: %s\n\n\n", in.c_str() );
 
-    string inConverted;
+  string inConverted;
 
-    inConverted.reserve( in.size() );
+  inConverted.reserve( in.size() );
 
-    bool afterEol = false;
+  bool afterEol = false;
 
-    for( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i )
-    {
-      switch( *i )
-      {
-        case '\n':
-          afterEol = true;
-          inConverted.append( "<br/>" );
+  for ( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i ) {
+    switch ( *i ) {
+      case '\n':
+        afterEol = true;
+        inConverted.append( "<br/>" );
         break;
 
-        case ' ':
-          if ( afterEol )
-          {
-            inConverted.append( "&nbsp;" );
-            break;
-          }
-          // Fall-through
-
-        default:
-          inConverted.push_back( *i );
-          afterEol = false;
-      }
-    }
-
-    QString result = QString::fromUtf8( inConverted.c_str(), inConverted.size() );
-
-    result.replace( QRegularExpression( "<\\s*(p|br)\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "<br/>" );
-    result.remove( QRegularExpression( "<\\s*/p\\s*>",
-                                       QRegularExpression::CaseInsensitiveOption ) );
-
-    result.replace( QRegularExpression( "<\\s*t\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    R"(<span class="sdict_tr" dir="ltr">)" );
-    result.replace( QRegularExpression( "<\\s*f\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "<span class=\"sdict_forms\">" );
-    result.replace( QRegularExpression( "<\\s*/(t|f)\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "</span>" );
-
-    result.replace( QRegularExpression( "<\\s*l\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "<ul>" );
-    result.replace( QRegularExpression( "<\\s*/l\\s*>",
-                                        QRegularExpression::CaseInsensitiveOption ),
-                    "</ul>" );
-
-
-    // Links handling
-
-    int n = 0;
-    for( ; ; )
-    {
-      QRegularExpression start_link_tag( "<\\s*r\\s*>", QRegularExpression::CaseInsensitiveOption );
-      QRegularExpression end_link_tag( "<\\s*/r\\s*>", QRegularExpression::CaseInsensitiveOption );
-
-      n = result.indexOf( start_link_tag, n );
-      if( n < 0 )
-        break;
-
-      int end = result.indexOf( end_link_tag, n );
-      if( end < 0 )
-        break;
-
-      QRegularExpressionMatch m= start_link_tag.match( result, 0, QRegularExpression::PartialPreferFirstMatch );
-      int tag_len = m.captured ().length();
-      QString link_text = result.mid( n + tag_len, end - n - tag_len );
-
-      m= end_link_tag.match( result, 0, QRegularExpression::PartialPreferFirstMatch );
-      result.replace( end, m.captured ().length(), "</a>" );
-      result.replace( n, tag_len, QString( R"(<a class="sdict_wordref" href="bword:)" ) + link_text + "\">");
-    }
-
-    // Adjust text direction for lines
-
-    n = 0;
-    bool b = true;
-    while( b )
-    {
-      int next = result.indexOf( "<br/>", n );
-      if( next < 0 )
-      {
-        next = result.length();
-        b = false;
-      }
-
-      if( !result.mid( n, next - n ).contains( '<' ) )
-      {
-        if( Html::unescape( result.mid( n, next - n ) ).isRightToLeft() != isToLanguageRTL() )
-        {
-          result.insert( next, "</span>" );
-          result.insert( n,
-                         QString( "<span dir = \"" )
-                         + ( isToLanguageRTL() ? "ltr" : "rtl" )
-                         + "\">"
-                        );
-          next = result.indexOf( "<br/>", n );
+      case ' ':
+        if ( afterEol ) {
+          inConverted.append( "&nbsp;" );
+          break;
         }
-      }
+        // Fall-through
 
-      n = next + 5;
+      default:
+        inConverted.push_back( *i );
+        afterEol = false;
+    }
+  }
+
+  QString result = QString::fromUtf8( inConverted.c_str(), inConverted.size() );
+
+  result.replace( QRegularExpression( "<\\s*(p|br)\\s*>", QRegularExpression::CaseInsensitiveOption ), "<br/>" );
+  result.remove( QRegularExpression( "<\\s*/p\\s*>", QRegularExpression::CaseInsensitiveOption ) );
+
+  result.replace( QRegularExpression( "<\\s*t\\s*>", QRegularExpression::CaseInsensitiveOption ),
+                  R"(<span class="sdict_tr" dir="ltr">)" );
+  result.replace( QRegularExpression( "<\\s*f\\s*>", QRegularExpression::CaseInsensitiveOption ),
+                  "<span class=\"sdict_forms\">" );
+  result.replace( QRegularExpression( "<\\s*/(t|f)\\s*>", QRegularExpression::CaseInsensitiveOption ), "</span>" );
+
+  result.replace( QRegularExpression( "<\\s*l\\s*>", QRegularExpression::CaseInsensitiveOption ), "<ul>" );
+  result.replace( QRegularExpression( "<\\s*/l\\s*>", QRegularExpression::CaseInsensitiveOption ), "</ul>" );
+
+
+  // Links handling
+
+  int n = 0;
+  for ( ;; ) {
+    QRegularExpression start_link_tag( "<\\s*r\\s*>", QRegularExpression::CaseInsensitiveOption );
+    QRegularExpression end_link_tag( "<\\s*/r\\s*>", QRegularExpression::CaseInsensitiveOption );
+
+    n = result.indexOf( start_link_tag, n );
+    if ( n < 0 )
+      break;
+
+    int end = result.indexOf( end_link_tag, n );
+    if ( end < 0 )
+      break;
+
+    QRegularExpressionMatch m = start_link_tag.match( result, 0, QRegularExpression::PartialPreferFirstMatch );
+    int tag_len               = m.captured().length();
+    QString link_text         = result.mid( n + tag_len, end - n - tag_len );
+
+    m = end_link_tag.match( result, 0, QRegularExpression::PartialPreferFirstMatch );
+    result.replace( end, m.captured().length(), "</a>" );
+    result.replace( n, tag_len, QString( R"(<a class="sdict_wordref" href="bword:)" ) + link_text + "\">" );
+  }
+
+  // Adjust text direction for lines
+
+  n      = 0;
+  bool b = true;
+  while ( b ) {
+    int next = result.indexOf( "<br/>", n );
+    if ( next < 0 ) {
+      next = result.length();
+      b    = false;
     }
 
-    return result.toUtf8().data();
+    if ( !result.mid( n, next - n ).contains( '<' ) ) {
+      if ( Html::unescape( result.mid( n, next - n ) ).isRightToLeft() != isToLanguageRTL() ) {
+        result.insert( next, "</span>" );
+        result.insert( n, QString( "<span dir = \"" ) + ( isToLanguageRTL() ? "ltr" : "rtl" ) + "\">" );
+        next = result.indexOf( "<br/>", n );
+      }
+    }
+
+    n = next + 5;
+  }
+
+  return result.toUtf8().data();
 }
 
-void SdictDictionary::loadArticle( uint32_t address,
-                                   string & articleText )
+void SdictDictionary::loadArticle( uint32_t address, string & articleText )
 {
-    uint32_t articleOffset = address;
-    uint32_t articleSize;
+  uint32_t articleOffset = address;
+  uint32_t articleSize;
 
-    vector< char > articleBody;
+  vector< char > articleBody;
 
-    {
-      QMutexLocker _( &sdictMutex );
-      df.seek( articleOffset );
-      df.read( &articleSize, sizeof(articleSize) );
-      articleBody.resize( articleSize );
-      df.read( &articleBody.front(), articleSize );
-    }
+  {
+    QMutexLocker _( &sdictMutex );
+    df.seek( articleOffset );
+    df.read( &articleSize, sizeof( articleSize ) );
+    articleBody.resize( articleSize );
+    df.read( &articleBody.front(), articleSize );
+  }
 
-    if ( articleBody.empty() )
-      throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
+  if ( articleBody.empty() )
+    throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
 
-    if( idxHeader.compressionType == 1 )
-        articleText = decompressZlib( articleBody.data(), articleSize );
-    else if( idxHeader.compressionType == 2 )
-        articleText = decompressBzip2( articleBody.data(), articleSize );
-    else
-        articleText = string( articleBody.data(), articleSize );
+  if ( idxHeader.compressionType == 1 )
+    articleText = decompressZlib( articleBody.data(), articleSize );
+  else if ( idxHeader.compressionType == 2 )
+    articleText = decompressBzip2( articleBody.data(), articleSize );
+  else
+    articleText = string( articleBody.data(), articleSize );
 
-    articleText = convert( articleText );
+  articleText = convert( articleText );
 
-    string div = "<div class=\"sdict\"";
-    if( isToLanguageRTL() )
-      div += " dir=\"rtl\"";
-    div += ">";
+  string div = "<div class=\"sdict\"";
+  if ( isToLanguageRTL() )
+    div += " dir=\"rtl\"";
+  div += ">";
 
-    articleText.insert( 0, div );
-    articleText.append( "</div>" );
+  articleText.insert( 0, div );
+  articleText.append( "</div>" );
 }
 
 void SdictDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "SDict: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "SDict: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "SDict: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
@@ -435,24 +408,20 @@ void SdictDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteratio
 
 void SdictDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     string articleStr;
     headword.clear();
     text.clear();
 
     loadArticle( articleAddress, articleStr );
 
-    try
-    {
+    try {
       text = Html::unescape( QString::fromStdString( articleStr ) );
     }
-    catch( std::exception & )
-    {
+    catch ( std::exception & ) {
     }
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "SDict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -486,13 +455,16 @@ public:
 
   SdictArticleRequest( wstring const & word_,
                        vector< wstring > const & alts_,
-                       SdictDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                       SdictDictionary & dict_,
+                       bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
     } );
-
   }
 
   void run();
@@ -511,16 +483,14 @@ public:
 
 void SdictArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   vector< WordArticleLink > chain = dict.findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
@@ -535,13 +505,11 @@ void SdictArticleRequest::run()
                                     // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -555,8 +523,7 @@ void SdictArticleRequest::run()
 
     headword = chain[ x ].word;
 
-    try
-    {
+    try {
       dict.loadArticle( chain[ x ].articleOffset, articleText );
 
       // Ok. Now, does it go to main articles, or to alternate ones? We list
@@ -564,29 +531,23 @@ void SdictArticleRequest::run()
 
       // We do the case-folded comparison here.
 
-      wstring headwordStripped =
-        Folding::applySimpleCaseOnly( headword );
-      if( ignoreDiacritics )
+      wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+      if ( ignoreDiacritics )
         headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
       multimap< wstring, pair< string, string > > & mapToUse =
-        ( wordCaseFolded == headwordStripped ) ?
-          mainArticles : alternateArticles;
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-      mapToUse.insert( pair(
-        Folding::applySimpleCaseOnly( headword ),
-        pair( headword, articleText ) ) );
+      mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
       articlesIncluded.insert( chain[ x ].articleOffset );
     }
-    catch( std::exception &ex )
-    {
+    catch ( std::exception & ex ) {
       gdWarning( "SDict: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -596,31 +557,25 @@ void SdictArticleRequest::run()
 
   multimap< wstring, pair< string, string > >::const_iterator i;
 
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-      result += dict.isFromLanguageRTL() ? "<h3 dir=\"rtl\">" : "<h3>";
-      result += i->second.first;
-      result += "</h3>";
-      result += i->second.second;
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    result += dict.isFromLanguageRTL() ? "<h3 dir=\"rtl\">" : "<h3>";
+    result += i->second.first;
+    result += "</h3>";
+    result += i->second.second;
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-      result += dict.isFromLanguageRTL() ? "<h3 dir=\"rtl\">" : "<h3>";
-      result += i->second.first;
-      result += "</h3>";
-      if( dict.isToLanguageRTL() )
-        result += "<span dir=\"rtl\">";
-      result += i->second.second;
-      if( dict.isToLanguageRTL() )
-        result += "</span>";
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    result += dict.isFromLanguageRTL() ? "<h3 dir=\"rtl\">" : "<h3>";
+    result += i->second.first;
+    result += "</h3>";
+    if ( dict.isToLanguageRTL() )
+      result += "<span dir=\"rtl\">";
+    result += i->second.second;
+    if ( dict.isToLanguageRTL() )
+      result += "</span>";
   }
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -631,28 +586,25 @@ sptr< Dictionary::DataRequest > SdictDictionary::getArticle( wstring const & wor
                                                              vector< wstring > const & alts,
                                                              wstring const &,
                                                              bool ignoreDiacritics )
-  
+
 {
-  return  std::make_shared<SdictArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< SdictArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
-QString const& SdictDictionary::getDescription()
+QString const & SdictDictionary::getDescription()
 {
-  if( !dictionaryDescription.isEmpty() )
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
 
-  dictionaryDescription = QObject::tr( "Title: %1%2" )
-                          .arg( QString::fromUtf8( getName().c_str() ) )
-                          .arg( "\n\n" );
+  dictionaryDescription = QObject::tr( "Title: %1%2" ).arg( QString::fromUtf8( getName().c_str() ) ).arg( "\n\n" );
 
-  try
-  {
+  try {
     QMutexLocker _( &sdictMutex );
 
     DCT_header dictHeader;
 
     df.seek( 0 );
-    if( df.readRecords( &dictHeader, sizeof(dictHeader), 1 ) != 1 )
+    if ( df.readRecords( &dictHeader, sizeof( dictHeader ), 1 ) != 1 )
       throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
 
     int compression = dictHeader.compression & 0x0F;
@@ -666,39 +618,36 @@ QString const& SdictDictionary::getDescription()
     data.resize( size );
     df.read( &data.front(), size );
 
-    if( compression == 1 )
+    if ( compression == 1 )
       str = decompressZlib( data.data(), size );
-    else if( compression == 2 )
+    else if ( compression == 2 )
       str = decompressBzip2( data.data(), size );
     else
       str = string( data.data(), size );
 
-    dictionaryDescription += QObject::tr( "Copyright: %1%2" )
-                             .arg( QString::fromUtf8( str.c_str(), str.size() ) )
-                             .arg( "\n\n" );
+    dictionaryDescription +=
+      QObject::tr( "Copyright: %1%2" ).arg( QString::fromUtf8( str.c_str(), str.size() ) ).arg( "\n\n" );
 
     df.seek( dictHeader.versionOffset );
     df.read( &size, sizeof( size ) );
     data.resize( size );
     df.read( &data.front(), size );
 
-    if( compression == 1 )
+    if ( compression == 1 )
       str = decompressZlib( data.data(), size );
-    else if( compression == 2 )
+    else if ( compression == 2 )
       str = decompressBzip2( data.data(), size );
     else
       str = string( data.data(), size );
 
-    dictionaryDescription += QObject::tr( "Version: %1%2" )
-                             .arg( QString::fromUtf8( str.c_str(), str.size() ) )
-                             .arg( "\n\n" );
+    dictionaryDescription +=
+      QObject::tr( "Version: %1%2" ).arg( QString::fromUtf8( str.c_str(), str.size() ) ).arg( "\n\n" );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "SDict: Failed description reading for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 
-  if( dictionaryDescription.isEmpty() )
+  if ( dictionaryDescription.isEmpty() )
     dictionaryDescription = "NONE";
 
   return dictionaryDescription;
@@ -706,165 +655,148 @@ QString const& SdictDictionary::getDescription()
 
 } // anonymous namespace
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
-      // Skip files with the extensions different to .dct to speed up the
-      // scanning
-      if ( i->size() < 4 ||
-          strcasecmp( i->c_str() + ( i->size() - 4 ), ".dct" ) != 0 )
-        continue;
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
+    // Skip files with the extensions different to .dct to speed up the
+    // scanning
+    if ( i->size() < 4 || strcasecmp( i->c_str() + ( i->size() - 4 ), ".dct" ) != 0 )
+      continue;
 
-      // Got the file -- check if we need to rebuid the index
+    // Got the file -- check if we need to rebuid the index
 
-      vector< string > dictFiles( 1, *i );
+    vector< string > dictFiles( 1, *i );
 
-      string dictId = Dictionary::makeDictionaryId( dictFiles );
+    string dictId = Dictionary::makeDictionaryId( dictFiles );
 
-      string indexFile = indicesDir + dictId;
+    string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
-        try
-        {
-          gdDebug( "SDict: Building the index for dictionary: %s\n", i->c_str() );
+    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
+      try {
+        gdDebug( "SDict: Building the index for dictionary: %s\n", i->c_str() );
 
-          File::Class df( *i, "rb" );
+        File::Class df( *i, "rb" );
 
-          DCT_header dictHeader;
+        DCT_header dictHeader;
 
-          df.read( &dictHeader, sizeof(dictHeader) );
-          if( strncmp( dictHeader.signature, "sdct", 4 ) )
-          {
-              gdWarning( "File \"%s\" is not valid SDictionary file", i->c_str() );
-              continue;
-          }
-          int compression = dictHeader.compression & 0x0F;
+        df.read( &dictHeader, sizeof( dictHeader ) );
+        if ( strncmp( dictHeader.signature, "sdct", 4 ) ) {
+          gdWarning( "File \"%s\" is not valid SDictionary file", i->c_str() );
+          continue;
+        }
+        int compression = dictHeader.compression & 0x0F;
 
-          vector< char > data;
-          uint32_t size;
+        vector< char > data;
+        uint32_t size;
 
-          df.seek( dictHeader.titleOffset );
-          df.read( &size, sizeof( size ) );
+        df.seek( dictHeader.titleOffset );
+        df.read( &size, sizeof( size ) );
+        data.resize( size );
+        df.read( &data.front(), size );
+
+        string dictName;
+
+        if ( compression == 1 )
+          dictName = decompressZlib( data.data(), size );
+        else if ( compression == 2 )
+          dictName = decompressBzip2( data.data(), size );
+        else
+          dictName = string( data.data(), size );
+
+        initializing.indexingDictionary( dictName );
+
+        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( (uint32_t)dictName.size() );
+        idx.write( dictName.data(), dictName.size() );
+
+        IndexedWords indexedWords;
+
+        ChunkedStorage::Writer chunks( idx );
+
+        uint32_t wordCount = 0;
+        set< uint32_t > articleOffsets;
+        uint32_t pos = dictHeader.fullIndexOffset;
+
+        for ( uint32_t j = 0; j < dictHeader.wordCount; j++ ) {
+          IndexElement el;
+          df.seek( pos );
+          df.read( &el, sizeof( el ) );
+          uint32_t articleOffset = dictHeader.articlesOffset + el.articleOffset;
+          size                   = el.nextWord - sizeof( el );
+          if ( el.nextWord < sizeof( el ) )
+            break;
+          wordCount++;
           data.resize( size );
           df.read( &data.front(), size );
 
-          string dictName;
+          if ( articleOffsets.find( articleOffset ) == articleOffsets.end() )
+            articleOffsets.insert( articleOffset );
 
-          if( compression == 1 )
-              dictName = decompressZlib( data.data(), size );
-          else if( compression == 2 )
-              dictName = decompressBzip2( data.data(), size );
-          else
-              dictName = string( data.data(), size );
+          // Insert new entry
 
-          initializing.indexingDictionary( dictName );
+          indexedWords.addWord( Utf8::decode( string( data.data(), size ) ), articleOffset );
 
-          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( (uint32_t) dictName.size() );
-          idx.write( dictName.data(), dictName.size() );
-
-          IndexedWords indexedWords;
-
-          ChunkedStorage::Writer chunks( idx );
-
-          uint32_t wordCount = 0;
-          set< uint32_t > articleOffsets;
-          uint32_t pos = dictHeader.fullIndexOffset;
-
-          for( uint32_t j = 0; j < dictHeader.wordCount; j++ )
-          {
-            IndexElement el;
-            df.seek( pos );
-            df.read( &el, sizeof(el) );
-            uint32_t articleOffset = dictHeader.articlesOffset + el.articleOffset;
-            size = el.nextWord - sizeof(el);
-            if( el.nextWord < sizeof(el) )
-                break;
-            wordCount++;
-            data.resize( size );
-            df.read( &data.front(), size );
-
-            if( articleOffsets.find( articleOffset ) == articleOffsets.end() )
-                articleOffsets.insert( articleOffset );
-
-            // Insert new entry
-
-            indexedWords.addWord( Utf8::decode( string( data.data(), size ) ), articleOffset);
-
-            pos += el.nextWord;
-          }
-          // 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.articleCount = articleOffsets.size();
-          idxHeader.wordCount = wordCount;
-
-          idxHeader.langFrom = LangCoder::code2toInt( dictHeader.inputLang );
-          idxHeader.langTo = LangCoder::code2toInt( dictHeader.outputLang );
-          idxHeader.compressionType = compression;
-
-          idx.rewind();
-
-          idx.write( &idxHeader, sizeof( idxHeader ) );
+          pos += el.nextWord;
         }
-        catch( std::exception & e )
-        {
-          gdWarning( "Sdictionary dictionary indexing failed: %s, error: %s\n",
-                     i->c_str(), e.what() );
-          continue;
-        }
-        catch( ... )
-        {
-          qWarning( "Sdictionary dictionary indexing failed\n" );
-          continue;
-        }
-      } // if need to rebuild
-      try
-      {
-        dictionaries.push_back(  std::make_shared<SdictDictionary>( dictId,
-                                                     indexFile,
-                                                     dictFiles ) );
+        // 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.articleCount = articleOffsets.size();
+        idxHeader.wordCount    = wordCount;
+
+        idxHeader.langFrom        = LangCoder::code2toInt( dictHeader.inputLang );
+        idxHeader.langTo          = LangCoder::code2toInt( dictHeader.outputLang );
+        idxHeader.compressionType = compression;
+
+        idx.rewind();
+
+        idx.write( &idxHeader, sizeof( idxHeader ) );
       }
-      catch( std::exception & e )
-      {
-        gdWarning( "Sdictionary dictionary initializing failed: %s, error: %s\n",
-                   i->c_str(), e.what() );
+      catch ( std::exception & e ) {
+        gdWarning( "Sdictionary dictionary indexing failed: %s, error: %s\n", i->c_str(), e.what() );
+        continue;
       }
+      catch ( ... ) {
+        qWarning( "Sdictionary dictionary indexing failed\n" );
+        continue;
+      }
+    } // if need to rebuild
+    try {
+      dictionaries.push_back( std::make_shared< SdictDictionary >( dictId, indexFile, dictFiles ) );
+    }
+    catch ( std::exception & e ) {
+      gdWarning( "Sdictionary dictionary initializing failed: %s, error: %s\n", i->c_str(), e.what() );
+    }
   }
   return dictionaries;
 }
 
-}
+} // namespace Sdict
diff --git a/src/dict/sdict.hh b/src/dict/sdict.hh
index 81de56c0..a6b0a5ff 100644
--- a/src/dict/sdict.hh
+++ b/src/dict/sdict.hh
@@ -12,12 +12,9 @@ namespace Sdict {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-  ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Sdict
 
 #endif
diff --git a/src/dict/slob.cc b/src/dict/slob.cc
index 106d04b2..76244ec3 100644
--- a/src/dict/slob.cc
+++ b/src/dict/slob.cc
@@ -3,48 +3,48 @@
 
 #ifdef MAKE_ZIM_SUPPORT
 
-#include "slob.hh"
-#include "btreeidx.hh"
+  #include "slob.hh"
+  #include "btreeidx.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"
-#include "utils.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"
+  #include "utils.hh"
 
-#ifdef _MSC_VER
-#include <stub_msvc.h>
-#endif
+  #ifdef _MSC_VER
+    #include <stub_msvc.h>
+  #endif
 
-#include <QString>
-#include <QFile>
-#include <QFileInfo>
-#include <QDir>
-#include <QTextCodec>
-#include <QMap>
-#include <QPair>
-#include <QRegExp>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat>
-#endif
-#include <QProcess>
-#include <QVector>
-#include <QtAlgorithms>
+  #include <QString>
+  #include <QFile>
+  #include <QFileInfo>
+  #include <QDir>
+  #include <QTextCodec>
+  #include <QMap>
+  #include <QPair>
+  #include <QRegExp>
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QtCore5Compat>
+  #endif
+  #include <QProcess>
+  #include <QVector>
+  #include <QtAlgorithms>
 
-#include <QRegularExpression>
+  #include <QRegularExpression>
 
-#include <string>
-#include <vector>
-#include <map>
-#include <set>
-#include <algorithm>
+  #include <string>
+  #include <vector>
+  #include <map>
+  #include <set>
+  #include <algorithm>
 
 namespace Slob {
 
@@ -61,39 +61,38 @@ 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 )
+using Dictionary::exCantReadFile;
 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 )
+  #pragma pack( push, 1 )
 
-enum
-{
-  Signature = 0x58424C53, // SLBX on little-endian, XBLS on big-endian
+enum {
+  Signature            = 0x58424C53, // SLBX on little-endian, XBLS on big-endian
   CurrentFormatVersion = 2 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  quint32 signature; // First comes the signature, SLBX
-  quint32 formatVersion; // File format version (CurrentFormatVersion)
+  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
+  quint32 langFrom; // Source language
+  quint32 langTo;   // Target language
 }
-#ifndef _MSC_VER
-__attribute__((packed))
-#endif
+  #ifndef _MSC_VER
+__attribute__( ( packed ) )
+  #endif
 ;
 
-#pragma pack( pop )
+  #pragma pack( pop )
 
 const char SLOB_MAGIC[ 8 ] = { 0x21, 0x2d, 0x31, 0x53, 0x4c, 0x4f, 0x42, 0x1f };
 
@@ -111,9 +110,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 
@@ -124,15 +122,20 @@ public:
   typedef QVector< RefEntryOffsetItem > RefOffsetsVector;
 
 private:
-  enum Compressions
-  { UNKNOWN = 0, NONE, ZLIB, BZ2, LZMA2 };
+  enum Compressions {
+    UNKNOWN = 0,
+    NONE,
+    ZLIB,
+    BZ2,
+    LZMA2
+  };
 
   QFile file;
   QString fileName, dictionaryName;
   Compressions compression;
   QString encoding;
   unsigned char uuid[ 16 ];
-  QTextCodec *codec;
+  QTextCodec * codec;
   QMap< QString, QString > tags;
   QVector< QString > contentTypes;
   quint32 blobCount;
@@ -179,39 +182,57 @@ public:
   }
 
   QString const & getDictionaryName() const
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   quint32 blobsCount() const
-  { return blobCount; }
+  {
+    return blobCount;
+  }
 
   quint64 dataOffset() const
-  { return storeOffset; }
+  {
+    return storeOffset;
+  }
 
   quint32 getRefsCount() const
-  { return refsCount; }
+  {
+    return refsCount;
+  }
 
   quint32 getContentTypesCount() const
-  { return contentTypesCount; }
+  {
+    return contentTypesCount;
+  }
 
   QTextCodec * getCodec() const
-  { return codec; }
+  {
+    return codec;
+  }
 
   const RefOffsetsVector & getSortedRefOffsets();
 
   void clearRefOffsets()
-  { refsOffsetVector.clear(); }
+  {
+    refsOffsetVector.clear();
+  }
 
   QString getContentType( quint8 content_id ) const
-  { return content_id < contentTypes.size() ? contentTypes[ content_id ] : QString(); }
+  {
+    return content_id < contentTypes.size() ? contentTypes[ content_id ] : QString();
+  }
 
   QMap< QString, QString > const & getTags() const
-  { return tags; }
+  {
+    return tags;
+  }
 
   void open( const QString & name );
 
-  void getRefEntryAtOffset(quint64 offset, RefEntry & entry );
+  void getRefEntryAtOffset( quint64 offset, RefEntry & entry );
 
-  void getRefEntry(quint32 ref_nom, RefEntry & entry );
+  void getRefEntry( quint32 ref_nom, RefEntry & entry );
 
   quint8 getItem( RefEntry const & entry, string * data );
 };
@@ -226,14 +247,14 @@ QString SlobFile::readString( unsigned length )
   QByteArray data = file.read( length );
   QString str;
 
-  if( codec != 0 && !data.isEmpty() )
+  if ( codec != 0 && !data.isEmpty() )
     str = codec->toUnicode( data );
   else
     str = QString( data );
 
   char term = 0;
-  int n = str.indexOf( term );
-  if( n >= 0 )
+  int n     = str.indexOf( term );
+  if ( n >= 0 )
     str.resize( n );
 
   return str;
@@ -242,8 +263,7 @@ QString SlobFile::readString( unsigned length )
 QString SlobFile::readTinyText()
 {
   unsigned char len;
-  if( !file.getChar( ( char * )&len ) )
-  {
+  if ( !file.getChar( (char *)&len ) ) {
     QString error = fileName + ": " + file.errorString();
     throw exCantReadFile( string( error.toUtf8().data() ) );
   }
@@ -253,8 +273,7 @@ QString SlobFile::readTinyText()
 QString SlobFile::readText()
 {
   quint16 len;
-  if( file.read( ( char * )&len, sizeof( len ) ) != sizeof( len ) )
-  {
+  if ( file.read( (char *)&len, sizeof( len ) ) != sizeof( len ) ) {
     QString error = fileName + ": " + file.errorString();
     throw exCantReadFile( string( error.toUtf8().data() ) );
   }
@@ -264,8 +283,7 @@ QString SlobFile::readText()
 QString SlobFile::readLargeText()
 {
   quint32 len;
-  if( file.read( ( char * )&len, sizeof( len ) ) != sizeof( len ) )
-  {
+  if ( file.read( (char *)&len, sizeof( len ) ) != sizeof( len ) ) {
     QString error = fileName + ": " + file.errorString();
     throw exCantReadFile( string( error.toUtf8().data() ) );
   }
@@ -274,9 +292,9 @@ QString SlobFile::readLargeText()
 
 void SlobFile::open( const QString & name )
 {
-QString error( name + ": " );
+  QString error( name + ": " );
 
-  if( file.isOpen() )
+  if ( file.isOpen() )
     file.close();
 
   fileName = name;
@@ -288,20 +306,19 @@ QString error( name + ": " );
     dictionaryName = fi.fileName();
   }
 
-  for( ; ; )
-  {
+  for ( ;; ) {
 
-    if( !file.open( QFile::ReadOnly ) )
+    if ( !file.open( QFile::ReadOnly ) )
       break;
 
     char magic[ 8 ];
-    if( file.read( magic, sizeof( magic ) ) != sizeof( magic ) )
+    if ( file.read( magic, sizeof( magic ) ) != sizeof( magic ) )
       break;
 
-    if( memcmp( magic, SLOB_MAGIC, sizeof( magic ) ) != 0 )
+    if ( memcmp( magic, SLOB_MAGIC, sizeof( magic ) ) != 0 )
       throw exNotSlobFile( string( name.toUtf8().data() ) );
 
-    if( file.read( ( char * )uuid, sizeof( uuid ) ) != sizeof( uuid ) )
+    if ( file.read( (char *)uuid, sizeof( uuid ) ) != sizeof( uuid ) )
       break;
 
     // Read encoding
@@ -309,9 +326,8 @@ QString error( name + ": " );
     encoding = readTinyText();
 
     codec = QTextCodec::codecForName( encoding.toLatin1() );
-    if( codec == 0 )
-    {
-      error = QString( "for encoding \"") + encoding + "\"";
+    if ( codec == 0 ) {
+      error = QString( "for encoding \"" ) + encoding + "\"";
       throw exNoCodecFound( string( error.toUtf8().data() ) );
     }
 
@@ -319,42 +335,36 @@ QString error( name + ": " );
 
     QString compr = readTinyText();
 
-    if( compr.compare( "zlib", Qt::CaseInsensitive ) == 0 )
+    if ( compr.compare( "zlib", Qt::CaseInsensitive ) == 0 )
       compression = ZLIB;
-    else
-    if( compr.compare( "bz2", Qt::CaseInsensitive ) == 0 )
+    else if ( compr.compare( "bz2", Qt::CaseInsensitive ) == 0 )
       compression = BZ2;
-    else
-    if( compr.compare( "lzma2", Qt::CaseInsensitive ) == 0 )
+    else if ( compr.compare( "lzma2", Qt::CaseInsensitive ) == 0 )
       compression = LZMA2;
-    else
-    if( compr.isEmpty() || compr.compare( "none", Qt::CaseInsensitive ) == 0 )
+    else if ( compr.isEmpty() || compr.compare( "none", Qt::CaseInsensitive ) == 0 )
       compression = NONE;
 
     // Read tags
 
     unsigned char count;
-    if( !file.getChar( ( char * )&count ) )
+    if ( !file.getChar( (char *)&count ) )
       break;
 
-    for( unsigned i = 0; i < count; i++ )
-    {
-      QString key = readTinyText();
+    for ( unsigned i = 0; i < count; i++ ) {
+      QString key   = readTinyText();
       QString value = readTinyText();
-      tags[ key ] = value;
+      tags[ key ]   = value;
 
-      if( key.compare( "label", Qt::CaseInsensitive ) == 0
-          || key.compare( "name", Qt::CaseInsensitive ) == 0)
+      if ( key.compare( "label", Qt::CaseInsensitive ) == 0 || key.compare( "name", Qt::CaseInsensitive ) == 0 )
         dictionaryName = value;
     }
 
     // Read content types
 
-    if( !file.getChar( ( char * )&count ) )
+    if ( !file.getChar( (char *)&count ) )
       break;
 
-    for( unsigned i = 0; i < count; i++ )
-    {
+    for ( unsigned i = 0; i < count; i++ ) {
       QString type = readText();
       contentTypes.append( type );
     }
@@ -363,33 +373,33 @@ QString error( name + ": " );
     // Read data parameters
 
     quint32 cnt;
-    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( 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 ) )
+    if ( file.read( (char *)&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
       break;
     storeOffset = qFromBigEndian( tmp );
 
-    if( file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+    if ( file.read( (char *)&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
       break;
     fileSize = qFromBigEndian( tmp );
 
-    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
+    if ( file.read( (char *)&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
       break;
     refsCount = qFromBigEndian( cnt );
 
     refsOffset = file.pos();
 
-    if( !file.seek( storeOffset ) )
+    if ( !file.seek( storeOffset ) )
       break;
 
-    if( file.read( ( char * )&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
+    if ( file.read( (char *)&cnt, sizeof( cnt ) ) != sizeof( cnt ) )
       break;
     itemsCount = qFromBigEndian( cnt );
 
-    itemsOffset = storeOffset + sizeof( itemsCount );
+    itemsOffset     = storeOffset + sizeof( itemsCount );
     itemsDataOffset = itemsOffset + itemsCount * sizeof( quint64 );
 
     return;
@@ -401,22 +411,20 @@ QString error( name + ": " );
 const SlobFile::RefOffsetsVector & SlobFile::getSortedRefOffsets()
 {
   quint64 tmp;
-  qint64 size = refsCount * sizeof( quint64 );
+  qint64 size  = refsCount * sizeof( quint64 );
   quint64 base = refsOffset + size;
 
   refsOffsetVector.clear();
   refsOffsetVector.reserve( refsCount );
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     QByteArray offsets;
     offsets.resize( size );
 
-    if( !file.seek( refsOffset ) || file.read( offsets.data(), size ) != size )
+    if ( !file.seek( refsOffset ) || file.read( offsets.data(), size ) != size )
       break;
 
-    for( quint32 i = 0; i < refsCount; i++ )
-    {
+    for ( quint32 i = 0; i < refsCount; i++ ) {
       memcpy( &tmp, offsets.data() + i * sizeof( quint64 ), sizeof( tmp ) );
       refsOffsetVector.append( RefEntryOffsetItem( base + qFromBigEndian( tmp ), i ) );
     }
@@ -430,20 +438,19 @@ const SlobFile::RefOffsetsVector & SlobFile::getSortedRefOffsets()
 
 void SlobFile::getRefEntryAtOffset( quint64 offset, RefEntry & entry )
 {
-  for( ; ; )
-  {
-    if( !file.seek( offset ) )
+  for ( ;; ) {
+    if ( !file.seek( offset ) )
       break;
 
     entry.key = readText();
 
     quint32 index;
-    if( file.read( ( char * )&index, sizeof( index ) ) != sizeof( 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 ) )
+    if ( file.read( (char *)&binIndex, sizeof( binIndex ) ) != sizeof( binIndex ) )
       break;
     entry.binIndex = qFromBigEndian( binIndex );
 
@@ -460,9 +467,8 @@ 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 ) )
+  for ( ;; ) {
+    if ( !file.seek( pos ) || file.read( (char *)&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
       break;
 
     offset = qFromBigEndian( tmp ) + refsOffset + refsCount * sizeof( quint64 );
@@ -480,62 +486,56 @@ quint8 SlobFile::getItem( RefEntry const & entry, string * data )
   quint64 pos = itemsOffset + entry.itemIndex * sizeof( quint64 );
   quint64 offset, tmp;
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     // Read item data types
 
-    if( !file.seek( pos ) || file.read( ( char * )&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
+    if ( !file.seek( pos ) || file.read( (char *)&tmp, sizeof( tmp ) ) != sizeof( tmp ) )
       break;
 
     offset = qFromBigEndian( tmp ) + itemsDataOffset;
 
-    if( !file.seek( offset ) )
+    if ( !file.seek( offset ) )
       break;
 
     quint32 bins, bins_be;
-    if( file.read( ( char * )&bins_be, sizeof( bins_be ) ) != sizeof( bins_be ) )
+    if ( file.read( (char *)&bins_be, sizeof( bins_be ) ) != sizeof( bins_be ) )
       break;
     bins = qFromBigEndian( bins_be );
 
-    if( entry.binIndex >= bins )
+    if ( entry.binIndex >= bins )
       return 0xFF;
 
     QVector< quint8 > ids;
     ids.resize( bins );
-    if( file.read( ( char * )ids.data(), bins ) != bins )
+    if ( file.read( (char *)ids.data(), bins ) != bins )
       break;
 
     quint8 id = ids[ entry.binIndex ];
 
-    if( id >= (unsigned)contentTypes.size() )
+    if ( id >= (unsigned)contentTypes.size() )
       return 0xFF;
 
-    if( data != 0 )
-    {
+    if ( data != 0 ) {
       // Read item data
-      if( currentItem != entry.itemIndex )
-      {
+      if ( currentItem != entry.itemIndex ) {
         currentItemData.clear();
         quint32 length, length_be;
-        if( file.read( ( char * )&length_be, sizeof( length_be ) ) != sizeof( 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 == NONE )
+        if ( compression == NONE )
           currentItemData = string( compressedData.data(), compressedData.length() );
-        else
-        if( compression == ZLIB )
+        else if ( compression == ZLIB )
           currentItemData = decompressZlib( compressedData.data(), length );
-        else
-        if( compression == BZ2 )
+        else if ( compression == BZ2 )
           currentItemData = decompressBzip2( compressedData.data(), length );
         else
           currentItemData = decompressLzma2( compressedData.data(), length, true );
 
-        if( currentItemData.empty() )
-        {
+        if ( currentItemData.empty() ) {
           currentItem = 0xFFFFFFFF;
           return 0xFF;
         }
@@ -545,9 +545,9 @@ quint8 SlobFile::getItem( RefEntry const & entry, string * data )
       // Find bin data inside item
 
       const char * ptr = currentItemData.c_str();
-      quint32 pos = entry.binIndex * sizeof( quint32 );
+      quint32 pos      = entry.binIndex * sizeof( quint32 );
 
-      if( pos >= currentItemData.length() - sizeof( quint32 ) )
+      if ( pos >= currentItemData.length() - sizeof( quint32 ) )
         return 0xFF;
 
       quint32 offset, offset_be;
@@ -556,7 +556,7 @@ quint8 SlobFile::getItem( RefEntry const & entry, string * data )
 
       pos = bins * sizeof( quint32 ) + offset;
 
-      if( pos >= currentItemData.length() - sizeof( quint32 ) )
+      if ( pos >= currentItemData.length() - sizeof( quint32 ) )
         return 0xFF;
 
       quint32 length, len_be;
@@ -584,159 +584,156 @@ class SlobDictionary: public BtreeIndexing::BtreeDictionary
   SlobFile sf;
   QString texCgiPath, texCachePath;
 
+  string idxFileName;
+
 public:
 
   SlobDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   ~SlobDictionary();
 
-    string getName() noexcept override
-    { return dictionaryName; }
+  string getName() noexcept override
+  {
+    return dictionaryName;
+  }
 
-    map< Dictionary::Property, string > getProperties() noexcept override
-    { return map< Dictionary::Property, string >(); }
+  map< Dictionary::Property, string > getProperties() noexcept override
+  {
+    return map< Dictionary::Property, string >();
+  }
 
-    unsigned long getArticleCount() noexcept override
-    { return idxHeader.articleCount; }
+  unsigned long getArticleCount() noexcept override
+  {
+    return idxHeader.articleCount;
+  }
 
-    unsigned long getWordCount() noexcept override
-    { return idxHeader.wordCount; }
+  unsigned long getWordCount() noexcept override
+  {
+    return idxHeader.wordCount;
+  }
 
-    inline quint32 getLangFrom() const override
-    { return idxHeader.langFrom; }
+  inline quint32 getLangFrom() const override
+  {
+    return idxHeader.langFrom;
+  }
 
-    inline quint32 getLangTo() const override
-    { return idxHeader.langTo; }
+  inline quint32 getLangTo() const override
+  {
+    return idxHeader.langTo;
+  }
 
-    sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                        vector< wstring > const & alts,
-                                                        wstring const &,
-                                                        bool ignoreDiacritics ) override
-      ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-    sptr< Dictionary::DataRequest > getResource( string const & name ) override
-      ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
-    QString const& getDescription() override;
+  QString const & getDescription() override;
 
-    /// Loads the resource.
-    void loadResource( std::string &resourceName, string & data );
+  /// Loads the resource.
+  void loadResource( std::string & resourceName, string & data );
 
-    sptr< Dictionary::DataRequest >
-    getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
-    void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
+  sptr< Dictionary::DataRequest >
+  getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
+  void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-    quint64 getArticlePos( uint32_t articleNumber );
+  quint64 getArticlePos( uint32_t articleNumber );
 
-    void sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets, QAtomicInt & isCancelled ) override;
-    void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
+  void sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets, QAtomicInt & isCancelled ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
-    void setFTSParameters( Config::FullTextSearch const & fts ) override
-    {
-      can_FTS = fts.enabled && !fts.disabledTypes.contains( "SLOB", Qt::CaseInsensitive )
-        && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
-    }
+  void setFTSParameters( Config::FullTextSearch const & fts ) override
+  {
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "SLOB", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+  }
 
-    uint32_t getFtsIndexVersion() override
-    { return 2; }
+  uint32_t getFtsIndexVersion() override
+  {
+    return 2;
+  }
 
 protected:
 
-    void loadIcon() noexcept override;
+  void loadIcon() noexcept override;
 
 private:
 
-    /// Loads the article.
-    void loadArticle( quint32 address,
-                      string & articleText );
+  /// Loads the article.
+  void loadArticle( quint32 address, string & articleText );
 
-    quint32 readArticle( quint32 address,
-                         string & articleText,
-                         RefEntry & entry );
+  quint32 readArticle( quint32 address, string & articleText, RefEntry & entry );
 
-    string convert( string const & in_data, RefEntry const & entry );
+  string convert( string const & in_data, RefEntry const & entry );
 
-    void removeDirectory( QString const & directory );
+  void removeDirectory( QString const & directory );
 
-    friend class SlobArticleRequest;
-    friend class SlobResourceRequest;
+  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 >() )
+SlobDictionary::SlobDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
+  BtreeDictionary( id, dictionaryFiles ),
+  idxFileName( indexFile ),
+  idx( indexFile, "rb" ),
+  idxHeader( idx.read< IdxHeader >() )
 {
-    // Open data file
+  // Open data file
 
-    try
-    {
-      sf.open( dictionaryFiles[ 0 ].c_str() );
-    }
-    catch( std::exception & e )
-    {
-      gdWarning( "Slob dictionary initializing failed: %s, error: %s\n",
-                 dictionaryFiles[ 0 ].c_str(), e.what() );
-    }
+  try {
+    sf.open( 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
+  // Initialize the indexes
 
-    openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                          idxHeader.indexRootOffset ),
-               idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
-    resourceIndex.openIndex( IndexInfo( idxHeader.resourceIndexBtreeMaxElements,
-                                        idxHeader.resourceIndexRootOffset ),
-                             idx, idxResourceMutex );
+  resourceIndex.openIndex( IndexInfo( idxHeader.resourceIndexBtreeMaxElements, idxHeader.resourceIndexRootOffset ),
+                           idx,
+                           idxResourceMutex );
 
-    // Read dictionary name
+  // Read dictionary name
 
-    dictionaryName = sf.getDictionaryName().toStdString();
-    if( dictionaryName.empty() )
-    {
-      QString name   = QDir::fromNativeSeparators( dictionaryFiles[ 0 ].c_str() );
-      int n = name.lastIndexOf( '/' );
-      dictionaryName = name.mid( n + 1 ).toStdString();
-    }
+  dictionaryName = sf.getDictionaryName().toStdString();
+  if ( dictionaryName.empty() ) {
+    QString name   = QDir::fromNativeSeparators( dictionaryFiles[ 0 ].c_str() );
+    int n          = name.lastIndexOf( '/' );
+    dictionaryName = name.mid( n + 1 ).toStdString();
+  }
 
-    // Full-text search parameters
+  // Full-text search parameters
 
-    can_FTS = true;
+  can_FTS = true;
 
-    ftsIdxName = indexFile + Dictionary::getFtsSuffix();
+  ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-    if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-        && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
-      FTS_index_completed.ref();
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( 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();
+  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() )
+  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() )
+  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() );
@@ -755,36 +752,33 @@ void SlobDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 4 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_slob.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_slob.png" );
   }
 
   dictionaryIconLoaded = true;
 }
 
-QString const& SlobDictionary::getDescription()
+QString const & SlobDictionary::getDescription()
 {
-  if( !dictionaryDescription.isEmpty() )
+  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() )
+  for ( it = tags.begin(); it != tags.end(); ++it ) {
+    if ( it != tags.begin() )
       dictionaryDescription += "\n\n";
 
-    dictionaryDescription += it.key() + ": " +it.value();
+    dictionaryDescription += it.key() + ": " + it.value();
   }
 
   return dictionaryDescription;
 }
 
-void SlobDictionary::loadArticle( quint32 address,
-                                  string & articleText )
+void SlobDictionary::loadArticle( quint32 address, string & articleText )
 {
   articleText.clear();
 
@@ -792,8 +786,7 @@ void SlobDictionary::loadArticle( quint32 address,
 
   readArticle( address, articleText, entry );
 
-  if( !articleText.empty() )
-  {
+  if ( !articleText.empty() ) {
     articleText = convert( articleText, entry );
   }
   else
@@ -803,7 +796,7 @@ void SlobDictionary::loadArticle( quint32 address,
   string cleaner = Utils::Html::getHtmlCleaner();
 
   string prefix( "<div class=\"slobdict\"" );
-  if( isToLanguageRTL() )
+  if ( isToLanguageRTL() )
     prefix += " dir=\"rtl\"";
   prefix += ">";
 
@@ -816,21 +809,21 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
 
   // pattern of img and script
   text.replace( QRegularExpression( "<\\s*(img|script)\\s+([^>]*)src=\"(?!(?:data|https?|ftp):)(|/)([^\"]*)\"" ),
-                QString( R"(<\1 \2src="bres://%1/\4")").arg( getId().c_str() ) );
+                QString( R"(<\1 \2src="bres://%1/\4")" ).arg( getId().c_str() ) );
 
   // pattern <link... href="..." ...>
   text.replace( QRegularExpression( R"(<\s*link\s+([^>]*)href="(?!(?:data|https?|ftp):))" ),
-                QString( "<link \\1href=\"bres://%1/").arg( getId().c_str() ) );
+                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
   QString anchor;
-  QRegularExpression rxLink( R"lit(<\s*a\s+([^>]*)href="(?!(?:\w+://|#|mailto:|tel:))(/|)([^"]*)"\s*(title="[^"]*")?[^>]*>)lit" );
+  QRegularExpression rxLink(
+    R"lit(<\s*a\s+([^>]*)href="(?!(?:\w+://|#|mailto:|tel:))(/|)([^"]*)"\s*(title="[^"]*")?[^>]*>)lit" );
   QRegularExpressionMatchIterator it = rxLink.globalMatch( text );
-  int pos = 0;
+  int pos                            = 0;
   QString newText;
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
 
     newText += text.mid( pos, match.capturedStart() - pos );
@@ -838,33 +831,31 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
 
     QStringList list = match.capturedTexts();
     // Add empty strings for compatibility with QRegExp behaviour
-    for( int i = match.lastCapturedIndex() + 1; i < 5; i++ )
+    for ( int i = match.lastCapturedIndex() + 1; i < 5; i++ )
       list.append( QString() );
 
-    QString tag = list[3];
-    if ( !list[4].isEmpty() )
-      tag = list[4].split("\"")[1];
+    QString tag = list[ 3 ];
+    if ( !list[ 4 ].isEmpty() )
+      tag = list[ 4 ].split( "\"" )[ 1 ];
 
     // Find anchor
     int n = list[ 3 ].indexOf( '#' );
-    if( n > 0 )
-    {
+    if ( n > 0 ) {
       anchor = QString( "?gdanchor=" ) + list[ 3 ].mid( n + 1 );
       tag.remove( list[ 3 ].mid( n ) );
     }
     else
       anchor.clear();
 
-    tag.remove( QRegularExpression(".*/") ).
-        remove( QRegularExpression( "\\.(s|)htm(l|)$", QRegularExpression::PatternOption::CaseInsensitiveOption ) ).
-        replace( "_", "%20" ).
-        prepend( "<a href=\"gdlookup://localhost/" ).
-        append( anchor + "\" " + list[4] + ">" );
+    tag.remove( QRegularExpression( ".*/" ) )
+      .remove( QRegularExpression( "\\.(s|)htm(l|)$", QRegularExpression::PatternOption::CaseInsensitiveOption ) )
+      .replace( "_", "%20" )
+      .prepend( "<a href=\"gdlookup://localhost/" )
+      .append( anchor + "\" " + list[ 4 ] + ">" );
 
     newText += tag;
   }
-  if( pos )
-  {
+  if ( pos ) {
     newText += text.mid( pos );
     text = newText;
   }
@@ -873,23 +864,21 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
 
   // Handle TeX formulas via mimetex.cgi
 
-  if( !texCgiPath.isEmpty() )
-  {
-      QRegularExpression texImage( R"lit(<\s*img\s+class="([^"]+)"\s*([^>]*)alt="([^"]+)"[^>]*>)lit" );
-      QRegularExpression regFrac( "\\\\[dt]frac" );
-      QRegularExpression regSpaces( R"(\s+([\{\(\[\}\)\]]))" );
+  if ( !texCgiPath.isEmpty() ) {
+    QRegularExpression texImage( R"lit(<\s*img\s+class="([^"]+)"\s*([^>]*)alt="([^"]+)"[^>]*>)lit" );
+    QRegularExpression regFrac( "\\\\[dt]frac" );
+    QRegularExpression regSpaces( R"(\s+([\{\(\[\}\)\]]))" );
 
     QRegExp multReg( R"(\*\{(\d+)\}([^\{]|\{([^\}]+)\}))", Qt::CaseSensitive, QRegExp::RegExp2 );
 
     QString arrayDesc( "\\begin{array}{" );
-    pos = 0;
+    pos               = 0;
     unsigned texCount = 0;
     QString imgName;
 
     QRegularExpressionMatchIterator it = texImage.globalMatch( text );
     QString newText;
-    while( it.hasNext() )
-    {
+    while ( it.hasNext() ) {
       QRegularExpressionMatch match = it.next();
 
       newText += text.mid( pos, match.capturedStart() - pos );
@@ -898,16 +887,13 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
       QStringList list = match.capturedTexts();
 
 
-      if( list[ 1 ].compare( "tex" ) == 0
-          || list[ 1 ].compare( "mwe-math-fallback-image-inline" ) == 0
-          || list[ 1 ].endsWith( " tex" ) )
-      {
+      if ( list[ 1 ].compare( "tex" ) == 0 || list[ 1 ].compare( "mwe-math-fallback-image-inline" ) == 0
+           || list[ 1 ].endsWith( " tex" ) ) {
         QString name;
-        name = name.asprintf( "%04X%04X%04X.gif", entry.itemIndex, entry.binIndex, texCount );
+        name    = name.asprintf( "%04X%04X%04X.gif", entry.itemIndex, entry.binIndex, texCount );
         imgName = texCachePath + "/" + name;
 
-        if( !QFileInfo( imgName ).exists() )
-        {
+        if ( !QFileInfo( imgName ).exists() ) {
 
           // Replace some TeX commands which don't support by mimetex.cgi
 
@@ -930,43 +916,37 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
           // Format array descriptions (mimetex now don't support *{N}x constructions in it)
 
           int pos1 = 0;
-          while( pos1 >= 0 )
-          {
+          while ( pos1 >= 0 ) {
             pos1 = tex.indexOf( arrayDesc, pos1, Qt::CaseInsensitive );
-            if( pos1 >= 0 )
-            {
+            if ( pos1 >= 0 ) {
               // Retrieve array description
               QString desc, newDesc;
-              int n = 0;
+              int n      = 0;
               int nstart = pos1 + arrayDesc.size();
               int i;
-              for( i = 0; i + nstart < tex.size(); i++ )
-              {
-                if( tex[ i + nstart ] == '{' )
+              for ( i = 0; i + nstart < tex.size(); i++ ) {
+                if ( tex[ i + nstart ] == '{' )
                   n += 1;
-                if( tex[ i + nstart ] == '}' )
+                if ( tex[ i + nstart ] == '}' )
                   n -= 1;
-                if( n < 0 )
+                if ( n < 0 )
                   break;
               }
-              if( i > 0 && i + nstart + 1 < tex.size() )
+              if ( i > 0 && i + nstart + 1 < tex.size() )
                 desc = tex.mid( nstart, i );
 
-              if( !desc.isEmpty() )
-              {
+              if ( !desc.isEmpty() ) {
                 // Expand multipliers: "*{5}x" -> "xxxxx"
 
                 newDesc = desc;
                 QString newStr;
                 int pos2 = 0;
-                while( pos2 >= 0 )
-                {
+                while ( pos2 >= 0 ) {
                   pos2 = multReg.indexIn( newDesc, pos2 );
-                  if( pos2 >= 0 )
-                  {
+                  if ( pos2 >= 0 ) {
                     QStringList list = multReg.capturedTexts();
-                    int n = list[ 1 ].toInt();
-                    for( int i = 0; i < n; i++ )
+                    int n            = list[ 1 ].toInt();
+                    for ( int i = 0; i < n; i++ )
                       newStr += list[ 3 ].isEmpty() ? list[ 2 ] : list[ 3 ];
                     newDesc.replace( pos2, list[ 0 ].size(), newStr );
                     pos2 += newStr.size();
@@ -984,16 +964,15 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
               break;
           }
 
-          QString command = texCgiPath + " -e " +  imgName
-                            + " \"" + tex + "\"";
-          QProcess::execute( command,QStringList() );
+          QString command = texCgiPath + " -e " + imgName + " \"" + tex + "\"";
+          QProcess::execute( command, QStringList() );
         }
 
         QString tag = QString( R"(<img class="imgtex" src="file://)" )
-#ifdef Q_OS_WIN32
-                      + "/"
-#endif
-                      + imgName + "\" alt=\"" + list[ 3 ] + "\">";
+  #ifdef Q_OS_WIN32
+          + "/"
+  #endif
+          + imgName + "\" alt=\"" + list[ 3 ] + "\">";
 
         newText += tag;
 
@@ -1002,27 +981,22 @@ string SlobDictionary::convert( const string & in, RefEntry const & entry )
       }
       else
         newText += list[ 0 ];
-
     }
-    if( pos )
-    {
+    if ( pos ) {
       newText += text.mid( pos );
       text = newText;
     }
     newText.clear();
   }
-#ifdef Q_OS_WIN32
-  else
-  {
+  #ifdef Q_OS_WIN32
+  else {
     // Increase equations scale
     text = QString::fromLatin1( "<script type=\"text/x-mathjax-config\">MathJax.Hub.Config({" )
-           + " SVG: { scale: 170, linebreaks: { automatic:true } }"
-           + ", \"HTML-CSS\": { scale: 210, linebreaks: { automatic:true } }"
-           + ", CommonHTML: { scale: 210, linebreaks: { automatic:true } }"
-           + " });</script>"
-           + text;
+      + " SVG: { scale: 170, linebreaks: { automatic:true } }"
+      + ", \"HTML-CSS\": { scale: 210, linebreaks: { automatic:true } }"
+      + ", CommonHTML: { scale: 210, linebreaks: { automatic:true } }" + " });</script>" + text;
   }
-#endif
+  #endif
 
   // Fix outstanding elements
   text += "<br style=\"clear:both;\" />";
@@ -1037,39 +1011,37 @@ void SlobDictionary::loadResource( std::string & resourceName, string & data )
 
   link = resourceIndex.findArticles( Utf8::decode( resourceName ) );
 
-  if( link.empty() )
+  if ( link.empty() )
     return;
 
   readArticle( link[ 0 ].articleOffset, data, entry );
 }
 
-quint32 SlobDictionary::readArticle( quint32 articleNumber, std::string & result,
-                                     RefEntry & entry )
+quint32 SlobDictionary::readArticle( quint32 articleNumber, std::string & result, RefEntry & entry )
 {
   string data;
   quint8 contentId;
 
   {
     QMutexLocker _( &slobMutex );
-    if( entry.key.isEmpty() )
+    if ( entry.key.isEmpty() )
       sf.getRefEntry( articleNumber, entry );
     contentId = sf.getItem( entry, &data );
   }
 
-  if( contentId == 0xFF )
+  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() );
+  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;
@@ -1089,51 +1061,32 @@ quint64 SlobDictionary::getArticlePos( uint32_t articleNumber )
 
 void SlobDictionary::sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets, QAtomicInt & isCancelled )
 {
-  QVector< uint32_t > newOffsets;
-  newOffsets.reserve( offsets.size() );
-
-  {
-    QMutexLocker _( &slobMutex );
-
-    SlobFile::RefOffsetsVector const & sortedOffsets = sf.getSortedRefOffsets();
-
-    qint32 entries = sf.getRefsCount();
-    for ( qint32 i = 0; i < entries; i++ ) {
-      if ( offsets.contains( sortedOffsets[ i ].second ) )
-        newOffsets.append( sortedOffsets[ i ].second );
-    }
-  }
-
-  offsets.reserve( newOffsets.size() );
-  for ( int i = 0; i < newOffsets.size(); i++ )
-    offsets[ i ] = newOffsets.at( i );
+  //Currently , we use xapian to create the fulltext index. The order of offsets is no important.
 }
 
 void SlobDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
   if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-          || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
   if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( !ensureInitDone().empty() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Slob: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Slob: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
-    FtsHelpers::makeFTSIndex( this, isCancelled );
+  try {
+    const auto slob_dic = std::make_unique< SlobDictionary >( getId(), idxFileName, getDictionaryFilenames() );
+    FtsHelpers::makeFTSIndex( slob_dic.get(), isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Slob: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
@@ -1141,32 +1094,28 @@ void SlobDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
 
 void SlobDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  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 ) )
-      {
+    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;
+    headword     = entry.key;
 
     text = QString::fromUtf8( articleText.data(), articleText.size() );
 
-    if( type == htmlType )
+    if ( type == htmlType )
       text = Html::unescape( text );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Slob: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -1201,8 +1150,12 @@ public:
 
   SlobArticleRequest( wstring const & word_,
                       vector< wstring > const & alts_,
-                      SlobDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                      SlobDictionary & dict_,
+                      bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -1226,16 +1179,14 @@ public:
 
 void SlobArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
   vector< WordArticleLink > chain = dict.findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
@@ -1246,22 +1197,21 @@ void SlobArticleRequest::run()
   multimap< wstring, pair< string, string > > mainArticles, alternateArticles;
 
   set< quint64 > articlesIncluded; // Some synonims make it that the articles
-                                    // appear several times. We combat this
-                                    // by only allowing them to appear once.
+                                   // appear several times. We combat this
+                                   // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
 
-    quint64 pos = dict.getArticlePos( chain[ x ].articleOffset ); // Several "articleOffset" values may refer to one article
+    quint64 pos =
+      dict.getArticlePos( chain[ x ].articleOffset ); // Several "articleOffset" values may refer to one article
 
     if ( articlesIncluded.find( pos ) != articlesIncluded.end() )
       continue; // We already have this article in the body.
@@ -1271,12 +1221,10 @@ void SlobArticleRequest::run()
     string headword, articleText;
 
     headword = chain[ x ].word;
-    try
-    {
+    try {
       dict.loadArticle( chain[ x ].articleOffset, articleText );
     }
-    catch(...)
-    {
+    catch ( ... ) {
     }
 
     // Ok. Now, does it go to main articles, or to alternate ones? We list
@@ -1284,24 +1232,19 @@ void SlobArticleRequest::run()
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( headword );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, pair< string, string > > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( pair(
-      Folding::applySimpleCaseOnly( headword ),
-      pair( headword, articleText ) ) );
+    mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
     articlesIncluded.insert( pos );
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -1311,27 +1254,21 @@ void SlobArticleRequest::run()
 
   multimap< wstring, pair< string, string > >::const_iterator i;
 
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-      result += R"(<div class="slobdict"><h3 class="slobdict_headword">)";
-      result += i->second.first;
-      result += "</h3></div>";
-      result += i->second.second;
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    result += R"(<div class="slobdict"><h3 class="slobdict_headword">)";
+    result += i->second.first;
+    result += "</h3></div>";
+    result += i->second.second;
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-      result += R"(<div class="slobdict"><h3 class="slobdict_headword">)";
-      result += i->second.first;
-      result += "</h3></div>";
-      result += i->second.second;
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    result += R"(<div class="slobdict"><h3 class="slobdict_headword">)";
+    result += i->second.first;
+    result += "</h3></div>";
+    result += i->second.second;
   }
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -1342,9 +1279,9 @@ sptr< Dictionary::DataRequest > SlobDictionary::getArticle( wstring const & word
                                                             vector< wstring > const & alts,
                                                             wstring const &,
                                                             bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<SlobArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< SlobArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 //// SlobDictionary::getResource()
@@ -1361,14 +1298,13 @@ class SlobResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  SlobResourceRequest( SlobDictionary & dict_,
-                       string const & resourceName_ ):
+  SlobResourceRequest( SlobDictionary & dict_, string const & resourceName_ ):
     dict( dict_ ),
     resourceName( resourceName_ )
   {
-      f = QtConcurrent::run( [ this ]() {
-        this->run();
-      } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -1389,21 +1325,18 @@ public:
 void SlobResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     string resource;
     dict.loadResource( resourceName, resource );
-    if( resource.empty() )
+    if ( resource.empty() )
       throw exNoResource();
 
-    if( Filetype::isNameOfCSS( resourceName ) )
-    {
+    if ( Filetype::isNameOfCSS( resourceName ) ) {
       QString css = QString::fromUtf8( resource.data(), resource.size() );
       dict.isolateCSS( css, ".slobdict" );
       QByteArray bytes = css.toUtf8();
@@ -1412,16 +1345,13 @@ void SlobResourceRequest::run()
       data.resize( bytes.size() );
       memcpy( &data.front(), bytes.constData(), bytes.size() );
     }
-    else
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    else if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
 
       QMutexLocker _( &dataMutex );
       GdTiff::tiff2img( data );
     }
-    else
-    {
+    else {
       QMutexLocker _( &dataMutex );
       data.resize( resource.size() );
       memcpy( &data.front(), resource.data(), data.size() );
@@ -1430,10 +1360,11 @@ void SlobResourceRequest::run()
     QMutexLocker _( &dataMutex );
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "SLOB: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1441,156 +1372,139 @@ void SlobResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > SlobDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<SlobResourceRequest>( *this, name );
+  return std::make_shared< SlobResourceRequest >( *this, name );
 }
 
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing,
-                                      unsigned maxHeadwordsToExpand )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing,
+                                                      unsigned maxHeadwordsToExpand )
+
 {
   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
+  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( i->c_str() );
-      if( !firstName.endsWith( ".slob") )
-        continue;
+    QString firstName = QDir::fromNativeSeparators( i->c_str() );
+    if ( !firstName.endsWith( ".slob" ) )
+      continue;
 
-      // Got the file -- check if we need to rebuid the index
+    // Got the file -- check if we need to rebuid the index
 
-      vector< string > dictFiles( 1, *i );
+    vector< string > dictFiles( 1, *i );
 
-      string dictId = Dictionary::makeDictionaryId( dictFiles );
+    string dictId = Dictionary::makeDictionaryId( dictFiles );
 
-      string indexFile = indicesDir + dictId;
+    string indexFile = indicesDir + dictId;
 
-      try
-      {
-        if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-             indexIsOldOrBad( indexFile ) )
-        {
-          SlobFile sf;
+    try {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
+        SlobFile sf;
 
-          gdDebug( "Slob: Building the index for dictionary: %s\n", i->c_str() );
+        gdDebug( "Slob: Building the index for dictionary: %s\n", i->c_str() );
 
-          sf.open( firstName );
+        sf.open( firstName );
 
-          initializing.indexingDictionary( sf.getDictionaryName().toUtf8().constData() );
+        initializing.indexingDictionary( sf.getDictionaryName().toUtf8().constData() );
 
-          File::Class idx( indexFile, "wb" );
-          IdxHeader idxHeader;
-          memset( &idxHeader, 0, sizeof( idxHeader ) );
+        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.
+        // 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 );
 
-          RefEntry refEntry;
-          quint32 entries = sf.getRefsCount();
+        RefEntry refEntry;
+        quint32 entries = sf.getRefsCount();
 
-          IndexedWords indexedWords, indexedResources;
+        IndexedWords indexedWords, indexedResources;
 
-          set< quint64 > articlesPos;
-          quint32 articleCount = 0, wordCount = 0;
+        set< quint64 > articlesPos;
+        quint32 articleCount = 0, wordCount = 0;
 
-          SlobFile::RefOffsetsVector const & offsets = sf.getSortedRefOffsets();
+        SlobFile::RefOffsetsVector const & offsets = sf.getSortedRefOffsets();
 
-          for( quint32 i = 0; i < entries; i++ )
-          {
-            sf.getRefEntryAtOffset( offsets[ i ].first, refEntry );
+        for ( quint32 i = 0; i < entries; i++ ) {
+          sf.getRefEntryAtOffset( offsets[ i ].first, refEntry );
 
-            quint8 type = sf.getItem( refEntry, 0 );
+          quint8 type = sf.getItem( refEntry, 0 );
 
-            QString contentType = sf.getContentType( type );
+          QString contentType = sf.getContentType( type );
 
-            if( contentType.startsWith( "text/html", Qt::CaseInsensitive )
-                || contentType.startsWith( "text/plain", Qt::CaseInsensitive ) )
-            {
-              //Article
-              if( maxHeadwordsToExpand && entries > maxHeadwordsToExpand )
-                indexedWords.addSingleWord( gd::toWString( refEntry.key ), offsets[ i ].second );
-              else
-                indexedWords.addWord( gd::toWString( refEntry.key ), offsets[ i ].second );
-
-              wordCount += 1;
-
-              quint64 pos = ( ( (quint64)refEntry.itemIndex ) << 32 ) + refEntry.binIndex;
-              if( articlesPos.find( pos ) == articlesPos.end() )
-              {
-                articleCount += 1;
-                articlesPos.insert( pos );
-              }
-            }
+          if ( contentType.startsWith( "text/html", Qt::CaseInsensitive )
+               || contentType.startsWith( "text/plain", Qt::CaseInsensitive ) ) {
+            //Article
+            if ( maxHeadwordsToExpand && entries > maxHeadwordsToExpand )
+              indexedWords.addSingleWord( gd::toWString( refEntry.key ), offsets[ i ].second );
             else
-            {
-              indexedResources.addSingleWord( gd::toWString( refEntry.key ), offsets[ i ].second );
+              indexedWords.addWord( gd::toWString( refEntry.key ), offsets[ i ].second );
+
+            wordCount += 1;
+
+            quint64 pos = ( ( (quint64)refEntry.itemIndex ) << 32 ) + refEntry.binIndex;
+            if ( articlesPos.find( pos ) == articlesPos.end() ) {
+              articleCount += 1;
+              articlesPos.insert( pos );
             }
           }
-          sf.clearRefOffsets();
-
-          // 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
+          else {
+            indexedResources.addSingleWord( gd::toWString( refEntry.key ), offsets[ i ].second );
           }
-
-          {
-            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(std::make_shared<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;
+        sf.clearRefOffsets();
+
+        // 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( std::make_shared< 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;
 }
diff --git a/src/dict/slob.hh b/src/dict/slob.hh
index a095e3d6..1a4a3975 100644
--- a/src/dict/slob.hh
+++ b/src/dict/slob.hh
@@ -3,7 +3,7 @@
 
 #ifdef MAKE_ZIM_SUPPORT
 
-#include "dictionary.hh"
+  #include "dictionary.hh"
 
 /// Support for the Slob dictionaries.
 namespace Slob {
@@ -11,14 +11,12 @@ namespace Slob {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing &,
-                                      unsigned maxHeadwordsToExpand )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing &,
+                                                      unsigned maxHeadwordsToExpand );
 
-}
+} // namespace Slob
 
 #endif
 
diff --git a/src/dict/sounddir.cc b/src/dict/sounddir.cc
index 990da6c8..81d60100 100644
--- a/src/dict/sounddir.cc
+++ b/src/dict/sounddir.cc
@@ -31,23 +31,22 @@ using BtreeIndexing::IndexInfo;
 
 namespace {
 
-enum
-{
-  Signature = 0x58524453, // SDRX on little-endian, XRDS on big-endian
-  CurrentFormatVersion = 1+ BtreeIndexing::FormatVersion + Folding::Version
+enum {
+  Signature            = 0x58524453, // SDRX on little-endian, XRDS on big-endian
+  CurrentFormatVersion = 1 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, SDRX
-  uint32_t formatVersion; // File format version, is to be CurrentFormatVersion
-  uint32_t soundsCount; // Total number of sounds, for informative purposes only
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t signature;             // First comes the signature, SDRX
+  uint32_t formatVersion;         // File format version, is to be CurrentFormatVersion
+  uint32_t soundsCount;           // Total number of sounds, for informative purposes only
+  uint32_t chunksOffset;          // The offset to chunks' storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-} 
+}
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -57,9 +56,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 class SoundDirDictionary: public BtreeIndexing::BtreeDictionary
@@ -73,35 +71,41 @@ class SoundDirDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  SoundDirDictionary( string const & id, string const & name,
+  SoundDirDictionary( string const & id,
+                      string const & name,
                       string const & indexFile,
                       vector< string > const & dictionaryFiles,
                       QString const & iconFilename_ );
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.soundsCount; }
+  {
+    return idxHeader.soundsCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return getArticleCount(); }
+  {
+    return getArticleCount();
+  }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
 protected:
 
   void loadIcon() noexcept override;
+  bool get_file_name( uint32_t articleOffset, QString & file_name );
 };
 
 SoundDirDictionary::SoundDirDictionary( string const & id,
@@ -118,21 +122,17 @@ SoundDirDictionary::SoundDirDictionary( string const & id,
 {
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 }
 
 sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const & word,
                                                                 vector< wstring > const & alts,
                                                                 wstring const &,
                                                                 bool ignoreDiacritics )
-  
 {
   vector< WordArticleLink > chain = findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = findArticles( alts[ x ], ignoreDiacritics );
@@ -148,11 +148,10 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const &
                                     // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
     if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
       continue; // We already have this article in the body.
 
@@ -161,23 +160,20 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const &
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( chain[ x ].word );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( chain[ x ].word );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, unsigned > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( std::pair(
-      Folding::applySimpleCaseOnly( chain[ x ].word ), x ) );
+    mapToUse.insert( std::pair( Folding::applySimpleCaseOnly( chain[ x ].word ), x ) );
 
     articlesIncluded.insert( chain[ x ].articleOffset );
   }
 
   if ( mainArticles.empty() && alternateArticles.empty() )
-    return  std::make_shared<Dictionary::DataRequestInstant>( false ); // No such word
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such word
 
   string result;
 
@@ -188,104 +184,108 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getArticle( wstring const &
   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
-      {
-        QMutexLocker _( &idxMutex );
-        nameBlock = chunks.getBlock( chain[ i->second ].articleOffset, chunk );
 
-        if ( nameBlock >= &chunk.front() + chunk.size() )
-        {
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    uint32_t address = chain[ i->second ].articleOffset;
+
+    if ( mainArticles.size() + alternateArticles.size() <= 1 )
+      displayedName = chain[ i->second ].word;
+    else {
+      try {
+        QMutexLocker _( &idxMutex );
+        nameBlock = chunks.getBlock( address, 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
+        chunk.back()  = 0; // It must end with 0 anyway, but just in case
         displayedName = string( nameBlock );
       }
-      catch(  ChunkedStorage::exAddressOutOfRange & )
-      {
+      catch ( ChunkedStorage::exAddressOutOfRange & ) {
         // Bad address
         continue;
       }
     }
 
     result += "<tr>";
-
+    auto _displayName = Html::escape( displayedName );
+    QString file_name;
+    if ( !get_file_name( address, file_name ) ) {
+      // Bad address
+      file_name = QString::fromStdString( _displayName );
+    }
     QUrl url;
     url.setScheme( "gdau" );
     url.setHost( QString::fromUtf8( getId().c_str() ) );
-    url.setPath( Utils::Url::ensureLeadingSlash( QString::number( chain[ i->second ].articleOffset ) ) );
+    auto path = Utils::Url::ensureLeadingSlash( QString( "%1/%2" ).arg( QString::number( address ), file_name ) );
+    url.setPath( path );
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
-    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
+    result += "<td><a href=" + ref + ">" + _displayName + "</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
-      {
-        QMutexLocker _( &idxMutex );
-        nameBlock = chunks.getBlock( chain[ i->second ].articleOffset, chunk );
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    uint32_t address = chain[ i->second ].articleOffset;
 
-        if ( nameBlock >= &chunk.front() + chunk.size() )
-        {
+    if ( mainArticles.size() + alternateArticles.size() <= 1 )
+      displayedName = chain[ i->second ].word;
+    else {
+      try {
+        QMutexLocker _( &idxMutex );
+        nameBlock = chunks.getBlock( address, 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
+        chunk.back()  = 0; // It must end with 0 anyway, but just in case
         displayedName = string( nameBlock );
       }
-      catch(  ChunkedStorage::exAddressOutOfRange & )
-      {
+      catch ( ChunkedStorage::exAddressOutOfRange & ) {
         // Bad address
         continue;
       }
     }
 
     result += "<tr>";
-
+    auto _displayName = Html::escape( displayedName );
+    QString file_name;
+    if ( !get_file_name( address, file_name ) ) {
+      // Bad address
+      file_name = QString::fromStdString( _displayName );
+    }
     QUrl url;
     url.setScheme( "gdau" );
     url.setHost( QString::fromUtf8( getId().c_str() ) );
-    url.setPath( Utils::Url::ensureLeadingSlash( QString::number( chain[ i->second ].articleOffset ) ) );
+    auto path = Utils::Url::ensureLeadingSlash( QString( "%1/%2" ).arg( QString::number( address ), file_name ) );
+    url.setPath( path );
 
     string ref = string( "\"" ) + url.toEncoded().data() + "\"";
 
     result += addAudioLink( ref, getId() );
 
     result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
-    result += "<td><a href=" + ref + ">" + Html::escape( displayedName ) + "</a></td>";
+    result += "<td><a href=" + ref + ">" + _displayName + "</a></td>";
     result += "</tr>";
   }
 
   result += "</table>";
 
-  Dictionary::DataRequestInstant * ret =
-    new Dictionary::DataRequestInstant( true );
+  auto ret = std::make_shared< Dictionary::DataRequestInstant >( true );
 
-  ret->getData().resize( result.size() );
+  ret->appendString( result );
 
-  memcpy( &(ret->getData().front()), result.data(), result.size() );
-
-  return std::shared_ptr<Dictionary::DataRequestInstant>(ret);
+  return ret;
 }
 
 void SoundDirDictionary::loadIcon() noexcept
@@ -293,63 +293,77 @@ void SoundDirDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if( !iconFilename.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), iconFilename );
-    if( fInfo.isFile() )
+  if ( !iconFilename.isEmpty() ) {
+    const QFileInfo fInfo( QDir( Config::getConfigDir() ), iconFilename );
+    if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
-  if( dictionaryIcon.isNull() )
-    dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/playsound_full.png");
+  if ( dictionaryIcon.isNull() )
+    dictionaryIcon = QIcon( ":/icons/sounddir.svg" );
   dictionaryIconLoaded = true;
 }
 
-sptr< Dictionary::DataRequest > SoundDirDictionary::getResource( string const & name )
-  
+bool SoundDirDictionary::get_file_name( uint32_t articleOffset, QString & file_name )
 {
-  bool isNumber = false;
-
-  uint32_t articleOffset = QString::fromUtf8( name.c_str() ).toULong( &isNumber );
-
-  if ( !isNumber )
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such resource
-
   vector< char > chunk;
   char * articleData;
 
-  try
-  {
+  try {
     QMutexLocker _( &idxMutex );
 
     articleData = chunks.getBlock( articleOffset, chunk );
 
-    if ( articleData >= &chunk.front() + chunk.size() )
-    {
+    if ( articleData >= &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
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such resource
+  catch ( ChunkedStorage::exAddressOutOfRange & ) {
+    return false; // No such resource
   }
 
   chunk.back() = 0; // It must end with 0 anyway, but just in case
+  file_name    = QString::fromUtf8( articleData );
+  return true;
+}
 
-  QDir dir( QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() ) );
+sptr< Dictionary::DataRequest > SoundDirDictionary::getResource( string const & name )
 
-  QString fileName = QDir::toNativeSeparators( dir.filePath( QString::fromUtf8( articleData ) ) );
+{
+  bool isNumber = false;
+  uint32_t articleOffset;
+
+  const auto _name       = QString::fromStdString( name );
+  const qint64 sep_index = _name.indexOf( '/' );
+  if ( sep_index > 0 ) {
+    const auto number = _name.left( sep_index );
+    articleOffset     = number.toULong( &isNumber );
+  }
+  else {
+    articleOffset = QString::fromUtf8( name.c_str() ).toULong( &isNumber );
+  }
+
+
+  if ( !isNumber )
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such resource
+
+  QString file_name;
+  if ( !get_file_name( articleOffset, file_name ) ) {
+    // Bad address
+    return std::make_shared< Dictionary::DataRequestInstant >( false );
+  }
+
+  const QDir dir( QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() ) );
+
+  const QString fileName = QDir::toNativeSeparators( dir.filePath( file_name ) );
 
   // Now try loading that file
 
-  try
-  {
+  try {
     File::Class f( fileName.toStdString(), "rb" );
 
-    sptr< Dictionary::DataRequestInstant > dr =
-            std::make_shared<Dictionary::DataRequestInstant>( true );
+    sptr< Dictionary::DataRequestInstant > dr = std::make_shared< Dictionary::DataRequestInstant >( true );
 
     vector< char > & data = dr->getData();
 
@@ -362,35 +376,32 @@ sptr< Dictionary::DataRequest > SoundDirDictionary::getResource( string const &
 
     return dr;
   }
-  catch( File::Ex & )
-  {
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such resource
+  catch ( File::Ex & ) {
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such resource
   }
 }
 
-void addDir( QDir const & baseDir, QDir const & dir, IndexedWords & indexedWords,
-             uint32_t & soundsCount, ChunkedStorage::Writer & chunks )
+void addDir( QDir const & baseDir,
+             QDir const & dir,
+             IndexedWords & indexedWords,
+             uint32_t & soundsCount,
+             ChunkedStorage::Writer & chunks )
 {
-  QFileInfoList entries = dir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot );
+  const QFileInfoList entries = dir.entryInfoList( QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot );
 
-  for( QFileInfoList::const_iterator i = entries.constBegin();
-       i != entries.constEnd(); ++i )
-  {
+  for ( QFileInfoList::const_iterator i = entries.constBegin(); i != entries.constEnd(); ++i ) {
     if ( i->isDir() )
       addDir( baseDir, QDir( i->absoluteFilePath() ), indexedWords, soundsCount, chunks );
-    else
-    if ( Filetype::isNameOfSound( i->fileName().toUtf8().data() ) )
-    {
+    else if ( Filetype::isNameOfSound( i->fileName().toUtf8().data() ) ) {
       // Add this sound to index
-
       string fileName = baseDir.relativeFilePath( i->filePath() ).toUtf8().data();
 
-      uint32_t articleOffset = chunks.startNewBlock();
+      const uint32_t articleOffset = chunks.startNewBlock();
       chunks.addToBlock( fileName.c_str(), fileName.size() + 1 );
 
       wstring name = gd::toWString( i->fileName() );
 
-      wstring::size_type pos = name.rfind( L'.' );
+      const wstring::size_type pos = name.rfind( L'.' );
 
       if ( pos != wstring::npos )
         name.erase( pos );
@@ -402,18 +413,16 @@ void addDir( QDir const & baseDir, QDir const & dir, IndexedWords & indexedWords
   }
 }
 
-}
+} // namespace
 
 vector< sptr< Dictionary::Class > > makeDictionaries( Config::SoundDirs const & soundDirs,
                                                       string const & indicesDir,
                                                       Dictionary::Initializing & initializing )
-  
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( Config::SoundDirs::const_iterator i = soundDirs.begin(); i != soundDirs.end();
-       ++i )
-  {
+  for ( Config::SoundDirs::const_iterator i = soundDirs.begin(); i != soundDirs.end(); ++i ) {
     QDir dir( i->path );
 
     if ( !dir.exists() )
@@ -429,8 +438,7 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::SoundDirs const &
 
     string indexFile = indicesDir + dictId;
 
-    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) )
-    {
+    if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
       // Building the index
 
       qDebug() << "Sounds: Building the index for directory: " << i->path;
@@ -467,11 +475,11 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::SoundDirs const &
       IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
       idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-      idxHeader.indexRootOffset = idxInfo.rootOffset;
+      idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
-       // That concludes it. Update the header.
+      // That concludes it. Update the header.
 
-      idxHeader.signature = Signature;
+      idxHeader.signature     = Signature;
       idxHeader.formatVersion = CurrentFormatVersion;
 
       idx.rewind();
@@ -479,15 +487,15 @@ vector< sptr< Dictionary::Class > > makeDictionaries( Config::SoundDirs const &
       idx.write( &idxHeader, sizeof( idxHeader ) );
     }
 
-    dictionaries.push_back( std::make_shared<SoundDirDictionary>( dictId,
-                                                    i->name.toUtf8().data(),
-                                                    indexFile,
-                                                    dictFiles,
-                                                    i->iconFilename ) );
+    dictionaries.push_back( std::make_shared< SoundDirDictionary >( dictId,
+                                                                    i->name.toUtf8().data(),
+                                                                    indexFile,
+                                                                    dictFiles,
+                                                                    i->iconFilename ) );
   }
 
   return dictionaries;
 }
 
 
-}
+} // namespace SoundDir
diff --git a/src/dict/sounddir.hh b/src/dict/sounddir.hh
index 1c3f2eb0..7e2ee63e 100644
--- a/src/dict/sounddir.hh
+++ b/src/dict/sounddir.hh
@@ -13,11 +13,9 @@ namespace SoundDir {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::SoundDirs const &,
-                                                      string const & indicesDir,
-                                                      Dictionary::Initializing & )
-  ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( Config::SoundDirs const &, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace SoundDir
 
 #endif
diff --git a/src/dict/sources.cc b/src/dict/sources.cc
index 15b82f67..129bdf28 100644
--- a/src/dict/sources.cc
+++ b/src/dict/sources.cc
@@ -7,11 +7,11 @@
 #include <QStandardItemModel>
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-#include "chineseconversion.hh"
+  #include "chineseconversion.hh"
 #endif
 
 
-Sources::Sources( QWidget * parent, Config::Class const & cfg):
+Sources::Sources( QWidget * parent, Config::Class const & cfg ):
   QWidget( parent ),
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
   chineseConversion( new ChineseConversion( this, cfg.transliteration.chinese ) ),
@@ -29,20 +29,19 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg):
 {
   ui.setupUi( this );
 
-  Config::Hunspell const & hunspell = cfg.hunspell;
+  Config::Hunspell const & hunspell   = cfg.hunspell;
   Config::Transliteration const & trs = cfg.transliteration;
 
   Config::Lingua const & lingua = cfg.lingua;
-  Config::Forvo const & forvo = cfg.forvo;
+  Config::Forvo const & forvo   = cfg.forvo;
 
   // TODO: will programTypeEditorCreator and itemEditorFactory be destroyed by
   // anyone?
-  QItemEditorCreatorBase * programTypeEditorCreator =
-         new QStandardItemEditorCreator< ProgramTypeEditor >();
+  QItemEditorCreatorBase * programTypeEditorCreator = new QStandardItemEditorCreator< ProgramTypeEditor >();
 
   itemEditorFactory->registerEditor( QVariant::Int, programTypeEditorCreator );
 
-  itemDelegate->setItemEditorFactory( itemEditorFactory );
+  itemDelegate->setItemEditorFactory( itemEditorFactory.get() );
 
   ui.mediaWikis->setTabKeyNavigation( true );
   ui.mediaWikis->setModel( &mediawikisModel );
@@ -72,9 +71,10 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg):
   ui.programs->setModel( &programsModel );
   ui.programs->resizeColumnToContents( 0 );
   // Make sure this thing will be large enough
-  ui.programs->setColumnWidth( 1,
-    QFontMetrics( QFont() ).horizontalAdvance(
-      ProgramTypeEditor::getNameForType( Config::Program::PrefixMatch ) ) + 16 );
+  ui.programs->setColumnWidth(
+    1,
+    QFontMetrics( QFont() ).horizontalAdvance( ProgramTypeEditor::getNameForType( Config::Program::PrefixMatch ) )
+      + 16 );
   ui.programs->resizeColumnToContents( 2 );
   ui.programs->resizeColumnToContents( 3 );
   ui.programs->resizeColumnToContents( 4 );
@@ -102,8 +102,8 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg):
   ui.enableBelarusianTransliteration->setChecked( trs.enableBelarusianTransliteration );
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-  ui.transliterationLayout->addWidget(chineseConversion);
-  ui.transliterationLayout->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
+  ui.transliterationLayout->addWidget( chineseConversion );
+  ui.transliterationLayout->addItem( new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ) );
 #endif
 
   ui.enableRomaji->setChecked( trs.romaji.enable );
@@ -139,7 +139,7 @@ Sources::Sources( QWidget * parent, Config::Class const & cfg):
     // Sound dirs
 
     {
-      QStandardItemModel * model =  new QStandardItemModel( this );
+      QStandardItemModel * model = new QStandardItemModel( this );
       model->setHorizontalHeaderLabels( QStringList() << " " );
       model->invisibleRootItem()->appendRow( new QStandardItem( tr( "(not available in portable version)" ) ) );
       ui.soundDirs->setModel( model );
@@ -177,11 +177,9 @@ void Sources::fitHunspellDictsColumns()
 
 void Sources::on_addPath_clicked()
 {
-  QString dir =
-    QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
+  QString dir = QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
 
-  if ( !dir.isEmpty() )
-  {
+  if ( !dir.isEmpty() ) {
     pathsModel.addNewPath( dir );
     fitPathsColumns();
   }
@@ -191,12 +189,14 @@ void Sources::on_removePath_clicked()
 {
   QModelIndex current = ui.paths->currentIndex();
 
-  if ( current.isValid() &&
-      QMessageBox::question( this, tr( "Confirm removal" ),
-                             tr( "Remove directory <b>%1</b> from the list?" ).arg( pathsModel.getCurrentPaths()[ current.row() ].path ),
-                             QMessageBox::Ok,
-                             QMessageBox::Cancel ) == QMessageBox::Ok )
-  {
+  if ( current.isValid()
+       && QMessageBox::question(
+            this,
+            tr( "Confirm removal" ),
+            tr( "Remove directory <b>%1</b> from the list?" ).arg( pathsModel.getCurrentPaths()[ current.row() ].path ),
+            QMessageBox::Ok,
+            QMessageBox::Cancel )
+         == QMessageBox::Ok ) {
     pathsModel.removePath( current.row() );
     fitPathsColumns();
   }
@@ -204,11 +204,9 @@ void Sources::on_removePath_clicked()
 
 void Sources::on_addSoundDir_clicked()
 {
-  QString dir =
-    QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
+  QString dir = QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
 
-  if ( !dir.isEmpty() )
-  {
+  if ( !dir.isEmpty() ) {
     soundDirsModel.addNewSoundDir( dir, QDir( dir ).dirName() );
     fitSoundDirsColumns();
   }
@@ -218,12 +216,14 @@ void Sources::on_removeSoundDir_clicked()
 {
   QModelIndex current = ui.soundDirs->currentIndex();
 
-  if ( current.isValid() &&
-      QMessageBox::question( this, tr( "Confirm removal" ),
-                             tr( "Remove directory <b>%1</b> from the list?" ).arg( soundDirsModel.getCurrentSoundDirs()[ current.row() ].path ),
-                             QMessageBox::Ok,
-                             QMessageBox::Cancel ) == QMessageBox::Ok )
-  {
+  if ( current.isValid()
+       && QMessageBox::question( this,
+                                 tr( "Confirm removal" ),
+                                 tr( "Remove directory <b>%1</b> from the list?" )
+                                   .arg( soundDirsModel.getCurrentSoundDirs()[ current.row() ].path ),
+                                 QMessageBox::Ok,
+                                 QMessageBox::Cancel )
+         == QMessageBox::Ok ) {
     soundDirsModel.removeSoundDir( current.row() );
     fitSoundDirsColumns();
   }
@@ -231,11 +231,9 @@ void Sources::on_removeSoundDir_clicked()
 
 void Sources::on_changeHunspellPath_clicked()
 {
-  QString dir =
-    QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
+  QString dir = QFileDialog::getExistingDirectory( this, tr( "Choose a directory" ) );
 
-  if ( !dir.isEmpty() )
-  {
+  if ( !dir.isEmpty() ) {
     ui.hunspellPath->setText( dir );
     hunspellDictsModel.changePath( dir );
     fitHunspellDictsColumns();
@@ -245,9 +243,7 @@ void Sources::on_changeHunspellPath_clicked()
 void Sources::on_addMediaWiki_clicked()
 {
   mediawikisModel.addNewWiki();
-  QModelIndex result =
-    mediawikisModel.index( mediawikisModel.rowCount( QModelIndex() ) - 1,
-                           1, QModelIndex() );
+  QModelIndex result = mediawikisModel.index( mediawikisModel.rowCount( QModelIndex() ) - 1, 1, QModelIndex() );
 
   ui.mediaWikis->scrollTo( result );
   //ui.mediaWikis->setCurrentIndex( result );
@@ -258,11 +254,14 @@ void Sources::on_removeMediaWiki_clicked()
 {
   QModelIndex current = ui.mediaWikis->currentIndex();
 
-  if ( current.isValid() &&
-       QMessageBox::question( this, tr( "Confirm removal" ),
-                              tr( "Remove site <b>%1</b> from the list?" ).arg( mediawikisModel.getCurrentWikis()[ current.row() ].name ),
-                              QMessageBox::Ok,
-                              QMessageBox::Cancel ) == QMessageBox::Ok )
+  if ( current.isValid()
+       && QMessageBox::question(
+            this,
+            tr( "Confirm removal" ),
+            tr( "Remove site <b>%1</b> from the list?" ).arg( mediawikisModel.getCurrentWikis()[ current.row() ].name ),
+            QMessageBox::Ok,
+            QMessageBox::Cancel )
+         == QMessageBox::Ok )
     mediawikisModel.removeWiki( current.row() );
 }
 
@@ -270,9 +269,7 @@ void Sources::on_addWebSite_clicked()
 {
   webSitesModel.addNewSite();
 
-  QModelIndex result =
-    webSitesModel.index( webSitesModel.rowCount( QModelIndex() ) - 1,
-                         1, QModelIndex() );
+  QModelIndex result = webSitesModel.index( webSitesModel.rowCount( QModelIndex() ) - 1, 1, QModelIndex() );
 
   ui.webSites->scrollTo( result );
   ui.webSites->edit( result );
@@ -282,11 +279,14 @@ void Sources::on_removeWebSite_clicked()
 {
   QModelIndex current = ui.webSites->currentIndex();
 
-  if ( current.isValid() &&
-       QMessageBox::question( this, tr( "Confirm removal" ),
-                              tr( "Remove site <b>%1</b> from the list?" ).arg( webSitesModel.getCurrentWebSites()[ current.row() ].name ),
-                              QMessageBox::Ok,
-                              QMessageBox::Cancel ) == QMessageBox::Ok )
+  if ( current.isValid()
+       && QMessageBox::question( this,
+                                 tr( "Confirm removal" ),
+                                 tr( "Remove site <b>%1</b> from the list?" )
+                                   .arg( webSitesModel.getCurrentWebSites()[ current.row() ].name ),
+                                 QMessageBox::Ok,
+                                 QMessageBox::Cancel )
+         == QMessageBox::Ok )
     webSitesModel.removeSite( current.row() );
 }
 
@@ -294,9 +294,7 @@ void Sources::on_addDictServer_clicked()
 {
   dictServersModel.addNewServer();
 
-  QModelIndex result =
-    dictServersModel.index( dictServersModel.rowCount( QModelIndex() ) - 1,
-                            1, QModelIndex() );
+  QModelIndex result = dictServersModel.index( dictServersModel.rowCount( QModelIndex() ) - 1, 1, QModelIndex() );
 
   ui.dictServers->scrollTo( result );
   ui.dictServers->edit( result );
@@ -306,11 +304,14 @@ 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 )
+  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() );
 }
 
@@ -318,9 +319,7 @@ void Sources::on_addProgram_clicked()
 {
   programsModel.addNewProgram();
 
-  QModelIndex result =
-    programsModel.index( programsModel.rowCount( QModelIndex() ) - 1,
-                         1, QModelIndex() );
+  QModelIndex result = programsModel.index( programsModel.rowCount( QModelIndex() ) - 1, 1, QModelIndex() );
 
   ui.programs->scrollTo( result );
   ui.programs->edit( result );
@@ -330,11 +329,14 @@ void Sources::on_removeProgram_clicked()
 {
   QModelIndex current = ui.programs->currentIndex();
 
-  if ( current.isValid() &&
-       QMessageBox::question( this, tr( "Confirm removal" ),
-                              tr( "Remove program <b>%1</b> from the list?" ).arg( programsModel.getCurrentPrograms()[ current.row() ].name ),
-                              QMessageBox::Ok,
-                              QMessageBox::Cancel ) == QMessageBox::Ok )
+  if ( current.isValid()
+       && QMessageBox::question( this,
+                                 tr( "Confirm removal" ),
+                                 tr( "Remove program <b>%1</b> from the list?" )
+                                   .arg( programsModel.getCurrentPrograms()[ current.row() ].name ),
+                                 QMessageBox::Ok,
+                                 QMessageBox::Cancel )
+         == QMessageBox::Ok )
     programsModel.removeProgram( current.row() );
 }
 
@@ -349,7 +351,7 @@ Config::Hunspell Sources::getHunspell() const
 {
   Config::Hunspell h;
 
-  h.dictionariesPath = ui.hunspellPath->text();
+  h.dictionariesPath    = ui.hunspellPath->text();
   h.enabledDictionaries = hunspellDictsModel.getEnabledDictionaries();
 
   return h;
@@ -359,21 +361,21 @@ Config::Transliteration Sources::getTransliteration() const
 {
   Config::Transliteration tr;
 
-  tr.enableRussianTransliteration = ui.enableRussianTransliteration->isChecked();
-  tr.enableGermanTransliteration = ui.enableGermanTransliteration->isChecked();
-  tr.enableGreekTransliteration = ui.enableGreekTransliteration->isChecked();
+  tr.enableRussianTransliteration    = ui.enableRussianTransliteration->isChecked();
+  tr.enableGermanTransliteration     = ui.enableGermanTransliteration->isChecked();
+  tr.enableGreekTransliteration      = ui.enableGreekTransliteration->isChecked();
   tr.enableBelarusianTransliteration = ui.enableBelarusianTransliteration->isChecked();
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
   chineseConversion->getConfig( tr.chinese );
 #endif
-  tr.romaji.enable = ui.enableRomaji->isChecked();
-  tr.romaji.enableHepburn = ui.enableHepburn->isChecked();
-  tr.romaji.enableNihonShiki = ui.enableNihonShiki->isChecked();
+  tr.romaji.enable            = ui.enableRomaji->isChecked();
+  tr.romaji.enableHepburn     = ui.enableHepburn->isChecked();
+  tr.romaji.enableNihonShiki  = ui.enableNihonShiki->isChecked();
   tr.romaji.enableKunreiShiki = ui.enableKunreiShiki->isChecked();
-  tr.romaji.enableHiragana = ui.enableHiragana->isChecked();
-  tr.romaji.enableKatakana = ui.enableKatakana->isChecked();
+  tr.romaji.enableHiragana    = ui.enableHiragana->isChecked();
+  tr.romaji.enableKatakana    = ui.enableKatakana->isChecked();
 
-  tr.customTrans.enable = ui.enableCustomTransliteration->isChecked();
+  tr.customTrans.enable  = ui.enableCustomTransliteration->isChecked();
   tr.customTrans.context = ui.customTransliteration->toPlainText();
 
   return tr;
@@ -383,8 +385,8 @@ Config::Lingua Sources::getLingua() const
 {
   Config::Lingua lingua;
 
-  lingua.enable = ui.linguaEnabled->isChecked();
-  lingua.languageCodes = ui.linguaLangCode -> text();
+  lingua.enable        = ui.linguaEnabled->isChecked();
+  lingua.languageCodes = ui.linguaLangCode->text();
 
   return lingua;
 }
@@ -394,8 +396,8 @@ Config::Forvo Sources::getForvo() const
 {
   Config::Forvo forvo;
 
-  forvo.enable = ui.forvoEnabled->isChecked();
-  forvo.apiKey = ui.forvoApiKey->text();
+  forvo.enable        = ui.forvoEnabled->isChecked();
+  forvo.apiKey        = ui.forvoApiKey->text();
   forvo.languageCodes = ui.forvoLanguageCodes->text();
 
   return forvo;
@@ -403,9 +405,9 @@ Config::Forvo Sources::getForvo() const
 
 ////////// MediaWikisModel
 
-MediaWikisModel::MediaWikisModel( QWidget * parent,
-                                  Config::MediaWikis const & mediawikis_ ):
-  QAbstractItemModel( parent ), mediawikis( mediawikis_ )
+MediaWikisModel::MediaWikisModel( QWidget * parent, Config::MediaWikis const & mediawikis_ ):
+  QAbstractItemModel( parent ),
+  mediawikis( mediawikis_ )
 {
 }
 void MediaWikisModel::removeWiki( int index )
@@ -444,8 +446,7 @@ Qt::ItemFlags MediaWikisModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
+  if ( index.isValid() ) {
     if ( !index.column() )
       result |= Qt::ItemIsUserCheckable;
     else
@@ -474,8 +475,7 @@ int MediaWikisModel::columnCount( QModelIndex const & parent ) const
 QVariant MediaWikisModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Enabled" );
       case 1:
@@ -496,10 +496,8 @@ QVariant MediaWikisModel::data( QModelIndex const & index, int role ) const
   if ( index.row() >= mediawikis.size() )
     return QVariant();
 
-  if ( role == Qt::DisplayRole || role == Qt::EditRole )
-  {
-    switch( index.column() )
-    {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
+    switch ( index.column() ) {
       case 1:
         return mediawikis[ index.row() ].name;
       case 2:
@@ -517,14 +515,12 @@ QVariant MediaWikisModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool MediaWikisModel::setData( QModelIndex const & index, const QVariant & value,
-                               int role )
+bool MediaWikisModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= mediawikis.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
+  if ( role == Qt::CheckStateRole && !index.column() ) {
     //GD_DPRINTF( "type = %d\n", (int)value.type() );
     //GD_DPRINTF( "value = %d\n", (int)value.toInt() );
 
@@ -536,18 +532,17 @@ bool MediaWikisModel::setData( QModelIndex const & index, const QVariant & value
   }
 
   if ( role == Qt::DisplayRole || role == Qt::EditRole )
-    switch( index.column() )
-    {
+    switch ( index.column() ) {
       case 1:
-        mediawikis[ index.row() ].name =  value.toString();
+        mediawikis[ index.row() ].name = value.toString();
         dataChanged( index, index );
         return true;
       case 2:
-        mediawikis[ index.row() ].url =  value.toString();
+        mediawikis[ index.row() ].url = value.toString();
         dataChanged( index, index );
         return true;
       case 3:
-        mediawikis[ index.row() ].icon =  value.toString();
+        mediawikis[ index.row() ].icon = value.toString();
         dataChanged( index, index );
         return true;
       default:
@@ -560,9 +555,9 @@ bool MediaWikisModel::setData( QModelIndex const & index, const QVariant & value
 
 ////////// WebSitesModel
 
-WebSitesModel::WebSitesModel( QWidget * parent,
-                              Config::WebSites const & webSites_ ):
-  QAbstractItemModel( parent ), webSites( webSites_ )
+WebSitesModel::WebSitesModel( QWidget * parent, Config::WebSites const & webSites_ ):
+  QAbstractItemModel( parent ),
+  webSites( webSites_ )
 {
 }
 void WebSitesModel::removeSite( int index )
@@ -603,8 +598,7 @@ Qt::ItemFlags WebSitesModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
+  if ( index.isValid() ) {
     if ( index.column() <= 1 )
       result |= Qt::ItemIsUserCheckable;
     else
@@ -632,17 +626,15 @@ int WebSitesModel::columnCount( QModelIndex const & parent ) const
 
 QVariant WebSitesModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
-  if( role == Qt::ToolTipRole )
-  {
-    if( section == 1 )
+  if ( role == Qt::ToolTipRole ) {
+    if ( section == 1 )
       return tr( "Insert article as link inside <iframe> tag" );
 
     return QVariant();
   }
 
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Enabled" );
       case 1:
@@ -665,18 +657,15 @@ QVariant WebSitesModel::data( QModelIndex const & index, int role ) const
   if ( index.row() >= webSites.size() )
     return QVariant();
 
-  if( role == Qt::ToolTipRole )
-  {
-    if( index.column() == 1 )
+  if ( role == Qt::ToolTipRole ) {
+    if ( index.column() == 1 )
       return tr( "Insert article as link inside <iframe> tag" );
 
     return QVariant();
   }
 
-  if ( role == Qt::DisplayRole || role == Qt::EditRole )
-  {
-    switch( index.column() )
-    {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
+    switch ( index.column() ) {
       case 2:
         return webSites[ index.row() ].name;
       case 3:
@@ -697,14 +686,12 @@ QVariant WebSitesModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value,
-                               int role )
+bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= webSites.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
+  if ( role == Qt::CheckStateRole && !index.column() ) {
     //GD_DPRINTF( "type = %d\n", (int)value.type() );
     //GD_DPRINTF( "value = %d\n", (int)value.toInt() );
 
@@ -715,8 +702,7 @@ bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value,
     return true;
   }
 
-  if ( role == Qt::CheckStateRole && index.column() == 1 )
-  {
+  if ( role == Qt::CheckStateRole && index.column() == 1 ) {
     webSites[ index.row() ].inside_iframe = !webSites[ index.row() ].inside_iframe;
 
     dataChanged( index, index );
@@ -724,18 +710,17 @@ bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value,
   }
 
   if ( role == Qt::DisplayRole || role == Qt::EditRole )
-    switch( index.column() )
-    {
+    switch ( index.column() ) {
       case 2:
-        webSites[ index.row() ].name =  value.toString();
+        webSites[ index.row() ].name = value.toString();
         dataChanged( index, index );
         return true;
       case 3:
-        webSites[ index.row() ].url =  value.toString();
+        webSites[ index.row() ].url = value.toString();
         dataChanged( index, index );
         return true;
       case 4:
-        webSites[ index.row() ].iconFilename =  value.toString();
+        webSites[ index.row() ].iconFilename = value.toString();
         dataChanged( index, index );
         return true;
       default:
@@ -747,9 +732,9 @@ bool WebSitesModel::setData( QModelIndex const & index, const QVariant & value,
 
 ////////// DictServersModel
 
-DictServersModel::DictServersModel( QWidget * parent,
-                              Config::DictServers const & dictServers_ ):
-  QAbstractItemModel( parent ), dictServers( dictServers_ )
+DictServersModel::DictServersModel( QWidget * parent, Config::DictServers const & dictServers_ ):
+  QAbstractItemModel( parent ),
+  dictServers( dictServers_ )
 {
 }
 void DictServersModel::removeServer( int index )
@@ -788,8 +773,7 @@ Qt::ItemFlags DictServersModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
+  if ( index.isValid() ) {
     if ( !index.column() )
       result |= Qt::ItemIsUserCheckable;
     else
@@ -818,8 +802,7 @@ int DictServersModel::columnCount( QModelIndex const & parent ) const
 QVariant DictServersModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Enabled" );
       case 1:
@@ -844,10 +827,8 @@ 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() )
-    {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
+    switch ( index.column() ) {
       case 1:
         return dictServers[ index.row() ].name;
       case 2:
@@ -863,10 +844,10 @@ QVariant DictServersModel::data( QModelIndex const & index, int role ) const
     }
   }
 
-  if( role == Qt::ToolTipRole && index.column() == 3 )
+  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 )
+  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() )
@@ -875,14 +856,12 @@ QVariant DictServersModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool DictServersModel::setData( QModelIndex const & index, const QVariant & value,
-                               int role )
+bool DictServersModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= dictServers.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
+  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;
 
@@ -891,26 +870,25 @@ bool DictServersModel::setData( QModelIndex const & index, const QVariant & valu
   }
 
   if ( role == Qt::DisplayRole || role == Qt::EditRole )
-    switch( index.column() )
-    {
+    switch ( index.column() ) {
       case 1:
-        dictServers[ index.row() ].name =  value.toString();
+        dictServers[ index.row() ].name = value.toString();
         dataChanged( index, index );
         return true;
       case 2:
-        dictServers[ index.row() ].url =  value.toString();
+        dictServers[ index.row() ].url = value.toString();
         dataChanged( index, index );
         return true;
       case 3:
-        dictServers[ index.row() ].databases =  value.toString();
+        dictServers[ index.row() ].databases = value.toString();
         dataChanged( index, index );
         return true;
       case 4:
-        dictServers[ index.row() ].strategies =  value.toString();
+        dictServers[ index.row() ].strategies = value.toString();
         dataChanged( index, index );
         return true;
       case 5:
-        dictServers[ index.row() ].iconFilename =  value.toString();
+        dictServers[ index.row() ].iconFilename = value.toString();
         dataChanged( index, index );
         return true;
       default:
@@ -923,9 +901,9 @@ bool DictServersModel::setData( QModelIndex const & index, const QVariant & valu
 
 ////////// ProgramsModel
 
-ProgramsModel::ProgramsModel( QWidget * parent,
-                              Config::Programs const & programs_ ):
-  QAbstractItemModel( parent ), programs( programs_ )
+ProgramsModel::ProgramsModel( QWidget * parent, Config::Programs const & programs_ ):
+  QAbstractItemModel( parent ),
+  programs( programs_ )
 {
 }
 
@@ -941,7 +919,7 @@ void ProgramsModel::addNewProgram()
   Config::Program p;
 
   p.enabled = false;
-  p.type = Config::Program::Audio;
+  p.type    = Config::Program::Audio;
 
   p.id = Dictionary::generateRandomDictionaryId();
 
@@ -964,8 +942,7 @@ Qt::ItemFlags ProgramsModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
+  if ( index.isValid() ) {
     if ( !index.column() )
       result |= Qt::ItemIsUserCheckable;
     else
@@ -994,8 +971,7 @@ int ProgramsModel::columnCount( QModelIndex const & parent ) const
 QVariant ProgramsModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Enabled" );
       case 1:
@@ -1018,15 +994,13 @@ QVariant ProgramsModel::data( QModelIndex const & index, int role ) const
   if ( index.row() >= programs.size() )
     return QVariant();
 
-  if ( role == Qt::DisplayRole || role == Qt::EditRole )
-  {
-    switch( index.column() )
-    {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
+    switch ( index.column() ) {
       case 1:
         if ( role == Qt::DisplayRole )
           return ProgramTypeEditor::getNameForType( programs[ index.row() ].type );
         else
-          return QVariant( ( int ) programs[ index.row() ].type );
+          return QVariant( (int)programs[ index.row() ].type );
       case 2:
         return programs[ index.row() ].name;
       case 3:
@@ -1044,14 +1018,12 @@ QVariant ProgramsModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool ProgramsModel::setData( QModelIndex const & index, const QVariant & value,
-                             int role )
+bool ProgramsModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= programs.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
+  if ( role == Qt::CheckStateRole && !index.column() ) {
     programs[ index.row() ].enabled = !programs[ index.row() ].enabled;
 
     dataChanged( index, index );
@@ -1059,8 +1031,7 @@ bool ProgramsModel::setData( QModelIndex const & index, const QVariant & value,
   }
 
   if ( role == Qt::DisplayRole || role == Qt::EditRole )
-    switch( index.column() )
-    {
+    switch ( index.column() ) {
       case 1:
         programs[ index.row() ].type = Config::Program::Type( value.toInt() );
         dataChanged( index, index );
@@ -1086,8 +1057,7 @@ bool ProgramsModel::setData( QModelIndex const & index, const QVariant & value,
 
 QString ProgramTypeEditor::getNameForType( int v )
 {
-  switch( v )
-  {
+  switch ( v ) {
     case Config::Program::Audio:
       return tr( "Audio" );
     case Config::Program::PlainText:
@@ -1101,9 +1071,10 @@ QString ProgramTypeEditor::getNameForType( int v )
   }
 }
 
-ProgramTypeEditor::ProgramTypeEditor( QWidget * widget ): QComboBox( widget )
+ProgramTypeEditor::ProgramTypeEditor( QWidget * widget ):
+  QComboBox( widget )
 {
-  for( int x = 0; x < Config::Program::MaxTypeValue; ++x )
+  for ( int x = 0; x < Config::Program::MaxTypeValue; ++x )
     addItem( getNameForType( x ) );
 }
 
@@ -1119,9 +1090,9 @@ void ProgramTypeEditor::setType( int t )
 
 ////////// PathsModel
 
-PathsModel::PathsModel( QWidget * parent,
-                        Config::Paths const & paths_ ):
-  QAbstractItemModel( parent ), paths( paths_ )
+PathsModel::PathsModel( QWidget * parent, Config::Paths const & paths_ ):
+  QAbstractItemModel( parent ),
+  paths( paths_ )
 {
 }
 
@@ -1178,8 +1149,7 @@ int PathsModel::columnCount( QModelIndex const & parent ) const
 QVariant PathsModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Path" );
       case 1:
@@ -1205,14 +1175,12 @@ QVariant PathsModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool PathsModel::setData( QModelIndex const & index, const QVariant & /*value*/,
-                          int role )
+bool PathsModel::setData( QModelIndex const & index, const QVariant & /*value*/, int role )
 {
   if ( index.row() >= paths.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && index.column() == 1 )
-  {
+  if ( role == Qt::CheckStateRole && index.column() == 1 ) {
     paths[ index.row() ].recursive = !paths[ index.row() ].recursive;
 
     dataChanged( index, index );
@@ -1225,9 +1193,9 @@ bool PathsModel::setData( QModelIndex const & index, const QVariant & /*value*/,
 
 ////////// SoundDirsModel
 
-SoundDirsModel::SoundDirsModel( QWidget * parent,
-                                Config::SoundDirs const & soundDirs_ ):
-  QAbstractItemModel( parent ), soundDirs( soundDirs_ )
+SoundDirsModel::SoundDirsModel( QWidget * parent, Config::SoundDirs const & soundDirs_ ):
+  QAbstractItemModel( parent ),
+  soundDirs( soundDirs_ )
 {
 }
 
@@ -1284,8 +1252,7 @@ int SoundDirsModel::columnCount( QModelIndex const & parent ) const
 QVariant SoundDirsModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Path" );
       case 1:
@@ -1316,14 +1283,12 @@ QVariant SoundDirsModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool SoundDirsModel::setData( QModelIndex const & index, const QVariant & value,
-                              int role )
+bool SoundDirsModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= soundDirs.size() )
     return false;
 
-  if ( ( role == Qt::DisplayRole || role == Qt::EditRole ) && index.column() < 3 )
-  {
+  if ( ( role == Qt::DisplayRole || role == Qt::EditRole ) && index.column() < 3 ) {
     if ( !index.column() )
       soundDirs[ index.row() ].path = value.toString();
     else if ( index.column() == 1 )
@@ -1341,9 +1306,9 @@ bool SoundDirsModel::setData( QModelIndex const & index, const QVariant & value,
 
 ////////// HunspellDictsModel
 
-HunspellDictsModel::HunspellDictsModel( QWidget * parent,
-                                        Config::Hunspell const & hunspell ):
-  QAbstractItemModel( parent ), enabledDictionaries( hunspell.enabledDictionaries )
+HunspellDictsModel::HunspellDictsModel( QWidget * parent, Config::Hunspell const & hunspell ):
+  QAbstractItemModel( parent ),
+  enabledDictionaries( hunspell.enabledDictionaries )
 {
   changePath( hunspell.dictionariesPath );
 }
@@ -1369,8 +1334,7 @@ Qt::ItemFlags HunspellDictsModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
+  if ( index.isValid() ) {
     if ( !index.column() )
       result |= Qt::ItemIsUserCheckable;
   }
@@ -1397,8 +1361,7 @@ int HunspellDictsModel::columnCount( QModelIndex const & parent ) const
 QVariant HunspellDictsModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
   if ( role == Qt::DisplayRole )
-    switch( section )
-    {
+    switch ( section ) {
       case 0:
         return tr( "Enabled" );
       case 1:
@@ -1418,10 +1381,8 @@ QVariant HunspellDictsModel::data( QModelIndex const & index, int role ) const
   if ( role == Qt::DisplayRole && index.column() == 1 )
     return dataFiles[ index.row() ].dictName;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
-    for( unsigned x = enabledDictionaries.size(); x--; )
-    {
+  if ( role == Qt::CheckStateRole && !index.column() ) {
+    for ( unsigned x = enabledDictionaries.size(); x--; ) {
       if ( enabledDictionaries[ x ] == dataFiles[ index.row() ].dictId )
         return Qt::Checked;
     }
@@ -1432,18 +1393,14 @@ QVariant HunspellDictsModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool HunspellDictsModel::setData( QModelIndex const & index, const QVariant & /*value*/,
-                               int role )
+bool HunspellDictsModel::setData( QModelIndex const & index, const QVariant & /*value*/, int role )
 {
   if ( (unsigned)index.row() >= dataFiles.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && !index.column() )
-  {
-    for( unsigned x = enabledDictionaries.size(); x--; )
-    {
-      if ( enabledDictionaries[ x ] == dataFiles[ index.row() ].dictId )
-      {
+  if ( role == Qt::CheckStateRole && !index.column() ) {
+    for ( unsigned x = enabledDictionaries.size(); x--; ) {
+      if ( enabledDictionaries[ x ] == dataFiles[ index.row() ].dictId ) {
         // Remove it now
         enabledDictionaries.erase( enabledDictionaries.begin() + x );
         dataChanged( index, index );
diff --git a/src/dict/sources.hh b/src/dict/sources.hh
index 0560ee9a..38fbd13e 100644
--- a/src/dict/sources.hh
+++ b/src/dict/sources.hh
@@ -33,7 +33,9 @@ public:
 
   /// Returns the wikis the model currently has listed
   Config::MediaWikis const & getCurrentWikis() const
-  { return mediawikis; }
+  {
+    return mediawikis;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -63,7 +65,9 @@ public:
 
   /// Returns the sites the model currently has listed
   Config::WebSites const & getCurrentWebSites() const
-  { return webSites; }
+  {
+    return webSites;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -93,7 +97,9 @@ public:
 
   /// Returns the sites the model currently has listed
   Config::DictServers const & getCurrentDictServers() const
-  { return dictServers; }
+  {
+    return dictServers;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -123,7 +129,9 @@ public:
 
   /// Returns the sites the model currently has listed
   Config::Programs const & getCurrentPrograms() const
-  { return programs; }
+  {
+    return programs;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -141,11 +149,11 @@ private:
 
 class ProgramTypeEditor: public QComboBox
 {
-Q_OBJECT
-Q_PROPERTY(int type READ getType WRITE setType USER true)
+  Q_OBJECT
+  Q_PROPERTY( int type READ getType WRITE setType USER true )
 
 public:
-  ProgramTypeEditor( QWidget * widget = 0 );
+  explicit ProgramTypeEditor( QWidget * widget = nullptr );
 
   // Returns localized name for the given program type
   static QString getNameForType( int );
@@ -169,7 +177,9 @@ public:
 
   /// Returns the paths the model currently has listed
   Config::Paths const & getCurrentPaths() const
-  { return paths; }
+  {
+    return paths;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -199,7 +209,9 @@ public:
 
   /// Returns the soundDirs the model currently has listed
   Config::SoundDirs const & getCurrentSoundDirs() const
-  { return soundDirs; }
+  {
+    return soundDirs;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -228,7 +240,9 @@ public:
 
   /// Returns the dictionaries currently enabled
   Config::Hunspell::Dictionaries const & getEnabledDictionaries() const
-  { return enabledDictionaries; }
+  {
+    return enabledDictionaries;
+  }
 
   QModelIndex index( int row, int column, QModelIndex const & parent ) const;
   QModelIndex parent( QModelIndex const & parent ) const;
@@ -251,25 +265,37 @@ class Sources: public QWidget
   Q_OBJECT
 
 public:
-  Sources( QWidget * parent, Config::Class const &);
+  Sources( QWidget * parent, Config::Class const & );
 
   Config::Paths const & getPaths() const
-  { return pathsModel.getCurrentPaths(); }
+  {
+    return pathsModel.getCurrentPaths();
+  }
 
   Config::SoundDirs const & getSoundDirs() const
-  { return soundDirsModel.getCurrentSoundDirs(); }
+  {
+    return soundDirsModel.getCurrentSoundDirs();
+  }
 
   Config::MediaWikis const & getMediaWikis() const
-  { return mediawikisModel.getCurrentWikis(); }
+  {
+    return mediawikisModel.getCurrentWikis();
+  }
 
   Config::WebSites const & getWebSites() const
-  { return webSitesModel.getCurrentWebSites(); }
+  {
+    return webSitesModel.getCurrentWebSites();
+  }
 
   Config::DictServers const & getDictServers() const
-  { return dictServersModel.getCurrentDictServers(); }
+  {
+    return dictServersModel.getCurrentDictServers();
+  }
 
   Config::Programs const & getPrograms() const
-  { return programsModel.getCurrentPrograms(); }
+  {
+    return programsModel.getCurrentPrograms();
+  }
 
   Config::VoiceEngines getVoiceEngines() const;
 
@@ -290,13 +316,13 @@ private:
   Ui::Sources ui;
 
 #ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-  ChineseConversion *chineseConversion;
+  ChineseConversion * chineseConversion;
 #endif
 
-  TextToSpeechSource *textToSpeechSource;
+  TextToSpeechSource * textToSpeechSource;
 
   QItemDelegate * itemDelegate;
-  QItemEditorFactory * itemEditorFactory;
+  QScopedPointer< QItemEditorFactory > itemEditorFactory;
 
   MediaWikisModel mediawikisModel;
   WebSitesModel webSitesModel;
diff --git a/src/dict/stardict.cc b/src/dict/stardict.cc
index 2ac547c1..bd07a618 100644
--- a/src/dict/stardict.cc
+++ b/src/dict/stardict.cc
@@ -24,23 +24,23 @@
 #include <string>
 
 #ifndef Q_OS_WIN
-#include <arpa/inet.h>
+  #include <arpa/inet.h>
 #else
-#include <winsock.h>
+  #include <winsock.h>
 #endif
 #include <stdlib.h>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QString>
 #include <QSemaphore>
 #include <QAtomicInt>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #else
-#include <QRegExp>
+  #include <QRegExp>
 #endif
 #include <QStringList>
 #include <QDomDocument>
@@ -74,7 +74,7 @@ DEF_EX_STR( exNoSynFile, "No corresponding .syn file was found for", Dictionary:
 DEF_EX( ex64BitsNotSupported, "64-bit indices are not presently supported, sorry", Dictionary::Ex )
 DEF_EX( exDicttypeNotSupported, "Dictionaries with dicttypes are not supported, sorry", Dictionary::Ex )
 
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 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 )
@@ -93,32 +93,31 @@ struct Ifo
   explicit Ifo( File::Class & );
 };
 
-enum
-{
-  Signature = 0x58444953, // SIDX on little-endian, XDIS on big-endian
+enum {
+  Signature            = 0x58444953, // SIDX on little-endian, XDIS on big-endian
   CurrentFormatVersion = 9 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, SIDX
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t signature;             // First comes the signature, SIDX
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t chunksOffset;          // The offset to chunks' storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-  uint32_t wordCount; // Saved from Ifo::wordcount
-  uint32_t synWordCount; // Saved from Ifo::synwordcount
-  uint32_t bookNameSize; // Book name's length. Used to read it then.
-  uint32_t sameTypeSequenceSize; // That string's size. Used to read it then.
-  uint32_t langFrom;  // Source language
-  uint32_t langTo;    // Target language
-  uint32_t hasZipFile; // Non-zero means there's a zip file with resources present
+  uint32_t wordCount;                // Saved from Ifo::wordcount
+  uint32_t synWordCount;             // Saved from Ifo::synwordcount
+  uint32_t bookNameSize;             // Book name's length. Used to read it then.
+  uint32_t sameTypeSequenceSize;     // That string's size. Used to read it then.
+  uint32_t langFrom;                 // Source language
+  uint32_t langTo;                   // Target language
+  uint32_t hasZipFile;               // Non-zero means there's a zip file with resources present
   uint32_t zipIndexBtreeMaxElements; // Two fields from IndexInfo of the zip
                                      // resource index.
   uint32_t zipIndexRootOffset;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -128,9 +127,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 class StardictDictionary: public BtreeIndexing::BtreeDictionary
@@ -148,13 +146,14 @@ class StardictDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  StardictDictionary( string const & id, string const & indexFile,
-                      vector< string > const & dictionaryFiles );
+  StardictDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   ~StardictDictionary();
 
   string getName() noexcept override
-  { return bookName; }
+  {
+    return bookName;
+  }
 
   void setName( string _name ) noexcept override
   {
@@ -163,19 +162,29 @@ public:
 
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount + idxHeader.synWordCount; }
+  {
+    return idxHeader.wordCount + idxHeader.synWordCount;
+  }
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
   sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & ) override;
 
@@ -184,7 +193,7 @@ public:
 
   sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   QString getMainFilename() override;
 
@@ -192,14 +201,14 @@ public:
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "STARDICT", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "STARDICT", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
+
 protected:
 
   void loadIcon() noexcept override;
@@ -207,15 +216,11 @@ protected:
 private:
 
   /// Retrieves the article's offset/size in .dict file, and its headword.
-  void getArticleProps( uint32_t articleAddress,
-                        string & headword,
-                        uint32_t & offset, uint32_t & size );
+  void getArticleProps( uint32_t articleAddress, string & headword, uint32_t & offset, uint32_t & size );
 
   /// Loads the article, storing its headword and formatting the data it has
   /// into an html.
-  void loadArticle(  uint32_t address,
-                     string & headword,
-                     string & articleText );
+  void loadArticle( uint32_t address, string & headword, string & articleText );
 
   string loadString( size_t size );
 
@@ -244,24 +249,18 @@ StardictDictionary::StardictDictionary( string const & id,
   dz = dict_data_open( dictionaryFiles[ 2 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exDictzipError( string( dz_error_str( error ) )
-                          + "(" + dictionaryFiles[ 2 ] + ")" );
+    throw exDictzipError( string( dz_error_str( error ) ) + "(" + dictionaryFiles[ 2 ] + ")" );
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   // Open a resource zip file, if there's one
 
-  if ( idxHeader.hasZipFile &&
-       ( idxHeader.zipIndexBtreeMaxElements ||
-         idxHeader.zipIndexRootOffset ) )
-  {
-    resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements,
-                                      idxHeader.zipIndexRootOffset ),
-                           idx, idxMutex );
+  if ( idxHeader.hasZipFile && ( idxHeader.zipIndexBtreeMaxElements || idxHeader.zipIndexRootOffset ) ) {
+    resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements, idxHeader.zipIndexRootOffset ),
+                           idx,
+                           idxMutex );
 
     QString zipName = QDir::fromNativeSeparators( getDictionaryFilenames().back().c_str() );
 
@@ -275,8 +274,7 @@ StardictDictionary::StardictDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -296,10 +294,9 @@ void StardictDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 3 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_stardict.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_stardict.png" );
   }
 
   dictionaryIconLoaded = true;
@@ -307,7 +304,7 @@ void StardictDictionary::loadIcon() noexcept
 
 string StardictDictionary::loadString( size_t size )
 {
-  if( size == 0 )
+  if ( size == 0 )
     return string();
 
   vector< char > data( size );
@@ -319,7 +316,8 @@ string StardictDictionary::loadString( size_t size )
 
 void StardictDictionary::getArticleProps( uint32_t articleAddress,
                                           string & headword,
-                                          uint32_t & offset, uint32_t & size )
+                                          uint32_t & offset,
+                                          uint32_t & size )
 {
   vector< char > chunk;
 
@@ -335,101 +333,115 @@ void StardictDictionary::getArticleProps( uint32_t articleAddress,
   headword = articleData;
 }
 
-class PowerWordDataProcessor{
-    class PWSyntaxTranslate{
-    public:
-        PWSyntaxTranslate(const char* re, const char* replacement)
-            : _re(re, QRegularExpression::UseUnicodePropertiesOption )
+class PowerWordDataProcessor
+{
+  class PWSyntaxTranslate
+  {
+  public:
+    PWSyntaxTranslate( const char * re, const char * replacement ):
+      _re( re, QRegularExpression::UseUnicodePropertiesOption )
 
-            , _replacement(replacement)
-        {
-        }
-        const QRegularExpression & re() const {
-
-            return _re;
-        }
-        const QString & replacement() const {
-            return _replacement;
-        }
-    private:
-        QRegularExpression _re;
-
-        QString _replacement;
-    };
-public:
-    PowerWordDataProcessor(const char* resource, size_t size)
-        : _data(QString::fromUtf8(resource, size))
+      ,
+      _replacement( replacement )
     {
     }
+    const QRegularExpression & re() const
+    {
 
-    string process() {
-        QDomDocument doc;
-        QString ss;
-        ss = "<div class=\"sdct_k\">";
-        if (!doc.setContent(_data)) {
-            ss += _data ;
-        } else {
-            QStringList sl;
-            walkNode(doc.firstChild(), sl);
-
-            QStringListIterator itr(sl);
-            while (itr.hasNext()) {
-                QString s = itr.next();
-                translatePW(s);
-                ss += s;
-                ss += "<br>";
-            }
-        }
-        ss += "</div>";
-        QByteArray ba = ss.toUtf8();
-        return string(ba.data(), ba.size());
+      return _re;
     }
+    const QString & replacement() const
+    {
+      return _replacement;
+    }
+
+  private:
+    QRegularExpression _re;
+
+    QString _replacement;
+  };
+
+public:
+  PowerWordDataProcessor( const char * resource, size_t size ):
+    _data( QString::fromUtf8( resource, size ) )
+  {
+  }
+
+  string process()
+  {
+    QDomDocument doc;
+    QString ss;
+    ss = "<div class=\"sdct_k\">";
+    if ( !doc.setContent( _data ) ) {
+      ss += _data;
+    }
+    else {
+      QStringList sl;
+      walkNode( doc.firstChild(), sl );
+
+      QStringListIterator itr( sl );
+      while ( itr.hasNext() ) {
+        QString s = itr.next();
+        translatePW( s );
+        ss += s;
+        ss += "<br>";
+      }
+    }
+    ss += "</div>";
+    QByteArray ba = ss.toUtf8();
+    return string( ba.data(), ba.size() );
+  }
+
 private:
-    void walkNode(const QDomNode& e, QStringList& sl) {
-        if (e.isNull()) {
-            return;
-        }
-        if (e.isText()) {
-            sl.append(e.toText().data());
-        } else {
-            QDomNodeList l = e.childNodes();
-            for (int i = 0; i < l.size(); ++i) {
-                QDomNode n = l.at(i);
-                if (n.isText()) {
-                    sl.append(n.toText().data());
-                } else {
-                    walkNode(n, sl);
-                }
-            }
-        }
+  void walkNode( const QDomNode & e, QStringList & sl )
+  {
+    if ( e.isNull() ) {
+      return;
     }
-
-    void translatePW(QString& s){
-        const int TRANSLATE_TBL_SIZE=5;
-        static PWSyntaxTranslate t[TRANSLATE_TBL_SIZE]={
-            PWSyntaxTranslate(R"(&[bB]\s*\{([^\{}&]+)\})", "<B>\\1</B>"),
-            PWSyntaxTranslate(R"(&[iI]\s*\{([^\{}&]+)\})", "<I>\\1</I>"),
-            PWSyntaxTranslate(R"(&[uU]\s*\{([^\{}&]+)\})", "<U>\\1</U>"),
-            PWSyntaxTranslate(R"(&[lL]\s*\{([^\{}&]+)\})", R"(<SPAN style="color:#0000ff">\1</SPAN>)"),
-            PWSyntaxTranslate(R"(&[2]\s*\{([^\{}&]+)\})", R"(<SPAN style="color:#0000ff">\1</SPAN>)")
-        };
-
-        QString old;
-        while (s.compare(old) != 0) {
-            for (int i = 0; i < TRANSLATE_TBL_SIZE; ++i) {
-                PWSyntaxTranslate& a = t[i];
-                s.replace(a.re(), a.replacement());
-            }
-            old = s;
-        }
-        s.replace(QRegularExpression( "&.\\s*\\{",
-                                      QRegularExpression::UseUnicodePropertiesOption
-                                      | QRegularExpression::DotMatchesEverythingOption),
-                  "");
-        s.replace("}", "");
+    if ( e.isText() ) {
+      sl.append( e.toText().data() );
     }
+    else {
+      QDomNodeList l = e.childNodes();
+      for ( int i = 0; i < l.size(); ++i ) {
+        QDomNode n = l.at( i );
+        if ( n.isText() ) {
+          sl.append( n.toText().data() );
+        }
+        else {
+          walkNode( n, sl );
+        }
+      }
+    }
+  }
+
+  void translatePW( QString & s )
+  {
+    const int TRANSLATE_TBL_SIZE                     = 5;
+    static PWSyntaxTranslate t[ TRANSLATE_TBL_SIZE ] = {
+      PWSyntaxTranslate( R"(&[bB]\s*\{([^\{}&]+)\})", "<B>\\1</B>" ),
+      PWSyntaxTranslate( R"(&[iI]\s*\{([^\{}&]+)\})", "<I>\\1</I>" ),
+      PWSyntaxTranslate( R"(&[uU]\s*\{([^\{}&]+)\})", "<U>\\1</U>" ),
+      PWSyntaxTranslate( R"(&[lL]\s*\{([^\{}&]+)\})", R"(<SPAN style="color:#0000ff">\1</SPAN>)" ),
+      PWSyntaxTranslate( R"(&[2]\s*\{([^\{}&]+)\})", R"(<SPAN style="color:#0000ff">\1</SPAN>)" ) };
+
+    QString old;
+    while ( s.compare( old ) != 0 ) {
+      for ( int i = 0; i < TRANSLATE_TBL_SIZE; ++i ) {
+        PWSyntaxTranslate & a = t[ i ];
+        s.replace( a.re(), a.replacement() );
+      }
+      old = s;
+    }
+    s.replace( QRegularExpression( "&.\\s*\\{",
+                                   QRegularExpression::UseUnicodePropertiesOption
+                                     | QRegularExpression::DotMatchesEverythingOption ),
+               "" );
+    s.replace( "}", "" );
+  }
+
 private:
-    QString _data;
+  QString _data;
 };
 
 
@@ -440,8 +452,7 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
   QString text;
 
   // See "Type identifiers" at http://www.huzheng.org/stardict/StarDictFileFormat
-  switch( type )
-  {
+  switch ( type ) {
     case 'x': // Xdxf content
       return Xdxf2Html::convert( string( resource, size ), Xdxf2Html::STARDICT, NULL, this, &resourceZip );
     case 'h': // Html content
@@ -450,14 +461,14 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
 
       QRegularExpression imgRe( R"((<\s*img\s+[^>]*src\s*=\s*["']+)(?!(?:data|https?|ftp):))",
                                 QRegularExpression::CaseInsensitiveOption
-                                | QRegularExpression::InvertedGreedinessOption );
+                                  | QRegularExpression::InvertedGreedinessOption );
       QRegularExpression linkRe( R"((<\s*link\s+[^>]*href\s*=\s*["']+)(?!(?:data|https?|ftp):))",
                                  QRegularExpression::CaseInsensitiveOption
-                                 | QRegularExpression::InvertedGreedinessOption );
+                                   | QRegularExpression::InvertedGreedinessOption );
 
 
-      articleText.replace( imgRe , "\\1bres://" + QString::fromStdString( getId() ) + "/" )
-                 .replace( linkRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" );
+      articleText.replace( imgRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" )
+        .replace( linkRe, "\\1bres://" + QString::fromStdString( getId() ) + "/" );
 
       // Handle links to articles
 
@@ -468,8 +479,7 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
       int pos = 0;
       QString articleNewText;
       QRegularExpressionMatchIterator it = linksReg.globalMatch( articleText );
-      while( it.hasNext() )
-      {
+      while ( it.hasNext() ) {
         QRegularExpressionMatch match = it.next();
         articleNewText += articleText.mid( pos, match.capturedStart() - pos );
         pos = match.capturedEnd();
@@ -484,31 +494,27 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
           }
 
           QString newLink;
-          if( link.indexOf( '#' ) < 0 )
+          if ( link.indexOf( '#' ) < 0 )
             newLink = QString( "<a" ) + match.captured( 1 ) + "href=\"bword:" + link + "\"";
 
 
           // Anchors
-          if( link.indexOf( '#' ) > 0 &&  link.indexOf( "&#" ) < 0 )
-          {
+          if ( link.indexOf( '#' ) > 0 && link.indexOf( "&#" ) < 0 ) {
             newLink = QString( "<a" ) + match.captured( 1 ) + "href=\"gdlookup://localhost/" + link + "\"";
 
             newLink.replace( "#", "?gdanchor=" );
           }
 
-          if( !newLink.isEmpty() )
-          {
+          if ( !newLink.isEmpty() ) {
             articleNewText += newLink;
           }
           else
             articleNewText += match.captured();
-
         }
         else
           articleNewText += match.captured();
       }
-      if( pos )
-      {
+      if ( pos ) {
         articleNewText += articleText.mid( pos );
         articleText = articleNewText;
         articleNewText.clear();
@@ -518,40 +524,37 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
 
       QRegularExpression audioRe( R"(<\s*audio\s*src\s*=\s*(["']+)([^"']+)(["'])\s*>(.*)</audio>)",
                                   QRegularExpression::CaseInsensitiveOption
-                                  | QRegularExpression::DotMatchesEverythingOption
-                                  | QRegularExpression::InvertedGreedinessOption );
+                                    | QRegularExpression::DotMatchesEverythingOption
+                                    | QRegularExpression::InvertedGreedinessOption );
 
 
       pos = 0;
 
       it = audioRe.globalMatch( articleText );
-      while( it.hasNext() )
-      {
+      while ( it.hasNext() ) {
         QRegularExpressionMatch match = it.next();
         articleNewText += articleText.mid( pos, match.capturedStart() - pos );
         pos = match.capturedEnd();
 
         QString src = match.captured( 2 );
 
-        if( src.indexOf( "://" ) >= 0 )
+        if ( src.indexOf( "://" ) >= 0 )
           articleNewText += match.captured();
 
-        else
-        {
+        else {
           std::string href = "\"gdau://" + getId() + "/" + src.toUtf8().data() + "\"";
-          QString newTag = QString::fromUtf8( ( addAudioLink( href, getId() ) + "<span class=\"sdict_h_wav\"><a href=" + href + ">" ).c_str() );
+          QString newTag   = QString::fromUtf8(
+            ( addAudioLink( href, getId() ) + "<span class=\"sdict_h_wav\"><a href=" + href + ">" ).c_str() );
           newTag += match.captured( 4 );
-          if( match.captured( 4 ).indexOf( "<img " ) < 0 )
+          if ( match.captured( 4 ).indexOf( "<img " ) < 0 )
 
             newTag += R"( <img src="qrc:///icons/playsound.png" border="0" alt="Play">)";
           newTag += "</a></span>";
 
           articleNewText += newTag;
-
         }
       }
-      if( pos )
-      {
+      if ( pos ) {
         articleNewText += articleText.mid( pos );
         articleText = articleNewText;
         articleNewText.clear();
@@ -565,9 +568,8 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
               // encoding.
               // We just use Qt here, it should know better about system's
               // locale.
-      return "<div class=\"sdct_l\">" + Html::preformat( QString::fromLocal8Bit( resource, size ).toUtf8().data(),
-                                                         isToLanguageRTL() )
-                                      + "</div>";
+      return "<div class=\"sdct_l\">"
+        + Html::preformat( QString::fromLocal8Bit( resource, size ).toUtf8().data(), isToLanguageRTL() ) + "</div>";
     case 'g': // Pango markup.
       text = QString::fromUtf8( resource, size );
       pangoToHtml( text );
@@ -579,7 +581,7 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
       return "<div class=\"sdct_y\">" + Html::escape( string( resource, size ) ) + "</div>";
     case 'k': // KingSoft PowerWord data.
     {
-      PowerWordDataProcessor pwdp(resource, size);
+      PowerWordDataProcessor pwdp( resource, size );
       return pwdp.process();
     }
     case 'w': // MediaWiki markup. We don't handle this right now.
@@ -612,9 +614,9 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
       return "<div class=\"sdct_P\">(an embedded picture file)</div>";
   }
 
-  if ( islower( type ) )
-  {
-    return string( "<b>Unknown textual entry type " ) + string( 1, type ) + ":</b> " + Html::escape( string( resource, size ) ) + "<br>";
+  if ( islower( type ) ) {
+    return string( "<b>Unknown textual entry type " ) + string( 1, type ) + ":</b> "
+      + Html::escape( string( resource, size ) ) + "<br>";
   }
   else
     return string( "<b>Unknown blob entry type " ) + string( 1, type ) + "</b><br>";
@@ -622,7 +624,7 @@ string StardictDictionary::handleResource( char type, char const * resource, siz
 
 void StardictDictionary::pangoToHtml( QString & text )
 {
-/*
+  /*
  * Partially support for Pango Markup Language
  * Attributes "fallback", "lang", "gravity", "gravity_hint" just ignored
  */
@@ -633,140 +635,115 @@ void StardictDictionary::pangoToHtml( QString & text )
   text.replace( "\n", "<br>" );
 
   int pos = 0;
-  do
-  {
+  do {
     pos = spanRegex.indexIn( text, pos );
-    if( pos >= 0 )
-    {
+    if ( pos >= 0 ) {
       QString styles = spanRegex.cap( 1 );
       QString newSpan( "<span style=\"" );
       int stylePos = 0;
-      do
-      {
-        stylePos = styleRegex.indexIn( styles, stylePos );
+      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 )
-          {
+        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( " ", Qt::SkipEmptyParts );
             int n;
             QString sizeStr, stylesStr, familiesStr;
-            for( n = list.size() - 1; n >= 0; n-- )
-            {
+            for ( n = list.size() - 1; n >= 0; n-- ) {
               QString str = list.at( n );
 
               // font size
-              if( str[ 0 ].isNumber() )
-              {
+              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:" ) )
+              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" ) ;
+              if ( str.compare( "smallcaps", Qt::CaseInsensitive ) == 0 ) {
+                stylesStr += QString( "font-variant:small-caps" );
                 continue;
               }
 
               // font weight
-              if( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-weight:100;" );
                 continue;
               }
-              if( str.compare( "light", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "light", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-weight:200;" );
                 continue;
               }
-              if( str.compare( "bold", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "bold", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-weight:bold;" );
                 continue;
               }
-              if( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-weight:800;" );
                 continue;
               }
-              if( str.compare( "heavy", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "heavy", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-weight:900" );
                 continue;
               }
 
               // font stretch
-              if( str.compare( "ultracondensed", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "ultracondensed", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-stretch:ultra-condensed;" );
                 continue;
               }
-              if( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-stretch:extra-condensed;" );
                 continue;
               }
-              if( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-stretch:semi-condensed;" );
                 continue;
               }
-              if( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-stretch:semi-expanded;" );
                 continue;
               }
-              if( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 )
-              {
+              if ( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 ) {
                 stylesStr += QString( "font-stretch:extra-expanded;" );
                 continue;
               }
-              if( str.compare( "ultraexpanded", Qt::CaseInsensitive ) == 0 )
-              {
+              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 )
-              {
+              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 )
-              {
+              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 )
-            {
+            if ( n >= 0 ) {
               familiesStr = QString( "font-family:" );
-              for( int i = 0; i <= n; i++ )
-              {
-                if( i > 0 && !familiesStr.endsWith( ',' ) )
+              for ( int i = 0; i <= n; i++ ) {
+                if ( i > 0 && !familiesStr.endsWith( ',' ) )
                   familiesStr += ",";
                 familiesStr += list.at( i );
               }
@@ -775,151 +752,131 @@ void StardictDictionary::pangoToHtml( QString & text )
 
             newSpan += familiesStr + stylesStr + sizeStr;
           }
-          else if( style.compare( "font_family", Qt::CaseInsensitive ) == 0
-                   || style.compare( "face", Qt::CaseInsensitive ) == 0 )
+          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
-            {
+          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 )
+              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)
+          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( "font_weight", Qt::CaseInsensitive ) == 0
-                   || style.compare( "weight", Qt::CaseInsensitive ) == 0)
-          {
+          else if ( style.compare( "font_weight", Qt::CaseInsensitive ) == 0
+                    || style.compare( "weight", Qt::CaseInsensitive ) == 0 ) {
             QString str = styleRegex.cap( 2 );
-            if( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 )
+            if ( str.compare( "ultralight", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-weight:100;" );
-            else if( str.compare( "light", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "light", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-weight:200;" );
-            else if( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "ultrabold", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-weight:800;" );
-            else if( str.compare( "heavy", Qt::CaseInsensitive ) == 0 )
+            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 )
+          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 )
-          {
+          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 )
+            if ( str.compare( "ultracondensed", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-stretch:ultra-condensed;" );
-            else if( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "extracondensed", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-stretch:extra-condensed;" );
-            else if( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "semicondensed", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-stretch:semi-condensed;" );
-            else if( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "semiexpanded", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-stretch:semi-expanded;" );
-            else if( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 )
+            else if ( str.compare( "extraexpanded", Qt::CaseInsensitive ) == 0 )
               newSpan += QString( "font-stretch:extra-expanded;" );
-            else if( str.compare( "ultraexpanded", Qt::CaseInsensitive ) == 0 )
+            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 )
+          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 )
+          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 )
+          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 ) )
+          else if ( style.compare( "underline", Qt::CaseInsensitive ) == 0 ) {
+            if ( styleRegex.cap( 2 ).compare( "none", Qt::CaseInsensitive ) )
               newSpan += QString( "text-decoration-line:none;" );
-            else
-            {
+            else {
               newSpan += QString( "text-decoration-line:underline; " );
-              if( styleRegex.cap( 2 ).compare( "low", Qt::CaseInsensitive ) )
+              if ( styleRegex.cap( 2 ).compare( "low", Qt::CaseInsensitive ) )
                 newSpan += QString( "text-decoration-style:dotted;" );
-              else if( styleRegex.cap( 2 ).compare( "single", Qt::CaseInsensitive ) )
+              else if ( styleRegex.cap( 2 ).compare( "single", Qt::CaseInsensitive ) )
                 newSpan += QString( "text-decoration-style:solid;" );
-              else if( styleRegex.cap( 2 ).compare( "error", Qt::CaseInsensitive ) )
+              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 ) )
+          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
-            {
+          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 )
+              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
-            {
+          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 )
+              if ( spacing )
                 newSpan += QString( "letter-spacing:%1pt;" ).arg( spacing / 1024.0, 0, 'f', 3 );
             }
           }
 
           stylePos += styleRegex.matchedLength();
         }
-      }
-      while( stylePos >= 0 );
+      } while ( stylePos >= 0 );
 
       newSpan += "\">";
       text.replace( pos, spanRegex.matchedLength(), newSpan );
       pos += newSpan.size();
     }
-  }
-  while( pos >= 0 );
+  } while ( pos >= 0 );
 
   text.replace( "  ", "&nbsp;&nbsp;" );
 }
 
-void StardictDictionary::loadArticle( uint32_t address,
-                                      string & headword,
-                                      string & articleText )
+void StardictDictionary::loadArticle( uint32_t address, string & headword, string & articleText )
 {
   uint32_t offset, size;
 
@@ -934,9 +891,8 @@ void StardictDictionary::loadArticle( uint32_t address,
     articleBody = dict_data_read_( dz, offset, size, 0, 0 );
   }
 
-  if ( !articleBody )
-  {
-//    throw exCantReadFile( getDictionaryFilenames()[ 2 ] );
+  if ( !articleBody ) {
+    //    throw exCantReadFile( getDictionaryFilenames()[ 2 ] );
     articleText = string( "<div class=\"sdict_m\">DICTZIP error: " ) + dict_error_str( dz ) + "</div>";
     return;
   }
@@ -945,11 +901,9 @@ void StardictDictionary::loadArticle( uint32_t address,
 
   char * ptr = articleBody;
 
-  if ( !sameTypeSequence.empty() )
-  {
+  if ( !sameTypeSequence.empty() ) {
     /// The sequence is known, it's not stored in the article itself
-    for( unsigned seq = 0; seq < sameTypeSequence.size(); ++seq )
-    {
+    for ( unsigned seq = 0; seq < sameTypeSequence.size(); ++seq ) {
       // Last entry doesn't have size info -- it is inferred from
       // the bytes left
       bool entrySizeKnown = ( seq == sameTypeSequence.size() - 1 );
@@ -958,24 +912,24 @@ void StardictDictionary::loadArticle( uint32_t address,
 
       if ( entrySizeKnown )
         entrySize = size;
-      else
-      if ( !size )
-      {
-        gdWarning( "Stardict: short entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+      else if ( !size ) {
+        gdWarning( "Stardict: short entry for the word %s encountered in \"%s\".\n",
+                   headword.c_str(),
+                   getName().c_str() );
         break;
       }
 
       char type = sameTypeSequence[ seq ];
 
-      if ( islower( type ) )
-      {
+      if ( islower( type ) ) {
         // Zero-terminated entry, unless it's the last one
         if ( !entrySizeKnown )
           entrySize = strlen( ptr );
 
-        if ( size < entrySize )
-        {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( size < entrySize ) {
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                     headword.c_str(),
+                     getName().c_str() );
           break;
         }
 
@@ -987,16 +941,14 @@ void StardictDictionary::loadArticle( uint32_t address,
         ptr += entrySize;
         size -= entrySize;
       }
-      else
-      if ( isupper( *ptr ) )
-      {
+      else if ( isupper( *ptr ) ) {
         // An entry which has its size before contents, unless it's the last one
 
-        if ( !entrySizeKnown )
-        {
-          if ( size < sizeof( uint32_t ) )
-          {
-            gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( !entrySizeKnown ) {
+          if ( size < sizeof( uint32_t ) ) {
+            gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                       headword.c_str(),
+                       getName().c_str() );
             break;
           }
 
@@ -1008,9 +960,10 @@ void StardictDictionary::loadArticle( uint32_t address,
           size -= sizeof( uint32_t );
         }
 
-        if ( size < entrySize )
-        {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( size < entrySize ) {
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                     headword.c_str(),
+                     getName().c_str() );
           break;
         }
 
@@ -1019,27 +972,26 @@ void StardictDictionary::loadArticle( uint32_t address,
         ptr += entrySize;
         size -= entrySize;
       }
-      else
-      {
+      else {
         gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                   type, headword.c_str(), getName().c_str() );
+                   type,
+                   headword.c_str(),
+                   getName().c_str() );
         break;
       }
     }
   }
-  else
-  {
+  else {
     // The sequence is stored in each article separately
-    while( size )
-    {
-      if ( islower( *ptr ) )
-      {
+    while ( size ) {
+      if ( islower( *ptr ) ) {
         // Zero-terminated entry
         size_t len = strlen( ptr + 1 );
 
-        if ( size < len + 2 )
-        {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( size < len + 2 ) {
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                     headword.c_str(),
+                     getName().c_str() );
           break;
         }
 
@@ -1048,13 +1000,12 @@ void StardictDictionary::loadArticle( uint32_t address,
         ptr += len + 2;
         size -= len + 2;
       }
-      else
-      if ( isupper( *ptr ) )
-      {
+      else if ( isupper( *ptr ) ) {
         // An entry which havs its size before contents
-        if ( size < sizeof( uint32_t ) + 1 )
-        {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( size < sizeof( uint32_t ) + 1 ) {
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                     headword.c_str(),
+                     getName().c_str() );
           break;
         }
 
@@ -1064,9 +1015,10 @@ void StardictDictionary::loadArticle( uint32_t address,
 
         entrySize = ntohl( entrySize );
 
-        if ( size < sizeof( uint32_t ) + 1 + entrySize )
-        {
-          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n", headword.c_str(), getName().c_str() );
+        if ( size < sizeof( uint32_t ) + 1 + entrySize ) {
+          gdWarning( "Stardict: malformed entry for the word %s encountered in \"%s\".\n",
+                     headword.c_str(),
+                     getName().c_str() );
           break;
         }
 
@@ -1075,10 +1027,11 @@ void StardictDictionary::loadArticle( uint32_t address,
         ptr += sizeof( uint32_t ) + 1 + entrySize;
         size -= sizeof( uint32_t ) + 1 + entrySize;
       }
-      else
-      {
+      else {
         gdWarning( "Stardict: non-alpha entry type 0x%x for the word %s encountered in \"%s\".\n",
-                   (unsigned)*ptr, headword.c_str(), getName().c_str() );
+                   (unsigned)*ptr,
+                   headword.c_str(),
+                   getName().c_str() );
         break;
       }
     }
@@ -1087,106 +1040,90 @@ void StardictDictionary::loadArticle( uint32_t address,
   free( articleBody );
 }
 
-QString const& StardictDictionary::getDescription()
+QString const & StardictDictionary::getDescription()
 {
-    if( !dictionaryDescription.isEmpty() )
-        return dictionaryDescription;
-
-    File::Class ifoFile( getDictionaryFilenames()[ 0 ], "r" );
-    Ifo ifo( ifoFile );
-
-    if( !ifo.copyright.empty() )
-    {
-      QString copyright = QString::fromUtf8( ifo.copyright.c_str() )
-                          .replace( "<br>", "\n", Qt::CaseInsensitive );
-      dictionaryDescription += QObject::tr( "Copyright: %1%2" )
-                              .arg( copyright )
-                              .arg( "\n\n" );
-    }
-
-    if( !ifo.author.empty() )
-    {
-      QString author = QString::fromUtf8( ifo.author.c_str() );
-      dictionaryDescription += QObject::tr( "Author: %1%2" )
-                              .arg( author )
-                              .arg( "\n\n" );
-    }
-
-    if( !ifo.email.empty() )
-    {
-      QString email = QString::fromUtf8( ifo.email.c_str() );
-      dictionaryDescription += QObject::tr( "E-mail: %1%2" )
-                               .arg( email )
-                               .arg( "\n\n" );
-    }
-
-    if( !ifo.website.empty() )
-    {
-      QString website = QString::fromUtf8( ifo.website.c_str() );
-      dictionaryDescription += QObject::tr( "Website: %1%2" )
-                               .arg( website )
-                               .arg( "\n\n" );
-    }
-
-    if( !ifo.date.empty() )
-    {
-      QString date = QString::fromUtf8( ifo.date.c_str() );
-      dictionaryDescription += QObject::tr( "Date: %1%2" )
-                               .arg( date )
-                               .arg( "\n\n" );
-    }
-
-    if( !ifo.description.empty() )
-    {
-      QString desc = QString::fromUtf8( ifo.description.c_str() );
-      desc.replace( "\t", "<br/>" );
-      desc.replace( "\\n", "<br/>" );
-      desc.replace( "<br>", "<br/>", Qt::CaseInsensitive );
-      dictionaryDescription += Html::unescape( desc, Html::HtmlOption::Keep );
-    }
-
-    if( dictionaryDescription.isEmpty() )
-      dictionaryDescription = "NONE";
-
+  if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
+
+  File::Class ifoFile( getDictionaryFilenames()[ 0 ], "r" );
+  Ifo ifo( ifoFile );
+
+  if ( !ifo.copyright.empty() ) {
+    QString copyright = QString::fromUtf8( ifo.copyright.c_str() ).replace( "<br>", "\n", Qt::CaseInsensitive );
+    dictionaryDescription += QObject::tr( "Copyright: %1%2" ).arg( copyright ).arg( "\n\n" );
+  }
+
+  if ( !ifo.author.empty() ) {
+    QString author = QString::fromUtf8( ifo.author.c_str() );
+    dictionaryDescription += QObject::tr( "Author: %1%2" ).arg( author ).arg( "\n\n" );
+  }
+
+  if ( !ifo.email.empty() ) {
+    QString email = QString::fromUtf8( ifo.email.c_str() );
+    dictionaryDescription += QObject::tr( "E-mail: %1%2" ).arg( email ).arg( "\n\n" );
+  }
+
+  if ( !ifo.website.empty() ) {
+    QString website = QString::fromUtf8( ifo.website.c_str() );
+    dictionaryDescription += QObject::tr( "Website: %1%2" ).arg( website ).arg( "\n\n" );
+  }
+
+  if ( !ifo.date.empty() ) {
+    QString date = QString::fromUtf8( ifo.date.c_str() );
+    dictionaryDescription += QObject::tr( "Date: %1%2" ).arg( date ).arg( "\n\n" );
+  }
+
+  if ( !ifo.description.empty() ) {
+    QString desc = QString::fromUtf8( ifo.description.c_str() );
+    desc.replace( "\t", "<br/>" );
+    desc.replace( "\\n", "<br/>" );
+    desc.replace( "<br>", "<br/>", Qt::CaseInsensitive );
+    dictionaryDescription += Html::unescape( desc, Html::HtmlOption::Keep );
+  }
+
+  if ( dictionaryDescription.isEmpty() )
+    dictionaryDescription = "NONE";
+
+  return dictionaryDescription;
 }
 
-QString StardictDictionary::getMainFilename() { return getDictionaryFilenames()[ 0 ].c_str(); }
+QString StardictDictionary::getMainFilename()
+{
+  return getDictionaryFilenames()[ 0 ].c_str();
+}
 
 void StardictDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Stardict: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Stardict: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  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() );
+  catch ( std::exception & ex ) {
+    gdWarning( "Stardict: Failed building full-text search index for \"%s\", reason: %s\n",
+               getName().c_str(),
+               ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
 
 void StardictDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     string headwordStr, articleStr;
     loadArticle( articleAddress, headwordStr, articleStr );
 
@@ -1194,8 +1131,7 @@ void StardictDictionary::getArticleText( uint32_t articleAddress, QString & head
 
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Stardict: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -1225,9 +1161,9 @@ class StardictHeadwordsRequest: public Dictionary::WordSearchRequest
 
 public:
 
-  StardictHeadwordsRequest( wstring const & word_,
-                            StardictDictionary & dict_ ):
-    word( word_ ), dict( dict_ )
+  StardictHeadwordsRequest( wstring const & word_, StardictDictionary & dict_ ):
+    word( word_ ),
+    dict( dict_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -1251,35 +1187,30 @@ public:
 
 void StardictHeadwordsRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
-    vector< WordArticleLink > chain = dict.findArticles( word );
+  try {
+    //limited the synomys to at most 10 entries
+    vector< WordArticleLink > chain = dict.findArticles( word, false, 10 );
 
     wstring caseFolded = Folding::applySimpleCaseOnly( word );
 
-    for( unsigned x = 0; x < chain.size(); ++x )
-    {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-      {
+    for ( unsigned x = 0; x < chain.size(); ++x ) {
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
         finish();
         return;
       }
 
       string headword, articleText;
 
-      dict.loadArticle( chain[ x ].articleOffset,
-                        headword, articleText );
+      dict.loadArticle( chain[ x ].articleOffset, headword, articleText );
 
       wstring headwordDecoded = Utf8::decode( headword );
 
-      if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) )
-      {
+      if ( caseFolded != Folding::applySimpleCaseOnly( headwordDecoded ) ) {
         // The headword seems to differ from the input word, which makes the
         // input word its synonym.
         QMutexLocker _( &dataMutex );
@@ -1288,19 +1219,16 @@ void StardictHeadwordsRequest::run()
       }
     }
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     setErrorString( QString::fromUtf8( e.what() ) );
   }
 
   finish();
 }
 
-sptr< Dictionary::WordSearchRequest >
-  StardictDictionary::findHeadwordsForSynonym( wstring const & word )
-  
+sptr< Dictionary::WordSearchRequest > StardictDictionary::findHeadwordsForSynonym( wstring const & word )
 {
-  return synonymSearchEnabled ? std::make_shared<StardictHeadwordsRequest>( word, *this ) :
+  return synonymSearchEnabled ? std::make_shared< StardictHeadwordsRequest >( word, *this ) :
                                 Class::findHeadwordsForSynonym( word );
 }
 
@@ -1323,10 +1251,13 @@ class StardictArticleRequest: public Dictionary::DataRequest
 public:
 
   StardictArticleRequest( wstring const & word_,
-                     vector< wstring > const & alts_,
-                     StardictDictionary & dict_,
-                     bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                          vector< wstring > const & alts_,
+                          StardictDictionary & dict_,
+                          bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -1349,39 +1280,40 @@ public:
 
 void StardictArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     vector< WordArticleLink > chain = dict.findArticles( word, ignoreDiacritics );
 
-    for( unsigned x = 0; x < alts.size(); ++x )
-    {
-      /// Make an additional query for each alt
+    //if alts has more than 100 , great probability that the dictionary is wrong produced or parsed.
+    if ( alts.size() < 100 ) {
+      for ( unsigned x = 0; x < alts.size(); ++x ) {
+        /// Make an additional query for each alt
 
-      vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
-
-      chain.insert( chain.end(), altChain.begin(), altChain.end() );
+        vector< WordArticleLink > altChain = dict.findArticles( alts[ x ], ignoreDiacritics );
+        if ( altChain.size() > 100 ) {
+          continue;
+        }
+        chain.insert( chain.end(), altChain.begin(), altChain.end() );
+      }
     }
 
     multimap< wstring, pair< string, string > > mainArticles, alternateArticles;
 
-    set< uint32_t > articlesIncluded; // Some synonims make it that the articles
+    set< uint32_t > articlesIncluded; // Some synonyms make it that the articles
                                       // appear several times. We combat this
                                       // by only allowing them to appear once.
 
     wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-    if( ignoreDiacritics )
+    if ( ignoreDiacritics )
       wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-    for( unsigned x = 0; x < chain.size(); ++x )
-    {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-      {
+    //if the chain is too large, it is more likely has some dictionary making or parsing issue.
+    for ( unsigned x = 0; x < qMin( 10, (int)chain.size() ); ++x ) {
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
         finish();
         return;
       }
@@ -1400,24 +1332,19 @@ void StardictArticleRequest::run()
 
       // We do the case-folded comparison here.
 
-      wstring headwordStripped =
-        Folding::applySimpleCaseOnly( headword );
-      if( ignoreDiacritics )
+      wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+      if ( ignoreDiacritics )
         headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
       multimap< wstring, pair< string, string > > & mapToUse =
-        ( wordCaseFolded == headwordStripped ) ?
-          mainArticles : alternateArticles;
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-      mapToUse.insert( pair(
-        Folding::applySimpleCaseOnly( headword ),
-        pair( headword, articleText ) ) );
+      mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
       articlesIncluded.insert( chain[ x ].articleOffset );
     }
 
-    if ( mainArticles.empty() && alternateArticles.empty() )
-    {
+    if ( mainArticles.empty() && alternateArticles.empty() ) {
       // No such word
       finish();
       return;
@@ -1429,42 +1356,35 @@ void StardictArticleRequest::run()
 
     string cleaner = Utils::Html::getHtmlCleaner();
 
-    for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-    {
-        result += dict.isFromLanguageRTL() ? R"(<h3 class="sdct_headwords" dir="rtl">)" : "<h3 class=\"sdct_headwords\">";
-        result += i->second.first;
-        result += "</h3>";
-        if( dict.isToLanguageRTL() )
-          result += R"(<div style="display:inline;" dir="rtl">)";
-        result += i->second.second;
-        result += cleaner;
-        if( dict.isToLanguageRTL() )
-          result += "</div>";
+    for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+      result += dict.isFromLanguageRTL() ? R"(<h3 class="sdct_headwords" dir="rtl">)" : "<h3 class=\"sdct_headwords\">";
+      result += i->second.first;
+      result += "</h3>";
+      if ( dict.isToLanguageRTL() )
+        result += R"(<div style="display:inline;" dir="rtl">)";
+      result += i->second.second;
+      result += cleaner;
+      if ( dict.isToLanguageRTL() )
+        result += "</div>";
     }
 
-    for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-    {
-        result += dict.isFromLanguageRTL() ? R"(<h3 class="sdct_headwords" dir="rtl">)" : "<h3 class=\"sdct_headwords\">";
-        result += i->second.first;
-        result += "</h3>";
-        if( dict.isToLanguageRTL() )
-          result += R"(<div style="display:inline;" dir="rtl">)";
-        result += i->second.second;
-        result += cleaner;
-        if( dict.isToLanguageRTL() )
-          result += "</div>";
+    for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+      result += dict.isFromLanguageRTL() ? R"(<h3 class="sdct_headwords" dir="rtl">)" : "<h3 class=\"sdct_headwords\">";
+      result += i->second.first;
+      result += "</h3>";
+      if ( dict.isToLanguageRTL() )
+        result += R"(<div style="display:inline;" dir="rtl">)";
+      result += i->second.second;
+      result += cleaner;
+      if ( dict.isToLanguageRTL() )
+        result += "</div>";
     }
 
-    QMutexLocker _( &dataMutex );
-
-    data.resize( result.size() );
-
-    memcpy( &data.front(), result.data(), result.size() );
+    appendString( result );
 
     hasAnyData = true;
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     setErrorString( QString::fromUtf8( e.what() ) );
   }
 
@@ -1475,9 +1395,9 @@ sptr< Dictionary::DataRequest > StardictDictionary::getArticle( wstring const &
                                                                 vector< wstring > const & alts,
                                                                 wstring const &,
                                                                 bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<StardictArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< StardictArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 
@@ -1489,7 +1409,10 @@ static char const * beginsWith( char const * substr, char const * str )
 }
 
 Ifo::Ifo( File::Class & f ):
-  wordcount( 0 ), synwordcount( 0 ), idxfilesize( 0 ), idxoffsetbits( 32 )
+  wordcount( 0 ),
+  synwordcount( 0 ),
+  idxfilesize( 0 ),
+  idxoffsetbits( 32 )
 {
   static string const versionEq( "version=" );
 
@@ -1498,76 +1421,56 @@ Ifo::Ifo( File::Class & f ):
   //GD_DPRINTF( "%s<\n", f.gets().c_str() );
   //GD_DPRINTF( "%s<\n", f.gets().c_str() );
 
-  if ( QString::fromUtf8(f.gets().c_str()) != "StarDict's dict ifo file" ||
-       f.gets().compare( 0, versionEq.size(), versionEq ) )
+  if ( QString::fromUtf8( f.gets().c_str() ) != "StarDict's dict ifo file"
+       || f.gets().compare( 0, versionEq.size(), versionEq ) )
     throw exNotAnIfoFile();
 
   /// Now go through the file and parse options
 
-  try
-  {
+  try {
     char option[ 16384 ];
 
-    for( ; ; )
-    {
+    for ( ;; ) {
       if ( !f.gets( option, sizeof( option ), true ) )
         break;
 
       if ( char const * val = beginsWith( "bookname=", option ) )
         bookname = val;
-      else
-      if ( char const * val = beginsWith( "wordcount=", option ) )
-      {
-        if ( sscanf( val, "%u", & wordcount ) != 1 )
+      else if ( char const * val = beginsWith( "wordcount=", option ) ) {
+        if ( sscanf( val, "%u", &wordcount ) != 1 )
           throw exBadFieldInIfo( option );
       }
-      else
-      if ( char const * val = beginsWith( "synwordcount=", option ) )
-      {
-        if ( sscanf( val, "%u", & synwordcount ) != 1 )
+      else if ( char const * val = beginsWith( "synwordcount=", option ) ) {
+        if ( sscanf( val, "%u", &synwordcount ) != 1 )
           throw exBadFieldInIfo( option );
       }
-      else
-      if ( char const * val = beginsWith( "idxfilesize=", option ) )
-      {
-        if ( sscanf( val, "%u", & idxfilesize ) != 1 )
+      else if ( char const * val = beginsWith( "idxfilesize=", option ) ) {
+        if ( sscanf( val, "%u", &idxfilesize ) != 1 )
           throw exBadFieldInIfo( option );
       }
-      else
-      if ( char const * val = beginsWith( "idxoffsetbits=", option ) )
-      {
-        if ( sscanf( val, "%u", & idxoffsetbits ) != 1 || ( idxoffsetbits != 32
-             && idxoffsetbits != 64 ) )
+      else if ( char const * val = beginsWith( "idxoffsetbits=", option ) ) {
+        if ( sscanf( val, "%u", &idxoffsetbits ) != 1 || ( idxoffsetbits != 32 && idxoffsetbits != 64 ) )
           throw exBadFieldInIfo( option );
       }
-      else
-      if ( char const * val = beginsWith( "sametypesequence=", option ) )
+      else if ( char const * val = beginsWith( "sametypesequence=", option ) )
         sametypesequence = val;
-      else
-      if ( char const * val = beginsWith( "dicttype=", option ) )
+      else if ( char const * val = beginsWith( "dicttype=", option ) )
         dicttype = val;
-      else
-      if ( char const * val = beginsWith( "description=", option ) )
+      else if ( char const * val = beginsWith( "description=", option ) )
         description = val;
-      else
-      if ( char const * val = beginsWith( "copyright=", option ) )
+      else if ( char const * val = beginsWith( "copyright=", option ) )
         copyright = val;
-      else
-      if ( char const * val = beginsWith( "author=", option ) )
+      else if ( char const * val = beginsWith( "author=", option ) )
         author = val;
-      else
-      if ( char const * val = beginsWith( "email=", option ) )
+      else if ( char const * val = beginsWith( "email=", option ) )
         email = val;
-      else
-      if ( char const * val = beginsWith( "website=", option ) )
+      else if ( char const * val = beginsWith( "website=", option ) )
         website = val;
-      else
-      if ( char const * val = beginsWith( "date=", option ) )
+      else if ( char const * val = beginsWith( "date=", option ) )
         date = val;
     }
   }
-  catch( File::exReadError & )
-  {
+  catch ( File::exReadError & ) {
   }
 }
 
@@ -1586,8 +1489,7 @@ class StardictResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  StardictResourceRequest( StardictDictionary & dict_,
-                      string const & resourceName_ ):
+  StardictResourceRequest( StardictDictionary & dict_, string const & resourceName_ ):
     dict( dict_ ),
     resourceName( resourceName_ )
   {
@@ -1613,35 +1515,31 @@ public:
 void StardictResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
-    if( resourceName.at( 0 ) == '\x1E' )
+  try {
+    if ( resourceName.at( 0 ) == '\x1E' )
       resourceName = resourceName.erase( 0, 1 );
-    if( resourceName.at( resourceName.length() - 1 ) == '\x1F' )
+    if ( resourceName.at( resourceName.length() - 1 ) == '\x1F' )
       resourceName.erase( resourceName.length() - 1, 1 );
 
-    string n = dict.getContainingFolder().toStdString() + Utils::Fs::separator() + "res" + Utils::Fs::separator() + resourceName;
+    string n =
+      dict.getContainingFolder().toStdString() + Utils::Fs::separator() + "res" + Utils::Fs::separator() + resourceName;
 
     GD_DPRINTF( "n is %s\n", n.c_str() );
 
-    try
-    {
+    try {
       QMutexLocker _( &dataMutex );
 
       File::loadFromFile( n, data );
     }
-    catch( File::exCantOpen & )
-    {
+    catch ( File::exCantOpen & ) {
       // Try reading from zip file
 
-      if ( dict.resourceZip.isOpen() )
-      {
+      if ( dict.resourceZip.isOpen() ) {
         QMutexLocker _( &dataMutex );
 
         if ( !dict.resourceZip.loadFile( Utf8::decode( resourceName ), data ) )
@@ -1651,16 +1549,14 @@ void StardictResourceRequest::run()
         throw;
     }
 
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
 
       QMutexLocker _( &dataMutex );
       GdTiff::tiff2img( data );
     }
 
-    if( Filetype::isNameOfCSS( resourceName ) )
-    {
+    if ( Filetype::isNameOfCSS( resourceName ) ) {
       QMutexLocker _( &dataMutex );
 
       QString css = QString::fromUtf8( data.data(), data.size() );
@@ -1668,34 +1564,30 @@ void StardictResourceRequest::run()
       // Correct some url's
 
       QString id = QString::fromUtf8( dict.getId().c_str() );
-      int pos = 0;
+      int pos    = 0;
 
-      QRegularExpression links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))",
-                                QRegularExpression::CaseInsensitiveOption );
+      QRegularExpression links( R"(url\(\s*(['"]?)([^'"]*)(['"]?)\s*\))", QRegularExpression::CaseInsensitiveOption );
 
       QString newCSS;
       QRegularExpressionMatchIterator it = links.globalMatch( css );
-      while( it.hasNext() )
-      {
+      while ( it.hasNext() ) {
         QRegularExpressionMatch match = it.next();
         newCSS += css.mid( pos, match.capturedStart() - pos );
         pos = match.capturedEnd();
 
         QString url = match.captured( 2 );
 
-        if( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0)
-        {
+        if ( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0 ) {
           // External link
           newCSS += match.captured();
           continue;
         }
 
-        QString newUrl = QString( "url(" ) + match.captured( 1 ) + "bres://"
-                                           + id + "/" + url + match.captured( 3 ) + ")";
+        QString newUrl =
+          QString( "url(" ) + match.captured( 1 ) + "bres://" + id + "/" + url + match.captured( 3 ) + ")";
         newCSS += newUrl;
       }
-      if( pos )
-      {
+      if ( pos ) {
         newCSS += css.mid( pos );
         css = newCSS;
         newCSS.clear();
@@ -1710,58 +1602,43 @@ void StardictResourceRequest::run()
     QMutexLocker _( &dataMutex );
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Stardict: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-              resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
-  catch( ... )
-  {
+  catch ( ... ) {
   }
 
   finish();
 }
 
 sptr< Dictionary::DataRequest > StardictDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<StardictResourceRequest>( *this, name );
+  return std::make_shared< StardictResourceRequest >( *this, name );
 }
 
 } // anonymous namespace
 
-static void findCorrespondingFiles( string const & ifo,
-                                    string & idx, string & dict, string & syn )
+static void findCorrespondingFiles( string const & ifo, string & idx, string & dict, string & syn )
 {
   string base( ifo, 0, ifo.size() - 3 );
 
-  if ( !(
-          File::tryPossibleName( base + "idx", idx ) ||
-          File::tryPossibleName( base + "idx.gz", idx ) ||
-          File::tryPossibleName( base + "idx.dz", idx ) ||
-          File::tryPossibleName( base + "IDX", idx ) ||
-          File::tryPossibleName( base + "IDX.GZ", idx ) ||
-          File::tryPossibleName( base + "IDX.DZ", idx )
-      ) )
+  if ( !( File::tryPossibleName( base + "idx", idx ) || File::tryPossibleName( base + "idx.gz", idx )
+          || File::tryPossibleName( base + "idx.dz", idx ) || File::tryPossibleName( base + "IDX", idx )
+          || File::tryPossibleName( base + "IDX.GZ", idx ) || File::tryPossibleName( base + "IDX.DZ", idx ) ) )
     throw exNoIdxFile( ifo );
 
-  if ( !(
-          File::tryPossibleName( base + "dict", dict ) ||
-          File::tryPossibleName( base + "dict.dz", dict ) ||
-          File::tryPossibleName( base + "DICT", dict ) ||
-          File::tryPossibleName( base + "dict.DZ", dict )
-      ) )
+  if ( !( File::tryPossibleName( base + "dict", dict ) || File::tryPossibleName( base + "dict.dz", dict )
+          || File::tryPossibleName( base + "DICT", dict ) || File::tryPossibleName( base + "dict.DZ", dict ) ) )
     throw exNoDictFile( ifo );
 
-  if ( !(
-         File::tryPossibleName( base + "syn", syn ) ||
-         File::tryPossibleName( base + "syn.gz", syn ) ||
-         File::tryPossibleName( base + "syn.dz", syn ) ||
-         File::tryPossibleName( base + "SYN", syn ) ||
-         File::tryPossibleName( base + "SYN.GZ", syn ) ||
-         File::tryPossibleName( base + "SYN.DZ", syn )
-     ) )
+  if ( !( File::tryPossibleName( base + "syn", syn ) || File::tryPossibleName( base + "syn.gz", syn )
+          || File::tryPossibleName( base + "syn.dz", syn ) || File::tryPossibleName( base + "SYN", syn )
+          || File::tryPossibleName( base + "SYN.GZ", syn ) || File::tryPossibleName( base + "SYN.DZ", syn ) ) )
     syn.clear();
 }
 
@@ -1769,7 +1646,8 @@ static void handleIdxSynFile( string const & fileName,
                               IndexedWords & indexedWords,
                               ChunkedStorage::Writer & chunks,
                               vector< uint32_t > * articleOffsets,
-                              bool isSynFile, bool parseHeadwords )
+                              bool isSynFile,
+                              bool parseHeadwords )
 {
   gzFile stardictIdx = gd_gzopen( fileName.c_str() );
   if ( !stardictIdx )
@@ -1777,22 +1655,19 @@ static void handleIdxSynFile( string const & fileName,
 
   vector< char > image;
 
-  for( ; ; )
-  {
+  for ( ;; ) {
     size_t oldSize = image.size();
 
     image.resize( oldSize + 65536 );
 
     int rd = gzread( stardictIdx, &image.front() + oldSize, 65536 );
 
-    if ( rd < 0 )
-    {
+    if ( rd < 0 ) {
       gzclose( stardictIdx );
       throw exCantReadFile( fileName );
     }
 
-    if ( rd != 65536 )
-    {
+    if ( rd != 65536 ) {
       image.resize( oldSize + rd + 1 );
       break;
     }
@@ -1805,14 +1680,10 @@ static void handleIdxSynFile( string const & fileName,
 
   // Now parse it
 
-  for( char const * ptr = &image.front(); ptr != &image.back(); )
-  {
+  for ( char const * ptr = &image.front(); ptr != &image.back(); ) {
     size_t wordLen = strlen( ptr );
 
-    if ( ptr + wordLen + 1 + ( isSynFile ? sizeof( uint32_t ) :
-                                           sizeof( uint32_t ) * 2 ) >
-         &image.back() )
-    {
+    if ( ptr + wordLen + 1 + ( isSynFile ? sizeof( uint32_t ) : sizeof( uint32_t ) * 2 ) > &image.back() ) {
       GD_FDPRINTF( stderr, "Warning: sudden end of file %s\n", fileName.c_str() );
       break;
     }
@@ -1823,16 +1694,14 @@ static void handleIdxSynFile( string const & fileName,
 
     uint32_t offset;
 
-    if( strstr( word, "&#" ) )
-    {
+    if ( strstr( word, "&#" ) ) {
       // Decode some html-coded symbols in headword
       string unescapedWord = Html::unescapeUtf8( word );
       strncpy( (char *)word, unescapedWord.c_str(), wordLen );
       wordLen = strlen( word );
     }
 
-    if ( !isSynFile )
-    {
+    if ( !isSynFile ) {
       // We're processing the .idx file
       uint32_t articleOffset, articleSize;
 
@@ -1842,7 +1711,7 @@ static void handleIdxSynFile( string const & fileName,
       ptr += sizeof( uint32_t );
 
       articleOffset = ntohl( articleOffset );
-      articleSize = ntohl( articleSize );
+      articleSize   = ntohl( articleSize );
 
       // Create an entry for the article in the chunked storage
 
@@ -1855,8 +1724,7 @@ static void handleIdxSynFile( string const & fileName,
       chunks.addToBlock( &articleSize, sizeof( uint32_t ) );
       chunks.addToBlock( word, wordLen + 1 );
     }
-    else
-    {
+    else {
       // We're processing the .syn file
       uint32_t offsetInIndex;
 
@@ -1868,7 +1736,7 @@ static void handleIdxSynFile( string const & fileName,
       if ( offsetInIndex >= articleOffsets->size() )
         throw exIncorrectOffset( fileName );
 
-      offset = (*articleOffsets)[ offsetInIndex ];
+      offset = ( *articleOffsets )[ offsetInIndex ];
 
       // Some StarDict dictionaries are in fact badly converted Babylon ones.
       // They contain a lot of superfluous slashed entries with dollar signs.
@@ -1877,49 +1745,46 @@ static void handleIdxSynFile( string const & fileName,
       // punctuation folding. Hopefully there are not a whole lot of valid
       // synonyms which really start from slash and contain dollar signs, or
       // end with dollar and contain slashes.
-      if ( *word == '/' )
-      {
+      if ( *word == '/' ) {
         if ( strchr( word, '$' ) )
           continue; // Skip this entry
       }
-      else
-      if ( wordLen && word[ wordLen - 1 ] == '$' )
-      {
+      else if ( wordLen && word[ wordLen - 1 ] == '$' ) {
         if ( strchr( word, '/' ) )
           continue; // Skip this entry
       }
+
+      // if the entry is hypen, skip
+      if ( wordLen == 1 && *word == '-' ) {
+        continue; // Skip this entry
+      }
     }
 
     // Insert new entry into an index
 
-    if( parseHeadwords )
+    if ( parseHeadwords )
       indexedWords.addWord( Utf8::decode( word ), offset );
     else
       indexedWords.addSingleWord( Utf8::decode( word ), offset );
   }
 
-  GD_DPRINTF( "%u entires made\n", (unsigned) indexedWords.size() );
+  GD_DPRINTF( "%u entires made\n", (unsigned)indexedWords.size() );
 }
 
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing,
-                                      unsigned maxHeadwordsToExpand )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing,
+                                                      unsigned maxHeadwordsToExpand )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
-    if ( i->size() < 4 ||
-        strcasecmp( i->c_str() + ( i->size() - 4 ), ".ifo" ) != 0 )
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
+    if ( i->size() < 4 || strcasecmp( i->c_str() + ( i->size() - 4 ), ".ifo" ) != 0 )
       continue;
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, *i );
 
       string idxFileName, dictFileName, synFileName;
@@ -1938,18 +1803,16 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
       string baseName =
         QDir( QString::fromStdString( idxFileName ) ).absolutePath().toStdString() + Utils::Fs::separator();
 
-      if ( File::tryPossibleZipName( baseName + "res.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + "RES.ZIP", zipFileName ) ||
-           File::tryPossibleZipName( baseName + "res" + Utils::Fs::separator() + "res.zip", zipFileName ) )
+      if ( File::tryPossibleZipName( baseName + "res.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + "RES.ZIP", zipFileName )
+           || File::tryPossibleZipName( baseName + "res" + Utils::Fs::separator() + "res.zip", zipFileName ) )
         dictFiles.push_back( zipFileName );
 
       string dictId = Dictionary::makeDictionaryId( dictFiles );
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
 
         File::Class ifoFile( *i, "r" );
@@ -1964,18 +1827,15 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         if ( ifo.dicttype.size() )
           throw exDicttypeNotSupported();
 
-        if( synFileName.empty() )
-        {
-          if ( ifo.synwordcount )
-          {
-            GD_DPRINTF( "Warning: dictionary has synwordcount specified, but no "
-                        "corresponding .syn file was found\n" );
-            ifo.synwordcount = 0;  // Pretend it wasn't there
+        if ( synFileName.empty() ) {
+          if ( ifo.synwordcount ) {
+            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 )
-        {
+        else if ( !ifo.synwordcount ) {
           GD_DPRINTF( "Warning: ignoring .syn file %s, since there's no synwordcount in .ifo specified\n",
                       synFileName.c_str() );
         }
@@ -2006,19 +1866,28 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         // Load indices
         if ( !ifo.synwordcount )
-          handleIdxSynFile( idxFileName, indexedWords, chunks, 0, false,
+          handleIdxSynFile( idxFileName,
+                            indexedWords,
+                            chunks,
+                            0,
+                            false,
                             !maxHeadwordsToExpand || ifo.wordcount < maxHeadwordsToExpand );
-        else
-        {
+        else {
           vector< uint32_t > articleOffsets;
 
           articleOffsets.reserve( ifo.wordcount );
 
-          handleIdxSynFile( idxFileName, indexedWords, chunks, &articleOffsets,
+          handleIdxSynFile( idxFileName,
+                            indexedWords,
+                            chunks,
+                            &articleOffsets,
                             false,
                             !maxHeadwordsToExpand || ( ifo.wordcount + ifo.synwordcount ) < maxHeadwordsToExpand );
 
-          handleIdxSynFile( synFileName, indexedWords, chunks, &articleOffsets,
+          handleIdxSynFile( synFileName,
+                            indexedWords,
+                            chunks,
+                            &articleOffsets,
                             true,
                             !maxHeadwordsToExpand || ( ifo.wordcount + ifo.synwordcount ) < maxHeadwordsToExpand );
         }
@@ -2032,36 +1901,32 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
         idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-        idxHeader.indexRootOffset = idxInfo.rootOffset;
+        idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
         // That concludes it. Update the header.
 
-        idxHeader.signature = Signature;
+        idxHeader.signature     = Signature;
         idxHeader.formatVersion = CurrentFormatVersion;
 
-        idxHeader.wordCount = ifo.wordcount;
-        idxHeader.synWordCount = ifo.synwordcount;
-        idxHeader.bookNameSize = ifo.bookname.size();
+        idxHeader.wordCount            = ifo.wordcount;
+        idxHeader.synWordCount         = ifo.synwordcount;
+        idxHeader.bookNameSize         = ifo.bookname.size();
         idxHeader.sameTypeSequenceSize = ifo.sametypesequence.size();
 
         // read languages
-        QPair<quint32,quint32> langs =
-            LangCoder::findIdsForFilename( QString::fromStdString( dictFileName ) );
+        QPair< quint32, quint32 > langs = LangCoder::findIdsForFilename( QString::fromStdString( dictFileName ) );
 
         // if no languages found, try dictionary's name
-        if ( langs.first == 0 || langs.second == 0 )
-        {
-          langs =
-            LangCoder::findIdsForFilename( QString::fromStdString( ifo.bookname ) );
+        if ( langs.first == 0 || langs.second == 0 ) {
+          langs = LangCoder::findIdsForFilename( QString::fromStdString( ifo.bookname ) );
         }
 
         idxHeader.langFrom = langs.first;
-        idxHeader.langTo = langs.second;
+        idxHeader.langTo   = langs.second;
 
         // If there was a zip file, index it too
 
-        if ( zipFileName.size() )
-        {
+        if ( zipFileName.size() ) {
           GD_DPRINTF( "Indexing zip file\n" );
 
           idxHeader.hasZipFile = 1;
@@ -2071,21 +1936,19 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           if ( zipFile.openZipFile( QDir::fromNativeSeparators( zipFileName.c_str() ) ) )
             zipFile.indexFile( zipFileNames );
 
-          if( !zipFileNames.empty() )
-          {
+          if ( !zipFileNames.empty() ) {
             // Build the resulting zip file index
 
             IndexInfo idxInfo = BtreeIndexing::buildIndex( zipFileNames, idx );
 
             idxHeader.zipIndexBtreeMaxElements = idxInfo.btreeMaxElements;
-            idxHeader.zipIndexRootOffset = idxInfo.rootOffset;
+            idxHeader.zipIndexRootOffset       = idxInfo.rootOffset;
           }
-          else
-          {
+          else {
             // Bad zip file -- no index (though the mark that we have one
             // remains)
             idxHeader.zipIndexBtreeMaxElements = 0;
-            idxHeader.zipIndexRootOffset = 0;
+            idxHeader.zipIndexRootOffset       = 0;
           }
         }
         else
@@ -2098,14 +1961,10 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         idx.write( &idxHeader, sizeof( idxHeader ) );
       }
 
-      dictionaries.push_back( std::make_shared<StardictDictionary>( dictId,
-                                                      indexFile,
-                                                      dictFiles ) );
+      dictionaries.push_back( std::make_shared< StardictDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "Stardict dictionary initializing failed: %s, error: %s\n",
-                 i->c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "Stardict dictionary initializing failed: %s, error: %s\n", i->c_str(), e.what() );
     }
   }
 
@@ -2113,4 +1972,4 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 }
 
 
-}
+} // namespace Stardict
diff --git a/src/dict/stardict.hh b/src/dict/stardict.hh
index bfe82a23..e4cd3a5f 100644
--- a/src/dict/stardict.hh
+++ b/src/dict/stardict.hh
@@ -12,13 +12,11 @@ namespace Stardict {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing &,
-                                      unsigned maxHeadwordsToExpand )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing &,
+                                                      unsigned maxHeadwordsToExpand );
 
-}
+} // namespace Stardict
 
 #endif
diff --git a/src/dict/transliteration.cc b/src/dict/transliteration.cc
index 7548fae6..51ed315f 100644
--- a/src/dict/transliteration.cc
+++ b/src/dict/transliteration.cc
@@ -18,42 +18,52 @@ BaseTransliterationDictionary::BaseTransliterationDictionary( string const & id,
   name( name_ ),
   caseSensitive( caseSensitive_ )
 {
-  dictionaryIcon = dictionaryNativeIcon = icon_;
+  dictionaryIcon       = icon_;
   dictionaryIconLoaded = true;
 }
 
 string BaseTransliterationDictionary::getName() noexcept
-{ return name; }
+{
+  return name;
+}
 
 map< Dictionary::Property, string > BaseTransliterationDictionary::getProperties() noexcept
-{ return map< Dictionary::Property, string >(); }
+{
+  return map< Dictionary::Property, string >();
+}
 
 unsigned long BaseTransliterationDictionary::getArticleCount() noexcept
-{ return 0; }
+{
+  return 0;
+}
 
 unsigned long BaseTransliterationDictionary::getWordCount() noexcept
-{ return 0; }
+{
+  return 0;
+}
 
-sptr< Dictionary::WordSearchRequest > BaseTransliterationDictionary::prefixMatch( wstring const &,
-                                                                                  unsigned long ) 
-{ return std::make_shared<Dictionary::WordSearchRequestInstant>(); }
+sptr< Dictionary::WordSearchRequest > BaseTransliterationDictionary::prefixMatch( wstring const &, unsigned long )
+{
+  return std::make_shared< Dictionary::WordSearchRequestInstant >();
+}
 
-sptr< Dictionary::DataRequest > BaseTransliterationDictionary::getArticle( wstring const &,
-                                                                           vector< wstring > const &,
-                                                                           wstring const &, bool )
-  
-{ return std::make_shared<Dictionary::DataRequestInstant>( false ); }
+sptr< Dictionary::DataRequest >
+BaseTransliterationDictionary::getArticle( wstring const &, vector< wstring > const &, wstring const &, bool )
+
+{
+  return std::make_shared< Dictionary::DataRequestInstant >( false );
+}
 
 sptr< Dictionary::WordSearchRequest > BaseTransliterationDictionary::findHeadwordsForSynonym( wstring const & str )
-  
+
 {
-  sptr< Dictionary::WordSearchRequestInstant > result = std::make_shared<Dictionary::WordSearchRequestInstant>();
+  sptr< Dictionary::WordSearchRequestInstant > result = std::make_shared< Dictionary::WordSearchRequestInstant >();
 
   vector< wstring > alts = getAlternateWritings( str );
 
-  GD_DPRINTF( "alts = %u\n", (unsigned) alts.size() );
+  GD_DPRINTF( "alts = %u\n", (unsigned)alts.size() );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
+  for ( unsigned x = 0; x < alts.size(); ++x )
     result->getMatches().push_back( alts[ x ] );
 
   return result;
@@ -67,57 +77,46 @@ void Table::ins( char const * from, char const * to )
   if ( fr.size() > maxEntrySize )
     maxEntrySize = fr.size();
 
-  insert( std::pair< wstring, wstring >( fr,
-                                         Utf8::decode( std::string( to ) ) ) );
+  insert( std::pair< wstring, wstring >( fr, Utf8::decode( std::string( to ) ) ) );
 }
 
 
-TransliterationDictionary::TransliterationDictionary( string const & id,
-                                                      string const & name_,
-                                                      QIcon icon_,
-                                                      Table const & table_,
-                                                      bool caseSensitive_ ):
-  BaseTransliterationDictionary(id, name_, icon_, caseSensitive_),
+TransliterationDictionary::TransliterationDictionary(
+  string const & id, string const & name_, QIcon icon_, Table const & table_, bool caseSensitive_ ):
+  BaseTransliterationDictionary( id, name_, icon_, caseSensitive_ ),
   table( table_ )
 {
 }
 
-vector< wstring > TransliterationDictionary::getAlternateWritings( wstring const & str )
-  noexcept
+vector< wstring > TransliterationDictionary::getAlternateWritings( wstring const & str ) noexcept
 {
   vector< wstring > results;
 
   wstring result, folded;
   wstring const * target;
 
-  if ( caseSensitive )
-  {
+  if ( caseSensitive ) {
     // Don't do any transform -- the transliteration is case-sensitive
     target = &str;
   }
-  else
-  {
+  else {
     folded = Folding::applySimpleCaseOnly( str );
     target = &folded;
   }
 
   wchar const * ptr = target->c_str();
-  size_t left = target->size();
+  size_t left       = target->size();
 
   Table::const_iterator i;
 
-  while( left )
-  {
+  while ( left ) {
     unsigned x;
 
-    for( x = table.getMaxEntrySize(); x >= 1; --x )
-    {
-      if ( left >= x )
-      {
+    for ( x = table.getMaxEntrySize(); x >= 1; --x ) {
+      if ( left >= x ) {
         i = table.find( wstring( ptr, x ) );
 
-        if ( i != table.end() )
-        {
+        if ( i != table.end() ) {
           result.append( i->second );
           ptr += x;
           left -= x;
@@ -126,8 +125,7 @@ vector< wstring > TransliterationDictionary::getAlternateWritings( wstring const
       }
     }
 
-    if ( !x )
-    {
+    if ( !x ) {
       // No matches -- add this char as it is
       result.push_back( *ptr++ );
       --left;
@@ -140,4 +138,4 @@ vector< wstring > TransliterationDictionary::getAlternateWritings( wstring const
   return results;
 }
 
-}
+} // namespace Transliteration
diff --git a/src/dict/transliteration.hh b/src/dict/transliteration.hh
index b35a9785..3a66cb48 100644
--- a/src/dict/transliteration.hh
+++ b/src/dict/transliteration.hh
@@ -25,8 +25,7 @@ protected:
 
 public:
 
-  BaseTransliterationDictionary( string const & id, string const & name,
-                                 QIcon icon, bool caseSensitive = true );
+  BaseTransliterationDictionary( string const & id, string const & name, QIcon icon, bool caseSensitive = true );
 
   virtual string getName() noexcept;
 
@@ -36,19 +35,14 @@ public:
 
   virtual unsigned long getWordCount() noexcept;
 
-  virtual vector< wstring > getAlternateWritings( wstring const & )
-    noexcept = 0;
+  virtual vector< wstring > getAlternateWritings( wstring const & ) noexcept = 0;
 
-  virtual sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & )
-    ;
+  virtual sptr< Dictionary::WordSearchRequest > findHeadwordsForSynonym( wstring const & );
 
-  virtual sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &,
-                                                             unsigned long ) ;
+  virtual sptr< Dictionary::WordSearchRequest > prefixMatch( wstring const &, unsigned long );
 
-  virtual sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const &,
-                                                      wstring const &, bool )
-    ;
+  virtual sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const &, wstring const &, bool );
 };
 
 
@@ -58,11 +52,15 @@ class Table: public map< wstring, wstring >
 
 public:
 
-  Table(): maxEntrySize( 0 )
-  {}
+  Table():
+    maxEntrySize( 0 )
+  {
+  }
 
   unsigned getMaxEntrySize() const
-  { return maxEntrySize; }
+  {
+    return maxEntrySize;
+  }
 
 protected:
 
@@ -79,15 +77,12 @@ class TransliterationDictionary: public BaseTransliterationDictionary
 
 public:
 
-  TransliterationDictionary( string const & id, string const & name,
-                             QIcon icon,
-                             Table const & table,
-                             bool caseSensitive = true );
+  TransliterationDictionary(
+    string const & id, string const & name, QIcon icon, Table const & table, bool caseSensitive = true );
 
-  virtual vector< wstring > getAlternateWritings( wstring const & )
-    noexcept;
+  virtual vector< wstring > getAlternateWritings( wstring const & ) noexcept;
 };
 
-}
+} // namespace Transliteration
 
 #endif
diff --git a/src/dict/voiceengines.cc b/src/dict/voiceengines.cc
index 259c8be6..771f7b1c 100644
--- a/src/dict/voiceengines.cc
+++ b/src/dict/voiceengines.cc
@@ -16,8 +16,7 @@
 
 #include "utils.hh"
 
-namespace VoiceEngines
-{
+namespace VoiceEngines {
 
 using namespace Dictionary;
 using std::string;
@@ -37,51 +36,51 @@ private:
 public:
 
   VoiceEnginesDictionary( Config::VoiceEngine const & voiceEngine ):
-    Dictionary::Class(
-      toMd5( voiceEngine.name.toUtf8() ),
-      vector< string >() ),
+    Dictionary::Class( toMd5( voiceEngine.name.toUtf8() ), vector< string >() ),
     voiceEngine( voiceEngine )
   {
   }
 
   string getName() noexcept override
-  { return voiceEngine.name.toUtf8().data(); }
+  {
+    return voiceEngine.name.toUtf8().data();
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const & word,
-                                                 unsigned long maxResults ) override
-    ;
+  sptr< WordSearchRequest > prefixMatch( wstring const & word, unsigned long maxResults ) override;
 
-  sptr< DataRequest > getArticle( wstring const &,
-                                          vector< wstring > const & alts,
-                                          wstring const &, bool ) override
-    ;
+  sptr< DataRequest > getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ) override;
 
 protected:
 
   void loadIcon() noexcept override;
 };
 
-sptr< WordSearchRequest > VoiceEnginesDictionary::prefixMatch( wstring const & /*word*/,
-                                                               unsigned long /*maxResults*/ )
-  
+sptr< WordSearchRequest > VoiceEnginesDictionary::prefixMatch( wstring const & /*word*/, unsigned long /*maxResults*/ )
+
 {
   WordSearchRequestInstant * sr = new WordSearchRequestInstant();
   sr->setUncertain( true );
-  return std::shared_ptr<WordSearchRequestInstant>(sr);
+  return std::shared_ptr< WordSearchRequestInstant >( sr );
 }
 
-sptr< Dictionary::DataRequest > VoiceEnginesDictionary::getArticle(
-  wstring const & word, vector< wstring > const &, wstring const &, bool )
-  
+sptr< Dictionary::DataRequest >
+VoiceEnginesDictionary::getArticle( wstring const & word, vector< wstring > const &, wstring const &, bool )
+
 {
   string result;
   string wordUtf8( Utf8::encode( word ) );
@@ -92,21 +91,20 @@ sptr< Dictionary::DataRequest > VoiceEnginesDictionary::getArticle(
   url.setScheme( "gdtts" );
   url.setHost( "localhost" );
   url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( wordUtf8.c_str() ) ) );
-  QList< QPair<QString, QString> > query;
-  query.push_back( QPair<QString, QString>( "engine", QString::fromStdString( getId() ) ) );
+  QList< QPair< QString, QString > > query;
+  query.push_back( QPair< QString, QString >( "engine", QString::fromStdString( getId() ) ) );
   Utils::Url::setQueryItems( url, query );
 
   string encodedUrl = url.toEncoded().data();
-  string ref = string( "\"" ) + encodedUrl + "\"";
+  string ref        = string( "\"" ) + encodedUrl + "\"";
   result += addAudioLink( ref, getId() );
 
   result += "<td><a href=" + ref + R"(><img src="qrc:///icons/playsound.png" border="0" alt="Play"/></a></td>)";
   result += "<td><a href=" + ref + ">" + Html::escape( wordUtf8 ) + "</a></td>";
   result += "</tr></table>";
 
-  sptr< DataRequestInstant > ret = std::make_shared<DataRequestInstant>( true );
-  ret->getData().resize( result.size() );
-  memcpy( &( ret->getData().front() ), result.data(), result.size() );
+  auto ret = std::make_shared< DataRequestInstant >( true );
+  ret->appendString( result );
   return ret;
 }
 
@@ -115,30 +113,27 @@ void VoiceEnginesDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if ( !voiceEngine.iconFilename.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), voiceEngine.iconFilename );
+  if ( !voiceEngine.iconFilename.isEmpty() ) {
+    QFileInfo fInfo( QDir( Config::getConfigDir() ), voiceEngine.iconFilename );
     if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
   if ( dictionaryIcon.isNull() )
-    dictionaryIcon = dictionaryNativeIcon = QIcon( ":/icons/text2speech.svg" );
+    dictionaryIcon = QIcon( ":/icons/text2speech.svg" );
   dictionaryIconLoaded = true;
 }
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-  Config::VoiceEngines const & voiceEngines )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::VoiceEngines const & voiceEngines )
+
 {
   vector< sptr< Dictionary::Class > > result;
 
-  for ( Config::VoiceEngines::const_iterator i = voiceEngines.begin(); i != voiceEngines.end(); ++i )
-  {
+  for ( Config::VoiceEngines::const_iterator i = voiceEngines.begin(); i != voiceEngines.end(); ++i ) {
     if ( i->enabled )
-      result.push_back( std::make_shared<VoiceEnginesDictionary>( *i ) );
+      result.push_back( std::make_shared< VoiceEnginesDictionary >( *i ) );
   }
 
   return result;
 }
 
-}
+} // namespace VoiceEngines
diff --git a/src/dict/voiceengines.hh b/src/dict/voiceengines.hh
index e3d94acb..ae54a126 100644
--- a/src/dict/voiceengines.hh
+++ b/src/dict/voiceengines.hh
@@ -17,9 +17,8 @@ using std::vector;
 using std::string;
 using gd::wstring;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(Config::VoiceEngines const & voiceEngines)
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::VoiceEngines const & voiceEngines );
 
-}
+} // namespace VoiceEngines
 
 #endif
diff --git a/src/dict/website.cc b/src/dict/website.cc
index 1a496b2d..6e1cefd7 100644
--- a/src/dict/website.cc
+++ b/src/dict/website.cc
@@ -30,7 +30,8 @@ class WebSiteDictionary: public Dictionary::Class
 
 public:
 
-  WebSiteDictionary( string const & id, string const & name_,
+  WebSiteDictionary( string const & id,
+                     string const & name_,
                      QString const & urlTemplate_,
                      QString const & iconFilename_,
                      bool inside_iframe_,
@@ -40,39 +41,43 @@ public:
     iconFilename( iconFilename_ ),
     inside_iframe( inside_iframe_ ),
     netMgr( netMgr_ ),
-    experimentalIframe(false)
+    experimentalIframe( false )
   {
-    if( urlTemplate_.startsWith( "http://" ) || urlTemplate_.startsWith( "https://" ) )
-    {
+    if ( urlTemplate_.startsWith( "http://" ) || urlTemplate_.startsWith( "https://" ) ) {
       experimentalIframe = true;
     }
     //else file:/// local dictionary file path
 
-    urlTemplate = QUrl( urlTemplate_ ).toEncoded() ;
+    urlTemplate           = QUrl( urlTemplate_ ).toEncoded();
     dictionaryDescription = urlTemplate_;
   }
 
   string getName() noexcept override
-  { return name; }
+  {
+    return name;
+  }
 
   map< Property, string > getProperties() noexcept override
-  { return map< Property, string >(); }
+  {
+    return map< Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return 0; }
+  {
+    return 0;
+  }
 
-  sptr< WordSearchRequest > prefixMatch( wstring const & word,
-                                                 unsigned long ) override ;
+  sptr< WordSearchRequest > prefixMatch( wstring const & word, unsigned long ) override;
 
-  sptr< DataRequest > getArticle( wstring const &,
-                                          vector< wstring > const & alts,
-                                          wstring const & context, bool ) override
-    ;
+  sptr< DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const & context, bool ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
   void isolateWebCSS( QString & css );
 
@@ -81,10 +86,9 @@ protected:
   void loadIcon() noexcept override;
 };
 
-sptr< WordSearchRequest > WebSiteDictionary::prefixMatch( wstring const & /*word*/,
-                                                          unsigned long ) 
+sptr< WordSearchRequest > WebSiteDictionary::prefixMatch( wstring const & /*word*/, unsigned long )
 {
-  sptr< WordSearchRequestInstant > sr = std::make_shared<WordSearchRequestInstant>();
+  sptr< WordSearchRequestInstant > sr = std::make_shared< WordSearchRequestInstant >();
 
   sr->setUncertain( true );
 
@@ -105,10 +109,8 @@ class WebSiteArticleRequest: public WebSiteDataRequestSlots
 
 public:
 
-  WebSiteArticleRequest( QString const & url, QNetworkAccessManager & _mgr,
-                         Class * dictPtr_ );
-  ~WebSiteArticleRequest()
-  {}
+  WebSiteArticleRequest( QString const & url, QNetworkAccessManager & _mgr, Class * dictPtr_ );
+  ~WebSiteArticleRequest() {}
 
   void cancel() override;
 
@@ -123,13 +125,15 @@ void WebSiteArticleRequest::cancel()
   finish();
 }
 
-WebSiteArticleRequest::WebSiteArticleRequest( QString const & url_,
-                                              QNetworkAccessManager & _mgr,
-                                              Class * dictPtr_ ):
-  url( url_ ), dictPtr( dictPtr_ ), mgr( _mgr )
+WebSiteArticleRequest::WebSiteArticleRequest( QString const & url_, QNetworkAccessManager & _mgr, Class * dictPtr_ ):
+  url( url_ ),
+  dictPtr( dictPtr_ ),
+  mgr( _mgr )
 {
-  connect( &mgr, SIGNAL( finished( QNetworkReply * ) ),
-           this, SLOT( requestFinished( QNetworkReply * ) ),
+  connect( &mgr,
+           SIGNAL( finished( QNetworkReply * ) ),
+           this,
+           SLOT( requestFinished( QNetworkReply * ) ),
            Qt::QueuedConnection );
 
   QUrl reqUrl( url );
@@ -139,8 +143,7 @@ WebSiteArticleRequest::WebSiteArticleRequest( QString const & url_,
   netReply = mgr.get( request );
 
 #ifndef QT_NO_SSL
-  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ),
-           netReply, SLOT( ignoreSslErrors() ) );
+  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) );
 #endif
 }
 
@@ -154,26 +157,22 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
   if ( isFinished() ) // Was cancelled
     return;
 
-  if ( r != netReply )
-  {
+  if ( r != netReply ) {
     // Well, that's not our reply, don't do anything
     return;
   }
 
-  if ( netReply->error() == QNetworkReply::NoError )
-  {
+  if ( netReply->error() == QNetworkReply::NoError ) {
     // Check for redirect reply
 
     QVariant possibleRedirectUrl = netReply->attribute( QNetworkRequest::RedirectionTargetAttribute );
-    QUrl redirectUrl = possibleRedirectUrl.toUrl();
-    if( !redirectUrl.isEmpty() )
-    {
+    QUrl redirectUrl             = possibleRedirectUrl.toUrl();
+    if ( !redirectUrl.isEmpty() ) {
       disconnect( netReply, 0, 0, 0 );
       netReply->deleteLater();
       netReply = mgr.get( QNetworkRequest( redirectUrl ) );
 #ifndef QT_NO_SSL
-      connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ),
-               netReply, SLOT( ignoreSslErrors() ) );
+      connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) );
 #endif
       return;
     }
@@ -184,7 +183,7 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
     QString articleString;
 
     QTextCodec * codec = WebSiteArticleRequest::codecForHtml( replyData );
-    if( codec )
+    if ( codec )
       articleString = codec->toUnicode( replyData );
     else
       articleString = QString::fromUtf8( replyData );
@@ -193,18 +192,16 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
 
     QString root = netReply->url().scheme() + "://" + netReply->url().host();
     QString base = root + netReply->url().path();
-    while( !base.isEmpty() && !base.endsWith( "/" ) )
+    while ( !base.isEmpty() && !base.endsWith( "/" ) )
       base.chop( 1 );
 
     QRegularExpression tags( R"(<\s*(a|link|img|script)\s+[^>]*(src|href)\s*=\s*['"][^>]+>)",
                              QRegularExpression::CaseInsensitiveOption );
-    QRegularExpression links( R"(\b(src|href)\s*=\s*(['"])([^'"]+['"]))",
-                              QRegularExpression::CaseInsensitiveOption );
+    QRegularExpression links( R"(\b(src|href)\s*=\s*(['"])([^'"]+['"]))", QRegularExpression::CaseInsensitiveOption );
     int pos = 0;
     QString articleNewString;
     QRegularExpressionMatchIterator it = tags.globalMatch( articleString );
-    while( it.hasNext() )
-    {
+    while ( it.hasNext() ) {
       QRegularExpressionMatch match = it.next();
       articleNewString += articleString.mid( pos, match.capturedStart() - pos );
       pos = match.capturedEnd();
@@ -212,28 +209,24 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
       QString tag = match.captured();
 
       QRegularExpressionMatch match_links = links.match( tag );
-      if( !match_links.hasMatch() )
-      {
+      if ( !match_links.hasMatch() ) {
         articleNewString += tag;
         continue;
       }
 
       QString url = match_links.captured( 3 );
 
-      if( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0
-          || url.indexOf( "mailto:" ) >= 0 || url.startsWith( "#" )
-          || url.startsWith( "javascript:" ) )
-      {
+      if ( url.indexOf( ":/" ) >= 0 || url.indexOf( "data:" ) >= 0 || url.indexOf( "mailto:" ) >= 0
+           || url.startsWith( "#" ) || url.startsWith( "javascript:" ) ) {
         // External link, anchor or base64-encoded data
         articleNewString += tag;
         continue;
       }
 
       QString newUrl = match_links.captured( 1 ) + "=" + match_links.captured( 2 );
-      if( url.startsWith( "//" ) )
+      if ( url.startsWith( "//" ) )
         newUrl += netReply->url().scheme() + ":";
-      else
-      if( url.startsWith( "/" ) )
+      else if ( url.startsWith( "/" ) )
         newUrl += root;
       else
         newUrl += base;
@@ -242,8 +235,7 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
       tag.replace( match_links.capturedStart(), match_links.capturedLength(), newUrl );
       articleNewString += tag;
     }
-    if( pos )
-    {
+    if ( pos ) {
       articleNewString += articleString.mid( pos );
       articleString = articleNewString;
       articleNewString.clear();
@@ -252,61 +244,49 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
     // Redirect CSS links to own handler
 
     QString prefix = QString( "bres://" ) + dictPtr->getId().c_str() + "/";
-    QRegularExpression linkTags( R"((<\s*link\s[^>]*rel\s*=\s*['"]stylesheet['"]\s+[^>]*href\s*=\s*['"])([^'"]+)://([^'"]+['"][^>]+>))",
-                                 QRegularExpression::CaseInsensitiveOption );
+    QRegularExpression linkTags(
+      R"((<\s*link\s[^>]*rel\s*=\s*['"]stylesheet['"]\s+[^>]*href\s*=\s*['"])([^'"]+)://([^'"]+['"][^>]+>))",
+      QRegularExpression::CaseInsensitiveOption );
     pos = 0;
-    it = linkTags.globalMatch( articleString );
+    it  = linkTags.globalMatch( articleString );
 
-    while( it.hasNext() )
-    {
+    while ( it.hasNext() ) {
       QRegularExpressionMatch match = it.next();
       articleNewString += articleString.mid( pos, match.capturedStart() - pos );
       pos = match.capturedEnd();
 
-      QString newTag = match.captured( 1 ) + prefix + match.captured( 2 )
-                       + "/" + match.captured( 3 );
+      QString newTag = match.captured( 1 ) + prefix + match.captured( 2 ) + "/" + match.captured( 3 );
       articleNewString += newTag;
     }
-    if( pos )
-    {
+    if ( pos ) {
       articleNewString += articleString.mid( pos );
       articleString = articleNewString;
       articleNewString.clear();
     }
 
     // See Issue #271: A mechanism to clean-up invalid HTML cards.
-    articleString += QString::fromStdString(Utils::Html::getHtmlCleaner());
+    articleString += QString::fromStdString( Utils::Html::getHtmlCleaner() );
 
-    QByteArray articleBody = articleString.toUtf8();
 
     QString divStr = QString( "<div class=\"website\"" );
     divStr += dictPtr->isToLanguageRTL() ? " dir=\"rtl\">" : ">";
 
-    articleBody.prepend( divStr.toUtf8() );
-    articleBody.append( "</div>" );
+    articleString.prepend( divStr.toUtf8() );
+    articleString.append( "</div>" );
 
-    articleBody.prepend( "<div class=\"website_padding\"></div>" );
+    articleString.prepend( "<div class=\"website_padding\"></div>" );
 
-    QMutexLocker _( &dataMutex );
-
-    size_t prevSize = data.size();
-
-    data.resize( prevSize + articleBody.size() );
-
-    memcpy( &data.front() + prevSize, articleBody.data(), articleBody.size() );
+    appendString( articleString.toStdString() );
 
     hasAnyData = true;
-
   }
-  else
-  {
-    if( netReply->url().scheme() == "file" )
-    {
-      gdWarning( "WebSites: Failed loading article from \"%s\", reason: %s\n", dictPtr->getName().c_str(),
+  else {
+    if ( netReply->url().scheme() == "file" ) {
+      gdWarning( "WebSites: Failed loading article from \"%s\", reason: %s\n",
+                 dictPtr->getName().c_str(),
                  netReply->errorString().toUtf8().data() );
     }
-    else
-    {
+    else {
       setErrorString( netReply->errorString() );
     }
   }
@@ -317,74 +297,69 @@ void WebSiteArticleRequest::requestFinished( QNetworkReply * r )
   finish();
 }
 
-sptr< DataRequest > WebSiteDictionary::getArticle( wstring const & str,
-                                                   vector< wstring > const &,
-                                                   wstring const & context, bool )
-  
+sptr< DataRequest >
+WebSiteDictionary::getArticle( wstring const & str, vector< wstring > const &, wstring const & context, bool )
+
 {
   QByteArray urlString;
 
   // Context contains the right url to go to
   if ( context.size() )
     urlString = Utf8::encode( context ).c_str();
-  else
-  {
+  else {
     urlString = urlTemplate;
 
     QString inputWord = QString::fromStdU32String( str );
 
     urlString.replace( "%25GDWORD%25", inputWord.toUtf8().toPercentEncoding() );
 
-    QTextCodec *codec = QTextCodec::codecForName( "Windows-1251" );
-    if( codec )
+    QTextCodec * codec = QTextCodec::codecForName( "Windows-1251" );
+    if ( codec )
       urlString.replace( "%25GD1251%25", codec->fromUnicode( inputWord ).toPercentEncoding() );
 
     codec = QTextCodec::codecForName( "Big-5" );
-    if( codec )
+    if ( codec )
       urlString.replace( "%25GDBIG5%25", codec->fromUnicode( inputWord ).toPercentEncoding() );
 
     codec = QTextCodec::codecForName( "Big5-HKSCS" );
-    if( codec )
+    if ( codec )
       urlString.replace( "%25GDBIG5HKSCS%25", codec->fromUnicode( inputWord ).toPercentEncoding() );
 
     codec = QTextCodec::codecForName( "Shift-JIS" );
-    if( codec )
+    if ( codec )
       urlString.replace( "%25GDSHIFTJIS%25", codec->fromUnicode( inputWord ).toPercentEncoding() );
 
     codec = QTextCodec::codecForName( "GB18030" );
-    if( codec )
+    if ( codec )
       urlString.replace( "%25GDGBK%25", codec->fromUnicode( inputWord ).toPercentEncoding() );
 
 
     // Handle all ISO-8859 encodings
-    for( int x = 1; x <= 16; ++x )
-    {
+    for ( int x = 1; x <= 16; ++x ) {
       codec = QTextCodec::codecForName( QString( "ISO 8859-%1" ).arg( x ).toLatin1() );
-      if( codec )
-        urlString.replace( QString( "%25GDISO%1%25" ).arg( x ).toUtf8(), codec->fromUnicode( inputWord ).toPercentEncoding() );
+      if ( codec )
+        urlString.replace( QString( "%25GDISO%1%25" ).arg( x ).toUtf8(),
+                           codec->fromUnicode( inputWord ).toPercentEncoding() );
 
       if ( x == 10 )
         x = 12; // Skip encodings 11..12, they don't exist
     }
   }
 
-  if( inside_iframe )
-  {
+  if ( inside_iframe ) {
     // Just insert link in <iframe> tag
 
-    sptr< DataRequestInstant > dr = std::make_shared<DataRequestInstant>( true );
-
     string result = "<div class=\"website_padding\"></div>";
 
     //heuristic add url to global whitelist.
-    QUrl url(urlString);
-    GlobalBroadcaster::instance()->addWhitelist(url.host());
+    QUrl url( urlString );
+    GlobalBroadcaster::instance()->addWhitelist( url.host() );
 
     QString encodeUrl;
-    if(experimentalIframe){
-      encodeUrl="ifr://localhost?url="+QUrl::toPercentEncoding(  urlString);
+    if ( experimentalIframe ) {
+      encodeUrl = "ifr://localhost?url=" + QUrl::toPercentEncoding( urlString );
     }
-    else{
+    else {
       encodeUrl = urlString;
     }
 
@@ -397,16 +372,14 @@ sptr< DataRequest > WebSiteDictionary::getArticle( wstring const & str,
                       "style=\"overflow:visible; width:100%; display:block; border:none;\" sandbox=\"allow-same-origin allow-scripts allow-popups\">"
                       "</iframe>";
 
-    dr->getData().resize( result.size() );
-
-    memcpy( &( dr->getData().front() ), result.data(), result.size() );
-
+    auto dr = std::make_shared< DataRequestInstant >( true );
+    dr->appendString( result );
     return dr;
   }
 
   // To load data from site
 
-  return std::make_shared<WebSiteArticleRequest>( urlString, netMgr, this );
+  return std::make_shared< WebSiteArticleRequest >( urlString, netMgr, this );
 }
 
 class WebSiteResourceRequest: public WebSiteDataRequestSlots
@@ -418,10 +391,8 @@ class WebSiteResourceRequest: public WebSiteDataRequestSlots
 
 public:
 
-  WebSiteResourceRequest( QString const & url_, QNetworkAccessManager & _mgr,
-                          WebSiteDictionary * dictPtr_ );
-  ~WebSiteResourceRequest()
-  {}
+  WebSiteResourceRequest( QString const & url_, QNetworkAccessManager & _mgr, WebSiteDictionary * dictPtr_ );
+  ~WebSiteResourceRequest() {}
 
   void cancel() override;
 
@@ -433,10 +404,14 @@ private:
 WebSiteResourceRequest::WebSiteResourceRequest( QString const & url_,
                                                 QNetworkAccessManager & _mgr,
                                                 WebSiteDictionary * dictPtr_ ):
-  url( url_ ), dictPtr( dictPtr_ ), mgr( _mgr )
+  url( url_ ),
+  dictPtr( dictPtr_ ),
+  mgr( _mgr )
 {
-  connect( &mgr, SIGNAL( finished( QNetworkReply * ) ),
-           this, SLOT( requestFinished( QNetworkReply * ) ),
+  connect( &mgr,
+           SIGNAL( finished( QNetworkReply * ) ),
+           this,
+           SLOT( requestFinished( QNetworkReply * ) ),
            Qt::QueuedConnection );
 
   QUrl reqUrl( url );
@@ -444,8 +419,7 @@ WebSiteResourceRequest::WebSiteResourceRequest( QString const & url_,
   netReply = mgr.get( QNetworkRequest( reqUrl ) );
 
 #ifndef QT_NO_SSL
-  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ),
-           netReply, SLOT( ignoreSslErrors() ) );
+  connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) );
 #endif
 }
 
@@ -459,26 +433,22 @@ void WebSiteResourceRequest::requestFinished( QNetworkReply * r )
   if ( isFinished() ) // Was cancelled
     return;
 
-  if ( r != netReply )
-  {
+  if ( r != netReply ) {
     // Well, that's not our reply, don't do anything
     return;
   }
 
-  if ( netReply->error() == QNetworkReply::NoError )
-  {
+  if ( netReply->error() == QNetworkReply::NoError ) {
     // Check for redirect reply
 
     QVariant possibleRedirectUrl = netReply->attribute( QNetworkRequest::RedirectionTargetAttribute );
-    QUrl redirectUrl = possibleRedirectUrl.toUrl();
-    if( !redirectUrl.isEmpty() )
-    {
+    QUrl redirectUrl             = possibleRedirectUrl.toUrl();
+    if ( !redirectUrl.isEmpty() ) {
       disconnect( netReply, 0, 0, 0 );
       netReply->deleteLater();
       netReply = mgr.get( QNetworkRequest( redirectUrl ) );
 #ifndef QT_NO_SSL
-      connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ),
-               netReply, SLOT( ignoreSslErrors() ) );
+      connect( netReply, SIGNAL( sslErrors( QList< QSslError > ) ), netReply, SLOT( ignoreSslErrors() ) );
 #endif
       return;
     }
@@ -486,19 +456,11 @@ void WebSiteResourceRequest::requestFinished( QNetworkReply * r )
     // Handle reply data
 
     QByteArray replyData = netReply->readAll();
-    QString cssString = QString::fromUtf8( replyData );
+    QString cssString    = QString::fromUtf8( replyData );
 
     dictPtr->isolateWebCSS( cssString );
 
-    QByteArray cssData = cssString.toUtf8();
-
-    QMutexLocker _( &dataMutex );
-
-    size_t prevSize = data.size();
-
-    data.resize( prevSize + cssData.size() );
-
-    memcpy( &data.front() + prevSize, cssData.data(), cssData.size() );
+    appendString( cssString.toStdString() );
 
     hasAnyData = true;
   }
@@ -511,13 +473,13 @@ void WebSiteResourceRequest::requestFinished( QNetworkReply * r )
   finish();
 }
 
-sptr< Dictionary::DataRequest > WebSiteDictionary::getResource( string const & name ) 
+sptr< Dictionary::DataRequest > WebSiteDictionary::getResource( string const & name )
 {
   QString link = QString::fromUtf8( name.c_str() );
-  int pos = link.indexOf( '/' );
-  if( pos > 0 )
+  int pos      = link.indexOf( '/' );
+  if ( pos > 0 )
     link.replace( pos, 1, "://" );
-  return std::make_shared<WebSiteResourceRequest>( link, netMgr, this );
+  return std::make_shared< WebSiteResourceRequest >( link, netMgr, this );
 }
 
 void WebSiteDictionary::loadIcon() noexcept
@@ -525,38 +487,34 @@ void WebSiteDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
-  if( !iconFilename.isEmpty() )
-  {
-    QFileInfo fInfo(  QDir( Config::getConfigDir() ), iconFilename );
-    if( fInfo.isFile() )
+  if ( !iconFilename.isEmpty() ) {
+    QFileInfo fInfo( QDir( Config::getConfigDir() ), iconFilename );
+    if ( fInfo.isFile() )
       loadIconFromFile( fInfo.absoluteFilePath(), true );
   }
-  if( dictionaryIcon.isNull() && !loadIconFromText(":/icons/webdict.svg", QString::fromStdString(name ) ) )
-    dictionaryIcon = dictionaryNativeIcon = QIcon(":/icons/webdict.svg");
+  if ( dictionaryIcon.isNull() && !loadIconFromText( ":/icons/webdict.svg", QString::fromStdString( name ) ) )
+    dictionaryIcon = QIcon( ":/icons/webdict.svg" );
   dictionaryIconLoaded = true;
 }
 
-}
+} // namespace
+
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::WebSites const & ws, QNetworkAccessManager & mgr )
 
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::WebSites const & ws,
-                                                      QNetworkAccessManager & mgr )
-  
 {
   vector< sptr< Dictionary::Class > > result;
 
-  for( int x = 0; x < ws.size(); ++x )
-  {
+  for ( int x = 0; x < ws.size(); ++x ) {
     if ( ws[ x ].enabled )
-      result.push_back( std::make_shared<WebSiteDictionary>( ws[ x ].id.toUtf8().data(),
-                                               ws[ x ].name.toUtf8().data(),
-                                               ws[ x ].url,
-                                               ws[ x ].iconFilename,
-                                               ws[ x ].inside_iframe,
-                                               mgr )
-                      );
+      result.push_back( std::make_shared< WebSiteDictionary >( ws[ x ].id.toUtf8().data(),
+                                                               ws[ x ].name.toUtf8().data(),
+                                                               ws[ x ].url,
+                                                               ws[ x ].iconFilename,
+                                                               ws[ x ].inside_iframe,
+                                                               mgr ) );
   }
 
   return result;
 }
 
-}
+} // namespace WebSite
diff --git a/src/dict/website.hh b/src/dict/website.hh
index 9fb570e0..559e649c 100644
--- a/src/dict/website.hh
+++ b/src/dict/website.hh
@@ -15,9 +15,7 @@ namespace WebSite {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries( Config::WebSites const &,
-                                                      QNetworkAccessManager & )
-    ;
+vector< sptr< Dictionary::Class > > makeDictionaries( Config::WebSites const &, QNetworkAccessManager & );
 
 /// Exposed here for moc
 class WebSiteDataRequestSlots: public Dictionary::DataRequest
@@ -26,10 +24,9 @@ class WebSiteDataRequestSlots: public Dictionary::DataRequest
 
 protected slots:
 
-  virtual void requestFinished( QNetworkReply * )
-  {}
+  virtual void requestFinished( QNetworkReply * ) {}
 };
 
-}
+} // namespace WebSite
 
 #endif
diff --git a/src/dict/xdxf.cc b/src/dict/xdxf.cc
index 4c5420c4..076c6898 100644
--- a/src/dict/xdxf.cc
+++ b/src/dict/xdxf.cc
@@ -28,7 +28,7 @@
 #include "ftshelpers.hh"
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include <QIODevice>
@@ -38,8 +38,8 @@
 #include <QDir>
 #include <QPainter>
 #include <QRegExp>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat>
 #endif
 #include <QSemaphore>
 #include <QThreadPool>
@@ -66,12 +66,12 @@ quint32 getLanguageId( const QString & lang )
 {
   QString lstr = lang.left( 3 );
 
-  if( lstr.endsWith( QChar( '-' ) ) )
+  if ( lstr.endsWith( QChar( '-' ) ) )
     lstr.chop( 1 );
 
-  switch( lstr.size() )
-  {
-    case 2: return LangCoder::code2toInt( lstr.toLatin1().data() );
+  switch ( lstr.size() ) {
+    case 2:
+      return LangCoder::code2toInt( lstr.toLatin1().data() );
     case 3:
       return LangCoder::findIdForLanguageCode3( lstr.toStdString() );
   }
@@ -81,51 +81,49 @@ quint32 getLanguageId( const QString & lang )
 
 namespace {
 
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 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
-{
-  Signature = 0x46584458, // XDXF on little-endian, FXDX on big-endian
+enum {
+  Signature            = 0x46584458, // XDXF on little-endian, FXDX on big-endian
   CurrentFormatVersion = 6 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
-enum ArticleFormat
-{
+enum ArticleFormat {
   Default = 0,
-  Visual = 1,
+  Visual  = 1,
   Logical = 2
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, XDXF
-  uint32_t formatVersion; // File format version (CurrentFormatVersion)
-  uint32_t articleFormat; // ArticleFormat value, except that 0 = bad file
-  uint32_t langFrom; // Source language
-  uint32_t langTo;   // Target language
-  uint32_t articleCount; // Total number of articles
-  uint32_t wordCount; // Total number of words
-  uint32_t nameAddress; // Address of an utf8 name string, in chunks
-  uint32_t nameSize; // And its size
-  uint32_t descriptionAddress; // Address of an utf8 description string, in chunks
-  uint32_t descriptionSize; // And its size
-  uint32_t hasAbrv; // Non-zero means file has abrvs at abrvAddress
-  uint32_t abrvAddress; // Address of abrv map in the chunked storage
-  uint32_t chunksOffset; // The offset to chunks' storage
+  uint32_t signature;             // First comes the signature, XDXF
+  uint32_t formatVersion;         // File format version (CurrentFormatVersion)
+  uint32_t articleFormat;         // ArticleFormat value, except that 0 = bad file
+  uint32_t langFrom;              // Source language
+  uint32_t langTo;                // Target language
+  uint32_t articleCount;          // Total number of articles
+  uint32_t wordCount;             // Total number of words
+  uint32_t nameAddress;           // Address of an utf8 name string, in chunks
+  uint32_t nameSize;              // And its size
+  uint32_t descriptionAddress;    // Address of an utf8 description string, in chunks
+  uint32_t descriptionSize;       // And its size
+  uint32_t hasAbrv;               // Non-zero means file has abrvs at abrvAddress
+  uint32_t abrvAddress;           // Address of abrv map in the chunked storage
+  uint32_t chunksOffset;          // The offset to chunks' storage
   uint32_t indexBtreeMaxElements; // Two fields from IndexInfo
   uint32_t indexRootOffset;
-  uint32_t hasZipFile; // Non-zero means there's a zip file with resources
-                       // present
+  uint32_t hasZipFile;               // Non-zero means there's a zip file with resources
+                                     // present
   uint32_t zipIndexBtreeMaxElements; // Two fields from IndexInfo of the zip
                                      // resource index.
   uint32_t zipIndexRootOffset;
-  uint32_t revisionNumber; // Format revision 
+  uint32_t revisionNumber; // Format revision
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -135,14 +133,11 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion ||
-         !header.articleFormat;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion || !header.articleFormat;
 }
 
 
-
 class XdxfDictionary: public BtreeIndexing::BtreeDictionary
 {
   QMutex idxMutex;
@@ -157,39 +152,46 @@ class XdxfDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  XdxfDictionary( string const & id, string const & indexFile,
-                   vector< string > const & dictionaryFiles );
+  XdxfDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   ~XdxfDictionary();
 
   string getName() noexcept override
-  { return dictionaryName; }
+  {
+    return dictionaryName;
+  }
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.articleCount; }
+  {
+    return idxHeader.articleCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return idxHeader.wordCount; }
+  {
+    return idxHeader.wordCount;
+  }
 
   inline quint32 getLangFrom() const override
-  { return idxHeader.langFrom; }
+  {
+    return idxHeader.langFrom;
+  }
 
   inline quint32 getLangTo() const override
-  { return idxHeader.langTo; }
+  {
+    return idxHeader.langTo;
+  }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
-  QString const& getDescription() override;
+  QString const & getDescription() override;
 
   QString getMainFilename() override;
 
@@ -197,17 +199,18 @@ public:
   getSearchResults( QString const & searchString, int searchMode, bool matchCase, bool ignoreDiacritics ) override;
   void getArticleText( uint32_t articleAddress, QString & headword, QString & text ) override;
 
-  void makeFTSIndex(QAtomicInt & isCancelled, bool firstIteration ) override;
+  void makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration ) override;
 
   void setFTSParameters( Config::FullTextSearch const & fts ) override
   {
-    can_FTS = fts.enabled
-              && !fts.disabledTypes.contains( "XDXF", Qt::CaseInsensitive )
-              && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
+    can_FTS = fts.enabled && !fts.disabledTypes.contains( "XDXF", Qt::CaseInsensitive )
+      && ( fts.maxDictionarySize == 0 || getArticleCount() <= fts.maxDictionarySize );
   }
 
   uint32_t getFtsIndexVersion() override
-  { return 1; }
+  {
+    return 1;
+  }
 
 protected:
 
@@ -216,30 +219,25 @@ protected:
 private:
 
   // Loads the article, storing its headword and formatting article's data into an html.
-  void loadArticle( uint32_t address,
-                    string & articleText, QString * headword = 0 );
+  void loadArticle( uint32_t address, string & articleText, QString * headword = 0 );
 
   friend class XdxfArticleRequest;
   friend class XdxfResourceRequest;
 };
 
-XdxfDictionary::XdxfDictionary( string const & id,
-                                string const & indexFile,
-                                vector< string > const & dictionaryFiles ):
+XdxfDictionary::XdxfDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles ):
   BtreeDictionary( id, dictionaryFiles ),
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() )
 {
   // Read the dictionary name
 
-  chunks = std::shared_ptr<ChunkedStorage::Reader>(new ChunkedStorage::Reader(idx, idxHeader.chunksOffset ));
+  chunks = std::shared_ptr< ChunkedStorage::Reader >( new ChunkedStorage::Reader( idx, idxHeader.chunksOffset ) );
 
-  if ( idxHeader.nameSize )
-  {
+  if ( idxHeader.nameSize ) {
     vector< char > chunk;
 
-    dictionaryName = string( chunks->getBlock( idxHeader.nameAddress, chunk ),
-                             idxHeader.nameSize );
+    dictionaryName = string( chunks->getBlock( idxHeader.nameAddress, chunk ), idxHeader.nameSize );
   }
 
   // Open the file
@@ -248,13 +246,11 @@ XdxfDictionary::XdxfDictionary( string const & id,
   dz = dict_data_open( dictionaryFiles[ 0 ].c_str(), &error, 0 );
 
   if ( !dz )
-    throw exDictzipError( string( dz_error_str( error ) )
-                          + "(" + dictionaryFiles[ 0 ] + ")" );
+    throw exDictzipError( string( dz_error_str( error ) ) + "(" + dictionaryFiles[ 0 ] + ")" );
 
   // Read the abrv, if any
 
-  if ( idxHeader.hasAbrv )
-  {
+  if ( idxHeader.hasAbrv ) {
     vector< char > chunk;
 
     char * abrvBlock = chunks->getBlock( idxHeader.abrvAddress, chunk );
@@ -263,8 +259,7 @@ XdxfDictionary::XdxfDictionary( string const & id,
     memcpy( &total, abrvBlock, sizeof( uint32_t ) );
     abrvBlock += sizeof( uint32_t );
 
-    while( total-- )
-    {
+    while ( total-- ) {
       uint32_t keySz;
       memcpy( &keySz, abrvBlock, sizeof( uint32_t ) );
       abrvBlock += sizeof( uint32_t );
@@ -284,13 +279,10 @@ XdxfDictionary::XdxfDictionary( string const & id,
 
     // Open a resource zip file, if there's one
 
-    if ( idxHeader.hasZipFile &&
-         ( idxHeader.zipIndexBtreeMaxElements ||
-           idxHeader.zipIndexRootOffset ) )
-    {
-      resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements,
-                                        idxHeader.zipIndexRootOffset ),
-                             idx, idxMutex );
+    if ( idxHeader.hasZipFile && ( idxHeader.zipIndexBtreeMaxElements || idxHeader.zipIndexRootOffset ) ) {
+      resourceZip.openIndex( IndexInfo( idxHeader.zipIndexBtreeMaxElements, idxHeader.zipIndexRootOffset ),
+                             idx,
+                             idxMutex );
 
       QString zipName = QDir::fromNativeSeparators( getDictionaryFilenames().back().c_str() );
 
@@ -301,9 +293,7 @@ XdxfDictionary::XdxfDictionary( string const & id,
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-             idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   // Full-text search parameters
 
@@ -311,8 +301,7 @@ XdxfDictionary::XdxfDictionary( string const & id,
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-      && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -334,79 +323,73 @@ void XdxfDictionary::loadIcon() noexcept
   fileName = baseInfo.absoluteDir().absoluteFilePath( "icon32.png" );
   QFileInfo info( fileName );
 
-  if( !info.isFile() )
-  {
-      fileName = baseInfo.absoluteDir().absoluteFilePath( "icon16.png" );
-      info = QFileInfo( fileName );
+  if ( !info.isFile() ) {
+    fileName = baseInfo.absoluteDir().absoluteFilePath( "icon16.png" );
+    info     = QFileInfo( fileName );
   }
 
   if ( info.isFile() )
     loadIconFromFile( fileName, true );
 
-  if ( dictionaryIcon.isNull() )
-  {
+  if ( dictionaryIcon.isNull() ) {
     // Load failed -- use default icons
 
-    dictionaryIcon = QIcon(":/icons/icon32_xdxf.png");
-    dictionaryNativeIcon = QIcon(":/icons/icon32_xdxf.png");
+    dictionaryIcon = QIcon( ":/icons/icon32_xdxf.png" );
   }
 
   dictionaryIconLoaded = true;
 }
 
-QString const& XdxfDictionary::getDescription()
+QString const & XdxfDictionary::getDescription()
 {
-    if( !dictionaryDescription.isEmpty() )
-        return dictionaryDescription;
+  if ( !dictionaryDescription.isEmpty() )
+    return dictionaryDescription;
 
-    if( idxHeader.descriptionAddress == 0 )
-        dictionaryDescription = "NONE";
-    else
-    {
-        try
-        {
-            vector< char > chunk;
-            char * descr;
-            {
+  if ( idxHeader.descriptionAddress == 0 )
+    dictionaryDescription = "NONE";
+  else {
+    try {
+      vector< char > chunk;
+      char * descr;
+      {
         QMutexLocker _( &idxMutex );
         descr = chunks->getBlock( idxHeader.descriptionAddress, chunk );
-            }
-            dictionaryDescription = QString::fromUtf8( descr, idxHeader.descriptionSize );
-        }
-        catch(...)
-        {
-        }
+      }
+      dictionaryDescription = QString::fromUtf8( descr, idxHeader.descriptionSize );
     }
-    return dictionaryDescription;
+    catch ( ... ) {
+    }
+  }
+  return dictionaryDescription;
 }
 
-QString XdxfDictionary::getMainFilename() { return getDictionaryFilenames()[ 0 ].c_str(); }
+QString XdxfDictionary::getMainFilename()
+{
+  return getDictionaryFilenames()[ 0 ].c_str();
+}
 
 void XdxfDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
-  if( ensureInitDone().size() )
+  if ( ensureInitDone().size() )
     return;
 
-  if( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
+  if ( firstIteration && getArticleCount() > FTS::MaxDictionarySizeForFastSearch )
     return;
 
-  gdDebug( "Xdxf: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Xdxf: Building the full-text index for dictionary: %s\n", getName().c_str() );
 
-  try
-  {
+  try {
     FtsHelpers::makeFTSIndex( this, isCancelled );
     FTS_index_completed.ref();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Xdxf: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
@@ -414,15 +397,13 @@ void XdxfDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration
 
 void XdxfDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     string articleStr;
     loadArticle( articleAddress, articleStr, &headword );
 
     text = Html::unescape( QString::fromStdString( articleStr ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Xdxf: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -454,9 +435,13 @@ class XdxfArticleRequest: public Dictionary::DataRequest
 public:
 
   XdxfArticleRequest( wstring const & word_,
-                     vector< wstring > const & alts_,
-                     XdxfDictionary & dict_, bool ignoreDiacritics_ ):
-    word( word_ ), alts( alts_ ), dict( dict_ ), ignoreDiacritics( ignoreDiacritics_ )
+                      vector< wstring > const & alts_,
+                      XdxfDictionary & dict_,
+                      bool ignoreDiacritics_ ):
+    word( word_ ),
+    alts( alts_ ),
+    dict( dict_ ),
+    ignoreDiacritics( ignoreDiacritics_ )
   {
     f = QtConcurrent::run( [ this ]() {
       this->run();
@@ -480,8 +465,7 @@ public:
 
 void XdxfArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -503,12 +487,11 @@ void XdxfArticleRequest::run()
                                     // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
   for ( const auto & x : chain ) {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -522,8 +505,7 @@ void XdxfArticleRequest::run()
 
     headword = x.word;
 
-    try
-    {
+    try {
       dict.loadArticle( x.articleOffset, articleText );
 
       // Ok. Now, does it go to main articles, or to alternate ones? We list
@@ -531,29 +513,23 @@ void XdxfArticleRequest::run()
 
       // We do the case-folded comparison here.
 
-      wstring headwordStripped =
-        Folding::applySimpleCaseOnly( headword );
-      if( ignoreDiacritics )
+      wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+      if ( ignoreDiacritics )
         headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
       multimap< wstring, pair< string, string > > & mapToUse =
-        ( wordCaseFolded == headwordStripped ) ?
-          mainArticles : alternateArticles;
+        ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-      mapToUse.insert( pair(
-        Folding::applySimpleCaseOnly( headword ),
-        pair( headword, articleText ) ) );
+      mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
       articlesIncluded.insert( x.articleOffset );
     }
-    catch( std::exception &ex )
-    {
+    catch ( std::exception & ex ) {
       gdWarning( "XDXF: Failed loading article from \"%s\", reason: %s\n", dict.getName().c_str(), ex.what() );
     }
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -565,29 +541,23 @@ void XdxfArticleRequest::run()
 
   string cleaner = Utils::Html::getHtmlCleaner();
 
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-//      result += "<h3>";
-//      result += i->second.first;
-//      result += "</h3>";
-      result += i->second.second;
-      result += cleaner;
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    //      result += "<h3>";
+    //      result += i->second.first;
+    //      result += "</h3>";
+    result += i->second.second;
+    result += cleaner;
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-//      result += "<h3>";
-//      result += i->second.first;
-//      result += "</h3>";
-      result += i->second.second;
-      result += cleaner;
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    //      result += "<h3>";
+    //      result += i->second.first;
+    //      result += "</h3>";
+    result += i->second.second;
+    result += cleaner;
   }
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -598,14 +568,12 @@ sptr< Dictionary::DataRequest > XdxfDictionary::getArticle( wstring const & word
                                                             vector< wstring > const & alts,
                                                             wstring const &,
                                                             bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<XdxfArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< XdxfArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
-void XdxfDictionary::loadArticle( uint32_t address,
-                                  string & articleText,
-                                  QString * headword )
+void XdxfDictionary::loadArticle( uint32_t address, string & articleText, QString * headword )
 {
   // Read the properties
 
@@ -614,18 +582,17 @@ void XdxfDictionary::loadArticle( uint32_t address,
   char * propertiesData;
 
   {
-      QMutexLocker _( &idxMutex );
+    QMutexLocker _( &idxMutex );
 
-      propertiesData = chunks->getBlock( address, chunk );
+    propertiesData = chunks->getBlock( address, chunk );
   }
 
-  if ( &chunk.front() + chunk.size() - propertiesData < 9 )
-  {
+  if ( &chunk.front() + chunk.size() - propertiesData < 9 ) {
     articleText = string( "<div class=\"xdxf\">Index seems corrupted</div>" );
     return;
   }
 
-  unsigned char fType = (unsigned char) *propertiesData;
+  unsigned char fType = (unsigned char)*propertiesData;
 
   uint32_t articleOffset, articleSize;
 
@@ -643,15 +610,20 @@ void XdxfDictionary::loadArticle( uint32_t address,
     articleBody = dict_data_read_( dz, articleOffset, articleSize, 0, 0 );
   }
 
-  if ( !articleBody )
-  {
-//    throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
-      articleText = string( "<div class=\"xdxf\">DICTZIP error: " ) + dict_error_str( dz ) + "</div>";
+  if ( !articleBody ) {
+    //    throw exCantReadFile( getDictionaryFilenames()[ 0 ] );
+    articleText = string( "<div class=\"xdxf\">DICTZIP error: " ) + dict_error_str( dz ) + "</div>";
     return;
   }
 
-  articleText = Xdxf2Html::convert( string( articleBody ), Xdxf2Html::XDXF, idxHeader.hasAbrv ? &abrv : NULL, this,
-                                    &resourceZip, fType == Logical, idxHeader.revisionNumber, headword );
+  articleText = Xdxf2Html::convert( string( articleBody ),
+                                    Xdxf2Html::XDXF,
+                                    idxHeader.hasAbrv ? &abrv : NULL,
+                                    this,
+                                    &resourceZip,
+                                    fType == Logical,
+                                    idxHeader.revisionNumber,
+                                    headword );
 
   free( articleBody );
 }
@@ -662,38 +634,44 @@ class GzippedFile: public QIODevice
 
 public:
 
-  GzippedFile( char const * fileName ) ;
+  GzippedFile( char const * fileName );
 
   ~GzippedFile();
 
-//  size_t gzTell();
+  //  size_t gzTell();
 
   char * readDataArray( unsigned long startPos, unsigned long size );
 
 protected:
 
-  dictData *dz;
+  dictData * dz;
 
-  bool isSequential () const override
-  { return false; } // Which is a lie, but else pos() won't work
+  bool isSequential() const override
+  {
+    return false;
+  } // Which is a lie, but else pos() won't work
 
-  bool waitForReadyRead ( int ) override
-  { return !gzeof( gz ); }
+  bool waitForReadyRead( int ) override
+  {
+    return !gzeof( gz );
+  }
 
   qint64 bytesAvailable() const override
   {
-     return ( gzeof( gz ) ? 0 : 1 ) + QIODevice::bytesAvailable();
+    return ( gzeof( gz ) ? 0 : 1 ) + QIODevice::bytesAvailable();
   }
 
   qint64 readData( char * data, qint64 maxSize ) override;
 
   bool atEnd() const override;
 
-  qint64 writeData ( const char * /*data*/, qint64 /*maxSize*/ ) override
-  { return -1; }
+  qint64 writeData( const char * /*data*/, qint64 /*maxSize*/ ) override
+  {
+    return -1;
+  }
 };
 
-GzippedFile::GzippedFile( char const * fileName ) 
+GzippedFile::GzippedFile( char const * fileName )
 {
   gz = gd_gzopen( fileName );
   if ( !gz )
@@ -706,8 +684,8 @@ GzippedFile::GzippedFile( char const * fileName )
 GzippedFile::~GzippedFile()
 {
   gzclose( gz );
-  if( dz )
-      dict_data_close( dz );
+  if ( dz )
+    dict_data_close( dz );
 }
 
 bool GzippedFile::atEnd() const
@@ -733,21 +711,19 @@ qint64 GzippedFile::readData( char * data, qint64 maxSize )
   // With QT 5.x QXmlStreamReader ask one byte instead of one UTF-8 char.
   // We read and return all bytes for char.
 
-  if( n == 1 )
-  {
-    char ch = *data;
+  if ( n == 1 ) {
+    char ch      = *data;
     int addBytes = 0;
-    if( ch & 0x80 )
-    {
-      if( ( ch & 0xF8 ) == 0xF0 )
+    if ( ch & 0x80 ) {
+      if ( ( ch & 0xF8 ) == 0xF0 )
         addBytes = 3;
-      else if( ( ch & 0xF0 ) == 0xE0 )
+      else if ( ( ch & 0xF0 ) == 0xE0 )
         addBytes = 2;
-      else if( ( ch & 0xE0 ) == 0xC0 )
+      else if ( ( ch & 0xE0 ) == 0xC0 )
         addBytes = 1;
     }
 
-    if( addBytes )
+    if ( addBytes )
       n += gzread( gz, data + 1, addBytes );
   }
 
@@ -756,8 +732,8 @@ qint64 GzippedFile::readData( char * data, qint64 maxSize )
 
 char * GzippedFile::readDataArray( unsigned long startPos, unsigned long size )
 {
-  if( dz == NULL )
-      return NULL;
+  if ( dz == NULL )
+    return NULL;
   return dict_data_read_( dz, startPos, size, 0, 0 );
 }
 
@@ -765,20 +741,17 @@ QString readXhtmlData( QXmlStreamReader & stream )
 {
   QString result;
 
-  while( !stream.atEnd() )
-  {
+  while ( !stream.atEnd() ) {
     stream.readNext();
 
-    if ( stream.isStartElement() )
-    {
+    if ( stream.isStartElement() ) {
       QString name = stream.name().toString();
 
       result += "<" + Utils::escape( name ) + " ";
 
       QXmlStreamAttributes attrs = stream.attributes();
 
-      for( int x = 0; x < attrs.size(); ++x )
-      {
+      for ( int x = 0; x < attrs.size(); ++x ) {
         result += Utils::escape( attrs[ x ].name().toString() );
         result += "=\"" + Utils::escape( attrs[ x ].value().toString() ) + "\"";
       }
@@ -789,13 +762,10 @@ QString readXhtmlData( QXmlStreamReader & stream )
 
       result += "</" + Utils::escape( name ) + ">";
     }
-    else
-    if ( stream.isCharacters() || stream.isWhitespace() || stream.isCDATA() )
-    {
+    else if ( stream.isCharacters() || stream.isWhitespace() || stream.isCDATA() ) {
       result += stream.text();
     }
-    else
-    if ( stream.isEndElement() )
+    else if ( stream.isEndElement() )
       break;
   }
 
@@ -807,50 +777,44 @@ namespace {
 /// Deal with Qt 4.5 incompatibility
 QString readElementText( QXmlStreamReader & stream )
 {
-    return stream.readElementText( QXmlStreamReader::SkipChildElements );
+  return stream.readElementText( QXmlStreamReader::SkipChildElements );
 }
 
-}
+} // namespace
 
 
 void addAllKeyTags( QXmlStreamReader & stream, list< QString > & words )
 {
   // todo implement support for tag <srt>, that overrides the article sorting order
-  if ( stream.name() == u"k" )
-  {
+  if ( stream.name() == u"k" ) {
     words.push_back( readElementText( stream ) );
     return;
   }
 
-  while( !stream.atEnd() )
-  {
+  while ( !stream.atEnd() ) {
     stream.readNext();
-  
+
     if ( stream.isStartElement() )
       addAllKeyTags( stream, words );
-    else
-    if ( stream.isEndElement() )
+    else if ( stream.isEndElement() )
       return;
   }
 }
 
-void checkArticlePosition( GzippedFile & gzFile,
-                           uint32_t *pOffset,
-                           uint32_t *pSize )
+void checkArticlePosition( GzippedFile & gzFile, uint32_t * pOffset, uint32_t * pSize )
 {
-    char * data = gzFile.readDataArray( *pOffset, *pSize );
-    if( data == NULL )
-        return;
-    QString s = QString::fromUtf8( data );
-    free( data );
-    int n = s.lastIndexOf( "</ar" );
-    if( n > 0 )
-        *pSize -= s.size() - n;
-    if( s.at( 0 ) == '>')
-    {
-        *pOffset += 1;
-        *pSize -= 1;
-    }
+  char * data = gzFile.readDataArray( *pOffset, *pSize );
+  if ( data == NULL )
+    return;
+  QString s = QString::fromUtf8( data );
+  free( data );
+  int n = s.lastIndexOf( "</ar" );
+  if ( n > 0 )
+    *pSize -= s.size() - n;
+  if ( s.at( 0 ) == '>' ) {
+    *pOffset += 1;
+    *pSize -= 1;
+  }
 }
 
 void indexArticle( GzippedFile & gzFile,
@@ -867,11 +831,10 @@ void indexArticle( GzippedFile & gzFile,
 
   if ( formatValue == u"v" )
     format = Visual;
-  else
-  if ( formatValue == u"l" )
+  else if ( formatValue == u"l" )
     format = Logical;
-  if( format == Default )
-    format = defaultFormat; 
+  if ( format == Default )
+    format = defaultFormat;
   size_t articleOffset = gzFile.pos() - 1; // stream.characterOffset() is loony
 
   // uint32_t lineNumber = stream.lineNumber();
@@ -879,23 +842,18 @@ void indexArticle( GzippedFile & gzFile,
 
   list< QString > words;
 
-  while( !stream.atEnd() )
-  {
+  while ( !stream.atEnd() ) {
     stream.readNext();
 
     // Find any <k> tags and index them
-    if ( stream.isEndElement() )
-    {
+    if ( stream.isEndElement() ) {
       // End of the <ar> tag
 
-      if ( words.empty() )
-      {
+      if ( words.empty() ) {
         // Nothing to index, this article didn't have any tags
-        gdWarning( "No <k> tags found in an article at offset 0x%x, article skipped.\n",
-                  (unsigned) articleOffset );
+        gdWarning( "No <k> tags found in an article at offset 0x%x, article skipped.\n", (unsigned)articleOffset );
       }
-      else
-      {
+      else {
         // Add an entry
 
         uint32_t offset = chunks.startNewBlock();
@@ -913,7 +871,7 @@ void indexArticle( GzippedFile & gzFile,
         // Add also first header - it's needed for full-text search
         chunks.addToBlock( words.begin()->toUtf8().data(), words.begin()->toUtf8().length() + 1 );
 
-//        GD_DPRINTF( "%x: %s\n", articleOffset, words.begin()->toUtf8().data() );
+        //        GD_DPRINTF( "%x: %s\n", articleOffset, words.begin()->toUtf8().data() );
 
         // Add words to index
 
@@ -927,9 +885,7 @@ void indexArticle( GzippedFile & gzFile,
 
       return;
     }
-    else
-    if ( stream.isStartElement() )
-    {
+    else if ( stream.isStartElement() ) {
       addAllKeyTags( stream, words );
     }
   }
@@ -949,8 +905,7 @@ class XdxfResourceRequest: public Dictionary::DataRequest
 
 public:
 
-  XdxfResourceRequest( XdxfDictionary & dict_,
-                      string const & resourceName_ ):
+  XdxfResourceRequest( XdxfDictionary & dict_, string const & resourceName_ ):
     dict( dict_ ),
     resourceName( resourceName_ )
   {
@@ -977,14 +932,12 @@ public:
 void XdxfResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  if ( dict.ensureInitDone().size() )
-  {
+  if ( dict.ensureInitDone().size() ) {
     setErrorString( QString::fromUtf8( dict.ensureInitDone().c_str() ) );
     finish();
     return;
@@ -994,30 +947,24 @@ void XdxfResourceRequest::run()
 
   GD_DPRINTF( "n is %s\n", n.c_str() );
 
-  try
-  {
-    try
-    {
+  try {
+    try {
       QMutexLocker _( &dataMutex );
 
       File::loadFromFile( n, data );
     }
-    catch( File::exCantOpen & )
-    {
+    catch ( File::exCantOpen & ) {
       n = dict.getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator() + resourceName;
 
-      try
-      {
+      try {
         QMutexLocker _( &dataMutex );
 
         File::loadFromFile( n, data );
       }
-      catch( File::exCantOpen & )
-      {
+      catch ( File::exCantOpen & ) {
         // Try reading from zip file
 
-        if ( dict.resourceZip.isOpen() )
-        {
+        if ( dict.resourceZip.isOpen() ) {
           QMutexLocker _( &dataMutex );
 
           if ( !dict.resourceZip.loadFile( Utf8::decode( resourceName ), data ) )
@@ -1028,8 +975,7 @@ void XdxfResourceRequest::run()
       }
     }
 
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
       QMutexLocker _( &dataMutex );
       GdTiff::tiff2img( data );
@@ -1039,10 +985,11 @@ void XdxfResourceRequest::run()
 
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "XDXF: Failed loading resource \"%s\" for \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -1050,54 +997,49 @@ void XdxfResourceRequest::run()
 }
 
 sptr< Dictionary::DataRequest > XdxfDictionary::getResource( string const & name )
-  
+
 {
-  return std::make_shared<XdxfResourceRequest>( *this, name );
+  return std::make_shared< XdxfResourceRequest >( *this, name );
 }
 
-}
+} // namespace
 // anonymous namespace - this section of file is devoted to rebuilding of dictionary articles index
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
   for ( const auto & fileName : fileNames ) {
     // Only allow .xdxf and .xdxf.dz suffixes
 
-    if ( ( fileName.size() < 5  || strcasecmp( fileName.c_str() + ( fileName.size() - 5 ), ".xdxf" ) != 0 ) &&
-         ( fileName.size() < 8 ||
-           strcasecmp( fileName.c_str() + ( fileName.size() - 8 ), ".xdxf.dz" ) != 0 ) )
+    if ( ( fileName.size() < 5 || strcasecmp( fileName.c_str() + ( fileName.size() - 5 ), ".xdxf" ) != 0 )
+         && ( fileName.size() < 8 || strcasecmp( fileName.c_str() + ( fileName.size() - 8 ), ".xdxf.dz" ) != 0 ) )
       continue;
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, fileName );
 
-      string baseName = ( fileName[ fileName.size() - 5 ] == '.' ) ?
-               string( fileName, 0, fileName.size() - 5 ) : string( fileName, 0, fileName.size() - 8 );
+      string baseName = ( fileName[ fileName.size() - 5 ] == '.' ) ? string( fileName, 0, fileName.size() - 5 ) :
+                                                                     string( fileName, 0, fileName.size() - 8 );
 
       // See if there's a zip file with resources present. If so, include it.
 
       string zipFileName;
 
-      if ( File::tryPossibleZipName( baseName + ".xdxf.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".xdxf.dz.files.zip", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".XDXF.FILES.ZIP", zipFileName ) ||
-           File::tryPossibleZipName( baseName + ".XDXF.DZ.FILES.ZIP", zipFileName ) )
+      if ( File::tryPossibleZipName( baseName + ".xdxf.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".xdxf.dz.files.zip", zipFileName )
+           || File::tryPossibleZipName( baseName + ".XDXF.FILES.ZIP", zipFileName )
+           || File::tryPossibleZipName( baseName + ".XDXF.DZ.FILES.ZIP", zipFileName ) )
         dictFiles.push_back( zipFileName );
 
       string dictId = Dictionary::makeDictionaryId( dictFiles );
 
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         // Building the index
 
         gdDebug( "Xdxf: Building the index for dictionary: %s\n", fileName.c_str() );
@@ -1133,51 +1075,45 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
         bool hadXdxf = false;
 
-        while( !stream.atEnd() )
-        {
+        while ( !stream.atEnd() ) {
           stream.readNext();
 
-          if ( stream.isStartElement() )
-          {
+          if ( stream.isStartElement() ) {
             if ( stream.name() != u"xdxf" )
               throw exNotXdxfFile( dictFiles[ 0 ] );
-            else
-            {
+            else {
               // Read the xdxf
 
               string str = stream.attributes().value( "lang_from" ).toString().toLatin1().data();
-              if( !str.empty() )
+              if ( !str.empty() )
                 idxHeader.langFrom = getLanguageId( str.c_str() );
 
               str = stream.attributes().value( "lang_to" ).toString().toLatin1().data();
-              if( !str.empty() )
+              if ( !str.empty() )
                 idxHeader.langTo = getLanguageId( str.c_str() );
 
               QRegExp regNum( "\\d+" );
               regNum.indexIn( stream.attributes().value( "revision" ).toString() );
               idxHeader.revisionNumber = regNum.cap().toUInt();
 
-              bool isLogical = ( stream.attributes().value( "format" ) == u"logical" || idxHeader.revisionNumber >= 34 );
+              bool isLogical =
+                ( stream.attributes().value( "format" ) == u"logical" || idxHeader.revisionNumber >= 34 );
 
               idxHeader.articleFormat = isLogical ? Logical : Visual;
 
               unsigned articleCount = 0, wordCount = 0;
 
-              while( !stream.atEnd() )
-              {
+              while ( !stream.atEnd() ) {
                 stream.readNext();
 
-                if ( stream.isStartElement() )
-                {
+                if ( stream.isStartElement() ) {
                   // todo implement using short <title> for denoting the dictionary in settings or dict list toolbar
-                  if ( stream.name() == u"full_name" || stream.name() == u"full_title" )
-                  {
+                  if ( stream.name() == u"full_name" || stream.name() == u"full_title" ) {
                     // That's our name
 
                     QString name = stream.readElementText();
 
-                    if ( dictionaryName.isEmpty() )
-                    {
+                    if ( dictionaryName.isEmpty() ) {
                       dictionaryName = name;
 
                       initializing.indexingDictionary( dictionaryName.toUtf8().data() );
@@ -1190,27 +1126,22 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
                       chunks.addToBlock( n.data(), n.size() );
                     }
-                    else
-                    {
+                    else {
                       GD_DPRINTF( "Warning: duplicate full_name in %s\n", dictFiles[ 0 ].c_str() );
                     }
                   }
-                  else
-                  if ( stream.name() == u"description" )
-                  {
-                    // todo implement adding other information to the description like <publisher>, <authors>, <file_ver>, <creation_date>, <last_edited_date>, <dict_edition>, <publishing_date>, <dict_src_url> 
+                  else if ( stream.name() == u"description" ) {
+                    // todo implement adding other information to the description like <publisher>, <authors>, <file_ver>, <creation_date>, <last_edited_date>, <dict_edition>, <publishing_date>, <dict_src_url>
                     QString desc = readXhtmlData( stream );
 
-                    if( isLogical )
-                    {
+                    if ( isLogical ) {
                       desc = desc.simplified();
                       QRegularExpression br( "<br\\s*>\\s*</br>" );
-                      desc.replace( br, QString("\n") );
+                      desc.replace( br, QString( "\n" ) );
                     }
 
-                    if ( dictionaryDescription.isEmpty() )
-                    {
-                      dictionaryDescription = desc;
+                    if ( dictionaryDescription.isEmpty() ) {
+                      dictionaryDescription        = desc;
                       idxHeader.descriptionAddress = chunks.startNewBlock();
 
                       QByteArray n = dictionaryDescription.toUtf8();
@@ -1219,33 +1150,24 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
                       chunks.addToBlock( n.data(), n.size() );
                     }
-                    else
-                    {
+                    else {
                       GD_DPRINTF( "Warning: duplicate description in %s\n", dictFiles[ 0 ].c_str() );
                     }
                   }
-                  else
-                  if( stream.name() == u"languages" )
-                  {
-                    while( !( stream.isEndElement() && stream.name() == u"languages" ) && !stream.atEnd() )
-                    {
-                      if( !stream.readNext() )
+                  else if ( stream.name() == u"languages" ) {
+                    while ( !( stream.isEndElement() && stream.name() == u"languages" ) && !stream.atEnd() ) {
+                      if ( !stream.readNext() )
                         break;
-                      if ( stream.isStartElement() )
-                      {
-                        if( stream.name() == u"from" )
-                        {
-                          if( idxHeader.langFrom == 0 )
-                          {
-                            QString lang = stream.attributes().value( "xml:lang" ).toString();
+                      if ( stream.isStartElement() ) {
+                        if ( stream.name() == u"from" ) {
+                          if ( idxHeader.langFrom == 0 ) {
+                            QString lang       = stream.attributes().value( "xml:lang" ).toString();
                             idxHeader.langFrom = getLanguageId( lang );
                           }
                         }
-                        else if( stream.name() == u"to" )
-                        {
-                          if( idxHeader.langTo == 0 )
-                          {
-                            QString lang = stream.attributes().value( "xml:lang" ).toString();
+                        else if ( stream.name() == u"to" ) {
+                          if ( idxHeader.langTo == 0 ) {
+                            QString lang     = stream.attributes().value( "xml:lang" ).toString();
                             idxHeader.langTo = getLanguageId( lang );
                           }
                         }
@@ -1254,57 +1176,46 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                         break;
                     }
                   }
-                  else
-                  if ( stream.name() == u"abbreviations" )
-                  {
+                  else if ( stream.name() == u"abbreviations" ) {
                     QString s;
                     string value;
-                    list < wstring > keys;
-                    while( !( stream.isEndElement() && stream.name() == u"abbreviations" ) && !stream.atEnd() )
-                    {
-                      if( !stream.readNextStartElement() )
+                    list< wstring > keys;
+                    while ( !( stream.isEndElement() && stream.name() == u"abbreviations" ) && !stream.atEnd() ) {
+                      if ( !stream.readNextStartElement() )
                         break;
                       // abbreviations tag set switch at format revision = 30
-                      if( idxHeader.revisionNumber >= 30 )
-                      {
-                        while ( !( stream.isEndElement() && stream.name() == u"abbr_def" ) || !stream.atEnd() )
-                        {
-                          if ( stream.isStartElement() && stream.name() == u"abbr_k" )
-                          {
+                      if ( idxHeader.revisionNumber >= 30 ) {
+                        while ( !( stream.isEndElement() && stream.name() == u"abbr_def" ) || !stream.atEnd() ) {
+                          if ( stream.isStartElement() && stream.name() == u"abbr_k" ) {
                             s = readElementText( stream );
                             keys.push_back( gd::toWString( s ) );
                           }
-                          else if ( stream.isStartElement() && stream.name() == u"abbr_v" )
-                          {
-                            s =  readElementText( stream );
+                          else if ( stream.isStartElement() && stream.name() == u"abbr_v" ) {
+                            s     = readElementText( stream );
                             value = Folding::trimWhitespace( s ).toStdString();
-                              for ( const auto & key : keys ) {
-                                abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
-                              }
-                              keys.clear();
+                            for ( const auto & key : keys ) {
+                              abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
+                            }
+                            keys.clear();
                           }
                           else if ( stream.isEndElement() && stream.name() == u"abbreviations" )
                             break;
                           stream.readNext();
                         }
                       }
-                      else
-                      {
-                        while ( !( stream.isEndElement() && stream.name() == u"abr_def" ) || !stream.atEnd() )
-                        {
-                          if ( stream.isStartElement() && stream.name() == u"k" )
-                          {
+                      else {
+                        while ( !( stream.isEndElement() && stream.name() == u"abr_def" ) || !stream.atEnd() ) {
+                          if ( stream.isStartElement() && stream.name() == u"k" ) {
                             s = readElementText( stream );
                             keys.push_back( gd::toWString( s ) );
                           }
-                          else if ( stream.isStartElement() && stream.name() == u"v" )
-                          {
-                            s =  readElementText( stream );
+                          else if ( stream.isStartElement() && stream.name() == u"v" ) {
+                            s     = readElementText( stream );
                             value = Folding::trimWhitespace( s ).toStdString();
-                              for ( const auto & key : keys ) {
-                                abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
-                              }
-                              keys.clear();
+                            for ( const auto & key : keys ) {
+                              abrv[ Utf8::encode( Folding::trimWhitespace( key ) ) ] = value;
+                            }
+                            keys.clear();
                           }
                           else if ( stream.isEndElement() && stream.name() == u"abbreviations" )
                             break;
@@ -1313,20 +1224,22 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                       }
                     }
                   }
-                  else
-                  if ( stream.name() == u"ar" )
-                  {
-                    indexArticle( gzFile, stream, indexedWords, chunks,
-                                  articleCount, wordCount, isLogical ? Logical : Visual );
+                  else if ( stream.name() == u"ar" ) {
+                    indexArticle( gzFile,
+                                  stream,
+                                  indexedWords,
+                                  chunks,
+                                  articleCount,
+                                  wordCount,
+                                  isLogical ? Logical : Visual );
                   }
                 }
               }
 
               // Write abbreviations if presented
 
-              if( !abrv.empty() )
-              {
-                idxHeader.hasAbrv = 1;
+              if ( !abrv.empty() ) {
+                idxHeader.hasAbrv     = 1;
                 idxHeader.abrvAddress = chunks.startNewBlock();
 
                 uint32_t sz = abrv.size();
@@ -1352,14 +1265,13 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
               IndexInfo idxInfo = BtreeIndexing::buildIndex( indexedWords, idx );
 
               idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-              idxHeader.indexRootOffset = idxInfo.rootOffset;
+              idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
               indexedWords.clear(); // Release memory -- no need for this data
 
               // If there was a zip file, index it too
 
-              if ( zipFileName.size() )
-              {
+              if ( zipFileName.size() ) {
                 GD_DPRINTF( "Indexing zip file\n" );
 
                 idxHeader.hasZipFile = 1;
@@ -1369,32 +1281,30 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
                 if ( zipFile.openZipFile( QDir::fromNativeSeparators( zipFileName.c_str() ) ) )
                   zipFile.indexFile( zipFileNames );
 
-                if( !zipFileNames.empty() )
-                {
+                if ( !zipFileNames.empty() ) {
                   // Build the resulting zip file index
 
                   IndexInfo idxInfo = BtreeIndexing::buildIndex( zipFileNames, idx );
 
                   idxHeader.zipIndexBtreeMaxElements = idxInfo.btreeMaxElements;
-                  idxHeader.zipIndexRootOffset = idxInfo.rootOffset;
+                  idxHeader.zipIndexRootOffset       = idxInfo.rootOffset;
                 }
-                else
-                {
+                else {
                   // Bad zip file -- no index (though the mark that we have one
                   // remains)
                   idxHeader.zipIndexBtreeMaxElements = 0;
-                  idxHeader.zipIndexRootOffset = 0;
+                  idxHeader.zipIndexRootOffset       = 0;
                 }
               }
               else
                 idxHeader.hasZipFile = 0;
               // That concludes it. Update the header.
 
-              idxHeader.signature = Signature;
+              idxHeader.signature     = Signature;
               idxHeader.formatVersion = CurrentFormatVersion;
 
               idxHeader.articleCount = articleCount;
-              idxHeader.wordCount = wordCount;
+              idxHeader.wordCount    = wordCount;
 
               idx.rewind();
 
@@ -1409,26 +1319,22 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         if ( !hadXdxf )
           throw exNotXdxfFile( dictFiles[ 0 ] );
 
-        if ( stream.hasError() )
-        {
+        if ( stream.hasError() ) {
           gdWarning( "%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() );
+                     dictFiles[ 0 ].c_str(),
+                     stream.errorString().toUtf8().data(),
+                     (unsigned long)stream.lineNumber() );
         }
       }
 
-      dictionaries.push_back( std::make_shared<XdxfDictionary>( dictId,
-                                                  indexFile,
-                                                  dictFiles ) );
+      dictionaries.push_back( std::make_shared< XdxfDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "Xdxf dictionary initializing failed: %s, error: %s\n",
-                 fileName.c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "Xdxf dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
     }
   }
 
   return dictionaries;
 }
 
-}
+} // namespace Xdxf
diff --git a/src/dict/xdxf.hh b/src/dict/xdxf.hh
index c6a9e502..bab8336f 100644
--- a/src/dict/xdxf.hh
+++ b/src/dict/xdxf.hh
@@ -14,12 +14,9 @@ using std::string;
 
 quint32 getLanguageId( const QString & lang );
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-    ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace Xdxf
 
 #endif
diff --git a/src/dict/xdxf2html.cc b/src/dict/xdxf2html.cc
index 8bdf7481..3a1bf5ad 100644
--- a/src/dict/xdxf2html.cc
+++ b/src/dict/xdxf2html.cc
@@ -21,12 +21,12 @@
 
 namespace Xdxf2Html {
 
-static void fixLink( QDomElement & el, string const & dictId, const char *attrName )
+static void fixLink( QDomElement & el, string const & dictId, const char * attrName )
 {
   QUrl url;
   url.setScheme( "bres" );
-  url.setHost( QString::fromStdString(dictId) );
-  url.setPath( Utils::Url::ensureLeadingSlash( el.attribute(attrName) ) );
+  url.setHost( QString::fromStdString( dictId ) );
+  url.setPath( Utils::Url::ensureLeadingSlash( el.attribute( attrName ) ) );
 
   el.setAttribute( attrName, url.toEncoded().data() );
 }
@@ -34,30 +34,27 @@ static void fixLink( QDomElement & el, string const & dictId, const char *attrNa
 // converting a number into roman representation
 string convertToRoman( int input, int lower_case )
 {
-    string romanvalue = "";
-    if( input >= 4000 )
-    {
-        int x = ( input - input % 4000 ) / 1000;
-        romanvalue = "(" + convertToRoman( x, lower_case ) + ")" ;
-        input %= 4000;
-    }
+  string romanvalue = "";
+  if ( input >= 4000 ) {
+    int x      = ( input - input % 4000 ) / 1000;
+    romanvalue = "(" + convertToRoman( x, lower_case ) + ")";
+    input %= 4000;
+  }
 
-    const string roman[26] = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I",
-                               "m", "cm", "d", "cd", "c", "xc", "l", "xl", "x", "ix", "v", "iv", "i"};
-    const int decimal[13] =  {1000,  900, 500,  400, 100,   90,  50,   40,  10,    9,   5,    4,   1};
+  const string roman[ 26 ] = { "M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I",
+                               "m", "cm", "d", "cd", "c", "xc", "l", "xl", "x", "ix", "v", "iv", "i" };
+  const int decimal[ 13 ]  = { 1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1 };
 
-    for( int i = 0; i < 13; i++ )
-    {
-      while( input >= decimal[ i ] )
-      {
-        input -= decimal[ i ];
-        if ( lower_case == 1 )
-          romanvalue += roman[ i + 13 ];
-        else
-          romanvalue += roman[ i ];
-      }
+  for ( int i = 0; i < 13; i++ ) {
+    while ( input >= decimal[ i ] ) {
+      input -= decimal[ i ];
+      if ( lower_case == 1 )
+        romanvalue += roman[ i + 13 ];
+      else
+        romanvalue += roman[ i ];
     }
-    return romanvalue;
+  }
+  return romanvalue;
 }
 
 QDomElement fakeElement( QDomDocument & dom )
@@ -67,9 +64,14 @@ QDomElement fakeElement( QDomDocument & dom )
   return dom.createElement( "b" );
 }
 
-string convert( string const & in, DICT_TYPE type, map < string, string > const * pAbrv,
-                Dictionary::Class *dictPtr,  IndexedZip * resourceZip,
-                bool isLogicalFormat, unsigned revisionNumber, QString * headword )
+string convert( string const & in,
+                DICT_TYPE type,
+                map< string, string > const * pAbrv,
+                Dictionary::Class * dictPtr,
+                IndexedZip * resourceZip,
+                bool isLogicalFormat,
+                unsigned revisionNumber,
+                QString * headword )
 {
   // Convert spaces after each end of line to &nbsp;s, and then each end of
   // line to a <br>
@@ -80,13 +82,11 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   bool afterEol = false;
 
-  for( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i )
-  {
-    switch( *i )
-    {
+  for ( string::const_iterator i = in.begin(), j = in.end(); i != j; ++i ) {
+    switch ( *i ) {
       case '\n':
         afterEol = true;
-        if( !isLogicalFormat )
+        if ( !isLogicalFormat )
           inConverted.append( "<br/>" );
         break;
 
@@ -94,10 +94,9 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
         break;
 
       case ' ':
-        if ( afterEol )
-        {
-          if( !isLogicalFormat )
-            inConverted.append( "&nbsp;" ); 
+        if ( afterEol ) {
+          if ( !isLogicalFormat )
+            inConverted.append( "&#160;" ); // xml don't have &nbsp;
           break;
         }
         // Fall-through
@@ -115,62 +114,67 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
   int errorLine, errorColumn;
 
   string in_data;
-  if( type == XDXF )
-  {
-      in_data = "<div class=\"xdxf\"";
-      if( dictPtr->isToLanguageRTL() )
-        in_data += " dir=\"rtl\"";
-      in_data += ">";
+  if ( type == XDXF ) {
+    in_data = "<div class=\"xdxf\"";
+    if ( dictPtr->isToLanguageRTL() )
+      in_data += " dir=\"rtl\"";
+    in_data += ">";
   }
   else
-      in_data = "<div class=\"sdct_x\">";
+    in_data = "<div class=\"sdct_x\">";
   in_data += inConverted + "</div>";
 
-  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 );
-    gdWarning( "The input was: %s\n", in.c_str() );
 
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 5, 0 ) )
+  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 );
+    gdWarning( "The input was: %s\n", in_data.c_str() );
     return in;
   }
+#else
+  auto setContentResult = dd.setContent( QByteArray::fromStdString( in_data ) );
+  if ( !setContentResult ) {
+    qWarning( "Xdxf2html error, xml parse failed: %s at %d,%d\n",
+              setContentResult.errorMessage.toStdString().c_str(),
+              setContentResult.errorLine,
+              setContentResult.errorColumn );
+    gdWarning( "The input was: %s\n", in_data.c_str() );
+    return in;
+  }
+#endif
 
   QDomNodeList nodes = dd.elementsByTagName( "ex" ); // Example
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QString author, source;
     QDomElement el = nodes.at( 0 ).toElement();
 
     author = el.attribute( "author", QString() );
     source = el.attribute( "source", QString() );
 
-    if( el.hasChildNodes() )
-    {
+    if ( el.hasChildNodes() ) {
       QDomNodeList lst = el.childNodes();
-      for( int i = 0; i < lst.count(); ++i )
-      {
+      for ( int i = 0; i < lst.count(); ++i ) {
         QDomElement el2 = el.childNodes().at( i ).toElement();
-        if( el2.tagName().compare( "ex_orig", Qt::CaseInsensitive ) == 0 )
-        {
+        if ( el2.tagName().compare( "ex_orig", Qt::CaseInsensitive ) == 0 ) {
           el2.setTagName( "span" );
           el2.setAttribute( "class", "xdxf_ex_orig" );
         }
-        else if( el2.tagName().compare( "ex_tran", Qt::CaseInsensitive ) == 0 )
-        {
+        else if ( el2.tagName().compare( "ex_tran", Qt::CaseInsensitive ) == 0 ) {
           el2.setTagName( "span" );
           el2.setAttribute( "class", "xdxf_ex_tran" );
         }
       }
     }
-    if( ( !author.isEmpty() || !source.isEmpty() )
-        && ( !el.text().isEmpty() || !el.childNodes().isEmpty() ) )
-    {
+    if ( ( !author.isEmpty() || !source.isEmpty() ) && ( !el.text().isEmpty() || !el.childNodes().isEmpty() ) ) {
       QDomElement el2 = dd.createElement( "span" );
       el2.setAttribute( "class", "xdxf_ex_source" );
       QString text = author;
-      if( !source.isEmpty() )
-      {
-        if( !text.isEmpty() )
+      if ( !source.isEmpty() ) {
+        if ( !text.isEmpty() )
           text += ", ";
         text += source;
       }
@@ -179,23 +183,22 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
       el.appendChild( el2 );
     }
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_ex" );
     else
       el.setAttribute( "class", "xdxf_ex_old" );
   }
-  
+
   nodes = dd.elementsByTagName( "mrkd" ); // marked out words in translations/examples of usage
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
@@ -204,62 +207,56 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   nodes = dd.elementsByTagName( "k" ); // Key
 
-  if( headword )
+  if ( headword )
     headword->clear();
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
-    if( type == STARDICT )
-    {
-        el.setTagName( "span" );
-        el.setAttribute( "class", "xdxf_k" );
+    if ( type == STARDICT ) {
+      el.setTagName( "span" );
+      el.setAttribute( "class", "xdxf_k" );
     }
-    else
-    {
-        if( headword && headword->isEmpty() )
-          *headword = el.text();
+    else {
+      if ( headword && headword->isEmpty() )
+        *headword = el.text();
 
-        el.setTagName( "div" );
-        el.setAttribute( "class", "xdxf_headwords" );
-        bool isLanguageRtl = dictPtr->isFromLanguageRTL();
-        if( el.hasAttribute( "xml:lang" ) )
-        {
-          // Change xml-attribute "xml:lang" to html-attribute "lang"
-          QString lang = el.attribute( "xml:lang" );
-          el.removeAttribute( "xml:lang" );
-          el.setAttribute( "lang", lang );
+      el.setTagName( "div" );
+      el.setAttribute( "class", "xdxf_headwords" );
+      bool isLanguageRtl = dictPtr->isFromLanguageRTL();
+      if ( el.hasAttribute( "xml:lang" ) ) {
+        // Change xml-attribute "xml:lang" to html-attribute "lang"
+        QString lang = el.attribute( "xml:lang" );
+        el.removeAttribute( "xml:lang" );
+        el.setAttribute( "lang", lang );
 
-          quint32 langID = Xdxf::getLanguageId( lang );
-          if( langID )
-            isLanguageRtl = LangCoder::isLanguageRTL( langID );
-        }
-        if( isLanguageRtl != dictPtr->isToLanguageRTL() )
-          el.setAttribute( "dir", isLanguageRtl ? "rtl" : "ltr" );
+        quint32 langID = Xdxf::getLanguageId( lang );
+        if ( langID )
+          isLanguageRtl = LangCoder::isLanguageRTL( langID );
+      }
+      if ( isLanguageRtl != dictPtr->isToLanguageRTL() )
+        el.setAttribute( "dir", isLanguageRtl ? "rtl" : "ltr" );
     }
   }
-  
+
   // processing of nested <def>s
-  if( isLogicalFormat ) // in articles with visual format <def> tags do not effect the formatting.
+  if ( isLogicalFormat ) // in articles with visual format <def> tags do not effect the formatting.
   {
     nodes = dd.elementsByTagName( "def" );
-    
+
     // this is a logical type of XDXF, so we need to render proper numbering
     // we will do it this way:
-    
+
     // 1. we compute the maximum nesting depth of the article
     int maxNestingDepth = 1; // maximum nesting depth of the article
-    for( int i = 0; i < nodes.size(); i++ )
-    {
-      QDomElement el = nodes.at( i ).toElement();
+    for ( int i = 0; i < nodes.size(); i++ ) {
+      QDomElement el          = nodes.at( i ).toElement();
       QDomElement nestingNode = el;
-      int nestingCount = 0;
-      while ( nestingNode.parentNode().toElement().tagName() == "def" )
-      {
+      int nestingCount        = 0;
+      while ( nestingNode.parentNode().toElement().tagName() == "def" ) {
         nestingCount++;
         nestingNode = nestingNode.parentNode().toElement();
       }
@@ -267,56 +264,49 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
         maxNestingDepth = nestingCount;
     }
     // 2. in this loop we go layer-by-layer through all <def> and insert proper numbers according to its structure
-    for( int j = maxNestingDepth; j > 0; j-- ) // j symbolizes special depth to be processed at this iteration
+    for ( int j = maxNestingDepth; j > 0; j-- ) // j symbolizes special depth to be processed at this iteration
     {
-      int siblingCount = 0; // this  that counts the number of among all siblings of this depth
+      int siblingCount   = 0;  // this  that counts the number of among all siblings of this depth
       QString numberText = ""; // the number to be inserted into the beginning of <def> (I,II,IV,1,2,3,a),b),c)...)
-      for( int i = 0; i < nodes.size(); i++ )
-      {
-        QDomElement el = nodes.at( i ).toElement();
+      for ( int i = 0; i < nodes.size(); i++ ) {
+        QDomElement el          = nodes.at( i ).toElement();
         QDomElement nestingNode = el;
         // computing the depth @nestingDepth of a current node @el
         int nestingDepth = 0;
-        while( nestingNode.parentNode().toElement().tagName() == "def" )
-        {
+        while ( nestingNode.parentNode().toElement().tagName() == "def" ) {
           nestingDepth++;
-          nestingNode=nestingNode.parentNode().toElement();
-        } 
+          nestingNode = nestingNode.parentNode().toElement();
+        }
         // we process nodes on of current depth @j
         // we do this in order not to break the numbering at this depth level
-        if (nestingDepth == j)
-        {
+        if ( nestingDepth == j ) {
           siblingCount++;
-          if( maxNestingDepth == 1 )
-          {
+          if ( maxNestingDepth == 1 ) {
             numberText = numberText.setNum( siblingCount ) + ". ";
           }
-          else if( maxNestingDepth == 2 )
-          {
-            if( nestingDepth == 1 )
+          else if ( maxNestingDepth == 2 ) {
+            if ( nestingDepth == 1 )
               numberText = numberText.setNum( siblingCount ) + ". ";
-            if( nestingDepth == 2 )
+            if ( nestingDepth == 2 )
               numberText = numberText.setNum( siblingCount ) + ") ";
           }
-          else
-          {
-            if( nestingDepth == 1 )
-              numberText = QString::fromStdString( convertToRoman(siblingCount,0) + ". " );
-            if( nestingDepth == 2 )
+          else {
+            if ( nestingDepth == 1 )
+              numberText = QString::fromStdString( convertToRoman( siblingCount, 0 ) + ". " );
+            if ( nestingDepth == 2 )
               numberText = numberText.setNum( siblingCount ) + ". ";
-            if( nestingDepth == 3 )
+            if ( nestingDepth == 3 )
               numberText = numberText.setNum( siblingCount ) + ") ";
-            if( nestingDepth == 4 )
-              numberText = QString::fromStdString( convertToRoman(siblingCount,1) + ") " );
+            if ( nestingDepth == 4 )
+              numberText = QString::fromStdString( convertToRoman( siblingCount, 1 ) + ") " );
           }
           QDomElement numberNode = dd.createElement( "span" );
           numberNode.setAttribute( "class", "xdxf_num" );
           QDomText text_num = dd.createTextNode( numberText );
           numberNode.appendChild( text_num );
           el.insertBefore( numberNode, el.firstChild() );
-          
-          if ( el.hasAttribute( "cmt" ) )
-          {
+
+          if ( el.hasAttribute( "cmt" ) ) {
             QDomElement cmtNode = dd.createElement( "span" );
             cmtNode.setAttribute( "class", "xdxf_co" );
             QDomText text_num = dd.createTextNode( el.attribute( "cmt" ) );
@@ -324,40 +314,37 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
             el.insertAfter( cmtNode, el.firstChild() );
           }
         }
-        else if( nestingDepth < j ) // if it goes one level up @siblingCount needs to be reset
+        else if ( nestingDepth < j ) // if it goes one level up @siblingCount needs to be reset
           siblingCount = 0;
       }
     }
     // we finally change all <def> tags into 'xdxf_def' <span>s
-    while( nodes.size() )
-    {
+    while ( nodes.size() ) {
       QDomElement el = nodes.at( 0 ).toElement();
       el.setTagName( "span" );
       el.setAttribute( "class", "xdxf_def" );
       bool isLanguageRtl = dictPtr->isToLanguageRTL();
-      if( el.hasAttribute( "xml:lang" ) )
-      {
+      if ( el.hasAttribute( "xml:lang" ) ) {
         // Change xml-attribute "xml:lang" to html-attribute "lang"
         QString lang = el.attribute( "xml:lang" );
         el.removeAttribute( "xml:lang" );
         el.setAttribute( "lang", lang );
 
         quint32 langID = Xdxf::getLanguageId( lang );
-        if( langID )
+        if ( langID )
           isLanguageRtl = LangCoder::isLanguageRTL( langID );
       }
-      if( isLanguageRtl != dictPtr->isToLanguageRTL() )
+      if ( isLanguageRtl != dictPtr->isToLanguageRTL() )
         el.setAttribute( "dir", isLanguageRtl ? "rtl" : "ltr" );
     }
   }
-  
+
   nodes = dd.elementsByTagName( "opt" ); // Optional headword part
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
@@ -366,23 +353,20 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   nodes = dd.elementsByTagName( "kref" ); // Reference to another word
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "a" );
     el.setAttribute( "href", QString( "bword:" ) + el.text() );
     el.setAttribute( "class", "xdxf_kref" );
-    if ( el.hasAttribute( "idref" ) )
-    {
+    if ( el.hasAttribute( "idref" ) ) {
       // todo implement support for referencing only specific parts of the article
-      el.setAttribute( "href", QString( "bword:" ) + el.text() + "#" + el.attribute( "idref" ));
+      el.setAttribute( "href", QString( "bword:" ) + el.text() + "#" + el.attribute( "idref" ) );
     }
-    if ( el.hasAttribute( "kcmt" ) )
-    {
+    if ( el.hasAttribute( "kcmt" ) ) {
       QDomText kcmtText = dd.createTextNode( " " + el.attribute( "kcmt" ) );
       el.parentNode().insertAfter( kcmtText, el );
     }
@@ -390,15 +374,14 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   nodes = dd.elementsByTagName( "iref" ); // Reference to internet site
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     QString ref = el.attribute( "href" );
-    if( ref.isEmpty() )
+    if ( ref.isEmpty() )
       ref = el.text();
 
     el.setAttribute( "href", ref );
@@ -406,70 +389,62 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
   }
 
   // Abbreviations
-  if( revisionNumber < 29 )
+  if ( revisionNumber < 29 )
     nodes = dd.elementsByTagName( "abr" );
   else
     nodes = dd.elementsByTagName( "abbr" );
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
     el.setAttribute( "class", "xdxf_abbr" );
-    if( type == XDXF && pAbrv != nullptr )
-    {
+    if ( type == XDXF && pAbrv != nullptr ) {
       string val = Folding::trimWhitespace( el.text() ).toStdString();
 
-        // If we have such a key, display a title
+      // If we have such a key, display a title
 
       auto i = pAbrv->find( val );
 
-        if ( i != pAbrv->end() )
-        {
-          string title;
+      if ( i != pAbrv->end() ) {
+        string title;
 
-          if ( Utf8::decode( i->second ).size() < 70 )
-          {
-            // Replace all spaces with non-breakable ones, since that's how Lingvo shows tooltips
-            title.reserve( i->second.size() );
+        if ( Utf8::decode( i->second ).size() < 70 ) {
+          // Replace all spaces with non-breakable ones, since that's how Lingvo shows tooltips
+          title.reserve( i->second.size() );
 
-            for( char const * c = i->second.c_str(); *c; ++c )
-            {
-              if ( *c == ' ' || *c == '\t' )
-              {
-                // u00A0 in utf8
-                title.push_back( 0xC2 );
-                title.push_back( 0xA0 );
-              }
-              else
-              if( *c == '-' ) // Change minus to non-breaking hyphen (uE28091 in utf8)
-              {
-                title.push_back( 0xE2 );
-                title.push_back( 0x80 );
-                title.push_back( 0x91 );
-              }
-              else
-                title.push_back( *c );
+          for ( char const * c = i->second.c_str(); *c; ++c ) {
+            if ( *c == ' ' || *c == '\t' ) {
+              // u00A0 in utf8
+              title.push_back( 0xC2 );
+              title.push_back( 0xA0 );
             }
+            else if ( *c == '-' ) // Change minus to non-breaking hyphen (uE28091 in utf8)
+            {
+              title.push_back( 0xE2 );
+              title.push_back( 0x80 );
+              title.push_back( 0x91 );
+            }
+            else
+              title.push_back( *c );
           }
-          else
-            title = i->second;
-          el.setAttribute( "title", QString::fromStdU32String( Utf8::decode( title ) ) );
         }
+        else
+          title = i->second;
+        el.setAttribute( "title", QString::fromStdU32String( Utf8::decode( title ) ) );
+      }
     }
   }
 
   nodes = dd.elementsByTagName( "dtrn" ); // Direct translation
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
@@ -478,17 +453,15 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   nodes = dd.elementsByTagName( "c" ); // Color
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
 
-    if ( el.hasAttribute( "c" ) )
-    {
+    if ( el.hasAttribute( "c" ) ) {
       el.setAttribute( "style", "color:" + el.attribute( "c" ) );
       el.removeAttribute( "c" );
     }
@@ -498,15 +471,14 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   nodes = dd.elementsByTagName( "co" ); // Editorial comment
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_co" );
     else
       el.setAttribute( "class", "xdxf_co_old" );
@@ -514,181 +486,164 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
 
   /* grammar information */
   nodes = dd.elementsByTagName( "gr" ); // proper grammar tag
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_gr" );
     else
       el.setAttribute( "class", "xdxf_gr_old" );
   }
   nodes = dd.elementsByTagName( "pos" ); // deprecated grammar tag
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_gr" );
     else
       el.setAttribute( "class", "xdxf_gr_old" );
   }
   nodes = dd.elementsByTagName( "tense" ); // deprecated grammar tag
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_gr" );
     else
       el.setAttribute( "class", "xdxf_gr_old" );
   }
   /* end of grammar generation */
-  
+
   nodes = dd.elementsByTagName( "tr" ); // Transcription
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
     el.setTagName( "span" );
-    if( isLogicalFormat )
+    if ( isLogicalFormat )
       el.setAttribute( "class", "xdxf_tr" );
     else
       el.setAttribute( "class", "xdxf_tr_old" );
   }
-  
+
   // Ensure that ArticleNetworkAccessManager can deal with XDXF images.
   // We modify the URL by using the dictionary ID as the hostname.
   // This is necessary to determine from which dictionary a requested
   // image originates.
   nodes = dd.elementsByTagName( "img" );
 
-  for( int i = 0; i < nodes.size(); i++ )
-  {
+  for ( int i = 0; i < nodes.size(); i++ ) {
     QDomElement el = nodes.at( i ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
-    if ( el.hasAttribute( "src" ) )
-    {
+    if ( el.hasAttribute( "src" ) ) {
       fixLink( el, dictPtr->getId(), "src" );
     }
 
-    if ( el.hasAttribute( "losrc" ) )
-    {
+    if ( el.hasAttribute( "losrc" ) ) {
       fixLink( el, dictPtr->getId(), "losrc" );
     }
 
-    if ( el.hasAttribute( "hisrc" ) )
-    {
+    if ( el.hasAttribute( "hisrc" ) ) {
       fixLink( el, dictPtr->getId(), "hisrc" );
     }
   }
 
   nodes = dd.elementsByTagName( "rref" ); // Resource reference
 
-  while( nodes.size() )
-  {
+  while ( nodes.size() ) {
     QDomElement el = nodes.at( 0 ).toElement();
 
-    if( el.text().isEmpty() && el.childNodes().isEmpty() )
+    if ( el.text().isEmpty() && el.childNodes().isEmpty() )
       el.appendChild( fakeElement( dd ) );
 
-//    if( type == XDXF && dictPtr != NULL && !el.hasAttribute( "start" ) )
-    if( dictPtr != NULL && !el.hasAttribute( "start" ) )
-    {
-        string filename = Utf8::encode( gd::toWString( el.text() ) );
+    //    if( type == XDXF && dictPtr != NULL && !el.hasAttribute( "start" ) )
+    if ( dictPtr != NULL && !el.hasAttribute( "start" ) ) {
+      string filename = Utf8::encode( gd::toWString( el.text() ) );
+
+      if ( Filetype::isNameOfPicture( filename ) ) {
+        QUrl url;
+        url.setScheme( "bres" );
+        url.setHost( QString::fromUtf8( dictPtr->getId().c_str() ) );
+        url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
+
+        QDomElement newEl = dd.createElement( "img" );
+        newEl.setAttribute( "src", url.toEncoded().data() );
+        newEl.setAttribute( "alt", Html::escape( filename ).c_str() );
+
+        QDomNode parent = el.parentNode();
+        if ( !parent.isNull() ) {
+          parent.replaceChild( newEl, el );
+          continue;
+        }
+      }
+      else if ( Filetype::isNameOfSound( filename ) ) {
+
+        QDomElement el_script = dd.createElement( "script" );
+        QDomNode parent       = el.parentNode();
+        if ( !parent.isNull() ) {
+          bool search = false;
+          if ( type == STARDICT ) {
+            string n = dictPtr->getContainingFolder().toStdString() + Utils::Fs::separator() + string( "res" )
+              + Utils::Fs::separator() + filename;
+            search = !File::exists( n )
+              && ( !resourceZip || !resourceZip->isOpen() || !resourceZip->hasFile( Utf8::decode( filename ) ) );
+          }
+          else {
+            string n = dictPtr->getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator() + filename;
+            search   = !File::exists( n )
+              && !File::exists( dictPtr->getContainingFolder().toStdString() + Utils::Fs::separator() + filename )
+              && ( !resourceZip || !resourceZip->isOpen() || !resourceZip->hasFile( Utf8::decode( filename ) ) );
+          }
+
 
-        if ( Filetype::isNameOfPicture( filename ) )
-        {
           QUrl url;
-          url.setScheme( "bres" );
-          url.setHost( QString::fromUtf8( dictPtr->getId().c_str() ) );
+          url.setScheme( "gdau" );
+          url.setHost( QString::fromUtf8( search ? "search" : dictPtr->getId().c_str() ) );
           url.setPath( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
 
-          QDomElement newEl = dd.createElement( "img" );
-          newEl.setAttribute( "src", url.toEncoded().data() );
-          newEl.setAttribute( "alt", Html::escape( filename ).c_str() );
+          el_script.setAttribute( "type", "text/javascript" );
+          parent.replaceChild( el_script, el );
 
-          QDomNode parent = el.parentNode();
-          if( !parent.isNull() )
-          {
-            parent.replaceChild( newEl, el );
-            continue;
-          }
-        }
-        else if( Filetype::isNameOfSound( filename ) )
-        {
-
-          QDomElement el_script = dd.createElement( "script" );
-          QDomNode parent = el.parentNode();
-          if( !parent.isNull() )
-          {
-            bool search = false;
-            if( type == STARDICT )
-            {
-              string n = dictPtr->getContainingFolder().toStdString() + Utils::Fs::separator() + string( "res" ) + Utils::Fs::separator() + filename;
-              search = !File::exists( n ) &&
-                       ( !resourceZip ||
-                         !resourceZip->isOpen() ||
-                         !resourceZip->hasFile( Utf8::decode( filename ) ) );
-            }
-            else
-            {
-              string n = dictPtr->getDictionaryFilenames()[ 0 ] + ".files" + Utils::Fs::separator() + filename;
-              search   = !File::exists( n )
-                && !File::exists( dictPtr->getContainingFolder().toStdString() + Utils::Fs::separator() + 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( Utils::Url::ensureLeadingSlash( QString::fromUtf8( filename.c_str() ) ) );
-
-            el_script.setAttribute( "type", "text/javascript" );
-            parent.replaceChild( el_script, el );
-
-            QDomText el_txt = dd.createTextNode( makeAudioLinkScript( string( "\"" ) + url.toEncoded().data() + "\"",
-                                                                      dictPtr->getId() ).c_str() );
-            el_script.appendChild( el_txt );
-
-            QDomElement el_span = dd.createElement( "span" );
-            el_span.setAttribute( "class", "xdxf_wav" );
-            parent.insertAfter( el_span, el_script );
-
-            QDomElement el_a = dd.createElement( "a" );
-            el_a.setAttribute( "href", url.toEncoded().data() );
-            el_span.appendChild( el_a );
-
-            QDomElement el_img = dd.createElement( "img");
-            el_img.setAttribute( "src", "qrc:///icons/playsound.png" );
-            el_img.setAttribute( "border", "0" );
-            el_img.setAttribute( "align", "absmiddle" );
-            el_img.setAttribute( "alt", "Play" );
-            el_a.appendChild( el_img );
-
-            continue;
-          }
+          QDomText el_txt = dd.createTextNode(
+            makeAudioLinkScript( string( "\"" ) + url.toEncoded().data() + "\"", dictPtr->getId() ).c_str() );
+          el_script.appendChild( el_txt );
+
+          QDomElement el_span = dd.createElement( "span" );
+          el_span.setAttribute( "class", "xdxf_wav" );
+          parent.insertAfter( el_span, el_script );
+
+          QDomElement el_a = dd.createElement( "a" );
+          el_a.setAttribute( "href", url.toEncoded().data() );
+          el_span.appendChild( el_a );
+
+          QDomElement el_img = dd.createElement( "img" );
+          el_img.setAttribute( "src", "qrc:///icons/playsound.png" );
+          el_img.setAttribute( "border", "0" );
+          el_img.setAttribute( "align", "absmiddle" );
+          el_img.setAttribute( "alt", "Play" );
+          el_a.appendChild( el_img );
+
+          continue;
         }
+      }
     }
 
     // We don't really know how to handle this at the moment, so we'll just
@@ -702,5 +657,4 @@ string convert( string const & in, DICT_TYPE type, map < string, string > const
   return dd.toString().remove( RX::Html::emptyXmlTag ).toUtf8().data();
 }
 
-}
-
+} // namespace Xdxf2Html
diff --git a/src/dict/xdxf2html.hh b/src/dict/xdxf2html.hh
index 21854b20..42e936a0 100644
--- a/src/dict/xdxf2html.hh
+++ b/src/dict/xdxf2html.hh
@@ -13,17 +13,25 @@
 /// to convert articles with such a markup to an html.
 namespace Xdxf2Html {
 
-enum DICT_TYPE { STARDICT, XDXF };
+enum DICT_TYPE {
+  STARDICT,
+  XDXF
+};
 
 using std::string;
 using std::map;
 
 /// 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, map < string, string > const * pAbrv,
-                Dictionary::Class *dictPtr, IndexedZip * resourceZip, bool isLogicalFormat = false,
-                unsigned revisionNumber = 0, QString * headword = 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 );
 
-}
+} // namespace Xdxf2Html
 
 #endif
diff --git a/src/dict/zim.cc b/src/dict/zim.cc
index b9fe1097..83ea80e3 100644
--- a/src/dict/zim.cc
+++ b/src/dict/zim.cc
@@ -3,11 +3,11 @@
 
 #ifdef MAKE_ZIM_SUPPORT
 
-#include "zim.hh"
-#include "btreeidx.hh"
+  #include "zim.hh"
+  #include "btreeidx.hh"
 
-#include "folding.hh"
-#include "gddebug.hh"
+  #include "folding.hh"
+  #include "gddebug.hh"
   #include "utf8.hh"
   #include "langcoder.hh"
   #include "filetype.hh"
@@ -41,6 +41,8 @@
   #include <zim/archive.h>
   #include <zim/entry.h>
   #include <zim/item.h>
+  #include <zim/error.h>
+
 namespace Zim {
 
 using std::string;
@@ -56,7 +58,7 @@ using BtreeIndexing::IndexedWords;
 using BtreeIndexing::IndexInfo;
 
 DEF_EX_STR( exNotZimFile, "Not an Zim file", Dictionary::Ex )
-DEF_EX_STR( exCantReadFile, "Can't read file", Dictionary::Ex )
+using Dictionary::exCantReadFile;
 DEF_EX_STR( exInvalidZimHeader, "Invalid Zim header", Dictionary::Ex )
 DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
 
@@ -66,16 +68,15 @@ using ZimFile = zim::Archive;
 
   #pragma pack( push, 1 )
 
-enum
-{
-  Signature = 0x584D495A, // ZIMX on little-endian, XMIZ on big-endian
+enum {
+  Signature            = 0x584D495A, // ZIMX on little-endian, XMIZ on big-endian
   CurrentFormatVersion = 4 + BtreeIndexing::FormatVersion + Folding::Version
 };
 
 struct IdxHeader
 {
-  quint32 signature; // First comes the signature, ZIMX
-  quint32 formatVersion; // File format version (CurrentFormatVersion)
+  quint32 signature;             // First comes the signature, ZIMX
+  quint32 formatVersion;         // File format version (CurrentFormatVersion)
   quint32 indexBtreeMaxElements; // Two fields from IndexInfo
   quint32 indexRootOffset;
   quint32 resourceIndexBtreeMaxElements; // Two fields from IndexInfo
@@ -84,15 +85,15 @@ struct IdxHeader
   quint32 articleCount;
   quint32 namePtr;
   quint32 descriptionPtr;
-  quint32 langFrom;  // Source language
-  quint32 langTo;    // Target language
+  quint32 langFrom; // Source language
+  quint32 langTo;   // Target language
 }
-#ifndef _MSC_VER
-__attribute__((packed))
-#endif
+  #ifndef _MSC_VER
+__attribute__( ( packed ) )
+  #endif
 ;
 
-#pragma pack( pop )
+  #pragma pack( pop )
 
 // Some supporting functions
 bool indexIsOldOrBad( string const & indexFile )
@@ -101,9 +102,8 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 quint32 getArticleCluster( ZimFile const & file, quint32 articleNumber )
@@ -229,11 +229,11 @@ public:
 
 protected:
 
-    void loadIcon() noexcept override;
+  void loadIcon() noexcept override;
 
 private:
 
-    /// Loads the article.
+  /// Loads the article.
   quint32 loadArticle( quint32 address, string & articleText, bool rawText = false );
 
   string convert( string const & in_data );
@@ -266,8 +266,7 @@ ZimDictionary::ZimDictionary( string const & id, string const & indexFile, vecto
 
   ftsIdxName = indexFile + Dictionary::getFtsSuffix();
 
-  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName )
-       && !FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) )
+  if ( !Dictionary::needToRebuildIndex( dictionaryFiles, ftsIdxName ) && !FtsHelpers::ftsIndexIsOldOrBad( this ) )
     FTS_index_completed.ref();
 }
 
@@ -276,18 +275,34 @@ void ZimDictionary::loadIcon() noexcept
   if ( dictionaryIconLoaded )
     return;
 
+  // Try to load Original GD's user provided icon
   QString fileName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() );
-
   // Remove the extension
   fileName.chop( 3 );
-
-  if( !loadIconFromFile( fileName ) )
-  {
-    // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/icon32_zim.png");
+  if ( loadIconFromFile( fileName ) ) {
+    dictionaryIconLoaded = true;
+    return;
   }
 
-  dictionaryIconLoaded = true;
+  // Try to load zim's illustration, which is usually 48x48 png
+  try {
+    auto illustration = df.getIllustrationItem( 48 ).getData();
+    QImage img = QImage::fromData( reinterpret_cast< const uchar * >( illustration.data() ), illustration.size() );
+
+    if ( img.isNull() ) {
+      // Fallback to default icon
+      dictionaryIcon = QIcon( ":/icons/icon32_zim.png" );
+    }
+    else {
+      dictionaryIcon = QIcon( QPixmap::fromImage( img ) );
+    }
+
+    dictionaryIconLoaded = true;
+    return;
+  }
+  catch ( zim::EntryNotFound & e ) {
+    gdDebug( "ZIM icon not loaded for: %s", dictionaryName.c_str() );
+  }
 }
 
 quint32 ZimDictionary::loadArticle( quint32 address, string & articleText, bool rawText )
@@ -295,9 +310,9 @@ quint32 ZimDictionary::loadArticle( quint32 address, string & articleText, bool
   quint32 ret = 0;
   {
     QMutexLocker _( &zimMutex );
-    ret = readArticle( df, address, articleText);
+    ret = readArticle( df, address, articleText );
   }
-  if( !rawText )
+  if ( !rawText )
     articleText = convert( articleText );
 
   return ret;
@@ -317,10 +332,9 @@ string ZimDictionary::convert( const string & in )
 
   QRegularExpression rxImgScript( R"(<\s*(img|script|source)\s+([^>]*)src=(")([^"]*)\3)" );
   QRegularExpressionMatchIterator it = rxImgScript.globalMatch( text );
-  int pos = 0;
+  int pos                            = 0;
   QString newText;
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
 
     newText += text.mid( pos, match.capturedStart() - pos );
@@ -333,8 +347,7 @@ string ZimDictionary::convert( const string & in )
     QString urlLink = match.captured();
 
     QString replacedLink = urlLink;
-    if( !url.isEmpty() && !url.startsWith( "//" ) && !url.startsWith( "http://" ) && !url.startsWith( "https://" ) )
-    {
+    if ( !url.isEmpty() && !url.startsWith( "//" ) && !url.startsWith( "http://" ) && !url.startsWith( "https://" ) ) {
       //the pattern like : <\\1 \\2src=\\3bres://%1/
 
       //remove leading dot and slash
@@ -345,8 +358,7 @@ string ZimDictionary::convert( const string & in )
 
     newText += replacedLink;
   }
-  if( pos )
-  {
+  if ( pos ) {
     newText += text.mid( pos );
     text = newText;
   }
@@ -354,27 +366,27 @@ string ZimDictionary::convert( const string & in )
 
 
   // Fix links without '"'
-  text.replace( QRegularExpression( R"(href=(\.\.|)/([^\s>]+))" ),
-                QString( R"(href="\1/\2")" ) );
+  text.replace( QRegularExpression( R"(href=(\.\.|)/([^\s>]+))" ), QString( R"(href="\1/\2")" ) );
 
   // pattern <link... href="..." ...>
   text.replace( QRegularExpression( R"(<\s*link\s+([^>]*)href="(\.\.|)/)" ),
-                QString( "<link \\1href=\"bres://%1/").arg( getId().c_str() ) );
+                QString( "<link \\1href=\"bres://%1/" ).arg( getId().c_str() ) );
 
   // 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/([^:\"]*)\"";
+  QString urlWiki =
+    "\"http(s|)://en\\.(wiki(pedia|books|news|quote|source|voyage|versity)|wiktionary)\\.(org|com)/wiki/([^:\"]*)\"";
   text.replace( QRegularExpression( R"(<\s*a\s+(class="external"\s+|)href=)" + urlWiki ),
                 QString( R"(<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
   // <meta http-equiv="Refresh" content="0;url=../dsalsrv02.uchicago.edu/cgi-bin/0994.html">
-  QRegularExpression rxLink( R"lit(<\s*(?:a|meta)\s+([^>]*)(?:href|url)="?(?!(?:\w+://|#|mailto:|tel:))()([^"]*)"\s*(title="[^"]*")?[^>]*>)lit" );
-  it = rxLink.globalMatch( text );
+  QRegularExpression rxLink(
+    R"lit(<\s*(?:a|meta)\s+([^>]*)(?:href|url)="?(?!(?:\w+://|#|mailto:|tel:))()([^"]*)"\s*(title="[^"]*")?[^>]*>)lit" );
+  it  = rxLink.globalMatch( text );
   pos = 0;
-  while( it.hasNext() )
-  {
+  while ( it.hasNext() ) {
     QRegularExpressionMatch match = it.next();
 
     newText += text.mid( pos, match.capturedStart() - pos );
@@ -382,19 +394,18 @@ string ZimDictionary::convert( const string & in )
 
     QStringList list = match.capturedTexts();
     // Add empty strings for compatibility with QRegExp behaviour
-    for( int i = list.size(); i < 5; i++ )
+    for ( int i = list.size(); i < 5; i++ )
       list.append( QString() );
 
     QString formatTag;
     QString tag = list[ 3 ]; // a url, ex: Precambrian_Chaotian.html
     QString url = tag;
-    if( !list[ 4 ].isEmpty() ) // a title, ex: title="Precambrian/Chaotian"
+    if ( !list[ 4 ].isEmpty() ) // a title, ex: title="Precambrian/Chaotian"
     {
       tag       = list[ 4 ];
       formatTag = tag.split( "\"" )[ 1 ];
     }
-    else
-    {
+    else {
       //tag from list[3]
       formatTag = tag;
       formatTag.remove( RX::Zim::leadingDotSlash );
@@ -403,8 +414,7 @@ string ZimDictionary::convert( const string & in )
     QString urlLink = match.captured();
 
     QString replacedLink = urlLink;
-    if( !url.isEmpty() && !url.startsWith( "//" ) )
-    {
+    if ( !url.isEmpty() && !url.startsWith( "//" ) ) {
       replacedLink = urlLink.replace( url, "gdlookup://localhost/" + formatTag );
     }
 
@@ -418,12 +428,12 @@ string ZimDictionary::convert( const string & in )
 
   // Occasionally 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>
-  QRegularExpression rxBR( R"((<a href="gdlookup://localhost/[^"]*"\s*[^>]*>)\s*((\w\s*&lt;br(\\|/|)&gt;\s*)+\w)\s*</a>)",
-                           QRegularExpression::UseUnicodePropertiesOption );
-  pos = 0;
+  QRegularExpression rxBR(
+    R"((<a href="gdlookup://localhost/[^"]*"\s*[^>]*>)\s*((\w\s*&lt;br(\\|/|)&gt;\s*)+\w)\s*</a>)",
+    QRegularExpression::UseUnicodePropertiesOption );
+  pos                                 = 0;
   QRegularExpressionMatchIterator it2 = rxBR.globalMatch( text );
-  while( it2.hasNext() )
-  {
+  while ( it2.hasNext() ) {
     QRegularExpressionMatch match = it2.next();
 
     newText += text.mid( pos, match.capturedStart() - pos );
@@ -431,18 +441,20 @@ string ZimDictionary::convert( const string & in )
 
     QStringList list = match.capturedTexts();
     // Add empty strings for compatibility with QRegExp behaviour
-    for( int i = match.lastCapturedIndex() + 1; i < 3; i++ )
+    for ( int i = match.lastCapturedIndex() + 1; i < 3; i++ )
       list.append( QString() );
 
-    QString tag = list[2];
-    tag.replace( QRegularExpression( "&lt;br( |)(\\\\|/|)&gt;", QRegularExpression::PatternOption::CaseInsensitiveOption ) , "<br/>" ).
-        prepend( list[1] ).
-        append( "</a>" );
+    QString tag = list[ 2 ];
+    tag
+      .replace(
+        QRegularExpression( "&lt;br( |)(\\\\|/|)&gt;", QRegularExpression::PatternOption::CaseInsensitiveOption ),
+        "<br/>" )
+      .prepend( list[ 1 ] )
+      .append( "</a>" );
 
     newText += tag;
   }
-  if( pos )
-  {
+  if ( pos ) {
     newText += text.mid( pos );
     text = newText;
   }
@@ -462,7 +474,7 @@ void ZimDictionary::loadResource( std::string & resourceName, string & data )
   readArticleByPath( df, resourceName, data );
 }
 
-QString const& ZimDictionary::getDescription()
+QString const & ZimDictionary::getDescription()
 {
   if ( !dictionaryDescription.isEmpty() )
     return dictionaryDescription;
@@ -473,42 +485,37 @@ QString const& ZimDictionary::getDescription()
 
 void ZimDictionary::makeFTSIndex( QAtomicInt & isCancelled, bool firstIteration )
 {
-  if( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
-         || FtsHelpers::ftsIndexIsOldOrBad( ftsIdxName, this ) ) )
+  if ( !( Dictionary::needToRebuildIndex( getDictionaryFilenames(), ftsIdxName )
+          || FtsHelpers::ftsIndexIsOldOrBad( this ) ) )
     FTS_index_completed.ref();
 
-  if( haveFTSIndex() )
+  if ( haveFTSIndex() )
     return;
 
   if ( !ensureInitDone().empty() )
     return;
 
-  if( firstIteration )
+  if ( firstIteration )
     return;
 
-  gdDebug( "Zim: Building the full-text index for dictionary: %s\n",
-           getName().c_str() );
+  gdDebug( "Zim: 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 )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Zim: Failed building full-text search index for \"%s\", reason: %s\n", getName().c_str(), ex.what() );
     QFile::remove( ftsIdxName.c_str() );
   }
 }
 
-void ZimDictionary::sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets,
-                                               QAtomicInt & isCancelled )
+void ZimDictionary::sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets, QAtomicInt & isCancelled )
 {
   QVector< QPair< quint32, uint32_t > > offsetsWithClusters;
   offsetsWithClusters.reserve( offsets.size() );
 
-  for( QVector< uint32_t >::ConstIterator it = offsets.constBegin();
-       it != offsets.constEnd(); ++it )
-  {
-    if( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  for ( QVector< uint32_t >::ConstIterator it = offsets.constBegin(); it != offsets.constEnd(); ++it ) {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       return;
 
     QMutexLocker _( &zimMutex );
@@ -517,22 +524,20 @@ void ZimDictionary::sortArticlesOffsetsForFTS( QVector< uint32_t > & offsets,
 
   std::sort( offsetsWithClusters.begin(), offsetsWithClusters.end() );
 
-  for( int i = 0; i < offsetsWithClusters.size(); i++ )
+  for ( int i = 0; i < offsetsWithClusters.size(); i++ )
     offsets[ i ] = offsetsWithClusters.at( i ).second;
 }
 
 void ZimDictionary::getArticleText( uint32_t articleAddress, QString & headword, QString & text )
 {
-  try
-  {
+  try {
     headword.clear();
     string articleText;
 
     loadArticle( articleAddress, articleText, true );
     text = Html::unescape( QString::fromUtf8( articleText.data(), articleText.size() ) );
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Zim: Failed retrieving article from \"%s\", reason: %s\n", getName().c_str(), ex.what() );
   }
 }
@@ -567,7 +572,9 @@ public:
     dict( dict_ ),
     ignoreDiacritics( ignoreDiacritics_ )
   {
-    f = QtConcurrent::run( [ this ]() { this->run(); } );
+    f = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -586,8 +593,7 @@ public:
 
 void ZimArticleRequest::run()
 {
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
@@ -609,12 +615,11 @@ void ZimArticleRequest::run()
                                    // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
   for ( auto & x : chain ) {
-    if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-    {
+    if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
       finish();
       return;
     }
@@ -626,15 +631,13 @@ void ZimArticleRequest::run()
     headword = x.word;
 
     quint32 articleNumber = 0xFFFFFFFF;
-    try
-    {
+    try {
       articleNumber = dict.loadArticle( x.articleOffset, articleText );
     }
-    catch(...)
-    {
+    catch ( ... ) {
     }
 
-    if( articleNumber == 0xFFFFFFFF )
+    if ( articleNumber == 0xFFFFFFFF )
       continue; // No article loaded
 
     if ( articlesIncluded.find( articleNumber ) != articlesIncluded.end() )
@@ -645,24 +648,19 @@ void ZimArticleRequest::run()
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( headword );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( headword );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, pair< string, string > > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( pair(
-      Folding::applySimpleCaseOnly( headword ),
-      pair( headword, articleText ) ) );
+    mapToUse.insert( pair( Folding::applySimpleCaseOnly( headword ), pair( headword, articleText ) ) );
 
     articlesIncluded.insert( articleNumber );
   }
 
-  if ( mainArticles.empty() && alternateArticles.empty() )
-  {
+  if ( mainArticles.empty() && alternateArticles.empty() ) {
     // No such word
     finish();
     return;
@@ -676,31 +674,25 @@ void ZimArticleRequest::run()
   multimap< wstring, pair< string, string > >::const_iterator i;
 
 
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-      result += "<div class=\"zimdict\">";
-      result += "<h2 class=\"zimdict_headword\">";
-      result += i->second.first;
-      result += "</h2>";
-      result += i->second.second;
-      result += cleaner + "</div>";
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    result += "<div class=\"zimdict\">";
+    result += "<h2 class=\"zimdict_headword\">";
+    result += i->second.first;
+    result += "</h2>";
+    result += i->second.second;
+    result += cleaner + "</div>";
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-      result += "<div class=\"zimdict\">";
-      result += "<h2 class=\"zimdict_headword\">";
-      result += i->second.first;
-      result += "</h2>";
-      result += i->second.second;
-      result += cleaner + "</div>";
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    result += "<div class=\"zimdict\">";
+    result += "<h2 class=\"zimdict_headword\">";
+    result += i->second.first;
+    result += "</h2>";
+    result += i->second.second;
+    result += cleaner + "</div>";
   }
 
-  QMutexLocker _( &dataMutex );
-
-  data.resize( result.size() );
-
-  memcpy( &data.front(), result.data(), result.size() );
+  appendString( result );
 
   hasAnyData = true;
 
@@ -711,9 +703,9 @@ sptr< Dictionary::DataRequest > ZimDictionary::getArticle( wstring const & word,
                                                            vector< wstring > const & alts,
                                                            wstring const &,
                                                            bool ignoreDiacritics )
-  
+
 {
-  return std::make_shared<ZimArticleRequest>( word, alts, *this, ignoreDiacritics );
+  return std::make_shared< ZimArticleRequest >( word, alts, *this, ignoreDiacritics );
 }
 
 //// ZimDictionary::getResource()
@@ -755,21 +747,18 @@ public:
 void ZimResourceRequest::run()
 {
   // Some runnables linger enough that they are cancelled before they start
-  if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-  {
+  if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
     finish();
     return;
   }
 
-  try
-  {
+  try {
     string resource;
     dict.loadResource( resourceName, resource );
-    if( resource.empty() )
+    if ( resource.empty() )
       throw File::Ex();
 
-    if( Filetype::isNameOfCSS( resourceName ) )
-    {
+    if ( Filetype::isNameOfCSS( resourceName ) ) {
       QString css = QString::fromUtf8( resource.data(), resource.size() );
       dict.isolateCSS( css, ".zimdict" );
       QByteArray bytes = css.toUtf8();
@@ -778,15 +767,12 @@ void ZimResourceRequest::run()
       data.resize( bytes.size() );
       memcpy( &data.front(), bytes.constData(), bytes.size() );
     }
-    else
-    if ( Filetype::isNameOfTiff( resourceName ) )
-    {
+    else if ( Filetype::isNameOfTiff( resourceName ) ) {
       // Convert it
       QMutexLocker _( &dataMutex );
       GdTiff::tiff2img( data );
     }
-    else
-    {
+    else {
       QMutexLocker _( &dataMutex );
       data.resize( resource.size() );
       memcpy( &data.front(), resource.data(), data.size() );
@@ -795,10 +781,11 @@ void ZimResourceRequest::run()
     QMutexLocker _( &dataMutex );
     hasAnyData = true;
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "ZIM: Failed loading resource \"%s\" from \"%s\", reason: %s\n",
-               resourceName.c_str(), dict.getName().c_str(), ex.what() );
+               resourceName.c_str(),
+               dict.getName().c_str(),
+               ex.what() );
     // Resource not loaded -- we don't set the hasAnyData flag then
   }
 
@@ -808,23 +795,21 @@ void ZimResourceRequest::run()
 sptr< Dictionary::DataRequest > ZimDictionary::getResource( string const & name )
 {
   auto noLeadingDot = QString::fromStdString( name ).remove( RX::Zim::leadingDotSlash );
-  return std::make_shared<ZimResourceRequest>( *this, noLeadingDot.toStdString() );
+  return std::make_shared< ZimResourceRequest >( *this, noLeadingDot.toStdString() );
 }
 
 wstring normalizeWord( const std::string & url );
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing,
-                                      unsigned maxHeadwordsToExpand )
-  
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing,
+                                                      unsigned maxHeadwordsToExpand )
+
 {
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for(const auto & fileName : fileNames)
-  {
-      // Skip files with the extensions different to .zim to speed up the
-      // scanning
+  for ( const auto & fileName : fileNames ) {
+    // Skip files with the extensions different to .zim to speed up the
+    // scanning
 
     QString firstName = QDir::fromNativeSeparators( fileName.c_str() );
     if ( !firstName.endsWith( ".zim" ) && !firstName.endsWith( ".zimaa" ) ) {
@@ -936,18 +921,15 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
       }
 
       dictionaries.push_back( std::make_shared< ZimDictionary >( dictId, indexFile, dictFiles ) );
-      }
-      catch( std::exception & e )
-      {
-        gdWarning( "Zim dictionary initializing failed: %s, error: %s\n",
-                   fileName.c_str(), e.what() );
-        continue;
-      }
-      catch( ... )
-      {
-        qWarning( "Zim dictionary initializing failed\n" );
-        continue;
-      }
+    }
+    catch ( std::exception & e ) {
+      gdWarning( "Zim dictionary initializing failed: %s, error: %s\n", fileName.c_str(), e.what() );
+      continue;
+    }
+    catch ( ... ) {
+      qWarning( "Zim dictionary initializing failed\n" );
+      continue;
+    }
   }
   return dictionaries;
 }
diff --git a/src/dict/zim.hh b/src/dict/zim.hh
index 93848f6c..0bd86c2f 100644
--- a/src/dict/zim.hh
+++ b/src/dict/zim.hh
@@ -3,7 +3,7 @@
 
 #ifdef MAKE_ZIM_SUPPORT
 
-#include "dictionary.hh"
+  #include "dictionary.hh"
 
 /// Support for the Zim dictionaries.
 namespace Zim {
@@ -11,14 +11,12 @@ namespace Zim {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing &,
-                                      unsigned maxHeadwordsToExpand )
-  ;
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing &,
+                                                      unsigned maxHeadwordsToExpand );
 
-}
+} // namespace Zim
 
 #endif
 
diff --git a/src/dict/zipsounds.cc b/src/dict/zipsounds.cc
index 743d5397..77bfda02 100644
--- a/src/dict/zipsounds.cc
+++ b/src/dict/zipsounds.cc
@@ -20,7 +20,7 @@
 #include <QDir>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
 
 #include "utils.hh"
@@ -40,23 +40,22 @@ namespace {
 
 DEF_EX( exInvalidData, "Invalid data encountered", Dictionary::Ex )
 
-enum
-{
-  Signature = 0x5350495a, // ZIPS on little-endian, SPIZ on big-endian
+enum {
+  Signature            = 0x5350495a, // ZIPS on little-endian, SPIZ on big-endian
   CurrentFormatVersion = 6 + BtreeIndexing::FormatVersion
 };
 
 struct IdxHeader
 {
-  uint32_t signature; // First comes the signature, ZIPS
-  uint32_t formatVersion; // File format version, currently 1.
-  uint32_t soundsCount; // Total number of sounds, for informative purposes only
+  uint32_t signature;             // First comes the signature, ZIPS
+  uint32_t formatVersion;         // File format version, currently 1.
+  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))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -66,35 +65,31 @@ bool indexIsOldOrBad( string const & indexFile )
 
   IdxHeader header;
 
-  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 ||
-         header.signature != Signature ||
-         header.formatVersion != CurrentFormatVersion;
+  return idx.readRecords( &header, sizeof( header ), 1 ) != 1 || header.signature != Signature
+    || header.formatVersion != CurrentFormatVersion;
 }
 
 wstring stripExtension( string const & str )
 {
   wstring name;
-  try
-  {
+  try {
     name = Utf8::decode( str );
   }
-  catch( Utf8::exCantDecode & )
-  {
+  catch ( Utf8::exCantDecode & ) {
     return name;
   }
 
-  if( Filetype::isNameOfSound( str ) )
-  {
+  if ( Filetype::isNameOfSound( str ) ) {
     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' ' )
+    while ( n && name.at( n - 1 ) == L' ' )
       n--;
 
-    if( n != name.length() )
+    if ( n != name.length() )
       name.erase( n );
   }
   return name;
@@ -110,28 +105,29 @@ class ZipSoundsDictionary: public BtreeIndexing::BtreeDictionary
 
 public:
 
-  ZipSoundsDictionary( string const & id, string const & indexFile,
-                       vector< string > const & dictionaryFiles );
+  ZipSoundsDictionary( string const & id, string const & indexFile, vector< string > const & dictionaryFiles );
 
   string getName() noexcept override;
 
   map< Dictionary::Property, string > getProperties() noexcept override
-  { return map< Dictionary::Property, string >(); }
+  {
+    return map< Dictionary::Property, string >();
+  }
 
   unsigned long getArticleCount() noexcept override
-  { return idxHeader.soundsCount; }
+  {
+    return idxHeader.soundsCount;
+  }
 
   unsigned long getWordCount() noexcept override
-  { return getArticleCount(); }
+  {
+    return getArticleCount();
+  }
 
-  sptr< Dictionary::DataRequest > getArticle( wstring const &,
-                                                      vector< wstring > const & alts,
-                                                      wstring const &,
-                                                      bool ignoreDiacritics ) override
-    ;
+  sptr< Dictionary::DataRequest >
+  getArticle( wstring const &, vector< wstring > const & alts, wstring const &, bool ignoreDiacritics ) override;
 
-  sptr< Dictionary::DataRequest > getResource( string const & name ) override
-    ;
+  sptr< Dictionary::DataRequest > getResource( string const & name ) override;
 
 protected:
 
@@ -145,21 +141,16 @@ ZipSoundsDictionary::ZipSoundsDictionary( string const & id,
   idx( indexFile, "rb" ),
   idxHeader( idx.read< IdxHeader >() )
 {
-  chunks = std::shared_ptr<ChunkedStorage::Reader>(new ChunkedStorage::Reader( idx, idxHeader.chunksOffset ));
+  chunks = std::shared_ptr< ChunkedStorage::Reader >( new ChunkedStorage::Reader( idx, idxHeader.chunksOffset ) );
 
   // Initialize the index
 
-  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                        idxHeader.indexRootOffset ),
-                        idx, idxMutex );
+  openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 
   QString zipName = QDir::fromNativeSeparators( getDictionaryFilenames()[ 0 ].c_str() );
 
   zipsFile.openZipFile( zipName );
-  zipsFile.openIndex( IndexInfo( idxHeader.indexBtreeMaxElements,
-                                 idxHeader.indexRootOffset ),
-                                 idx, idxMutex );
-
+  zipsFile.openIndex( IndexInfo( idxHeader.indexBtreeMaxElements, idxHeader.indexRootOffset ), idx, idxMutex );
 }
 
 string ZipSoundsDictionary::getName() noexcept
@@ -176,12 +167,11 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
                                                                  vector< wstring > const & alts,
                                                                  wstring const &,
                                                                  bool ignoreDiacritics )
-  
+
 {
   vector< WordArticleLink > chain = findArticles( word, ignoreDiacritics );
 
-  for( unsigned x = 0; x < alts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < alts.size(); ++x ) {
     /// Make an additional query for each alt
 
     vector< WordArticleLink > altChain = findArticles( alts[ x ], ignoreDiacritics );
@@ -196,11 +186,10 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
                                     // by only allowing them to appear once.
 
   wstring wordCaseFolded = Folding::applySimpleCaseOnly( word );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     wordCaseFolded = Folding::applyDiacriticsOnly( wordCaseFolded );
 
-  for( unsigned x = 0; x < chain.size(); ++x )
-  {
+  for ( unsigned x = 0; x < chain.size(); ++x ) {
     if ( articlesIncluded.find( chain[ x ].articleOffset ) != articlesIncluded.end() )
       continue; // We already have this article in the body.
 
@@ -209,23 +198,20 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
 
     // We do the case-folded comparison here.
 
-    wstring headwordStripped =
-      Folding::applySimpleCaseOnly( chain[ x ].word );
-    if( ignoreDiacritics )
+    wstring headwordStripped = Folding::applySimpleCaseOnly( chain[ x ].word );
+    if ( ignoreDiacritics )
       headwordStripped = Folding::applyDiacriticsOnly( headwordStripped );
 
     multimap< wstring, uint32_t > & mapToUse =
-      ( wordCaseFolded == headwordStripped ) ?
-        mainArticles : alternateArticles;
+      ( wordCaseFolded == headwordStripped ) ? mainArticles : alternateArticles;
 
-    mapToUse.insert( std::pair(
-      Folding::applySimpleCaseOnly( chain[ x ].word ), chain[ x ].articleOffset ) );
+    mapToUse.insert( std::pair( Folding::applySimpleCaseOnly( chain[ x ].word ), chain[ x ].articleOffset ) );
 
     articlesIncluded.insert( chain[ x ].articleOffset );
   }
 
   if ( mainArticles.empty() && alternateArticles.empty() )
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such word
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such word
 
   string result;
 
@@ -236,22 +222,18 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
   vector< char > chunk;
   char * nameBlock;
 
-  for( i = mainArticles.begin(); i != mainArticles.end(); ++i )
-  {
-    try
-    {
+  for ( i = mainArticles.begin(); i != mainArticles.end(); ++i ) {
+    try {
       QMutexLocker _( &idxMutex );
       nameBlock = chunks->getBlock( i->second, chunk );
 
-      if ( nameBlock >= &chunk.front() + chunk.size() )
-      {
+      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 & )
-    {
+    catch ( ChunkedStorage::exAddressOutOfRange & ) {
       // Bad address
       continue;
     }
@@ -263,8 +245,8 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
     string name( nameBlock, sz );
     nameBlock += sz;
 
-    string displayedName = mainArticles.size() + alternateArticles.size() > 1 ?
-           name : Utf8::encode( stripExtension( name ) );
+    string displayedName =
+      mainArticles.size() + alternateArticles.size() > 1 ? name : Utf8::encode( stripExtension( name ) );
 
     result += "<tr>";
 
@@ -282,22 +264,18 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
     result += "</tr>";
   }
 
-  for( i = alternateArticles.begin(); i != alternateArticles.end(); ++i )
-  {
-    try
-    {
+  for ( i = alternateArticles.begin(); i != alternateArticles.end(); ++i ) {
+    try {
       QMutexLocker _( &idxMutex );
       nameBlock = chunks->getBlock( i->second, chunk );
 
-      if ( nameBlock >= &chunk.front() + chunk.size() )
-      {
+      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 & )
-    {
+    catch ( ChunkedStorage::exAddressOutOfRange & ) {
       // Bad address
       continue;
     }
@@ -309,8 +287,8 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
     string name( nameBlock, sz );
     nameBlock += sz;
 
-    string displayedName = mainArticles.size() + alternateArticles.size() > 1 ?
-           name : Utf8::encode( stripExtension( name ) );
+    string displayedName =
+      mainArticles.size() + alternateArticles.size() > 1 ? name : Utf8::encode( stripExtension( name ) );
 
     result += "<tr>";
 
@@ -330,18 +308,13 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getArticle( wstring const &
 
   result += "</table>";
 
-  Dictionary::DataRequestInstant * ret =
-    new Dictionary::DataRequestInstant( true );
-
-  ret->getData().resize( result.size() );
-
-  memcpy( &(ret->getData().front()), result.data(), result.size() );
-
-  return std::shared_ptr<Dictionary::DataRequestInstant>(ret);
+  auto ret = std::make_shared< Dictionary::DataRequestInstant >( true );
+  ret->appendString( result );
+  return ret;
 }
 
 sptr< Dictionary::DataRequest > ZipSoundsDictionary::getResource( string const & name )
-  
+
 {
   // Remove extension for sound files (like in sound dirs)
 
@@ -350,13 +323,12 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getResource( string const &
   vector< WordArticleLink > chain = findArticles( strippedName );
 
   if ( chain.empty() )
-    return std::make_shared<Dictionary::DataRequestInstant>( false ); // No such resource
+    return std::make_shared< Dictionary::DataRequestInstant >( false ); // No such resource
 
   // Find sound
 
   uint32_t dataOffset = 0;
-  for( int x = chain.size() - 1; x >= 0 ; x-- )
-  {
+  for ( int x = chain.size() - 1; x >= 0; x-- ) {
     vector< char > chunk;
     char * nameBlock = chunks->getBlock( chain[ x ].articleOffset, chunk );
 
@@ -369,17 +341,16 @@ sptr< Dictionary::DataRequest > ZipSoundsDictionary::getResource( string const &
 
     memcpy( &dataOffset, nameBlock, sizeof( uint32_t ) );
 
-    if( name.compare( fileName ) == 0 )
+    if ( name.compare( fileName ) == 0 )
       break;
   }
 
-  sptr< Dictionary::DataRequestInstant > dr =
-    std::make_shared<Dictionary::DataRequestInstant>( true );
+  sptr< Dictionary::DataRequestInstant > dr = std::make_shared< Dictionary::DataRequestInstant >( true );
 
   if ( zipsFile.loadFile( dataOffset, dr->getData() ) )
     return dr;
 
-  return std::make_shared<Dictionary::DataRequestInstant>( false );
+  return std::make_shared< Dictionary::DataRequestInstant >( false );
 }
 
 void ZipSoundsDictionary::loadIcon() noexcept
@@ -392,42 +363,35 @@ void ZipSoundsDictionary::loadIcon() noexcept
   // Remove the extension
   fileName.chop( 4 );
 
-  if( !loadIconFromFile( fileName ) )
-  {
+  if ( !loadIconFromFile( fileName ) ) {
     // Load failed -- use default icons
-    dictionaryNativeIcon = dictionaryIcon = QIcon(":/icons/playsound_full.png");
+    dictionaryIcon = QIcon( ":/icons/zipsound.svg" );
   }
 
   dictionaryIconLoaded = true;
 }
 
-}
+} // namespace
+
+vector< sptr< Dictionary::Class > > makeDictionaries( vector< string > const & fileNames,
+                                                      string const & indicesDir,
+                                                      Dictionary::Initializing & initializing )
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & initializing )
-  
 {
-  (void) initializing;
+  (void)initializing;
   vector< sptr< Dictionary::Class > > dictionaries;
 
-  for( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end();
-       ++i )
-  {
+  for ( vector< string >::const_iterator i = fileNames.begin(); i != fileNames.end(); ++i ) {
     /// Only allow .zips extension
     if ( i->size() < 5 || strcasecmp( i->c_str() + ( i->size() - 5 ), ".zips" ) != 0 )
       continue;
 
-    try
-    {
+    try {
       vector< string > dictFiles( 1, *i );
-      string dictId = Dictionary::makeDictionaryId( dictFiles );
+      string dictId    = Dictionary::makeDictionaryId( dictFiles );
       string indexFile = indicesDir + dictId;
 
-      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) ||
-           indexIsOldOrBad( indexFile ) )
-      {
+      if ( Dictionary::needToRebuildIndex( dictFiles, indexFile ) || indexIsOldOrBad( indexFile ) ) {
         gdDebug( "Zips: Building the index for dictionary: %s\n", i->c_str() );
 
         File::Class idx( indexFile, "wb" );
@@ -448,25 +412,22 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
         if ( zipFile.openZipFile( QDir::fromNativeSeparators( i->c_str() ) ) )
           zipFile.indexFile( zipFileNames, &namesCount );
 
-        if( !zipFileNames.empty() )
-        {
-          for( IndexedWords::iterator i = zipFileNames.begin(); i != zipFileNames.end(); ++i )
-          {
+        if ( !zipFileNames.empty() ) {
+          for ( IndexedWords::iterator i = zipFileNames.begin(); i != zipFileNames.end(); ++i ) {
             vector< WordArticleLink > links = i->second;
-            for( unsigned x = 0; x < links.size(); x++ )
-            {
+            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) );
+              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() )
+              if ( !word.empty() )
                 names.addWord( word, offset );
             }
           }
@@ -482,9 +443,9 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
           // That concludes it. Update the header.
 
           idxHeader.indexBtreeMaxElements = idxInfo.btreeMaxElements;
-          idxHeader.indexRootOffset = idxInfo.rootOffset;
+          idxHeader.indexRootOffset       = idxInfo.rootOffset;
 
-          idxHeader.signature = Signature;
+          idxHeader.signature     = Signature;
           idxHeader.formatVersion = CurrentFormatVersion;
 
           idxHeader.soundsCount = namesCount;
@@ -493,26 +454,21 @@ vector< sptr< Dictionary::Class > > makeDictionaries(
 
           idx.write( &idxHeader, sizeof( idxHeader ) );
         }
-        else
-        {
+        else {
           idx.close();
           QFile::remove( QDir::fromNativeSeparators( indexFile.c_str() ) );
           throw exInvalidData();
         }
       }
 
-      dictionaries.push_back( std::make_shared<ZipSoundsDictionary>( dictId,
-                                                       indexFile,
-                                                       dictFiles ) );
+      dictionaries.push_back( std::make_shared< ZipSoundsDictionary >( dictId, indexFile, dictFiles ) );
     }
-    catch( std::exception & e )
-    {
-      gdWarning( "Zipped sounds pack reading failed: %s, error: %s\n",
-                 i->c_str(), e.what() );
+    catch ( std::exception & e ) {
+      gdWarning( "Zipped sounds pack reading failed: %s, error: %s\n", i->c_str(), e.what() );
     }
   }
 
   return dictionaries;
 }
 
-}
+} // namespace ZipSounds
diff --git a/src/dict/zipsounds.hh b/src/dict/zipsounds.hh
index d24555f6..a0b7c5c8 100644
--- a/src/dict/zipsounds.hh
+++ b/src/dict/zipsounds.hh
@@ -11,12 +11,9 @@ namespace ZipSounds {
 using std::vector;
 using std::string;
 
-vector< sptr< Dictionary::Class > > makeDictionaries(
-                                      vector< string > const & fileNames,
-                                      string const & indicesDir,
-                                      Dictionary::Initializing & )
-  ;
+vector< sptr< Dictionary::Class > >
+makeDictionaries( vector< string > const & fileNames, string const & indicesDir, Dictionary::Initializing & );
 
-}
+} // namespace ZipSounds
 
 #endif // ZIPSOUNDS_HH
diff --git a/src/dictzip.c b/src/dictzip.c
index 4b4d24d8..51b26586 100644
--- a/src/dictzip.c
+++ b/src/dictzip.c
@@ -37,86 +37,86 @@
 
 #define OUT_BUFFER_SIZE 0xffffL
 
-#define IN_BUFFER_SIZE ((unsigned long)((double)(OUT_BUFFER_SIZE - 12) * 0.89))
+#define IN_BUFFER_SIZE ( (unsigned long)( (double)( OUT_BUFFER_SIZE - 12 ) * 0.89 ) )
 
 /* For gzip-compatible header, as defined in RFC 1952 */
 
-				/* Magic for GZIP (rfc1952)                */
-#define GZ_MAGIC1     0x1f	/* First magic byte                        */
-#define GZ_MAGIC2     0x8b	/* Second magic byte                       */
+/* Magic for GZIP (rfc1952)                */
+#define GZ_MAGIC1 0x1f /* First magic byte                        */
+#define GZ_MAGIC2 0x8b /* Second magic byte                       */
 
-				/* FLaGs (bitmapped), from rfc1952         */
-#define GZ_FTEXT      0x01	/* Set for ASCII text                      */
-#define GZ_FHCRC      0x02	/* Header CRC16                            */
-#define GZ_FEXTRA     0x04	/* Optional field (random access index)    */
-#define GZ_FNAME      0x08	/* Original name                           */
-#define GZ_COMMENT    0x10	/* Zero-terminated, human-readable comment */
-#define GZ_MAX           2	/* Maximum compression                     */
-#define GZ_FAST          4	/* Fasted compression                      */
+/* FLaGs (bitmapped), from rfc1952         */
+#define GZ_FTEXT   0x01 /* Set for ASCII text                      */
+#define GZ_FHCRC   0x02 /* Header CRC16                            */
+#define GZ_FEXTRA  0x04 /* Optional field (random access index)    */
+#define GZ_FNAME   0x08 /* Original name                           */
+#define GZ_COMMENT 0x10 /* Zero-terminated, human-readable comment */
+#define GZ_MAX     2    /* Maximum compression                     */
+#define GZ_FAST    4    /* Fasted compression                      */
 
-				/* These are from rfc1952                  */
-#define GZ_OS_FAT        0	/* FAT filesystem (MS-DOS, OS/2, NT/Win32) */
-#define GZ_OS_AMIGA      1	/* Amiga                                   */
-#define GZ_OS_VMS        2	/* VMS (or OpenVMS)                        */
-#define GZ_OS_UNIX       3      /* Unix                                    */
-#define GZ_OS_VMCMS      4      /* VM/CMS                                  */
-#define GZ_OS_ATARI      5      /* Atari TOS                               */
-#define GZ_OS_HPFS       6      /* HPFS filesystem (OS/2, NT)              */
-#define GZ_OS_MAC        7      /* Macintosh                               */
-#define GZ_OS_Z          8      /* Z-System                                */
-#define GZ_OS_CPM        9      /* CP/M                                    */
-#define GZ_OS_TOPS20    10      /* TOPS-20                                 */
-#define GZ_OS_NTFS      11      /* NTFS filesystem (NT)                    */
-#define GZ_OS_QDOS      12      /* QDOS                                    */
-#define GZ_OS_ACORN     13      /* Acorn RISCOS                            */
-#define GZ_OS_UNKNOWN  255      /* unknown                                 */
+/* These are from rfc1952                  */
+#define GZ_OS_FAT     0   /* FAT filesystem (MS-DOS, OS/2, NT/Win32) */
+#define GZ_OS_AMIGA   1   /* Amiga                                   */
+#define GZ_OS_VMS     2   /* VMS (or OpenVMS)                        */
+#define GZ_OS_UNIX    3   /* Unix                                    */
+#define GZ_OS_VMCMS   4   /* VM/CMS                                  */
+#define GZ_OS_ATARI   5   /* Atari TOS                               */
+#define GZ_OS_HPFS    6   /* HPFS filesystem (OS/2, NT)              */
+#define GZ_OS_MAC     7   /* Macintosh                               */
+#define GZ_OS_Z       8   /* Z-System                                */
+#define GZ_OS_CPM     9   /* CP/M                                    */
+#define GZ_OS_TOPS20  10  /* TOPS-20                                 */
+#define GZ_OS_NTFS    11  /* NTFS filesystem (NT)                    */
+#define GZ_OS_QDOS    12  /* QDOS                                    */
+#define GZ_OS_ACORN   13  /* Acorn RISCOS                            */
+#define GZ_OS_UNKNOWN 255 /* unknown                                 */
 
-#define GZ_RND_S1       'R'	/* First magic for random access format    */
-#define GZ_RND_S2       'A'	/* Second magic for random access format   */
+#define GZ_RND_S1 'R' /* First magic for random access format    */
+#define GZ_RND_S2 'A' /* Second magic for random access format   */
 
-#define GZ_ID1           0	/* GZ_MAGIC1                               */
-#define GZ_ID2           1	/* GZ_MAGIC2                               */
-#define GZ_CM            2	/* Compression Method (Z_DEFALTED)         */
-#define GZ_FLG	         3	/* FLaGs (see above)                       */
-#define GZ_MTIME         4	/* Modification TIME                       */
-#define GZ_XFL           8	/* eXtra FLags (GZ_MAX or GZ_FAST)         */
-#define GZ_OS            9	/* Operating System                        */
-#define GZ_XLEN         10	/* eXtra LENgth (16bit)                    */
-#define GZ_FEXTRA_START 12	/* Start of extra fields                   */
-#define GZ_SI1          12	/* Subfield ID1                            */
-#define GZ_SI2          13      /* Subfield ID2                            */
-#define GZ_SUBLEN       14	/* Subfield length (16bit)                 */
-#define GZ_VERSION      16      /* Version for subfield format             */
-#define GZ_CHUNKLEN     18	/* Chunk length (16bit)                    */
-#define GZ_CHUNKCNT     20	/* Number of chunks (16bit)                */
-#define GZ_RNDDATA      22	/* Random access data (16bit)              */
+#define GZ_ID1          0  /* GZ_MAGIC1                               */
+#define GZ_ID2          1  /* GZ_MAGIC2                               */
+#define GZ_CM           2  /* Compression Method (Z_DEFALTED)         */
+#define GZ_FLG          3  /* FLaGs (see above)                       */
+#define GZ_MTIME        4  /* Modification TIME                       */
+#define GZ_XFL          8  /* eXtra FLags (GZ_MAX or GZ_FAST)         */
+#define GZ_OS           9  /* Operating System                        */
+#define GZ_XLEN         10 /* eXtra LENgth (16bit)                    */
+#define GZ_FEXTRA_START 12 /* Start of extra fields                   */
+#define GZ_SI1          12 /* Subfield ID1                            */
+#define GZ_SI2          13 /* Subfield ID2                            */
+#define GZ_SUBLEN       14 /* Subfield length (16bit)                 */
+#define GZ_VERSION      16 /* Version for subfield format             */
+#define GZ_CHUNKLEN     18 /* Chunk length (16bit)                    */
+#define GZ_CHUNKCNT     20 /* Number of chunks (16bit)                */
+#define GZ_RNDDATA      22 /* Random access data (16bit)              */
 
 
-#define DBG_VERBOSE     (0<<30|1<< 0) /* Verbose                            */
-#define DBG_ZIP         (0<<30|1<< 1) /* Zip                                */
-#define DBG_UNZIP       (0<<30|1<< 2) /* Unzip                              */
-#define DBG_SEARCH      (0<<30|1<< 3) /* Search                             */
-#define DBG_SCAN        (0<<30|1<< 4) /* Config file scan                   */
-#define DBG_PARSE       (0<<30|1<< 5) /* Config file parse                  */
-#define DBG_INIT        (0<<30|1<< 6) /* Database initialization            */
-#define DBG_PORT        (0<<30|1<< 7) /* Log port number for connections    */
-#define DBG_LEV         (0<<30|1<< 8) /* Levenshtein matching               */
-#define DBG_AUTH        (0<<30|1<< 9) /* Debug authentication               */
-#define DBG_NODETACH    (0<<30|1<<10) /* Don't detach as a background proc. */
-#define DBG_NOFORK      (0<<30|1<<11) /* Don't fork (single threaded)       */
-#define DBG_ALT         (0<<30|1<<12) /* altcompare()                      */
+#define DBG_VERBOSE  ( 0 << 30 | 1 << 0 )  /* Verbose                            */
+#define DBG_ZIP      ( 0 << 30 | 1 << 1 )  /* Zip                                */
+#define DBG_UNZIP    ( 0 << 30 | 1 << 2 )  /* Unzip                              */
+#define DBG_SEARCH   ( 0 << 30 | 1 << 3 )  /* Search                             */
+#define DBG_SCAN     ( 0 << 30 | 1 << 4 )  /* Config file scan                   */
+#define DBG_PARSE    ( 0 << 30 | 1 << 5 )  /* Config file parse                  */
+#define DBG_INIT     ( 0 << 30 | 1 << 6 )  /* Database initialization            */
+#define DBG_PORT     ( 0 << 30 | 1 << 7 )  /* Log port number for connections    */
+#define DBG_LEV      ( 0 << 30 | 1 << 8 )  /* Levenshtein matching               */
+#define DBG_AUTH     ( 0 << 30 | 1 << 9 )  /* Debug authentication               */
+#define DBG_NODETACH ( 0 << 30 | 1 << 10 ) /* Don't detach as a background proc. */
+#define DBG_NOFORK   ( 0 << 30 | 1 << 11 ) /* Don't fork (single threaded)       */
+#define DBG_ALT      ( 0 << 30 | 1 << 12 ) /* altcompare()                      */
 
-#define LOG_SERVER      (0<<30|1<< 0) /* Log server diagnostics             */
-#define LOG_CONNECT     (0<<30|1<< 1) /* Log connection information         */
-#define LOG_STATS       (0<<30|1<< 2) /* Log termination information        */
-#define LOG_COMMAND     (0<<30|1<< 3) /* Log commands                       */
-#define LOG_FOUND       (0<<30|1<< 4) /* Log words found                    */
-#define LOG_NOTFOUND    (0<<30|1<< 5) /* Log words not found                */
-#define LOG_CLIENT      (0<<30|1<< 6) /* Log client                         */
-#define LOG_HOST        (0<<30|1<< 7) /* Log remote host name               */
-#define LOG_TIMESTAMP   (0<<30|1<< 8) /* Log with timestamps                */
-#define LOG_MIN         (0<<30|1<< 9) /* Log a few minimal things           */
-#define LOG_AUTH        (0<<30|1<<10) /* Log authentication denials         */
+#define LOG_SERVER    ( 0 << 30 | 1 << 0 )  /* Log server diagnostics             */
+#define LOG_CONNECT   ( 0 << 30 | 1 << 1 )  /* Log connection information         */
+#define LOG_STATS     ( 0 << 30 | 1 << 2 )  /* Log termination information        */
+#define LOG_COMMAND   ( 0 << 30 | 1 << 3 )  /* Log commands                       */
+#define LOG_FOUND     ( 0 << 30 | 1 << 4 )  /* Log words found                    */
+#define LOG_NOTFOUND  ( 0 << 30 | 1 << 5 )  /* Log words not found                */
+#define LOG_CLIENT    ( 0 << 30 | 1 << 6 )  /* Log client                         */
+#define LOG_HOST      ( 0 << 30 | 1 << 7 )  /* Log remote host name               */
+#define LOG_TIMESTAMP ( 0 << 30 | 1 << 8 )  /* Log with timestamps                */
+#define LOG_MIN       ( 0 << 30 | 1 << 9 )  /* Log a few minimal things           */
+#define LOG_AUTH      ( 0 << 30 | 1 << 10 ) /* Log authentication denials         */
 
 #define DICT_LOG_TERM    0
 #define DICT_LOG_DEFINE  1
@@ -128,10 +128,10 @@
 #define DICT_LOG_AUTH    7
 #define DICT_LOG_CONNECT 8
 
-#define DICT_UNKNOWN    0
-#define DICT_TEXT       1
-#define DICT_GZIP       2
-#define DICT_DZIP       3
+#define DICT_UNKNOWN 0
+#define DICT_TEXT    1
+#define DICT_GZIP    2
+#define DICT_DZIP    3
 
 #include <ctype.h>
 #include <fcntl.h>
@@ -145,35 +145,37 @@
 #define PRINTF( ... )
 
 #define xmalloc malloc
-#define xfree free
+#define xfree   free
 
 static const char * _err_programName = "GoldenDict";
 
 #define log_error( ... )
 #define log_error_va( ... )
 
-static void err_fatal( const char *routine, const char *format, ... )
+static void err_fatal( const char * routine, const char * format, ... )
 {
-   va_list ap;
+  va_list ap;
 
-   fflush( stdout );
-   if (_err_programName) {
-      if (routine)
-	 fprintf( stderr, "%s (%s): ", _err_programName, routine );
-      else
-	 fprintf( stderr, "%s: ", _err_programName );
-   } else {
-      if (routine) fprintf( stderr, "%s: ", routine );
-   }
-   
-   va_start( ap, format );
-   vfprintf( stderr, format, ap );
-   log_error_va( routine, format, ap );
-   va_end( ap );
-   
-   fflush( stderr );
-   fflush( stdout );
-//   exit ( 1 );
+  fflush( stdout );
+  if ( _err_programName ) {
+    if ( routine )
+      fprintf( stderr, "%s (%s): ", _err_programName, routine );
+    else
+      fprintf( stderr, "%s: ", _err_programName );
+  }
+  else {
+    if ( routine )
+      fprintf( stderr, "%s: ", routine );
+  }
+
+  va_start( ap, format );
+  vfprintf( stderr, format, ap );
+  log_error_va( routine, format, ap );
+  va_end( ap );
+
+  fflush( stderr );
+  fflush( stdout );
+  //   exit ( 1 );
 }
 
 /* \doc |err_fatal_errno| flushes "stdout", prints a fatal error report on
@@ -181,58 +183,62 @@ static void err_fatal( const char *routine, const char *format, ... )
    "stderr" and "stdout", and calls |exit|.  |routine| is the name of the
    routine in which the error took place. */
 
-static void err_fatal_errno( const char *routine, const char *format, ... )
+static void err_fatal_errno( const char * routine, const char * format, ... )
 {
-   va_list ap;
-   int     errorno = errno;
+  va_list ap;
+  int errorno = errno;
 
-   fflush( stdout );
-   if (_err_programName) {
-      if (routine)
-	 fprintf( stderr, "%s (%s): ", _err_programName, routine );
-      else
-	 fprintf( stderr, "%s: ", _err_programName );
-   } else {
-      if (routine) fprintf( stderr, "%s: ", routine );
-   }
-   
-   va_start( ap, format );
-   vfprintf( stderr, format, ap );
-   log_error_va( routine, format, ap );
-   va_end( ap );
+  fflush( stdout );
+  if ( _err_programName ) {
+    if ( routine )
+      fprintf( stderr, "%s (%s): ", _err_programName, routine );
+    else
+      fprintf( stderr, "%s: ", _err_programName );
+  }
+  else {
+    if ( routine )
+      fprintf( stderr, "%s: ", routine );
+  }
+
+  va_start( ap, format );
+  vfprintf( stderr, format, ap );
+  log_error_va( routine, format, ap );
+  va_end( ap );
 
 #if HAVE_STRERROR
-   fprintf( stderr, "%s: %s\n", routine, strerror( errorno ) );
-   log_error( routine, "%s: %s\n", routine, strerror( errorno ) );
+  fprintf( stderr, "%s: %s\n", routine, strerror( errorno ) );
+  log_error( routine, "%s: %s\n", routine, strerror( errorno ) );
 #else
-   errno = errorno;
-   perror( routine );
-   log_error( routine, "%s: errno = %d\n", routine, errorno );
+  errno = errorno;
+  perror( routine );
+  log_error( routine, "%s: errno = %d\n", routine, errorno );
 #endif
-   
-   fflush( stderr );
-   fflush( stdout );
-//   exit( 1 );
+
+  fflush( stderr );
+  fflush( stdout );
+  //   exit( 1 );
 }
 
 /* \doc |err_internal| flushes "stdout", prints the fatal error message,
    flushes "stderr" and "stdout", and calls |abort| so that a core dump is
    generated. */
 
-static void err_internal( const char *routine, const char *format, ... )
+static void err_internal( const char * routine, const char * format, ... )
 {
   va_list ap;
 
   fflush( stdout );
-  if (_err_programName) {
-     if (routine)
-  fprintf( stderr, "%s (%s): Internal error\n     ",
-     _err_programName, routine );
-     else
-  fprintf( stderr, "%s: Internal error\n     ", _err_programName );
-  } else {
-     if (routine) fprintf( stderr, "%s: Internal error\n     ", routine );
-     else         fprintf( stderr, "Internal error\n     " );
+  if ( _err_programName ) {
+    if ( routine )
+      fprintf( stderr, "%s (%s): Internal error\n     ", _err_programName, routine );
+    else
+      fprintf( stderr, "%s: Internal error\n     ", _err_programName );
+  }
+  else {
+    if ( routine )
+      fprintf( stderr, "%s: Internal error\n     ", routine );
+    else
+      fprintf( stderr, "Internal error\n     " );
   }
 
   va_start( ap, format );
@@ -240,384 +246,359 @@ static void err_internal( const char *routine, const char *format, ... )
   log_error( routine, format, ap );
   va_end( ap );
 
-  if (_err_programName)
-     fprintf( stderr, "Aborting %s...\n", _err_programName );
+  if ( _err_programName )
+    fprintf( stderr, "Aborting %s...\n", _err_programName );
   else
-     fprintf( stderr, "Aborting...\n" );
+    fprintf( stderr, "Aborting...\n" );
   fflush( stderr );
   fflush( stdout );
-//  abort();
+  //  abort();
 }
 
 #ifndef __func__
-# ifdef __FUNCTION__
-#  define __func__  __FUNCTION__
-# else
-#  define __func__  __FILE__
-# endif
+  #ifdef __FUNCTION__
+    #define __func__ __FUNCTION__
+  #else
+    #define __func__ __FILE__
+  #endif
 #endif
 
-static enum  DZ_ERRORS 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;
-   char          buffer[BUFFERSIZE];
-   int           extraLength, subLength;
-   int           i;
-   char          *pt;
-   int           c;
-   struct stat   sb;
-   unsigned long crc   = crc32( 0L, Z_NULL, 0 );
-   int           count;
-   unsigned long offset;
+  FILE * str;
+  int id1, id2, si1, si2;
+  char buffer[ BUFFERSIZE ];
+  int extraLength, subLength;
+  int i;
+  char * pt;
+  int c;
+  struct stat sb;
+  unsigned long crc = crc32( 0L, Z_NULL, 0 );
+  int count;
+  unsigned long offset;
 
-   if (!(str = gd_fopen( filename, "rb" )))
-   {
-      err_fatal_errno( __func__,
-		       "Cannot open data file \"%s\" for read\n", filename );
-      return DZ_ERR_OPENFILE;
-   }
+  if ( !( str = gd_fopen( filename, "rb" ) ) ) {
+    err_fatal_errno( __func__, "Cannot open data file \"%s\" for read\n", filename );
+    return DZ_ERR_OPENFILE;
+  }
 
-   header->filename     = NULL;//str_find( filename );
-   header->headerLength = GZ_XLEN - 1;
-   header->type         = DICT_UNKNOWN;
-   
-   id1                  = getc( str );
-   id2                  = getc( str );
+  header->filename     = NULL; //str_find( filename );
+  header->headerLength = GZ_XLEN - 1;
+  header->type         = DICT_UNKNOWN;
 
-   if (id1 != GZ_MAGIC1 || id2 != GZ_MAGIC2) {
-      header->type = DICT_TEXT;
-      fstat( fileno( str ), &sb );
-      header->compressedLength = header->length = sb.st_size;
-      header->origFilename     = NULL;//str_find( filename );
-      header->mtime            = sb.st_mtime;
-      if (computeCRC) {
-	 rewind( str );
-	 while (!feof( str )) {
-	    if ((count = fread( buffer, 1, BUFFERSIZE, str ))) {
-	       crc = crc32( crc, (Bytef *)buffer, count );
-	    }
-	 }
+  id1 = getc( str );
+  id2 = getc( str );
+
+  if ( id1 != GZ_MAGIC1 || id2 != GZ_MAGIC2 ) {
+    header->type = DICT_TEXT;
+    fstat( fileno( str ), &sb );
+    header->compressedLength = header->length = sb.st_size;
+    header->origFilename                      = NULL; //str_find( filename );
+    header->mtime                             = sb.st_mtime;
+    if ( computeCRC ) {
+      rewind( str );
+      while ( !feof( str ) ) {
+        if ( ( count = fread( buffer, 1, BUFFERSIZE, str ) ) ) {
+          crc = crc32( crc, (Bytef *)buffer, count );
+        }
       }
-      header->crc = crc;
-      fclose( str );
-      return DZ_NOERROR;
-   }
-   header->type = DICT_GZIP;
-   
-   header->method       = getc( str );
-   header->flags        = getc( str );
-   header->mtime        = getc( str ) <<  0;
-   header->mtime       |= getc( str ) <<  8;
-   header->mtime       |= getc( str ) << 16;
-   header->mtime       |= getc( str ) << 24;
-   header->extraFlags   = getc( str );
-   header->os           = getc( str );
-   
-   if (header->flags & GZ_FEXTRA) {
-      extraLength          = getc( str ) << 0;
-      extraLength         |= getc( str ) << 8;
-      header->headerLength += extraLength + 2;
-      si1                  = getc( str );
-      si2                  = getc( str );
-      
-      if (si1 == GZ_RND_S1 && si2 == GZ_RND_S2) {
-	 subLength            = getc( str ) << 0;
-	 subLength           |= getc( str ) << 8;
-	 header->version      = getc( str ) << 0;
-	 header->version     |= getc( str ) << 8;
-	 
-	 if (header->version != 1)
-	 {
-	    err_internal( __func__,
-			  "dzip header version %d not supported\n",
-			  header->version );
-	    fclose( str );
-	    return DZ_ERR_UNSUPPORTED_FORMAT;
-	 }
-   
-	 header->chunkLength  = getc( str ) << 0;
-	 header->chunkLength |= getc( str ) << 8;
-	 header->chunkCount   = getc( str ) << 0;
-	 header->chunkCount  |= getc( str ) << 8;
-	 
-	 if (header->chunkCount <= 0) {
-	    fclose( str );
-	    return DZ_ERR_INVALID_FORMAT;
-	 }
-	 header->chunks = xmalloc( sizeof( header->chunks[0] )
-				   * header->chunkCount );
-         if( header->chunks == 0 )
-         {
-           fclose( str );
-           return DZ_ERR_NOMEMORY;
-         }
+    }
+    header->crc = crc;
+    fclose( str );
+    return DZ_NOERROR;
+  }
+  header->type = DICT_GZIP;
 
-         for (i = 0; i < header->chunkCount; i++) {
-	    header->chunks[i]  = getc( str ) << 0;
-	    header->chunks[i] |= getc( str ) << 8;
-	 }
-	 header->type = DICT_DZIP;
-      } else {
-	 fseek( str, header->headerLength, SEEK_SET );
-      }
-   }
-   
-   if (header->flags & GZ_FNAME) { /* FIXME! Add checking against header len */
-      pt = buffer;
-      while ((c = getc( str )) && c != EOF){
-	 *pt++ = c;
+  header->method = getc( str );
+  header->flags  = getc( str );
+  header->mtime  = getc( str ) << 0;
+  header->mtime |= getc( str ) << 8;
+  header->mtime |= getc( str ) << 16;
+  header->mtime |= getc( str ) << 24;
+  header->extraFlags = getc( str );
+  header->os         = getc( str );
 
-	 if (pt == buffer + sizeof (buffer)){
-	    err_fatal (
-	       __func__,
-	       "too long FNAME field in dzip file \"%s\"\n", filename);
-	    fclose( str );
-	    if( header->chunks )
-	      free( header->chunks );
-	    return DZ_ERR_INVALID_FORMAT;
-	 }
+  if ( header->flags & GZ_FEXTRA ) {
+    extraLength = getc( str ) << 0;
+    extraLength |= getc( str ) << 8;
+    header->headerLength += extraLength + 2;
+    si1 = getc( str );
+    si2 = getc( str );
+
+    if ( si1 == GZ_RND_S1 && si2 == GZ_RND_S2 ) {
+      subLength = getc( str ) << 0;
+      subLength |= getc( str ) << 8;
+      header->version = getc( str ) << 0;
+      header->version |= getc( str ) << 8;
+
+      if ( header->version != 1 ) {
+        err_internal( __func__, "dzip header version %d not supported\n", header->version );
+        fclose( str );
+        return DZ_ERR_UNSUPPORTED_FORMAT;
       }
 
-      *pt = '\0';
-      header->origFilename = NULL;//str_find( buffer );
-      header->headerLength += strlen( buffer ) + 1;
-   } else {
-      header->origFilename = NULL;
-   }
-   
-   if (header->flags & GZ_COMMENT) { /* FIXME! Add checking for header len */
-      pt = buffer;
-      while ((c = getc( str )) && c != EOF){
-	 *pt++ = c;
+      header->chunkLength = getc( str ) << 0;
+      header->chunkLength |= getc( str ) << 8;
+      header->chunkCount = getc( str ) << 0;
+      header->chunkCount |= getc( str ) << 8;
 
-	 if (pt == buffer + sizeof (buffer)){
-	    err_fatal (
-	       __func__,
-	       "too long COMMENT field in dzip file \"%s\"\n", filename);
-	    fclose( str );
-	    if( header->chunks )
-	      free( header->chunks );
-	    return DZ_ERR_INVALID_FORMAT;
-	 }
+      if ( header->chunkCount <= 0 ) {
+        fclose( str );
+        return DZ_ERR_INVALID_FORMAT;
+      }
+      header->chunks = xmalloc( sizeof( header->chunks[ 0 ] ) * header->chunkCount );
+      if ( header->chunks == 0 ) {
+        fclose( str );
+        return DZ_ERR_NOMEMORY;
       }
 
-      *pt = '\0';
-      header->comment = NULL;//str_find( buffer );
-      header->headerLength += strlen( buffer ) + 1;
-   } else {
-      header->comment = NULL;
-   }
+      for ( i = 0; i < header->chunkCount; i++ ) {
+        header->chunks[ i ] = getc( str ) << 0;
+        header->chunks[ i ] |= getc( str ) << 8;
+      }
+      header->type = DICT_DZIP;
+    }
+    else {
+      fseek( str, header->headerLength, SEEK_SET );
+    }
+  }
 
-   if (header->flags & GZ_FHCRC) {
-      getc( str );
-      getc( str );
-      header->headerLength += 2;
-   }
+  if ( header->flags & GZ_FNAME ) { /* FIXME! Add checking against header len */
+    pt = buffer;
+    while ( ( c = getc( str ) ) && c != EOF ) {
+      *pt++ = c;
 
-   if (ftell( str ) != header->headerLength + 1)
-   {
-      err_internal( __func__,
-		    "File position (%lu) != header length + 1 (%d)\n",
-		    ftell( str ), header->headerLength + 1 );
-      fclose( str );
-      if( header->chunks )
-        free( header->chunks );
-      return DZ_ERR_INVALID_FORMAT;
-   }
+      if ( pt == buffer + sizeof( buffer ) ) {
+        err_fatal( __func__, "too long FNAME field in dzip file \"%s\"\n", filename );
+        fclose( str );
+        if ( header->chunks )
+          free( header->chunks );
+        return DZ_ERR_INVALID_FORMAT;
+      }
+    }
 
-   fseek( str, -8, SEEK_END );
-   header->crc     = getc( str ) <<  0;
-   header->crc    |= getc( str ) <<  8;
-   header->crc    |= getc( str ) << 16;
-   header->crc    |= getc( str ) << 24;
-   header->length  = getc( str ) <<  0;
-   header->length |= getc( str ) <<  8;
-   header->length |= getc( str ) << 16;
-   header->length |= getc( str ) << 24;
-   header->compressedLength = ftell( str );
+    *pt                  = '\0';
+    header->origFilename = NULL; //str_find( buffer );
+    header->headerLength += strlen( buffer ) + 1;
+  }
+  else {
+    header->origFilename = NULL;
+  }
 
-				/* 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;
-   }
+  if ( header->flags & GZ_COMMENT ) { /* FIXME! Add checking for header len */
+    pt = buffer;
+    while ( ( c = getc( str ) ) && c != EOF ) {
+      *pt++ = c;
 
-   for (offset = header->headerLength + 1, i = 0;
-	i < header->chunkCount;
-	i++)
-   {
-      header->offsets[i] = offset;
-      offset += header->chunks[i];
-   }
+      if ( pt == buffer + sizeof( buffer ) ) {
+        err_fatal( __func__, "too long COMMENT field in dzip file \"%s\"\n", filename );
+        fclose( str );
+        if ( header->chunks )
+          free( header->chunks );
+        return DZ_ERR_INVALID_FORMAT;
+      }
+    }
 
-   fclose( str );
-   return DZ_NOERROR;
+    *pt             = '\0';
+    header->comment = NULL; //str_find( buffer );
+    header->headerLength += strlen( buffer ) + 1;
+  }
+  else {
+    header->comment = NULL;
+  }
+
+  if ( header->flags & GZ_FHCRC ) {
+    getc( str );
+    getc( str );
+    header->headerLength += 2;
+  }
+
+  if ( ftell( str ) != header->headerLength + 1 ) {
+    err_internal( __func__, "File position (%lu) != header length + 1 (%d)\n", ftell( str ), header->headerLength + 1 );
+    fclose( str );
+    if ( header->chunks )
+      free( header->chunks );
+    return DZ_ERR_INVALID_FORMAT;
+  }
+
+  fseek( str, -8, SEEK_END );
+  header->crc = getc( str ) << 0;
+  header->crc |= getc( str ) << 8;
+  header->crc |= getc( str ) << 16;
+  header->crc |= getc( str ) << 24;
+  header->length = getc( str ) << 0;
+  header->length |= getc( str ) << 8;
+  header->length |= getc( str ) << 16;
+  header->length |= getc( str ) << 24;
+  header->compressedLength = ftell( str );
+
+  /* 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++ ) {
+    header->offsets[ i ] = offset;
+    offset += header->chunks[ i ];
+  }
+
+  fclose( str );
+  return DZ_NOERROR;
 }
 
-dictData *dict_data_open( const char *filename,
-                          enum DZ_ERRORS * error,
-                          int computeCRC )
+dictData * dict_data_open( const char * filename, enum DZ_ERRORS * error, int computeCRC )
 {
-   dictData    *h = NULL;
-//   struct stat sb;
-   int         j;
+  dictData * h = NULL;
+  //   struct stat sb;
+  int j;
 
-   if (!filename)
-   {
-     *error = DZ_ERR_OPENFILE;
-     return NULL;
-   }
+  if ( !filename ) {
+    *error = DZ_ERR_OPENFILE;
+    return NULL;
+  }
 
-   h = xmalloc( sizeof( struct dictData ) );
-   if( h == 0 )
-   {
-     *error = DZ_ERR_NOMEMORY;
-     return 0;
-   }
+  h = xmalloc( sizeof( struct dictData ) );
+  if ( h == 0 ) {
+    *error = DZ_ERR_NOMEMORY;
+    return 0;
+  }
 
-   memset( h, 0, sizeof( struct dictData ) );
+  memset( h, 0, sizeof( struct dictData ) );
 #ifdef __WIN32
-   h->fd = INVALID_HANDLE_VALUE;
+  h->fd = INVALID_HANDLE_VALUE;
 #endif
-   h->initialized = 0;
+  h->initialized = 0;
 
-   for(;;)
-   {
+  for ( ;; ) {
 #ifdef __WIN32
-     wchar_t wname[16384];
+    wchar_t wname[ 16384 ];
 #endif
-     *error = dict_read_header( filename, h, computeCRC );
-     if ( *error != DZ_NOERROR ) {
-       break; /*
+    *error = dict_read_header( filename, h, computeCRC );
+    if ( *error != DZ_NOERROR ) {
+      break; /*
         err_fatal( __func__,
        "\"%s\" not in text or dzip format\n", filename );*/
-     }
+    }
 
 #ifdef __WIN32
-     if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
-     {
-       *error = DZ_ERR_OPENFILE;
-       break;
-     }
+    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->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 );
+    h->size = GetFileSize( h->fd, 0 );
 #else
-     h->fd = gd_fopen( filename, "rb" );
+    h->fd = gd_fopen( filename, "rb" );
 
-     if ( !h->fd )
-     {
-       *error = DZ_ERR_OPENFILE;
-       break;
-        /*err_fatal_errno( __func__,
+    if ( !h->fd ) {
+      *error = DZ_ERR_OPENFILE;
+      break;
+      /*err_fatal_errno( __func__,
              "Cannot open data file \"%s\"\n", filename );*/
-      }
+    }
 
-     fseek( h->fd, 0, SEEK_END );
+    fseek( h->fd, 0, SEEK_END );
 
-     h->size = ftell( h->fd );
+    h->size = ftell( h->fd );
 #endif
 
-     for (j = 0; j < DICT_CACHE_SIZE; j++) {
-        h->cache[j].chunk    = -1;
-        h->cache[j].stamp    = -1;
-        h->cache[j].inBuffer = NULL;
-        h->cache[j].count    = 0;
-     }
+    for ( j = 0; j < DICT_CACHE_SIZE; j++ ) {
+      h->cache[ j ].chunk    = -1;
+      h->cache[ j ].stamp    = -1;
+      h->cache[ j ].inBuffer = NULL;
+      h->cache[ j ].count    = 0;
+    }
 
-     *error = DZ_NOERROR;
-     return h;
-   }
-   dict_data_close( h );
-   return( 0 );
+    *error = DZ_NOERROR;
+    return h;
+  }
+  dict_data_close( h );
+  return ( 0 );
 }
 
-void dict_data_close( dictData *header )
+void dict_data_close( dictData * header )
 {
-   int i;
+  int i;
 
-   if (!header)
-      return;
+  if ( !header )
+    return;
 
 #ifdef __WIN32
-   if ( header->fd != INVALID_HANDLE_VALUE )
-     CloseHandle( header->fd );
+  if ( header->fd != INVALID_HANDLE_VALUE )
+    CloseHandle( header->fd );
 #else
-   if ( header->fd )
-     fclose( header->fd );
+  if ( header->fd )
+    fclose( header->fd );
 #endif
 
-   if (header->chunks)       xfree( header->chunks );
-   if (header->offsets)      xfree( header->offsets );
+  if ( header->chunks )
+    xfree( header->chunks );
+  if ( header->offsets )
+    xfree( header->offsets );
 
-   if (header->initialized) {
-      if (inflateEnd( &header->zStream ))
-	 err_internal( __func__,
-		       "Cannot shut down inflation engine: %s\n",
-		       header->zStream.msg );
-   }
+  if ( header->initialized ) {
+    if ( inflateEnd( &header->zStream ) )
+      err_internal( __func__, "Cannot shut down inflation engine: %s\n", header->zStream.msg );
+  }
 
-   for (i = 0; i < DICT_CACHE_SIZE; ++i){
-      if (header -> cache [i].inBuffer)
-	 xfree (header -> cache [i].inBuffer);
-   }
+  for ( i = 0; i < DICT_CACHE_SIZE; ++i ) {
+    if ( header->cache[ i ].inBuffer )
+      xfree( header->cache[ i ].inBuffer );
+  }
 
-   xfree( header );
+  xfree( header );
 }
 
-char *dict_data_read_ (
-   dictData *h, unsigned long start, unsigned long size,
-   const char *preFilter, const char *postFilter )
+char * dict_data_read_(
+  dictData * h, unsigned long start, unsigned long size, const char * preFilter, const char * postFilter )
 {
-   char * buffer;
-   char * pt;
-   unsigned long end;
-   int           count;
-   char          *inBuffer;
-   char          outBuffer[OUT_BUFFER_SIZE];
-   int           firstChunk, lastChunk;
-   int           firstOffset, lastOffset;
-   int           i, j;
-   int           found, target, lastStamp;
-   (void) preFilter;
-   (void) postFilter;
+  char * buffer;
+  char * pt;
+  unsigned long end;
+  int count;
+  char * inBuffer;
+  char outBuffer[ OUT_BUFFER_SIZE ];
+  int firstChunk, lastChunk;
+  int firstOffset, lastOffset;
+  int i, j;
+  int found, target, lastStamp;
+  (void)preFilter;
+  (void)postFilter;
 
-   end  = start + size;
+  end = start + size;
 
-   buffer = xmalloc( size + 1 );
-   if( !buffer )
-   {
-     strcpy( h->errorString, dz_error_str( DZ_ERR_NOMEMORY ) );
-     return 0;
-   }
+  buffer = xmalloc( size + 1 );
+  if ( !buffer ) {
+    strcpy( h->errorString, dz_error_str( DZ_ERR_NOMEMORY ) );
+    return 0;
+  }
 
-   if ( !size )
-   {
-     *buffer = 0;
-     return buffer;
-   }
+  if ( !size ) {
+    *buffer = 0;
+    return buffer;
+  }
 
-   PRINTF(DBG_UNZIP,
-	  ("dict_data_read( %p, %lu, %lu, %s, %s )\n",
-	   h, start, size, preFilter, postFilter ));
+  PRINTF( DBG_UNZIP, ( "dict_data_read( %p, %lu, %lu, %s, %s )\n", h, start, size, preFilter, postFilter ) );
 
-   assert( h != NULL);
-   switch (h->type) {
-   case DICT_GZIP:
-/*
+  assert( h != NULL );
+  switch ( h->type ) {
+    case DICT_GZIP:
+      /*
       err_fatal( __func__,
 		 "Cannot seek on pure gzip format files.\n"
 		 "Use plain text (for performance)"
@@ -627,126 +608,16 @@ char *dict_data_read_ (
       strcpy( h->errorString, "Cannot seek on pure gzip format files" );
       xfree( buffer );
       return 0;
-   case DICT_TEXT:
-   {
+    case DICT_TEXT: {
 #ifdef __WIN32
-     long hiPtr = 0;
-     DWORD pos = SetFilePointer( h->fd, start, &hiPtr, FILE_BEGIN );
-     DWORD readed = 0;
-     if( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
-       ReadFile( h->fd, buffer, size, &readed, 0 );
-     if( size != readed )
+      long hiPtr   = 0;
+      DWORD pos    = SetFilePointer( h->fd, start, &hiPtr, FILE_BEGIN );
+      DWORD readed = 0;
+      if ( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
+        ReadFile( h->fd, buffer, size, &readed, 0 );
+      if ( size != readed )
 #else
-     if ( fseek( h->fd, start, SEEK_SET ) != 0 ||
-          fread( buffer, size, 1, h->fd ) != 1 )
-#endif
-     {
-       strcpy( h->errorString, dz_error_str( DZ_ERR_READFILE ) );
-       xfree( buffer );
-       return 0;
-     }
-
-     buffer[size] = '\0';
-   }
-   break;
-   case DICT_DZIP:
-      if (!h->initialized) {
-	 h->zStream.zalloc    = NULL;
-	 h->zStream.zfree     = NULL;
-	 h->zStream.opaque    = NULL;
-	 h->zStream.next_in   = 0;
-	 h->zStream.avail_in  = 0;
-	 h->zStream.next_out  = NULL;
-	 h->zStream.avail_out = 0;
-	 if (inflateInit2( &h->zStream, -15 ) != Z_OK)
-/*
-	    err_internal( __func__,
-			  "Cannot initialize inflation engine: %s\n",
-			  h->zStream.msg );
-*/
-	 {
-	   sprintf( h->errorString, "Cannot initialize inflation engine: %s", h->zStream.msg );
-	   xfree( buffer );
-	   return 0;
-	 }
-	 ++h->initialized;
-      }
-      firstChunk  = start / h->chunkLength;
-      firstOffset = start - firstChunk * h->chunkLength;
-      lastChunk   = end / h->chunkLength;
-      lastOffset  = end - lastChunk * h->chunkLength;
-      PRINTF(DBG_UNZIP,
-	     ("   start = %lu, end = %lu\n"
-	      "firstChunk = %d, firstOffset = %d,"
-	      " lastChunk = %d, lastOffset = %d\n",
-	      start, end, firstChunk, firstOffset, lastChunk, lastOffset ));
-      for (pt = buffer, i = firstChunk; i <= lastChunk; i++) {
-
-				/* Access cache */
-	 found  = 0;
-	 target = 0;
-	 lastStamp = INT_MAX;
-	 for (j = 0; j < DICT_CACHE_SIZE; j++) {
-#if USE_CACHE
-	    if (h->cache[j].chunk == i) {
-	       found  = 1;
-	       target = j;
-	       break;
-	    }
-#endif
-	    if (h->cache[j].stamp < lastStamp) {
-	       lastStamp = h->cache[j].stamp;
-	       target = j;
-	    }
-	 }
-
-	 h->cache[target].stamp = ++h->stamp;
-	 if( h->stamp < 0 )
-	 {
-	    h->stamp = 0;
-	    for (j = 0; j < DICT_CACHE_SIZE; j++)
-	      h->cache[j].stamp = -1;
-	 }
-	 if (found) {
-	    count = h->cache[target].count;
-	    inBuffer = h->cache[target].inBuffer;
-	 } else {
-#ifdef __WIN32
-        DWORD pos ;
-        DWORD readed;
-#endif
-	    h->cache[target].chunk = -1;
-	    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 ) {
-/*
-	       err_internal( __func__,
-			     "h->chunks[%d] = %d >= %ld (OUT_BUFFER_SIZE)\n",
-			     i, h->chunks[i], OUT_BUFFER_SIZE );
-*/
-              sprintf( h->errorString, "h->chunks[%d] = %d >= %ld (OUT_BUFFER_SIZE)\n",
-                       i, h->chunks[i], OUT_BUFFER_SIZE );
-              xfree( buffer );
-              return 0;
-	    }
-
-#ifdef __WIN32
-      pos = SetFilePointer( h->fd, h->offsets[ i ], 0, FILE_BEGIN );
-      readed = 0;
-      if( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
-        ReadFile( h->fd, outBuffer, h->chunks[ i ], &readed, 0 );
-      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 )
+      if ( fseek( h->fd, start, SEEK_SET ) != 0 || fread( buffer, size, 1, h->fd ) != 1 )
 #endif
       {
         strcpy( h->errorString, dz_error_str( DZ_ERR_READFILE ) );
@@ -754,97 +625,218 @@ char *dict_data_read_ (
         return 0;
       }
 
-      dict_data_filter( outBuffer, &count, OUT_BUFFER_SIZE, preFilter );
-	 
-	    h->zStream.next_in   = (Bytef *)outBuffer;
-	    h->zStream.avail_in  = h->chunks[i];
-	    h->zStream.next_out  = (Bytef *)inBuffer;
-	    h->zStream.avail_out = h->chunkLength;
-	    if (inflate( &h->zStream,  Z_PARTIAL_FLUSH ) != Z_OK)
-	    {
-//	       err_fatal( __func__, "inflate: %s\n", h->zStream.msg );
-	      sprintf( h->errorString, "inflate: %s\n", h->zStream.msg );
-	      xfree( buffer );
-	      return 0;
-	    }
-	    if (h->zStream.avail_in)
-/*
+      buffer[ size ] = '\0';
+    } break;
+    case DICT_DZIP:
+      if ( !h->initialized ) {
+        h->zStream.zalloc    = NULL;
+        h->zStream.zfree     = NULL;
+        h->zStream.opaque    = NULL;
+        h->zStream.next_in   = 0;
+        h->zStream.avail_in  = 0;
+        h->zStream.next_out  = NULL;
+        h->zStream.avail_out = 0;
+        if ( inflateInit2( &h->zStream, -15 ) != Z_OK )
+        /*
+	    err_internal( __func__,
+			  "Cannot initialize inflation engine: %s\n",
+			  h->zStream.msg );
+*/
+        {
+          sprintf( h->errorString, "Cannot initialize inflation engine: %s", h->zStream.msg );
+          xfree( buffer );
+          return 0;
+        }
+        ++h->initialized;
+      }
+      firstChunk  = start / h->chunkLength;
+      firstOffset = start - firstChunk * h->chunkLength;
+      lastChunk   = end / h->chunkLength;
+      lastOffset  = end - lastChunk * h->chunkLength;
+      PRINTF( DBG_UNZIP,
+              ( "   start = %lu, end = %lu\n"
+                "firstChunk = %d, firstOffset = %d,"
+                " lastChunk = %d, lastOffset = %d\n",
+                start,
+                end,
+                firstChunk,
+                firstOffset,
+                lastChunk,
+                lastOffset ) );
+      for ( pt = buffer, i = firstChunk; i <= lastChunk; i++ ) {
+
+        /* Access cache */
+        found     = 0;
+        target    = 0;
+        lastStamp = INT_MAX;
+        for ( j = 0; j < DICT_CACHE_SIZE; j++ ) {
+#if USE_CACHE
+          if ( h->cache[ j ].chunk == i ) {
+            found  = 1;
+            target = j;
+            break;
+          }
+#endif
+          if ( h->cache[ j ].stamp < lastStamp ) {
+            lastStamp = h->cache[ j ].stamp;
+            target    = j;
+          }
+        }
+
+        h->cache[ target ].stamp = ++h->stamp;
+        if ( h->stamp < 0 ) {
+          h->stamp = 0;
+          for ( j = 0; j < DICT_CACHE_SIZE; j++ )
+            h->cache[ j ].stamp = -1;
+        }
+        if ( found ) {
+          count    = h->cache[ target ].count;
+          inBuffer = h->cache[ target ].inBuffer;
+        }
+        else {
+#ifdef __WIN32
+          DWORD pos;
+          DWORD readed;
+#endif
+          h->cache[ target ].chunk = -1;
+          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 ) {
+            /*
+	       err_internal( __func__,
+			     "h->chunks[%d] = %d >= %ld (OUT_BUFFER_SIZE)\n",
+			     i, h->chunks[i], OUT_BUFFER_SIZE );
+*/
+            sprintf( h->errorString,
+                     "h->chunks[%d] = %d >= %ld (OUT_BUFFER_SIZE)\n",
+                     i,
+                     h->chunks[ i ],
+                     OUT_BUFFER_SIZE );
+            xfree( buffer );
+            return 0;
+          }
+
+#ifdef __WIN32
+          pos    = SetFilePointer( h->fd, h->offsets[ i ], 0, FILE_BEGIN );
+          readed = 0;
+          if ( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
+            ReadFile( h->fd, outBuffer, h->chunks[ i ], &readed, 0 );
+          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;
+          }
+
+          dict_data_filter( outBuffer, &count, OUT_BUFFER_SIZE, preFilter );
+
+          h->zStream.next_in   = (Bytef *)outBuffer;
+          h->zStream.avail_in  = h->chunks[ i ];
+          h->zStream.next_out  = (Bytef *)inBuffer;
+          h->zStream.avail_out = h->chunkLength;
+          if ( inflate( &h->zStream, Z_PARTIAL_FLUSH ) != Z_OK ) {
+            //	       err_fatal( __func__, "inflate: %s\n", h->zStream.msg );
+            sprintf( h->errorString, "inflate: %s\n", h->zStream.msg );
+            xfree( buffer );
+            return 0;
+          }
+          if ( h->zStream.avail_in )
+          /*
 	       err_internal( __func__,
 			     "inflate did not flush (%d pending, %d avail)\n",
 			     h->zStream.avail_in, h->zStream.avail_out );
 */
-	    {
-	      sprintf( h->errorString, "inflate did not flush (%d pending, %d avail)\n",
-		       h->zStream.avail_in, h->zStream.avail_out );
-	      xfree( buffer );
-	      return 0;
-	    }
-	    
-	    count = h->chunkLength - h->zStream.avail_out;
-      dict_data_filter( inBuffer, &count, h->chunkLength, postFilter );
+          {
+            sprintf( h->errorString,
+                     "inflate did not flush (%d pending, %d avail)\n",
+                     h->zStream.avail_in,
+                     h->zStream.avail_out );
+            xfree( buffer );
+            return 0;
+          }
 
-	    h->cache[target].count = count;
-	    h->cache[target].chunk = i;
-	 }
-	 
-	 if (i == firstChunk) {
-	    if (i == lastChunk) {
-	       memcpy( pt, inBuffer + firstOffset, lastOffset-firstOffset);
-	       pt += lastOffset - firstOffset;
-	    } else {
-	       if (count != h->chunkLength )
-/*
+          count = h->chunkLength - h->zStream.avail_out;
+          dict_data_filter( inBuffer, &count, h->chunkLength, postFilter );
+
+          h->cache[ target ].count = count;
+          h->cache[ target ].chunk = i;
+        }
+
+        if ( i == firstChunk ) {
+          if ( i == lastChunk ) {
+            memcpy( pt, inBuffer + firstOffset, lastOffset - firstOffset );
+            pt += lastOffset - firstOffset;
+          }
+          else {
+            if ( count != h->chunkLength )
+            /*
 		  err_internal( __func__,
 				"Length = %d instead of %d\n",
 				count, h->chunkLength );
 */
-	       {
-		 sprintf( h->errorString, "Length = %d instead of %d\n",
-			  count, h->chunkLength );
-		 xfree( buffer );
-		 return 0;
-	       }
-	       memcpy( pt, inBuffer + firstOffset,
-		       h->chunkLength - firstOffset );
-	       pt += h->chunkLength - firstOffset;
-	    }
-	 } else if (i == lastChunk) {
-	    memcpy( pt, inBuffer, lastOffset );
-	    pt += lastOffset;
-	 } else {
-	    assert( count == h->chunkLength );
-	    memcpy( pt, inBuffer, h->chunkLength );
-	    pt += h->chunkLength;
-	 }
+            {
+              sprintf( h->errorString, "Length = %d instead of %d\n", count, h->chunkLength );
+              xfree( buffer );
+              return 0;
+            }
+            memcpy( pt, inBuffer + firstOffset, h->chunkLength - firstOffset );
+            pt += h->chunkLength - firstOffset;
+          }
+        }
+        else if ( i == lastChunk ) {
+          memcpy( pt, inBuffer, lastOffset );
+          pt += lastOffset;
+        }
+        else {
+          assert( count == h->chunkLength );
+          memcpy( pt, inBuffer, h->chunkLength );
+          pt += h->chunkLength;
+        }
       }
       *pt = '\0';
       break;
-   case DICT_UNKNOWN:
-//      err_fatal( __func__, "Cannot read unknown file type\n" );
+    case DICT_UNKNOWN:
+      //      err_fatal( __func__, "Cannot read unknown file type\n" );
       strcpy( h->errorString, "Cannot read unknown file type" );
       xfree( buffer );
       return 0;
-   }
-   h->errorString[ 0 ] = 0;
-   return buffer;
+  }
+  h->errorString[ 0 ] = 0;
+  return buffer;
 }
 
-char *dict_error_str( dictData *data )
+char * dict_error_str( dictData * data )
 {
   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";
+  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 --git a/src/dictzip.hh b/src/dictzip.hh
index afbf1e3c..f9838168 100644
--- a/src/dictzip.hh
+++ b/src/dictzip.hh
@@ -28,12 +28,11 @@
 #include <zlib.h>
 
 #ifdef __WIN32
-#include <windows.h>
+  #include <windows.h>
 #endif
 
 #ifdef __cplusplus
-extern "C" 
-{
+extern "C" {
 #endif
 
 
@@ -41,11 +40,12 @@ extern "C"
 
 #define DICT_CACHE_SIZE 5
 
-typedef struct dictCache {
-   int           chunk;
-   char          *inBuffer;
-   int           stamp;
-   int           count;
+typedef struct dictCache
+{
+  int chunk;
+  char * inBuffer;
+  int stamp;
+  int count;
 } dictCache;
 
 enum DZ_ERRORS {
@@ -58,63 +58,59 @@ enum DZ_ERRORS {
   DZ_ERR_NOMEMORY
 };
 
-typedef struct dictData {
+typedef struct dictData
+{
 #ifdef __WIN32
-   HANDLE        fd;		/* file handle */
+  HANDLE fd; /* file handle */
 #else
-   FILE *        fd;		/* file descriptor */
+  FILE * fd; /* file descriptor */
 #endif
 
-   unsigned long size;		/* size of file */
-   
-   int           type;
-   const char    *filename;
-   z_stream      zStream;
-   int           initialized;
+  unsigned long size; /* size of file */
 
-   int           headerLength;
-   int           method;
-   int           flags;
-   time_t        mtime;
-   int           extraFlags;
-   int           os;
-   int           version;
-   int           chunkLength;
-   int           chunkCount;
-   int           *chunks;
-   unsigned long *offsets;	/* Sum-scan of chunks. */
-   const char    *origFilename;
-   const char    *comment;
-   unsigned long crc;
-   unsigned long length;
-   unsigned long compressedLength;
-   int           stamp;
-   dictCache     cache[DICT_CACHE_SIZE];
-   char          errorString[512];
+  int type;
+  const char * filename;
+  z_stream zStream;
+  int initialized;
+
+  int headerLength;
+  int method;
+  int flags;
+  time_t mtime;
+  int extraFlags;
+  int os;
+  int version;
+  int chunkLength;
+  int chunkCount;
+  int * chunks;
+  unsigned long * offsets; /* Sum-scan of chunks. */
+  const char * origFilename;
+  const char * comment;
+  unsigned long crc;
+  unsigned long length;
+  unsigned long compressedLength;
+  int stamp;
+  dictCache cache[ DICT_CACHE_SIZE ];
+  char errorString[ 512 ];
 } dictData;
 
 
 /* initialize .data file */
-extern dictData *dict_data_open (
-   const char *filename, enum DZ_ERRORS * error, int computeCRC);
+extern dictData * dict_data_open( const char * filename, enum DZ_ERRORS * error, int computeCRC );
 /* */
-extern void dict_data_close (
-   dictData *data);
+extern void dict_data_close( dictData * data );
 
-extern char *dict_data_read_ (
-   dictData *data,
-   unsigned long start, unsigned long end,
-   const char *preFilter,
-   const char *postFilter );
+extern char * dict_data_read_(
+  dictData * data, unsigned long start, unsigned long end, const char * preFilter, const char * postFilter );
 
-extern char *dict_error_str( dictData *data );
+extern char * dict_error_str( dictData * data );
 
-extern const char *dz_error_str( enum DZ_ERRORS error );
+extern const char * dz_error_str( enum DZ_ERRORS error );
 
-extern int        mmap_mode;
+extern int mmap_mode;
 
 #ifdef __cplusplus
-}  /* end extern "C" */
+} /* end extern "C" */
 #endif
 
 #endif /* _DICTZIP_H_ */
diff --git a/src/externalaudioplayer.cc b/src/externalaudioplayer.cc
index 2303c03d..fef94c3b 100644
--- a/src/externalaudioplayer.cc
+++ b/src/externalaudioplayer.cc
@@ -4,7 +4,8 @@
 #include "externalaudioplayer.hh"
 #include "externalviewer.hh"
 
-ExternalAudioPlayer::ExternalAudioPlayer() : exitingViewer( 0 )
+ExternalAudioPlayer::ExternalAudioPlayer():
+  exitingViewer( 0 )
 {
 }
 
@@ -30,27 +31,24 @@ QString ExternalAudioPlayer::play( const char * data, int size )
   stop();
 
   Q_ASSERT( !viewer && "viewer must be null at this point for exception safety." );
-  try
-  {
+  try {
     // Our destructor properly destroys viewers we remember about.
     // In the unlikely case that we call viewer.reset() during the application
     // exit, ~QObject() prevents leaks as this class is a parent of all viewers.
     viewer.reset( new ExternalViewer( data, size, "wav", playerCommandLine, this ) );
   }
-  catch( const ExternalViewer::Ex & e )
-  {
+  catch ( const ExternalViewer::Ex & e ) {
     return e.what();
   }
 
-  if( exitingViewer )
+  if ( exitingViewer )
     return QString(); // Will start later.
   return startViewer();
 }
 
 void ExternalAudioPlayer::stop()
 {
-  if( !exitingViewer && viewer && !viewer->stop() )
-  {
+  if ( !exitingViewer && viewer && !viewer->stop() ) {
     // Give the previous viewer a chance to stop before starting a new one.
     // This prevents overlapping audio and possible conflicts between
     // external program instances.
@@ -66,18 +64,15 @@ void ExternalAudioPlayer::stop()
 
 void ExternalAudioPlayer::onViewerDestroyed( QObject * destroyedViewer )
 {
-  if( exitingViewer == destroyedViewer )
-  {
+  if ( exitingViewer == destroyedViewer ) {
     exitingViewer = 0;
-    if( viewer )
-    {
+    if ( viewer ) {
       QString errorMessage = startViewer();
-      if( !errorMessage.isEmpty() )
+      if ( !errorMessage.isEmpty() )
         emit error( errorMessage );
     }
   }
-  else
-  if( viewer.data() == destroyedViewer )
+  else if ( viewer.data() == destroyedViewer )
     viewer.take(); // viewer finished and died -> release ownership.
 }
 
@@ -85,12 +80,10 @@ QString ExternalAudioPlayer::startViewer()
 {
   Q_ASSERT( !exitingViewer && viewer );
   connect( viewer.data(), &QObject::destroyed, this, &ExternalAudioPlayer::onViewerDestroyed );
-  try
-  {
+  try {
     viewer->start();
   }
-  catch( const ExternalViewer::Ex & e )
-  {
+  catch ( const ExternalViewer::Ex & e ) {
     viewer.reset();
     return e.what();
   }
diff --git a/src/externalaudioplayer.hh b/src/externalaudioplayer.hh
index c9a531aa..a8546762 100644
--- a/src/externalaudioplayer.hh
+++ b/src/externalaudioplayer.hh
@@ -10,9 +10,10 @@
 
 class ExternalViewer;
 
-class ExternalAudioPlayer : public AudioPlayerInterface
+class ExternalAudioPlayer: public AudioPlayerInterface
 {
   Q_OBJECT
+
 public:
   ExternalAudioPlayer();
   ~ExternalAudioPlayer();
@@ -35,7 +36,11 @@ private:
 
   struct ScopedPointerDeleteLater
   {
-    static void cleanup( QObject * p ) { if( p ) p->deleteLater(); }
+    static void cleanup( QObject * p )
+    {
+      if ( p )
+        p->deleteLater();
+    }
   };
   // deleteLater() is safer because viewer actively participates in the QEventLoop.
   QScopedPointer< ExternalViewer, ScopedPointerDeleteLater > viewer;
diff --git a/src/externalviewer.cc b/src/externalviewer.cc
index 6d8581e8..e623ac4b 100644
--- a/src/externalviewer.cc
+++ b/src/externalviewer.cc
@@ -7,10 +7,8 @@
 #include "parsecmdline.hh"
 #include "gddebug.hh"
 
-ExternalViewer::ExternalViewer( const char * data, int size,
-                                QString const & extension, QString const & viewerCmdLine_,
-                                QObject * parent)
-    :
+ExternalViewer::ExternalViewer(
+  const char * data, int size, QString const & extension, QString const & viewerCmdLine_, QObject * parent ):
   QObject( parent ),
   tempFile( QDir::temp().filePath( QString( "gd-XXXXXXXX." ) + extension ) ),
   viewer( this ),
@@ -23,7 +21,7 @@ ExternalViewer::ExternalViewer( const char * data, int size,
 
 #ifdef Q_OS_WIN32
   // Issue #239
-  tempFileName = QDir::toNativeSeparators(tempFileName);
+  tempFileName = QDir::toNativeSeparators( tempFileName );
 #endif
 
   tempFile.close();
@@ -31,15 +29,14 @@ ExternalViewer::ExternalViewer( const char * data, int size,
   GD_DPRINTF( "%s\n", tempFile.fileName().toLocal8Bit().data() );
 }
 
-void ExternalViewer::start() 
+void ExternalViewer::start()
 {
   connect( &viewer, &QProcess::finished, this, &QObject::deleteLater );
   connect( &viewer, &QProcess::errorOccurred, this, &QObject::deleteLater );
 
   QStringList args = parseCommandLine( viewerCmdLine );
 
-  if ( !args.isEmpty() )
-  {
+  if ( !args.isEmpty() ) {
     QString program = args.first();
     args.pop_front();
     args.push_back( tempFileName );
@@ -53,7 +50,7 @@ void ExternalViewer::start()
 
 bool ExternalViewer::stop()
 {
-  if( viewer.state() == QProcess::NotRunning )
+  if ( viewer.state() == QProcess::NotRunning )
     return true;
   viewer.terminate();
   QTimer::singleShot( 1000, &viewer, &QProcess::kill ); // In case terminate() fails.
@@ -63,7 +60,7 @@ bool ExternalViewer::stop()
 void ExternalViewer::stopSynchronously()
 {
   // This implementation comes straight from QProcess::~QProcess().
-  if( viewer.state() == QProcess::NotRunning )
+  if ( viewer.state() == QProcess::NotRunning )
     return;
   viewer.kill();
   viewer.waitForFinished();
@@ -71,7 +68,7 @@ void ExternalViewer::stopSynchronously()
 
 void stopAndDestroySynchronously( ExternalViewer * viewer )
 {
-  if( !viewer )
+  if ( !viewer )
     return;
   viewer->stopSynchronously();
   delete viewer;
diff --git a/src/externalviewer.hh b/src/externalviewer.hh
index b7bb6ba6..55188a29 100644
--- a/src/externalviewer.hh
+++ b/src/externalviewer.hh
@@ -25,14 +25,12 @@ public:
   DEF_EX( exCantCreateTempFile, "Couldn't create temporary file.", Ex )
   DEF_EX_STR( exCantRunViewer, "Couldn't run external viewer:", Ex )
 
-  ExternalViewer( const char * data, int size,
-                  QString const & extension, QString const & viewerCmdLine,
-                  QObject * parent = 0 )
-    ;
+  ExternalViewer(
+    const char * data, int size, QString const & extension, QString const & viewerCmdLine, QObject * parent = 0 );
 
   // Once this is called, the object will be deleted when it's done, even if
   // the function throws.
-  void start() ;
+  void start();
 
   /// If the external process is running, requests its termination and returns
   /// false - expect the QObject::destroyed() signal to be emitted soon.
diff --git a/src/ffmpegaudio.cc b/src/ffmpegaudio.cc
index d26ea1ea..825add0d 100644
--- a/src/ffmpegaudio.cc
+++ b/src/ffmpegaudio.cc
@@ -1,40 +1,39 @@
 #ifdef MAKE_FFMPEG_PLAYER
 
-#include "audiooutput.hh"
-#include "ffmpegaudio.hh"
+  #include "audiooutput.hh"
+  #include "ffmpegaudio.hh"
 
-#include <math.h>
-#include <errno.h>
+  #include <math.h>
+  #include <errno.h>
 
 extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libavutil/avutil.h>
-#include "libswresample/swresample.h"
+  #include <libavcodec/avcodec.h>
+  #include <libavformat/avformat.h>
+  #include <libavutil/avutil.h>
+  #include "libswresample/swresample.h"
 }
 
-#include <QString>
-#include <QDataStream>
+  #include <QString>
+  #include <QDataStream>
 
-#include <vector>
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) )
-  #include <QMediaDevices>
+  #include <vector>
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) )
+    #include <QMediaDevices>
 
-  #include <QAudioDevice>
-#endif
-#include "gddebug.hh"
-#include "utils.hh"
+    #include <QAudioDevice>
+  #endif
+  #include "gddebug.hh"
+  #include "utils.hh"
 
 using std::vector;
 
-namespace Ffmpeg
-{
+namespace Ffmpeg {
 
 QMutex DecoderThread::deviceMutex_;
 
 static inline QString avErrorString( int errnum )
 {
-  char buf[64];
+  char buf[ 64 ];
   av_strerror( errnum, buf, 64 );
   return QString::fromLatin1( buf );
 }
@@ -47,13 +46,13 @@ AudioService & AudioService::instance()
 
 AudioService::AudioService()
 {
-//  ao_initialize();
+  //  ao_initialize();
 }
 
 AudioService::~AudioService()
 {
   emit cancelPlaying( true );
-//  ao_shutdown();
+  //  ao_shutdown();
 }
 
 void AudioService::playMemory( const char * ptr, int size )
@@ -76,8 +75,7 @@ void AudioService::stop()
 
 struct DecoderContext
 {
-  enum
-  {
+  enum {
     kBufferSize = 32768
   };
 
@@ -86,19 +84,19 @@ struct DecoderContext
   QByteArray audioData_;
   QDataStream audioDataStream_;
   AVFormatContext * formatContext_;
-#if LIBAVCODEC_VERSION_MAJOR < 59
+  #if LIBAVCODEC_VERSION_MAJOR < 59
   AVCodec * codec_;
-#else
+  #else
   const AVCodec * codec_;
-#endif
+  #endif
   AVCodecContext * codecContext_;
   AVIOContext * avioContext_;
   AVStream * audioStream_;
-//  ao_device * aoDevice_;
+  //  ao_device * aoDevice_;
   AudioOutput * audioOutput;
   bool avformatOpened_;
 
-  SwrContext *swr_;
+  SwrContext * swr_;
 
   DecoderContext( QByteArray const & audioData, QAtomicInt & isCancelled );
   ~DecoderContext();
@@ -108,7 +106,7 @@ struct DecoderContext
   bool openOutputDevice( QString & errorString );
   void closeOutputDevice();
   bool play( QString & errorString );
-  bool normalizeAudio( AVFrame * frame, vector<uint8_t> & samples );
+  bool normalizeAudio( AVFrame * frame, vector< uint8_t > & samples );
   void playFrame( AVFrame * frame );
 };
 
@@ -135,16 +133,16 @@ DecoderContext::~DecoderContext()
 
 static int readAudioData( void * opaque, unsigned char * buffer, int bufferSize )
 {
-  QDataStream * pStream = ( QDataStream * )opaque;
+  QDataStream * pStream = (QDataStream *)opaque;
   // This function is passed as the read_packet callback into avio_alloc_context().
   // The documentation for this callback parameter states:
   // For stream protocols, must never return 0 but rather a proper AVERROR code.
-  if( pStream->atEnd() )
+  if ( pStream->atEnd() )
     return AVERROR_EOF;
-  const int bytesRead = pStream->readRawData( ( char * )buffer, bufferSize );
+  const int bytesRead = pStream->readRawData( (char *)buffer, bufferSize );
   // QDataStream::readRawData() returns 0 at EOF => return AVERROR_EOF in this case.
   // An error is unlikely here, so just print a warning and return AVERROR_EOF too.
-  if( bytesRead < 0 )
+  if ( bytesRead < 0 )
     gdWarning( "readAudioData: error while reading raw data." );
   return bytesRead > 0 ? bytesRead : AVERROR_EOF;
 }
@@ -152,111 +150,101 @@ static int readAudioData( void * opaque, unsigned char * buffer, int bufferSize
 bool DecoderContext::openCodec( QString & errorString )
 {
   formatContext_ = avformat_alloc_context();
-  if ( !formatContext_ )
-  {
+  if ( !formatContext_ ) {
     errorString = "avformat_alloc_context() failed.";
     return false;
   }
 
-  unsigned char * avioBuffer = ( unsigned char * )av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
+  unsigned char * avioBuffer = (unsigned char *)av_malloc( kBufferSize + AV_INPUT_BUFFER_PADDING_SIZE );
 
-  if ( !avioBuffer )
-  {
+  if ( !avioBuffer ) {
     errorString = "av_malloc() failed.";
     return false;
   }
 
   // Don't free buffer allocated here (if succeeded), it will be cleaned up automatically.
   avioContext_ = avio_alloc_context( avioBuffer, kBufferSize, 0, &audioDataStream_, readAudioData, NULL, NULL );
-  if ( !avioContext_ )
-  {
+  if ( !avioContext_ ) {
     av_free( avioBuffer );
     errorString = "avio_alloc_context() failed.";
     return false;
   }
 
-  avioContext_->seekable = 0;
+  avioContext_->seekable   = 0;
   avioContext_->write_flag = 0;
 
   // If pb not set, avformat_open_input() simply crash.
   formatContext_->pb = avioContext_;
   formatContext_->flags |= AVFMT_FLAG_CUSTOM_IO;
 
-  int ret = 0;
+  int ret         = 0;
   avformatOpened_ = true;
 
   ret = avformat_open_input( &formatContext_, NULL, NULL, NULL );
-  if ( ret < 0 )
-  {
+  if ( ret < 0 ) {
     errorString = QString( "avformat_open_input() failed: %1." ).arg( avErrorString( ret ) );
     return false;
   }
 
   ret = avformat_find_stream_info( formatContext_, NULL );
-  if ( ret < 0 )
-  {
+  if ( ret < 0 ) {
     errorString = QString( "avformat_find_stream_info() failed: %1." ).arg( avErrorString( ret ) );
     return false;
   }
 
   // Find audio stream, use the first audio stream if available
-  for ( unsigned i = 0; i < formatContext_->nb_streams; i++ )
-  {
-    if ( formatContext_->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO )
-    {
-      audioStream_ = formatContext_->streams[i];
+  for ( unsigned i = 0; i < formatContext_->nb_streams; i++ ) {
+    if ( formatContext_->streams[ i ]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
+      audioStream_ = formatContext_->streams[ i ];
       break;
     }
   }
-  if ( !audioStream_ )
-  {
+  if ( !audioStream_ ) {
     errorString = QString( "Could not find audio stream." );
     return false;
   }
 
   codec_ = avcodec_find_decoder( audioStream_->codecpar->codec_id );
-  if ( !codec_ )
-  {
+  if ( !codec_ ) {
     errorString = QString( "Codec [id: %1] not found." ).arg( audioStream_->codecpar->codec_id );
     return false;
   }
   codecContext_ = avcodec_alloc_context3( codec_ );
-  if ( !codecContext_ )
-  {
+  if ( !codecContext_ ) {
     errorString = QString( "avcodec_alloc_context3() failed." );
     return false;
   }
   avcodec_parameters_to_context( codecContext_, audioStream_->codecpar );
 
   ret = avcodec_open2( codecContext_, codec_, NULL );
-  if ( ret < 0 )
-  {
+  if ( ret < 0 ) {
     errorString = QString( "avcodec_open2() failed: %1." ).arg( avErrorString( ret ) );
     return false;
   }
 
-  gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n", codec_->long_name,
-          codecContext_->channels, codecContext_->sample_rate, av_get_sample_fmt_name( codecContext_->sample_fmt ) );
+  gdDebug( "Codec open: %s: channels: %d, rate: %d, format: %s\n",
+           codec_->long_name,
+           codecContext_->channels,
+           codecContext_->sample_rate,
+           av_get_sample_fmt_name( codecContext_->sample_fmt ) );
 
   auto layout = codecContext_->channel_layout;
-  if( !layout )
-  {
+  if ( !layout ) {
     layout                        = av_get_default_channel_layout( codecContext_->channels );
     codecContext_->channel_layout = layout;
   }
 
   swr_ = swr_alloc_set_opts( NULL,
-    layout,
-    AV_SAMPLE_FMT_S16,
-    44100,
-    layout,
-    codecContext_->sample_fmt,
-    codecContext_->sample_rate,
-    0,
-    NULL );
+                             layout,
+                             AV_SAMPLE_FMT_S16,
+                             44100,
+                             layout,
+                             codecContext_->sample_fmt,
+                             codecContext_->sample_rate,
+                             0,
+                             NULL );
 
-  if( !swr_ || swr_init( swr_ ) < 0 )
-  {
+  if ( !swr_ || swr_init( swr_ ) < 0 ) {
     av_log( NULL, AV_LOG_ERROR, "Cannot create sample rate converter \n" );
     swr_free( &swr_ );
     return false;
@@ -267,15 +255,12 @@ bool DecoderContext::openCodec( QString & errorString )
 
 void DecoderContext::closeCodec()
 {
-  if ( swr_ )
-  {
+  if ( swr_ ) {
     swr_free( &swr_ );
   }
 
-  if ( !formatContext_ )
-  {
-    if ( avioContext_ )
-    {
+  if ( !formatContext_ ) {
+    if ( avioContext_ ) {
       av_free( avioContext_->buffer );
       avioContext_ = NULL;
     }
@@ -284,16 +269,13 @@ void DecoderContext::closeCodec()
 
   // avformat_open_input() is not called, just free the buffer associated with
   // the AVIOContext, and the AVFormatContext
-  if ( !avformatOpened_ )
-  {
-    if ( formatContext_ )
-    {
+  if ( !avformatOpened_ ) {
+    if ( formatContext_ ) {
       avformat_free_context( formatContext_ );
       formatContext_ = NULL;
     }
 
-    if ( avioContext_ )
-    {
+    if ( avioContext_ ) {
       av_free( avioContext_->buffer );
       avioContext_ = NULL;
     }
@@ -304,8 +286,7 @@ void DecoderContext::closeCodec()
 
   // Closing a codec context without prior avcodec_open2() will result in
   // a crash in ffmpeg
-  if ( audioStream_ && codecContext_ && codec_ )
-  {
+  if ( audioStream_ && codecContext_ && codec_ ) {
     audioStream_->discard = AVDISCARD_ALL;
     avcodec_close( codecContext_ );
     avcodec_free_context( &codecContext_ );
@@ -318,9 +299,9 @@ void DecoderContext::closeCodec()
 bool DecoderContext::openOutputDevice( QString & errorString )
 {
   // only check device when qt version is greater than 6.2
-  #if  (QT_VERSION >= QT_VERSION_CHECK(6,2,0))
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 2, 0 ) )
   QAudioDevice m_outputDevice = QMediaDevices::defaultAudioOutput();
-  if(m_outputDevice.isNull()){
+  if ( m_outputDevice.isNull() ) {
     errorString += QString( "Can not found default audio output device" );
     return false;
   }
@@ -330,85 +311,72 @@ bool DecoderContext::openOutputDevice( QString & errorString )
   return true;
 }
 
-void DecoderContext::closeOutputDevice()
-{
-
-}
+void DecoderContext::closeOutputDevice() {}
 
 bool DecoderContext::play( QString & errorString )
 {
   AVFrame * frame = av_frame_alloc();
-  if ( !frame )
-  {
+  if ( !frame ) {
     errorString = QString( "avcodec_alloc_frame() failed." );
     return false;
   }
 
   AVPacket * packet = av_packet_alloc();
 
-  while ( !Utils::AtomicInt::loadAcquire( isCancelled_ ) &&
-          av_read_frame( formatContext_, packet ) >= 0 )
-  {
-    if ( packet->stream_index == audioStream_->index )
-    {
+  while ( !Utils::AtomicInt::loadAcquire( isCancelled_ ) && av_read_frame( formatContext_, packet ) >= 0 ) {
+    if ( packet->stream_index == audioStream_->index ) {
       int ret = avcodec_send_packet( codecContext_, packet );
       /* read all the output frames (in general there may be any number of them) */
-      while( ret >= 0 )
-      {
-        ret = avcodec_receive_frame( codecContext_, frame);
+      while ( ret >= 0 ) {
+        ret = avcodec_receive_frame( codecContext_, frame );
 
         if ( Utils::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
           break;
 
         playFrame( frame );
       }
-
     }
 
     av_packet_unref( packet );
-
   }
 
   /* flush the decoder */
   packet->data = NULL;
   packet->size = 0;
-  int ret = avcodec_send_packet(codecContext_, packet );
-  while( ret >= 0 )
-  {
-    ret = avcodec_receive_frame(codecContext_, frame);
+  int ret      = avcodec_send_packet( codecContext_, packet );
+  while ( ret >= 0 ) {
+    ret = avcodec_receive_frame( codecContext_, frame );
     if ( Utils::AtomicInt::loadAcquire( isCancelled_ ) || ret < 0 )
       break;
     playFrame( frame );
   }
   av_frame_free( &frame );
-  av_packet_free(&packet);
+  av_packet_free( &packet );
   return true;
 }
 
-bool DecoderContext::normalizeAudio( AVFrame * frame, vector<uint8_t > & samples )
+bool DecoderContext::normalizeAudio( AVFrame * frame, vector< uint8_t > & samples )
 {
   auto dst_freq     = 44100;
   auto dst_channels = codecContext_->channels;
-  int out_count     = (int64_t) frame->nb_samples * dst_freq / frame->sample_rate + 256;
+  int out_count     = (int64_t)frame->nb_samples * dst_freq / frame->sample_rate + 256;
   int out_size      = av_samples_get_buffer_size( NULL, dst_channels, out_count, AV_SAMPLE_FMT_S16, 1 );
   samples.resize( out_size );
   uint8_t * data[ 2 ] = { 0 };
-  data[ 0 ] = &samples.front();
+  data[ 0 ]           = &samples.front();
 
-  auto out_nb_samples = swr_convert( swr_, data, out_count, (const uint8_t **) frame->extended_data, frame->nb_samples );
+  auto out_nb_samples = swr_convert( swr_, data, out_count, (const uint8_t **)frame->extended_data, frame->nb_samples );
 
-  if( out_nb_samples < 0 )
-  {
+  if ( out_nb_samples < 0 ) {
     av_log( NULL, AV_LOG_ERROR, "converte fail \n" );
     return false;
   }
-  else
-  {
-//    qDebug( "out_count:%d, out_nb_samples:%d, frame->nb_samples:%d \n", out_count, out_nb_samples, frame->nb_samples );
+  else {
+    //    qDebug( "out_count:%d, out_nb_samples:%d, frame->nb_samples:%d \n", out_count, out_nb_samples, frame->nb_samples );
   }
 
-  int actual_size      = av_samples_get_buffer_size( NULL, dst_channels, out_nb_samples, AV_SAMPLE_FMT_S16, 1 );
-  samples.resize(actual_size);
+  int actual_size = av_samples_get_buffer_size( NULL, dst_channels, out_nb_samples, AV_SAMPLE_FMT_S16, 1 );
+  samples.resize( actual_size );
   return true;
 }
 
@@ -417,14 +385,13 @@ void DecoderContext::playFrame( AVFrame * frame )
   if ( !frame )
     return;
 
-  vector<uint8_t> samples;
-  if ( normalizeAudio( frame, samples ) )
-  {
-    audioOutput->play(&samples.front(), samples.size());
+  vector< uint8_t > samples;
+  if ( normalizeAudio( frame, samples ) ) {
+    audioOutput->play( &samples.front(), samples.size() );
   }
 }
 
-DecoderThread::DecoderThread( QByteArray const & audioData, QObject * parent ) :
+DecoderThread::DecoderThread( QByteArray const & audioData, QObject * parent ):
   QThread( parent ),
   isCancelled_( 0 ),
   audioData_( audioData )
@@ -441,14 +408,12 @@ void DecoderThread::run()
   QString errorString;
   DecoderContext d( audioData_, isCancelled_ );
 
-  if ( !d.openCodec( errorString ) )
-  {
+  if ( !d.openCodec( errorString ) ) {
     emit error( errorString );
     return;
   }
 
-  while ( !deviceMutex_.tryLock( 100 ) )
-  {
+  while ( !deviceMutex_.tryLock( 100 ) ) {
     if ( Utils::AtomicInt::loadAcquire( isCancelled_ ) )
       return;
   }
@@ -469,6 +434,6 @@ void DecoderThread::cancel( bool waitUntilFinished )
     this->wait();
 }
 
-}
+} // namespace Ffmpeg
 
 #endif // MAKE_FFMPEG_PLAYER
diff --git a/src/ffmpegaudio.hh b/src/ffmpegaudio.hh
index c1425345..7db19b53 100644
--- a/src/ffmpegaudio.hh
+++ b/src/ffmpegaudio.hh
@@ -3,16 +3,15 @@
 
 #ifdef MAKE_FFMPEG_PLAYER
 
-#include <QObject>
-#include <QMutex>
-#include <QAtomicInt>
-#include <QByteArray>
-#include <QThread>
+  #include <QObject>
+  #include <QMutex>
+  #include <QAtomicInt>
+  #include <QByteArray>
+  #include <QThread>
 
-namespace Ffmpeg
-{
+namespace Ffmpeg {
 
-class AudioService : public QObject
+class AudioService: public QObject
 {
   Q_OBJECT
 
@@ -50,7 +49,7 @@ signals:
   void error( QString const & message );
 };
 
-}
+} // namespace Ffmpeg
 
 #endif // MAKE_FFMPEG_PLAYER
 
diff --git a/src/ffmpegaudioplayer.hh b/src/ffmpegaudioplayer.hh
index a7107db2..8ceb7c8c 100644
--- a/src/ffmpegaudioplayer.hh
+++ b/src/ffmpegaudioplayer.hh
@@ -9,21 +9,27 @@
 
 #ifdef MAKE_FFMPEG_PLAYER
 
-namespace Ffmpeg
-{
+namespace Ffmpeg {
 
-class AudioPlayer : public AudioPlayerInterface
+class AudioPlayer: public AudioPlayerInterface
 {
   Q_OBJECT
+
 public:
- AudioPlayer() { connect( &AudioService::instance(), &AudioService::error, this, &AudioPlayerInterface::error ); }
+  AudioPlayer()
+  {
+    connect( &AudioService::instance(), &AudioService::error, this, &AudioPlayerInterface::error );
+  }
 
- ~AudioPlayer() { stop(); }
+  ~AudioPlayer()
+  {
+    stop();
+  }
 
- virtual QString play( const char * data, int size )
- {
-   AudioService::instance().playMemory( data, size );
-   return QString();
+  virtual QString play( const char * data, int size )
+  {
+    AudioService::instance().playMemory( data, size );
+    return QString();
   }
 
   virtual void stop()
@@ -32,7 +38,7 @@ public:
   }
 };
 
-}
+} // namespace Ffmpeg
 
 #endif // MAKE_FFMPEG_PLAYER
 
diff --git a/src/ftshelpers.cc b/src/ftshelpers.cc
index 6c33bf4c..7f948f38 100644
--- a/src/ftshelpers.cc
+++ b/src/ftshelpers.cc
@@ -1,5 +1,6 @@
 /* This file is (c) 2014 Abs62
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
+//xapian.h must at the first in the  include header files to avoid collision with other macro definition.
 #include "xapian.h"
 #include <cstdlib>
 #include "fulltextsearch.hh"
@@ -13,118 +14,55 @@
 #include <vector>
 #include <string>
 
-#include <QVector>
 
 #include <QRegularExpression>
 
-#include "wildcard.hh"
-#include "globalregex.hh"
-#include <QSemaphoreReleaser>
 
 using std::vector;
 using std::string;
 
 DEF_EX( exUserAbort, "User abort", Dictionary::Ex )
 
-namespace FtsHelpers
-{
+namespace FtsHelpers {
 // finished  reversed   dehsinif
 const static std::string finish_mark = std::string( "dehsinif" );
 
-bool ftsIndexIsOldOrBad( string const & indexFile,
-                         BtreeIndexing::BtreeDictionary * dict )
+bool ftsIndexIsOldOrBad( BtreeIndexing::BtreeDictionary * dict )
 {
-  try
-  {
+  try {
     Xapian::WritableDatabase db( dict->ftsIndexName() );
-    auto docid = db.get_lastdocid();
-    auto document = db.get_document(docid);
+    auto docid    = db.get_lastdocid();
+    auto document = db.get_document( docid );
 
-    qDebug()<<document.get_data().c_str();
+    qDebug() << document.get_data().c_str();
     //use a special document to mark the end of the index.
-    return document.get_data()!=finish_mark;
+    return document.get_data() != finish_mark;
   }
-  catch( Xapian::Error & e )
-  {
+  catch ( Xapian::Error & e ) {
     qWarning() << e.get_description().c_str();
     //the file is corrupted,remove it.
-    QFile::remove(QString::fromStdString(dict->ftsIndexName()));
+    QFile::remove( QString::fromStdString( dict->ftsIndexName() ) );
     return true;
   }
-  catch( ... )
-  {
+  catch ( ... ) {
     return true;
   }
-  return false;
 }
 
-static QString makeHiliteRegExpString( QStringList const & words,
-                                       int searchMode, int distanceBetweenWords, bool hasCJK = false, bool ignoreWordsOrder = false )
-{
-  QString searchString( "(" );
-
-  QString stripWords( "(?:\\W+\\w+){0," );
-
-  if( hasCJK )
-  {
-    stripWords = "(?:[\\W\\w]){0,";
-  }
-
-  if( distanceBetweenWords >= 0 )
-    stripWords += QString::number( distanceBetweenWords );
-  stripWords += "}";
-
-  if(!hasCJK)
-  {
-    stripWords += "\\W+";
-  }
-
-  QString boundWord( searchMode == FTS::WholeWords ? "\\b" : "(?:\\w*)");
-  if(hasCJK)
-  {
-    //no boundary for CJK
-    boundWord.clear();
-  }
-
-  for( int x = 0; x < words.size(); x++ )
-  {
-    if( x )
-    {
-      searchString += stripWords;
-      if(ignoreWordsOrder)
-        searchString += "(";
-    }
-
-    searchString += boundWord + words[ x ] + boundWord;
-
-    if( x )
-    {
-      if( ignoreWordsOrder )
-        searchString += ")?";
-    }
-
-  }
-
-  searchString += ")";
-  return searchString;
-}
 
 void tokenizeCJK( QStringList & indexWords, QRegularExpression wordRegExp, QStringList list )
 {
   QStringList wordList, hieroglyphList;
-  for(auto word : list)
-  {
+  for ( auto word : list ) {
     // 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() ) )
-      {
+    for ( int x = 0; x < word.size(); x++ )
+      if ( Utils::isCJKChar( word.at( x ).unicode() ) ) {
         parsed = true;
         hieroglyph.append( word[ x ] );
 
-        if( QChar( word.at( x ) ).isHighSurrogate()
-            &&  QChar( word[ x + 1 ] ).isLowSurrogate() )
+        if ( QChar( word.at( x ) ).isHighSurrogate() && QChar( word[ x + 1 ] ).isLowSurrogate() )
           hieroglyph.append( word[ ++x ] );
 
         hieroglyphList.append( hieroglyph );
@@ -132,7 +70,7 @@ void tokenizeCJK( QStringList & indexWords, QRegularExpression wordRegExp, QStri
       }
 
     // If word don't contains CJK symbols put it in list as is
-    if( !parsed )
+    if ( !parsed )
       wordList.append( word );
   }
 
@@ -143,98 +81,17 @@ void tokenizeCJK( QStringList & indexWords, QRegularExpression wordRegExp, QStri
   indexWords += hieroglyphList;
 }
 
-bool containCJK( QString const & str)
+bool containCJK( QString const & str )
 {
   bool hasCJK = false;
-  for(auto x : str)
-    if( isCJKChar( x.unicode() ) )
-    {
+  for ( auto x : str )
+    if ( Utils::isCJKChar( x.unicode() ) ) {
       hasCJK = true;
       break;
     }
   return hasCJK;
 }
 
-bool parseSearchString( QString const & str, QStringList & indexWords,
-                        QStringList & searchWords,
-                        QRegExp & searchRegExp, int searchMode,
-                        bool matchCase,
-                        int distanceBetweenWords,
-                        bool & hasCJK,
-                        bool ignoreWordsOrder )
-{
-  searchWords.clear();
-  indexWords.clear();
-  // QRegularExpression spacesRegExp( "\\W+", QRegularExpression::UseUnicodePropertiesOption );
-  // QRegularExpression wordRegExp( QString( "\\w{" ) + QString::number( FTS::MinimumWordSize ) + ",}", QRegularExpression::UseUnicodePropertiesOption );
-  // QRegularExpression setsRegExp( "\\[[^\\]]+\\]", QRegularExpression::CaseInsensitiveOption );
-  // QRegularExpression regexRegExp( "\\\\[afnrtvdDwWsSbB]|\\\\x([0-9A-Fa-f]{4})|\\\\0([0-7]{3})", QRegularExpression::CaseInsensitiveOption);
-
-  hasCJK = containCJK( str );
-
-  if( searchMode == FTS::WholeWords || searchMode == FTS::PlainText )
-  {
-    // Make words list for search in article text
-    searchWords = str.normalized( QString::NormalizationForm_C ).split( RX::Ftx::spacesRegExp, Qt::SkipEmptyParts );
-    // Make words list for index search
-    QStringList list =
-      str.normalized( QString::NormalizationForm_C ).toLower().split( RX::Ftx::spacesRegExp, Qt::SkipEmptyParts );
-
-    QString searchString;
-    if( hasCJK )
-    {
-      tokenizeCJK( indexWords, RX::Ftx::wordRegExp, list );
-      // QStringList allWords = str.split( spacesRegExp, Qt::SkipEmptyParts );
-      searchString         = makeHiliteRegExpString( list, searchMode, distanceBetweenWords, hasCJK , ignoreWordsOrder);
-    }
-    else
-    {
-      indexWords = list.filter( RX::Ftx::wordRegExp );
-      indexWords.removeDuplicates();
-
-      // Make regexp for results hilite
-
-      QStringList allWords = str.split( RX::Ftx::spacesRegExp, Qt::SkipEmptyParts );
-      searchString = makeHiliteRegExpString( allWords, searchMode, distanceBetweenWords,false, ignoreWordsOrder );
-    }
-    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 RegExp commands
-    if( searchMode == FTS::RegExp )
-      tmp.replace( RX::Ftx::regexRegExp, " " );
-
-    // Remove all symbol sets
-    tmp.replace( RX::Ftx::setsRegExp, " " );
-
-    QStringList const list =
-      tmp.normalized( QString::NormalizationForm_C ).toLower().split( RX::Ftx::spacesRegExp, Qt::SkipEmptyParts );
-
-    if( hasCJK )
-    {
-      tokenizeCJK( indexWords, RX::Ftx::wordRegExp, list );
-    }
-    else
-    {
-      indexWords = list.filter( RX::Ftx::wordRegExp );
-      indexWords.removeDuplicates();
-    }
-
-    searchRegExp = QRegExp( str, matchCase ? Qt::CaseSensitive : Qt::CaseInsensitive,
-                            searchMode == FTS::Wildcards ? QRegExp::WildcardUnix : QRegExp::RegExp2 );
-    searchRegExp.setMinimal( true );
-  }
-
-  return true;
-}
-
 void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancelled )
 {
   QMutexLocker _( &dict->getFtsMutex() );
@@ -325,7 +182,14 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
       Xapian::Document doc;
 
       indexer.set_document( doc );
-      indexer.index_text_without_positions( articleStr.toStdString() );
+
+      if ( GlobalBroadcaster::instance()->getPreference()->fts.enablePosition ) {
+        indexer.index_text( articleStr.toStdString() );
+      }
+      else {
+        indexer.index_text_without_positions( articleStr.toStdString() );
+      }
+
       doc.set_data( std::to_string( address ) );
       // Add the document to the database.
       db.add_document( doc );
@@ -348,11 +212,6 @@ void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancell
   }
 }
 
-bool isCJKChar( ushort ch )
-{
-  return Utils::isCJKChar(ch);
-}
-
 void FTSResultsRequest::run()
 {
   if ( !dict.ensureInitDone().empty() ) {
@@ -361,14 +220,12 @@ void FTSResultsRequest::run()
     return;
   }
 
-  try
-  {
-    if( dict.haveFTSIndex() )
-    {
+  try {
+    if ( dict.haveFTSIndex() ) {
       //no need to parse the search string,  use xapian directly.
       //if the search mode is wildcard, change xapian search query flag?
       // Open the database for searching.
-      Xapian::Database db(dict.ftsIndexName());
+      Xapian::Database db( dict.ftsIndexName() );
 
       // Start an enquire session.
       Xapian::Enquire enquire( db );
@@ -382,37 +239,34 @@ void FTSResultsRequest::run()
       Xapian::QueryParser qp;
       qp.set_database( db );
       Xapian::QueryParser::feature_flag flag = Xapian::QueryParser::FLAG_DEFAULT;
-      if( searchMode == FTS::Wildcards )
+      if ( searchMode == FTS::Wildcards )
         flag = Xapian::QueryParser::FLAG_WILDCARD;
-      Xapian::Query query = qp.parse_query( query_string, flag|Xapian::QueryParser::FLAG_CJK_NGRAM );
+      Xapian::Query query = qp.parse_query( query_string, flag | Xapian::QueryParser::FLAG_CJK_NGRAM );
       qDebug() << "Parsed query is: " << query.get_description().c_str();
 
       // Find the top 100 results for the query.
       enquire.set_query( query );
       Xapian::MSet matches = enquire.get_mset( 0, 100 );
 
-      emit matchCount(matches.get_matches_estimated());
+      emit matchCount( matches.get_matches_estimated() );
       // Display the results.
       qDebug() << matches.get_matches_estimated() << " results found.\n";
-      qDebug() << "Matches 1-" << matches.size() << ":\n\n";
+      qDebug() << "Matches " << matches.size() << ":\n\n";
       QList< uint32_t > offsetsForHeadwords;
-      for( Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i )
-      {
+      for ( Xapian::MSetIterator i = matches.begin(); i != matches.end(); ++i ) {
         qDebug() << i.get_rank() + 1 << ": " << i.get_weight() << " docid=" << *i << " ["
                  << i.get_document().get_data().c_str() << "]";
-        if(i.get_document().get_data()==finish_mark)
+        if ( i.get_document().get_data() == finish_mark )
           continue;
         offsetsForHeadwords.append( atoi( i.get_document().get_data().c_str() ) );
       }
 
-      if( !offsetsForHeadwords.isEmpty() )
-      {
+      if ( !offsetsForHeadwords.isEmpty() ) {
         QVector< QString > headwords;
         QMutexLocker _( &dataMutex );
         QString id = QString::fromUtf8( dict.getId().c_str() );
         dict.getHeadwordsFromOffsets( offsetsForHeadwords, headwords, &isCancelled );
-        for(const auto & headword : headwords)
-        {
+        for ( const auto & headword : headwords ) {
           foundHeadwords->append( FTS::FtsHeadword( headword, id, QStringList(), matchCase ) );
         }
       }
@@ -432,18 +286,15 @@ void FTSResultsRequest::run()
       hasAnyData     = true;
     }
   }
-  catch (const Xapian::Error &e) {
+  catch ( const Xapian::Error & e ) {
     qWarning() << e.get_description().c_str();
   }
-  catch( std::exception &ex )
-  {
-    gdWarning( "FTS: Failed full-text search for \"%s\", reason: %s\n",
-               dict.getName().c_str(), ex.what() );
+  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
-
+} // namespace FtsHelpers
diff --git a/src/ftshelpers.hh b/src/ftshelpers.hh
index 13ea56c0..84f53b18 100644
--- a/src/ftshelpers.hh
+++ b/src/ftshelpers.hh
@@ -2,10 +2,10 @@
 #define __FTSHELPERS_HH_INCLUDED__
 
 #include <QString>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #else
-#include <QRegExp>
+  #include <QRegExp>
 #endif
 #include <QList>
 #include <QtConcurrent>
@@ -16,26 +16,13 @@
 #include "folding.hh"
 #include "wstring_qt.hh"
 
-#include <string>
+namespace FtsHelpers {
 
-namespace FtsHelpers
-{
-
-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,
-                        bool ignoreWordsOrder = false );
+bool ftsIndexIsOldOrBad( BtreeIndexing::BtreeDictionary * dict );
 
 void makeFTSIndex( BtreeIndexing::BtreeDictionary * dict, QAtomicInt & isCancelled );
-bool isCJKChar( ushort ch );
 
-class FTSResultsRequest : public Dictionary::DataRequest
+class FTSResultsRequest: public Dictionary::DataRequest
 {
   BtreeIndexing::BtreeDictionary & dict;
 
@@ -62,12 +49,15 @@ public:
     searchMode( searchMode_ ),
     matchCase( matchCase_ )
   {
-    if( ignoreDiacritics_ )
-      searchString = QString::fromStdU32String( Folding::applyDiacriticsOnly( gd::removeTrailingZero( searchString_ ) ) );
+    if ( ignoreDiacritics_ )
+      searchString =
+        QString::fromStdU32String( Folding::applyDiacriticsOnly( gd::removeTrailingZero( searchString_ ) ) );
 
     foundHeadwords = new QList< FTS::FtsHeadword >;
-    results         = 0;
-    f              = QtConcurrent::run( [ this ]() { this->run(); } );
+    results        = 0;
+    f              = QtConcurrent::run( [ this ]() {
+      this->run();
+    } );
   }
 
   void run();
@@ -85,6 +75,6 @@ public:
   }
 };
 
-} // namespace
+} // namespace FtsHelpers
 
 #endif // __FTSHELPERS_HH_INCLUDED__
diff --git a/src/fulltextsearch.cc b/src/fulltextsearch.cc
index 144199a1..06d1f48a 100644
--- a/src/fulltextsearch.cc
+++ b/src/fulltextsearch.cc
@@ -12,48 +12,47 @@
 
 #if defined( Q_OS_WIN32 )
 
-#include "initializing.hh"
-#include <qt_windows.h>
-#include <QOperatingSystemVersion>
+  #include "initializing.hh"
+  #include <qt_windows.h>
+  #include <QOperatingSystemVersion>
 
 #endif
 #include "globalregex.hh"
 
-namespace FTS
-{
+namespace FTS {
 
 void Indexing::run()
 {
-  try
-  {
+  try {
     timerThread->start();
-    // First iteration - dictionaries with no more MaxDictionarySizeForFastSearch articles
+    const int parallel_count = GlobalBroadcaster::instance()->getPreference()->fts.parallelThreads;
+    QSemaphore sem( parallel_count < 1 ? 1 : parallel_count );
+
+    QFutureSynchronizer< void > synchronizer;
+    qDebug() << "starting create the fts with thread:" << parallel_count;
     for ( const auto & dictionary : dictionaries ) {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
+      if ( Utils::AtomicInt::loadAcquire( isCancelled ) ) {
+        // synchronizer.setCancelOnWait( true );
         break;
+      }
 
       if ( dictionary->canFTS() && !dictionary->haveFTSIndex() ) {
-        emit sendNowIndexingName( QString::fromUtf8( dictionary->getName().c_str() ) );
-        dictionary->makeFTSIndex( isCancelled, true );
+        sem.acquire();
+        QFuture< void > const f = QtConcurrent::run( [ this, &sem, &dictionary ]() {
+          QSemaphoreReleaser const _( sem );
+          emit sendNowIndexingName( QString::fromUtf8( dictionary->getName().c_str() ) );
+          dictionary->makeFTSIndex( isCancelled, false );
+        } );
+        synchronizer.addFuture( f );
       }
     }
-
-    // Second iteration - all remaining dictionaries
-    for ( const auto & dictionary : dictionaries ) {
-      if ( Utils::AtomicInt::loadAcquire( isCancelled ) )
-        break;
-
-      if ( dictionary->canFTS() && !dictionary->haveFTSIndex() ) {
-        emit sendNowIndexingName( QString::fromUtf8( dictionary->getName().c_str() ) );
-        dictionary->makeFTSIndex( isCancelled, false );
-      }
-    }
-
+    qDebug() << "waiting for all the fts creation to finish.";
+    synchronizer.waitForFinished();
+    qDebug() << "finished/cancel all the fts creation";
     timerThread->quit();
     timerThread->wait();
   }
-  catch( std::exception &ex )
-  {
+  catch ( std::exception & ex ) {
     gdWarning( "Exception occurred while full-text search: %s", ex.what() );
   }
   emit sendNowIndexingName( QString() );
@@ -75,7 +74,7 @@ void Indexing::timeout()
   }
 }
 
-FtsIndexing::FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts):
+FtsIndexing::FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts ):
   dictionaries( dicts ),
   started( false )
 {
@@ -83,15 +82,14 @@ FtsIndexing::FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts
 
 void FtsIndexing::doIndexing()
 {
-  if( started )
+  if ( started )
     stopIndexing();
 
-  if( !started )
-  {
-    while( Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( !started ) {
+    while ( Utils::AtomicInt::loadAcquire( isCancelled ) )
       isCancelled.deref();
 
-    Indexing *idx = new Indexing( isCancelled, dictionaries, indexingExited );
+    Indexing * idx = new Indexing( isCancelled, dictionaries, indexingExited );
 
     connect( idx, &Indexing::sendNowIndexingName, this, &FtsIndexing::setNowIndexedName );
 
@@ -103,9 +101,8 @@ void FtsIndexing::doIndexing()
 
 void FtsIndexing::stopIndexing()
 {
-  if( started )
-  {
-    if( !Utils::AtomicInt::loadAcquire( isCancelled ) )
+  if ( started ) {
+    if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
       isCancelled.ref();
 
     indexingExited.acquire();
@@ -130,64 +127,55 @@ QString FtsIndexing::nowIndexingName()
   return nowIndexing;
 }
 
-void addSortedHeadwords( QList< FtsHeadword > & base_list, QList< FtsHeadword > const & add_list)
+void addSortedHeadwords( QList< FtsHeadword > & base_list, QList< FtsHeadword > const & add_list )
 {
   QList< FtsHeadword > list;
 
-  if( add_list.isEmpty() )
+  if ( add_list.isEmpty() )
     return;
 
-  if( base_list.isEmpty() )
-  {
+  if ( base_list.isEmpty() ) {
     base_list = add_list;
     return;
   }
 
   list.reserve( base_list.size() + add_list.size() );
 
-  QList< FtsHeadword >::iterator base_it = base_list.begin();
+  QList< FtsHeadword >::iterator base_it      = base_list.begin();
   QList< FtsHeadword >::const_iterator add_it = add_list.constBegin();
 
-  while( base_it != base_list.end() || add_it != add_list.end() )
-  {
-    if( base_it == base_list.end() )
-    {
-      while( add_it != add_list.end() )
-      {
+  while ( base_it != base_list.end() || add_it != add_list.end() ) {
+    if ( base_it == base_list.end() ) {
+      while ( add_it != add_list.end() ) {
         list.append( *add_it );
         ++add_it;
       }
       break;
     }
 
-    if( add_it == add_list.end() )
-    {
-      while( base_it != base_list.end() )
-      {
+    if ( add_it == add_list.end() ) {
+      while ( base_it != base_list.end() ) {
         list.append( *base_it );
         ++base_it;
       }
       break;
     }
 
-    if( *add_it < *base_it )
-    {
+    if ( *add_it < *base_it ) {
       list.append( *add_it );
       ++add_it;
     }
-    else if( *add_it == *base_it )
-    {
+    else if ( *add_it == *base_it ) {
       base_it->dictIDs.append( add_it->dictIDs );
-      for( QStringList::const_iterator itr = add_it->foundHiliteRegExps.constBegin();
-             itr != add_it->foundHiliteRegExps.constEnd(); ++itr )
-      {
-        if( !base_it->foundHiliteRegExps.contains( *itr ) )
+      for ( QStringList::const_iterator itr = add_it->foundHiliteRegExps.constBegin();
+            itr != add_it->foundHiliteRegExps.constEnd();
+            ++itr ) {
+        if ( !base_it->foundHiliteRegExps.contains( *itr ) )
           base_it->foundHiliteRegExps.append( *itr );
       }
       ++add_it;
     }
-    else
-    {
+    else {
       list.append( *base_it );
       ++base_it;
     }
@@ -216,7 +204,7 @@ FullTextSearchDialog::FullTextSearchDialog( QWidget * parent,
 
   setWindowTitle( tr( "Full-text search" ) );
 
-  if( cfg.preferences.fts.dialogGeometry.size() > 0 )
+  if ( cfg.preferences.fts.dialogGeometry.size() > 0 )
     restoreGeometry( cfg.preferences.fts.dialogGeometry );
 
   setNewIndexingName( ftsIdx.nowIndexingName() );
@@ -227,11 +215,11 @@ FullTextSearchDialog::FullTextSearchDialog( QWidget * parent,
            this,
            &FullTextSearchDialog::setNewIndexingName );
 
-  ui.searchMode->addItem( tr( "Whole words" ), WholeWords );
-  ui.searchMode->addItem( tr( "Plain text"), PlainText );
+  ui.searchMode->addItem( tr( "Default" ), WholeWords );
+  ui.searchMode->addItem( tr( "Plain text" ), PlainText );
   ui.searchMode->addItem( tr( "Wildcards" ), Wildcards );
 
-  ui.searchLine->setToolTip(tr("support xapian search syntax,such as AND OR +/- etc"));
+  ui.searchLine->setToolTip( tr( "support xapian search syntax,such as AND OR +/- etc" ) );
 
   ui.searchMode->setCurrentIndex( cfg.preferences.fts.searchMode );
 
@@ -246,24 +234,24 @@ FullTextSearchDialog::FullTextSearchDialog( QWidget * parent,
 
   connect( this, &QDialog::finished, this, &FullTextSearchDialog::saveData );
 
-  connect( ui.OKButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
-  connect( ui.cancelButton, SIGNAL( clicked() ), this, SLOT( reject() ) );
+  connect( ui.OKButton, &QPushButton::clicked, this, &QDialog::accept );
+  connect( ui.cancelButton, &QPushButton::clicked, this, &QDialog::reject );
 
 
   helpAction.setShortcut( QKeySequence( "F1" ) );
   helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
 
-  connect( &helpAction, &QAction::triggered, [](){
-    Help::openHelpWebpage(Help::section::ui_fulltextserch);
+  connect( &helpAction, &QAction::triggered, []() {
+    Help::openHelpWebpage( Help::section::ui_fulltextserch );
   } );
-  connect( ui.helpButton, &QAbstractButton::clicked, &helpAction,&QAction::trigger);
+  connect( ui.helpButton, &QAbstractButton::clicked, &helpAction, &QAction::trigger );
 
   addAction( &helpAction );
 
   ui.headwordsView->installEventFilter( this );
 
   delegate = new WordListItemDelegate( ui.headwordsView->itemDelegate() );
-  if( delegate )
+  if ( delegate )
     ui.headwordsView->setItemDelegate( delegate );
 
   ui.searchLine->selectAll();
@@ -276,20 +264,18 @@ void FullTextSearchDialog::setSearchText( const QString & text )
 
 FullTextSearchDialog::~FullTextSearchDialog()
 {
-  if( delegate )
+  if ( delegate )
     delegate->deleteLater();
 }
 
 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();
+  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() )
+    while ( searchReqs.size() )
       QApplication::processEvents();
   }
 }
@@ -299,9 +285,8 @@ 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() )
+  for ( unsigned x = 0; x < activeDicts.size(); x++ ) {
+    if ( activeDicts.at( x )->haveFTSIndex() )
       ready++;
     else
       toIndex++;
@@ -320,42 +305,29 @@ void FullTextSearchDialog::saveData()
 
 void FullTextSearchDialog::setNewIndexingName( QString name )
 {
-  ui.nowIndexingLabel->setText( tr( "Now indexing: " )
-                                + ( name.isEmpty() ? tr( "None" ) : name ) );
+  ui.nowIndexingLabel->setText( tr( "Now indexing: " ) + ( name.isEmpty() ? tr( "None" ) : name ) );
   showDictNumbers();
 }
 
 void FullTextSearchDialog::accept()
 {
-  QStringList list1, list2;
-  int mode = ui.searchMode->itemData( ui.searchMode->currentIndex() ).toInt();
+  const int mode = ui.searchMode->itemData( ui.searchMode->currentIndex() ).toInt();
 
   model->clear();
-  matchedCount=0;
+  matchedCount = 0;
   ui.articlesFoundLabel->setText( tr( "Articles found: " ) + QString::number( results.size() ) );
 
-  bool hasCJK;
-  if ( !FtsHelpers::parseSearchString( ui.searchLine->text(),
-                                       list1,
-                                       list2,
-                                       searchRegExp,
-                                       mode,
-                                       false,
-                                       0,
-                                       hasCJK,
-                                       false ) ) {
+  if ( ui.searchLine->text().isEmpty() ) {
     QMessageBox message( QMessageBox::Warning,
                          "GoldenDict",
-                         tr( "The search line must contains at least one word containing " )
-                           + QString::number( MinimumWordSize ) + tr( " or more symbols" ),
+                         tr( "The querying word can not be empty." ),
                          QMessageBox::Ok,
                          this );
     message.exec();
     return;
   }
 
-  if( activeDicts.empty() )
-  {
+  if ( activeDicts.empty() ) {
     QMessageBox message( QMessageBox::Warning,
                          "GoldenDict",
                          tr( "No dictionaries for full-text search" ),
@@ -369,27 +341,24 @@ void FullTextSearchDialog::accept()
   ui.searchProgressBar->show();
 
   // Make search requests
-
-  for( unsigned x = 0; x < activeDicts.size(); ++x )
-  {
-    if( !activeDicts[ x ] ->haveFTSIndex())
-    {
+  for ( unsigned x = 0; x < activeDicts.size(); ++x ) {
+    if ( !activeDicts[ x ]->haveFTSIndex() ) {
       continue;
     }
     //max results=100
     sptr< Dictionary::DataRequest > req =
       activeDicts[ x ]->getSearchResults( ui.searchLine->text(), mode, false, false );
     connect( req.get(),
-      &Dictionary::Request::finished,
-      this,
-      &FullTextSearchDialog::searchReqFinished,
-      Qt::QueuedConnection );
+             &Dictionary::Request::finished,
+             this,
+             &FullTextSearchDialog::searchReqFinished,
+             Qt::QueuedConnection );
 
     connect( req.get(),
-      &Dictionary::Request::matchCount,
-      this,
-      &FullTextSearchDialog::matchCount,
-      Qt::QueuedConnection );
+             &Dictionary::Request::matchCount,
+             this,
+             &FullTextSearchDialog::matchCount,
+             Qt::QueuedConnection );
 
     searchReqs.push_back( req );
   }
@@ -400,43 +369,34 @@ void FullTextSearchDialog::accept()
 void FullTextSearchDialog::searchReqFinished()
 {
   QList< FtsHeadword > allHeadwords;
-  while ( searchReqs.size() )
-  {
+  while ( searchReqs.size() ) {
     std::list< sptr< Dictionary::DataRequest > >::iterator it;
-    for( it = searchReqs.begin(); it != searchReqs.end(); ++it )
-    {
-      if ( (*it)->isFinished() )
-      {
+    for ( it = searchReqs.begin(); it != searchReqs.end(); ++it ) {
+      if ( ( *it )->isFinished() ) {
         GD_DPRINTF( "one finished.\n" );
 
-        QString errorString = (*it)->getErrorString();
+        QString errorString = ( *it )->getErrorString();
 
-        if ( (*it)->dataSize() >= 0 || errorString.size() )
-        {
+        if ( ( *it )->dataSize() >= 0 || errorString.size() ) {
           QList< FtsHeadword > * headwords;
-          if( (unsigned)(*it)->dataSize() >= sizeof( headwords ) )
-          {
+          if ( (unsigned)( *it )->dataSize() >= sizeof( headwords ) ) {
             QList< FtsHeadword > hws;
-            try
-            {
-              (*it)->getDataSlice( 0, sizeof( headwords ), &headwords );
+            try {
+              ( *it )->getDataSlice( 0, sizeof( headwords ), &headwords );
               hws.swap( *headwords );
-              std::sort( hws.begin(),  hws.end() );
+              std::sort( hws.begin(), hws.end() );
               delete headwords;
               addSortedHeadwords( allHeadwords, hws );
             }
-            catch( std::exception & e )
-            {
+            catch ( std::exception & e ) {
               gdWarning( "getDataSlice error: %s\n", e.what() );
             }
           }
-
         }
         break;
       }
     }
-    if( it != searchReqs.end() )
-    {
+    if ( it != searchReqs.end() ) {
       GD_DPRINTF( "erasing..\n" );
       searchReqs.erase( it );
       GD_DPRINTF( "erase done..\n" );
@@ -446,33 +406,30 @@ void FullTextSearchDialog::searchReqFinished()
       break;
   }
 
-  if( !allHeadwords.isEmpty() )
-  {
+  if ( !allHeadwords.isEmpty() ) {
     model->addResults( QModelIndex(), allHeadwords );
-    if( results.size() > matchedCount )
+    if ( results.size() > matchedCount )
       ui.articlesFoundLabel->setText( tr( "Articles found: " ) + QString::number( results.size() ) );
   }
 
-  if ( searchReqs.empty() )
-  {
+  if ( searchReqs.empty() ) {
     ui.searchProgressBar->hide();
     ui.OKButton->setEnabled( true );
     QApplication::beep();
   }
 }
 
-void FullTextSearchDialog::matchCount(int _matchCount){
-  matchedCount+=_matchCount;
-  ui.articlesFoundLabel->setText( tr( "Articles found: " )
-                                  + QString::number( matchedCount ) );
+void FullTextSearchDialog::matchCount( int _matchCount )
+{
+  matchedCount += _matchCount;
+  ui.articlesFoundLabel->setText( tr( "Articles found: " ) + QString::number( matchedCount ) );
 }
 
 void FullTextSearchDialog::reject()
 {
-  if( !searchReqs.empty() )
+  if ( !searchReqs.empty() )
     stopSearch();
-  else
-  {
+  else {
     saveData();
     emit closeDialog();
   }
@@ -480,34 +437,31 @@ void FullTextSearchDialog::reject()
 
 void FullTextSearchDialog::itemClicked( const QModelIndex & idx )
 {
-  if( idx.isValid() && idx.row() < results.size() )
-  {
+  if ( idx.isValid() && idx.row() < results.size() ) {
     QString headword = results[ idx.row() ].headword;
     QRegExp reg;
     auto searchText = ui.searchLine->text();
     searchText.replace( RX::Ftx::tokenBoundary, " " );
 
-    auto it = RX::Ftx::token.globalMatch(searchText);
+    auto it = RX::Ftx::token.globalMatch( searchText );
     QString firstAvailbeItem;
-    while( it.hasNext() )
-    {
+    while ( it.hasNext() ) {
       QRegularExpressionMatch match = it.next();
 
       auto p = match.captured();
-      if( p.startsWith( '-' ) )
+      if ( p.startsWith( '-' ) )
         continue;
 
       //the searched text should be like "term".remove enclosed double quotation marks.
-      if(p.startsWith("\"")){
-        p.remove("\"");
+      if ( p.startsWith( "\"" ) ) {
+        p.remove( "\"" );
       }
 
       firstAvailbeItem = p;
       break;
     }
 
-    if( !firstAvailbeItem.isEmpty() )
-    {
+    if ( !firstAvailbeItem.isEmpty() ) {
       reg = QRegExp( firstAvailbeItem, Qt::CaseInsensitive, QRegExp::RegExp2 );
       reg.setMinimal( true );
     }
@@ -524,40 +478,34 @@ void FullTextSearchDialog::updateDictionaries()
 
   Instances::Group const * activeGroup = 0;
 
-  for( unsigned x = 0; x < groups.size(); ++x )
-    if ( groups[ x ].id == group )
-    {
+  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;
+  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 )
+  if ( group == Instances::Group::AllGroupId )
     mutedDicts = &cfg.mutedDictionaries;
   else
     mutedDicts = grp ? &grp->mutedDictionaries : 0;
 
-  if( mutedDicts && !mutedDicts->isEmpty() )
-  {
+  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() ) )
-         )
+    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 )
+  else {
+    for ( unsigned x = 0; x < groupDicts.size(); ++x )
       if ( groupDicts[ x ]->canFTS() )
         activeDicts.push_back( groupDicts[ x ] );
   }
@@ -567,11 +515,9 @@ void FullTextSearchDialog::updateDictionaries()
 
 bool FullTextSearchDialog::eventFilter( QObject * obj, QEvent * ev )
 {
-  if( obj == ui.headwordsView && ev->type() == QEvent::KeyPress )
-  {
+  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 )
-    {
+    if ( kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter ) {
       itemClicked( ui.headwordsView->currentIndex() );
       return true;
     }
@@ -588,7 +534,7 @@ int HeadwordsListModel::rowCount( QModelIndex const & ) const
 
 QVariant HeadwordsListModel::data( QModelIndex const & index, int role ) const
 {
-  if( index.row() < 0 )
+  if ( index.row() < 0 )
     return QVariant();
 
   FtsHeadword const & head = headwords[ index.row() ];
@@ -596,27 +542,24 @@ QVariant HeadwordsListModel::data( QModelIndex const & index, int role ) const
   if ( head.headword.isEmpty() )
     return QVariant();
 
-  switch ( role )
-  {
-    case Qt::ToolTipRole:
-    {
+  switch ( role ) {
+    case Qt::ToolTipRole: {
       QString tt;
-      for( int x = 0; x < head.dictIDs.size(); x++ )
-      {
-        if( x != 0 )
+      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() ) ;
+        if ( n != -1 )
+          tt += QString::fromUtf8( dictionaries[ n ]->getName().c_str() );
       }
       return tt;
     }
 
-    case Qt::DisplayRole :
+    case Qt::DisplayRole:
       return head.headword;
 
-    case Qt::EditRole :
+    case Qt::EditRole:
       return head.headword;
 
     default:;
@@ -625,9 +568,9 @@ QVariant HeadwordsListModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-void HeadwordsListModel::addResults(const QModelIndex & parent, QList< FtsHeadword > const & hws )
+void HeadwordsListModel::addResults( const QModelIndex & parent, QList< FtsHeadword > const & hws )
 {
-Q_UNUSED( parent );
+  Q_UNUSED( parent );
   beginResetModel();
 
   addSortedHeadwords( headwords, hws );
@@ -652,9 +595,8 @@ bool HeadwordsListModel::clear()
 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 )
+  for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
+    if ( dictionaries[ x ]->getId().compare( dictID ) == 0 )
       return x;
   }
   return -1;
@@ -665,29 +607,29 @@ QString FtsHeadword::trimQuotes( QString const & str ) const
   QString trimmed( str );
 
   int n = 0;
-  while( str[ n ] == '\"' || str[ n ] == '\'' )
+  while ( str[ n ] == '\"' || str[ n ] == '\'' )
     n++;
-  if( n )
+  if ( n )
     trimmed = trimmed.mid( n );
 
-  while( trimmed.endsWith( '\"' ) || trimmed.endsWith( '\'' ) )
+  while ( trimmed.endsWith( '\"' ) || trimmed.endsWith( '\'' ) )
     trimmed.chop( 1 );
 
   return trimmed;
 }
 
-bool FtsHeadword::operator <( FtsHeadword const & other ) const
+bool FtsHeadword::operator<( FtsHeadword const & other ) const
 {
-  QString first = trimQuotes( headword );
+  QString first  = trimQuotes( headword );
   QString second = trimQuotes( other.headword );
 
   int result = first.localeAwareCompare( second );
-  if( result )
+  if ( result )
     return result < 0;
 
   // Headwords without quotes are equal
 
-  if( first.size() != headword.size() || second.size() != other.headword.size() )
+  if ( first.size() != headword.size() || second.size() != other.headword.size() )
     return headword.localeAwareCompare( other.headword ) < 0;
 
   return false;
diff --git a/src/fulltextsearch.hh b/src/fulltextsearch.hh
index edb7eef1..26f94b12 100644
--- a/src/fulltextsearch.hh
+++ b/src/fulltextsearch.hh
@@ -10,10 +10,10 @@
 #include <QSemaphore>
 #include <QStringList>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #else
-#include <QRegExp>
+  #include <QRegExp>
 #endif
 
 #include "dict/dictionary.hh"
@@ -23,8 +23,7 @@
 #include "instances.hh"
 #include "delegate.hh"
 
-namespace FTS
-{
+namespace FTS {
 
 enum {
   // Minimum word length for indexing
@@ -38,9 +37,8 @@ enum {
   MaxMatchLengthForHighlightResults = 500
 };
 
-enum SearchMode
-{
-  WholeWords = 0,
+enum SearchMode {
+  WholeWords = 0, // aka Default search using Xapian query syntax
   PlainText,
   Wildcards,
   RegExp
@@ -53,8 +51,7 @@ struct FtsHeadword
   QStringList foundHiliteRegExps;
   bool matchCase;
 
-  FtsHeadword( QString const & headword_, QString const & dictid_,
-               QStringList hilites, bool match_case ) :
+  FtsHeadword( QString const & headword_, QString const & dictid_, QStringList hilites, bool match_case ):
     headword( headword_ ),
     foundHiliteRegExps( hilites ),
     matchCase( match_case )
@@ -64,18 +61,22 @@ struct FtsHeadword
 
   QString trimQuotes( QString const & ) const;
 
-  bool operator <( FtsHeadword const & other ) const;
+  bool operator<( FtsHeadword const & other ) const;
 
-  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;
+  }
 
-  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
+class Indexing: public QObject, public QRunnable
 {
-Q_OBJECT
+  Q_OBJECT
 
   QAtomicInt & isCancelled;
   std::vector< sptr< Dictionary::Class > > const & dictionaries;
@@ -84,19 +85,20 @@ Q_OBJECT
   QThread * timerThread;
 
 public:
-  Indexing( QAtomicInt & cancelled, std::vector< sptr< Dictionary::Class > > const & dicts,
-            QSemaphore & hasExited_):
+  Indexing( QAtomicInt & cancelled, std::vector< sptr< Dictionary::Class > > const & dicts, QSemaphore & hasExited_ ):
     isCancelled( cancelled ),
     dictionaries( dicts ),
     hasExited( hasExited_ ),
-    timer(new QTimer(nullptr)), // must be null since it will live in separate thread
-    timerThread(new QThread(this))
+    timer( new QTimer( nullptr ) ), // must be null since it will live in separate thread
+    timerThread( new QThread( this ) )
   {
-    connect(timer, &QTimer::timeout, this, &Indexing::timeout);
-    timer->moveToThread(timerThread);
-    connect(timerThread, &QThread::started, timer, [this](){timer->start(2000);});
-    connect(timerThread, &QThread::finished, timer, &QTimer::stop);
-
+    connect( timer, &QTimer::timeout, this, &Indexing::timeout );
+    timer->moveToThread( timerThread );
+    connect( timerThread, &QThread::started, timer, [ this ]() {
+      timer->start( 2000 );
+    } );
+    connect( timerThread, &QThread::finished, timer, &QTimer::stop );
+    connect( timerThread, &QThread::finished, timer, &QObject::deleteLater );
   }
 
   ~Indexing()
@@ -114,13 +116,16 @@ private slots:
   void timeout();
 };
 
-class FtsIndexing : public QObject
+class FtsIndexing: public QObject
 {
-Q_OBJECT
+  Q_OBJECT
+
 public:
   FtsIndexing( std::vector< sptr< Dictionary::Class > > const & dicts );
   virtual ~FtsIndexing()
-  { stopIndexing(); }
+  {
+    stopIndexing();
+  }
 
   void setDictionaries( std::vector< sptr< Dictionary::Class > > const & dicts )
   {
@@ -129,7 +134,9 @@ public:
   }
 
   void clearDictionaries()
-  { dictionaries.clear(); }
+  {
+    dictionaries.clear();
+  }
 
   /// Start dictionaries indexing for full-text search
   void doIndexing();
@@ -139,7 +146,7 @@ public:
 
   QString nowIndexingName();
 
-protected:
+private:
   QAtomicInt isCancelled;
   QSemaphore indexingExited;
   std::vector< sptr< Dictionary::Class > > dictionaries;
@@ -161,20 +168,23 @@ class HeadwordsListModel: public QAbstractListModel
 
 public:
 
-  HeadwordsListModel( QWidget * parent, QList< FtsHeadword > & headwords_,
+  HeadwordsListModel( QWidget * parent,
+                      QList< FtsHeadword > & headwords_,
                       std::vector< sptr< Dictionary::Class > > const & dicts ):
-    QAbstractListModel( parent ), headwords( headwords_ ),
+    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 );
+  //  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 );
+  void addResults( const QModelIndex & parent, QList< FtsHeadword > const & headwords );
   bool clear();
 
 private:
@@ -188,7 +198,7 @@ signals:
   void contentChanged();
 };
 
-class FullTextSearchDialog : public QDialog
+class FullTextSearchDialog: public QDialog
 {
   Q_OBJECT
 
@@ -216,7 +226,10 @@ public:
   void setSearchText( const QString & text );
 
   void setCurrentGroup( unsigned group_ )
-  { group = group_; updateDictionaries(); }
+  {
+    group = group_;
+    updateDictionaries();
+  }
 
   void stopSearch();
 
@@ -237,14 +250,16 @@ private slots:
   void saveData();
   void accept();
   void searchReqFinished();
-  void matchCount(int);
+  void matchCount( int );
   void reject();
   void itemClicked( QModelIndex const & idx );
   void updateDictionaries();
 
 signals:
-  void showTranslationFor( QString const &, QStringList const & dictIDs,
-                           QRegExp const & searchRegExp, bool ignoreDiacritics );
+  void showTranslationFor( QString const &,
+                           QStringList const & dictIDs,
+                           QRegExp const & searchRegExp,
+                           bool ignoreDiacritics );
   void closeDialog();
 };
 
diff --git a/src/gestures.cc b/src/gestures.cc
index fb84eaae..a302063c 100644
--- a/src/gestures.cc
+++ b/src/gestures.cc
@@ -8,8 +8,7 @@
 #include "ui/articleview.hh"
 #include "gestures.hh"
 
-namespace Gestures
-{
+namespace Gestures {
 
 Qt::GestureType GDPinchGestureType;
 Qt::GestureType GDSwipeGestureType;
@@ -22,8 +21,7 @@ bool isFewTouchPointsPresented()
 
 QSwipeGesture::SwipeDirection getHorizontalDirection( qreal angle )
 {
-  if ( ( 0 <= angle && angle <= 45 )
-       || ( 315 <= angle && angle <= 360 ) )
+  if ( ( 0 <= angle && angle <= 45 ) || ( 315 <= angle && angle <= 360 ) )
     return QSwipeGesture::Right;
 
   if ( 135 <= angle && angle <= 225 )
@@ -43,18 +41,18 @@ QSwipeGesture::SwipeDirection getVerticalDirection( qreal angle )
   return QSwipeGesture::NoDirection;
 }
 
-GDPinchGesture::GDPinchGesture( QObject * parent ) :
-QGesture( parent ),
-isNewSequence( true )
+GDPinchGesture::GDPinchGesture( QObject * parent ):
+  QGesture( parent ),
+  isNewSequence( true )
 {
 }
 
 QGesture * GDPinchGestureRecognizer::create( QObject * pTarget )
 {
-  if ( pTarget && pTarget->isWidgetType()) {
+  if ( pTarget && pTarget->isWidgetType() ) {
     static_cast< QWidget * >( pTarget )->setAttribute( Qt::WA_AcceptTouchEvents );
   }
-  QGesture *pGesture = new GDPinchGesture( pTarget );
+  QGesture * pGesture = new GDPinchGesture( pTarget );
   return pGesture;
 }
 
@@ -63,94 +61,81 @@ void GDPinchGestureRecognizer::reset( QGesture * pGesture )
   QGestureRecognizer::reset( pGesture );
 }
 
-QGestureRecognizer::Result GDPinchGestureRecognizer::recognize( QGesture * state,
-                                                                QObject *,
-                                                                QEvent * event)
+QGestureRecognizer::Result GDPinchGestureRecognizer::recognize( QGesture * state, QObject *, QEvent * event )
 {
   QGestureRecognizer::Result result = QGestureRecognizer::Ignore;
-  GDPinchGesture * gest = static_cast< GDPinchGesture * >( state );
+  GDPinchGesture * gest             = static_cast< GDPinchGesture * >( state );
 
-  switch ( event->type() )
-  {
-    case QEvent::TouchBegin:
-      {
-        result = QGestureRecognizer::MayBeGesture;
-        gest->isNewSequence = true;
-        break;
-      }
+  switch ( event->type() ) {
+    case QEvent::TouchBegin: {
+      result              = QGestureRecognizer::MayBeGesture;
+      gest->isNewSequence = true;
+      break;
+    }
     case QEvent::TouchCancel:
-    case QEvent::TouchEnd:
-      {
-        result = QGestureRecognizer::CancelGesture;
-        fewTouchPointsPresented = false;
-        break;
-      }
-    case QEvent::TouchUpdate:
-      {
-        gest->scaleChanged = false;
-        const QTouchEvent * const ev = static_cast< const QTouchEvent * >( event );
-        fewTouchPointsPresented = ( ev->touchPoints().size() > 1 );
-        if ( ev->touchPoints().size() == 2 )
-        {
-          QTouchEvent::TouchPoint p1 = ev->touchPoints().at( 0 );
-          QTouchEvent::TouchPoint p2 = ev->touchPoints().at( 1 );
+    case QEvent::TouchEnd: {
+      result                  = QGestureRecognizer::CancelGesture;
+      fewTouchPointsPresented = false;
+      break;
+    }
+    case QEvent::TouchUpdate: {
+      gest->scaleChanged           = false;
+      const QTouchEvent * const ev = static_cast< const QTouchEvent * >( event );
+      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;
+        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();
-          }
+        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->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;
+        gest->isNewSequence = false;
+        if ( gest->totalScaleFactor <= OUT_SCALE_LIMIT || gest->totalScaleFactor >= IN_SCALE_LIMIT ) {
+          result              = QGestureRecognizer::TriggerGesture;
+          gest->isNewSequence = true;
         }
         else
-        {
-          gest->isNewSequence = true;
-          if ( gest->state() == Qt::NoGesture )
-            result = QGestureRecognizer::Ignore;
-          else
-            result = QGestureRecognizer::FinishGesture;
-        }
-        break;
+          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:
+    case QEvent::MouseButtonPress:
+    case QEvent::MouseMove:
+    case QEvent::MouseButtonRelease:
       result = QGestureRecognizer::Ignore;
       break;
-  default:
+    default:
       result = QGestureRecognizer::Ignore;
       break;
   }
@@ -158,11 +143,11 @@ QGestureRecognizer::Result GDPinchGestureRecognizer::recognize( QGesture * state
 }
 
 
-GDSwipeGesture::GDSwipeGesture( QObject * parent ) :
-QGesture( parent ),
-vertDirection( QSwipeGesture::NoDirection ),
-horizDirection( QSwipeGesture::NoDirection ),
-started( false )
+GDSwipeGesture::GDSwipeGesture( QObject * parent ):
+  QGesture( parent ),
+  vertDirection( QSwipeGesture::NoDirection ),
+  horizDirection( QSwipeGesture::NoDirection ),
+  started( false )
 {
 }
 
@@ -171,15 +156,15 @@ QGesture * GDSwipeGestureRecognizer::create( QObject * pTarget )
   if ( pTarget && pTarget->isWidgetType() ) {
     static_cast< QWidget * >( pTarget )->setAttribute( Qt::WA_AcceptTouchEvents );
   }
-  QGesture *pGesture = new GDSwipeGesture( pTarget );
+  QGesture * pGesture = new GDSwipeGesture( pTarget );
   return pGesture;
 }
 
 void GDSwipeGestureRecognizer::reset( QGesture * pGesture )
 {
-  GDSwipeGesture * gest = static_cast< GDSwipeGesture * >( pGesture );
-  gest->vertDirection = QSwipeGesture::NoDirection;
-  gest->horizDirection = QSwipeGesture::NoDirection;
+  GDSwipeGesture * gest    = static_cast< GDSwipeGesture * >( pGesture );
+  gest->vertDirection      = QSwipeGesture::NoDirection;
+  gest->horizDirection     = QSwipeGesture::NoDirection;
   gest->lastPositions[ 0 ] = QPoint();
   gest->lastPositions[ 1 ] = QPoint();
 
@@ -188,171 +173,151 @@ void GDSwipeGestureRecognizer::reset( QGesture * pGesture )
 
 qreal GDSwipeGestureRecognizer::computeAngle( int dx, int dy )
 {
-   double PI = 3.14159265;
+  double PI = 3.14159265;
 
-   // Need to convert from screen coordinates direction
-   // into classical coordinates direction.
-   dy = -dy;
+  // Need to convert from screen coordinates direction
+  // into classical coordinates direction.
+  dy = -dy;
 
-   double result = atan2( (double)dy, (double)dx ) ;
-   result = ( result * 180 ) / PI;
+  double result = atan2( (double)dy, (double)dx );
+  result        = ( result * 180 ) / PI;
 
-   // Always return positive angle.
-   if ( result < 0 )
-      result += 360;
+  // Always return positive angle.
+  if ( result < 0 )
+    result += 360;
 
-   return result;
+  return result;
 }
 
-QGestureRecognizer::Result GDSwipeGestureRecognizer::recognize( QGesture * state,
-                                                                QObject *,
-                                                                QEvent * event)
+QGestureRecognizer::Result GDSwipeGestureRecognizer::recognize( QGesture * state, QObject *, QEvent * event )
 {
-  GDSwipeGesture * swipe = static_cast< GDSwipeGesture * >( state );
+  GDSwipeGesture * swipe            = static_cast< GDSwipeGesture * >( state );
   QGestureRecognizer::Result result = QGestureRecognizer::Ignore;
 
-  switch( event->type() )
-  {
-    case QEvent::TouchBegin:
-      {
-        swipe->unsetHotSpot();
-        swipe->lastPositions[ 0 ] = QPoint();
-        swipe->started = true;
-        result = QGestureRecognizer::MayBeGesture;
-        break;
-      }
+  switch ( event->type() ) {
+    case QEvent::TouchBegin: {
+      swipe->unsetHotSpot();
+      swipe->lastPositions[ 0 ] = QPoint();
+      swipe->started            = true;
+      result                    = QGestureRecognizer::MayBeGesture;
+      break;
+    }
     case QEvent::TouchCancel:
-    case QEvent::TouchEnd:
-      {
-        fewTouchPointsPresented = false;
+    case QEvent::TouchEnd: {
+      fewTouchPointsPresented = false;
+      result                  = QGestureRecognizer::CancelGesture;
+      break;
+    }
+    case QEvent::TouchUpdate: {
+      const QTouchEvent * const ev = static_cast< const QTouchEvent * >( event );
+      fewTouchPointsPresented      = ( ev->touchPoints().size() > 1 );
+      if ( !swipe->started )
         result = QGestureRecognizer::CancelGesture;
-        break;
-      }
-    case QEvent::TouchUpdate:
-      {
-        const QTouchEvent * const ev = static_cast< const QTouchEvent * >( event );
-        fewTouchPointsPresented = ( ev->touchPoints().size() > 1 );
-        if( !swipe->started )
-          result = QGestureRecognizer::CancelGesture;
-        else
-        if( ev->touchPoints().size() == 2 )
-        {
-          //2-point gesture
+      else if ( ev->touchPoints().size() == 2 ) {
+        //2-point gesture
 
-          QTouchEvent::TouchPoint p1 = ev->touchPoints().at( 0 );
-          QTouchEvent::TouchPoint p2 = ev->touchPoints().at( 1 );
+        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;
+        if ( swipe->lastPositions[ 0 ].isNull() ) {
+          swipe->lastPositions[ 0 ] = p1.startScreenPos().toPoint();
+          swipe->lastPositions[ 1 ] = p2.startScreenPos().toPoint();
         }
-        else // No 2-point gesture
-          result = QGestureRecognizer::CancelGesture;
-        break;
+
+        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;
+      result = QGestureRecognizer::Ignore;
+      break;
     default:
-        result = QGestureRecognizer::Ignore;
-        break;
+      result = QGestureRecognizer::Ignore;
+      break;
   }
 
   return result;
 }
 
 const qreal GDPinchGestureRecognizer::OUT_SCALE_LIMIT = 0.5;
-const qreal GDPinchGestureRecognizer::IN_SCALE_LIMIT = 2;
+const qreal GDPinchGestureRecognizer::IN_SCALE_LIMIT  = 2;
 
-bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result,
-                         QPoint & point )
+bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result, QPoint & point )
 {
   result = NOT_HANLDED;
 
-  if( event->type() != QEvent::Gesture || !obj->isWidgetType() )
+  if ( event->type() != QEvent::Gesture || !obj->isWidgetType() )
     return false;
 
-  QGestureEvent * gev = static_cast<QGestureEvent *>( event );
+  QGestureEvent * gev = static_cast< QGestureEvent * >( event );
 
   gev->accept( Qt::PanGesture );
 
   QGesture * gesture = gev->gesture( GDSwipeGestureType );
-  if( gesture )
-  {
+  if ( gesture ) {
     GDSwipeGesture * swipe = static_cast< GDSwipeGesture * >( gesture );
-    point = swipe->hotSpot().toPoint();
+    point                  = swipe->hotSpot().toPoint();
 
-    if( swipe->getHorizDirection() != QSwipeGesture::NoDirection )
-      result = swipe->getHorizDirection() == QSwipeGesture::Left ?
-               SWIPE_LEFT : SWIPE_RIGHT;
+    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;
+    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 )
-  {
+  if ( gesture ) {
     GDPinchGesture * pinch = static_cast< GDPinchGesture * >( gesture );
-    point = pinch->getCenterPoint().toPoint();
+    point                  = pinch->getCenterPoint().toPoint();
 
-    if( pinch->isScaleChanged() )
-    {
-      if( pinch->getTotalScaleFactor() <= GDPinchGestureRecognizer::OUT_SCALE_LIMIT )
+    if ( pinch->isScaleChanged() ) {
+      if ( pinch->getTotalScaleFactor() <= GDPinchGestureRecognizer::OUT_SCALE_LIMIT )
         result = ZOOM_OUT;
-      if( pinch->getTotalScaleFactor() >= GDPinchGestureRecognizer::IN_SCALE_LIMIT )
+      if ( pinch->getTotalScaleFactor() >= GDPinchGestureRecognizer::IN_SCALE_LIMIT )
         result = ZOOM_IN;
     }
     gev->setAccepted( true );
@@ -360,8 +325,7 @@ bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result,
   }
 
   gesture = gev->gesture( Qt::PanGesture );
-  if( gesture )
-  {
+  if ( gesture ) {
     gev->setAccepted( true );
     return true;
   }
@@ -371,20 +335,19 @@ bool handleGestureEvent( QObject * obj, QEvent * event, GestureResult & result,
 void registerRecognizers()
 {
   QGestureRecognizer * pRecognizer = new Gestures::GDPinchGestureRecognizer();
-  GDPinchGestureType = QGestureRecognizer::registerRecognizer( pRecognizer );
+  GDPinchGestureType               = QGestureRecognizer::registerRecognizer( pRecognizer );
 
-  pRecognizer = new Gestures::GDSwipeGestureRecognizer();
+  pRecognizer        = new Gestures::GDSwipeGestureRecognizer();
   GDSwipeGestureType = QGestureRecognizer::registerRecognizer( pRecognizer );
 }
 
 void unregisterRecognizers()
 {
-  if( GDPinchGestureType )
+  if ( GDPinchGestureType )
     QGestureRecognizer::unregisterRecognizer( GDPinchGestureType );
 
-  if( GDSwipeGestureType )
+  if ( GDSwipeGestureType )
     QGestureRecognizer::unregisterRecognizer( GDSwipeGestureType );
 }
 
-} // namespace
-
+} // namespace Gestures
diff --git a/src/gestures.hh b/src/gestures.hh
index 060b126b..0f5b0b1a 100644
--- a/src/gestures.hh
+++ b/src/gestures.hh
@@ -7,11 +7,9 @@
 #include <QEvent>
 #include <QAction>
 
-namespace Gestures
-{
+namespace Gestures {
 
-enum GestureResult
-{
+enum GestureResult {
   NOT_HANLDED,
   SWIPE_LEFT,
   SWIPE_RIGHT,
@@ -31,17 +29,23 @@ void unregisterRecognizers();
 bool isFewTouchPointsPresented();
 
 class GDPinchGestureRecognizer;
-class GDPinchGesture : public QGesture
+class GDPinchGesture: public QGesture
 {
 public:
   GDPinchGesture( QObject * parent );
 
   bool isScaleChanged() const
-  { return scaleChanged; }
+  {
+    return scaleChanged;
+  }
   QPointF const & getCenterPoint() const
-  { return centerPoint; }
+  {
+    return centerPoint;
+  }
   qreal getTotalScaleFactor() const
-  { return totalScaleFactor; }
+  {
+    return totalScaleFactor;
+  }
 
 protected:
   QPointF startCenterPoint;
@@ -60,14 +64,18 @@ protected:
 };
 
 class GDSwipeGestureRecognizer;
-class GDSwipeGesture : public QGesture
+class GDSwipeGesture: public QGesture
 {
 public:
   GDSwipeGesture( QObject * parent );
   QSwipeGesture::SwipeDirection getHorizDirection() const
-  { return horizDirection; }
+  {
+    return horizDirection;
+  }
   QSwipeGesture::SwipeDirection getVertDirection() const
-  { return vertDirection; }
+  {
+    return vertDirection;
+  }
 
 protected:
   QSwipeGesture::SwipeDirection vertDirection;
@@ -78,36 +86,38 @@ protected:
   friend class GDSwipeGestureRecognizer;
 };
 
-class GDPinchGestureRecognizer : public QGestureRecognizer
+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 );
+  virtual QGesture * create( QObject * pTarget );
+  virtual QGestureRecognizer::Result recognize( QGesture * pGesture, QObject * pWatched, QEvent * pEvent );
+  void reset( QGesture * pGesture );
 };
 
-class GDSwipeGestureRecognizer : public QGestureRecognizer
+class GDSwipeGestureRecognizer: public QGestureRecognizer
 {
 public:
-  GDSwipeGestureRecognizer(){}
+  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 );
+  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
+} // namespace Gestures
 
 #endif // __GESTURES_HH_INCLUDED__
diff --git a/src/headwordsmodel.cc b/src/headwordsmodel.cc
index c4cabb29..d5ea4499 100644
--- a/src/headwordsmodel.cc
+++ b/src/headwordsmodel.cc
@@ -1,8 +1,12 @@
 #include "headwordsmodel.hh"
 #include "wstring_qt.hh"
 
-HeadwordListModel::HeadwordListModel( QObject * parent ) :
-  QAbstractListModel( parent ), filtering( false ), totalSize(0), index( 0 ),ptr( nullptr )
+HeadwordListModel::HeadwordListModel( QObject * parent ):
+  QAbstractListModel( parent ),
+  filtering( false ),
+  totalSize( 0 ),
+  index( 0 ),
+  ptr( nullptr )
 {
 }
 
@@ -24,8 +28,7 @@ bool HeadwordListModel::isFinish() const
 // export headword
 QString HeadwordListModel::getRow( int row )
 {
-  if( fileSortedList.empty() )
-  {
+  if ( fileSortedList.empty() ) {
     fileSortedList << words;
     fileSortedList.sort();
   }
@@ -34,8 +37,7 @@ QString HeadwordListModel::getRow( int row )
 
 void HeadwordListModel::setFilter( QRegularExpression reg )
 {
-  if( reg.pattern().isEmpty() )
-  {
+  if ( reg.pattern().isEmpty() ) {
     filtering = false;
     return;
   }
@@ -52,7 +54,7 @@ void HeadwordListModel::appendWord( const QString & word )
   words.append( word );
 }
 
-void HeadwordListModel::addMatches( QStringList matches)
+void HeadwordListModel::addMatches( QStringList matches )
 {
   QStringList filtered;
   for ( auto const & w : matches ) {
@@ -74,20 +76,15 @@ void HeadwordListModel::addMatches( QStringList matches)
 void HeadwordListModel::requestFinished()
 {
   // See how many new requests have finished, and if we have any new results
-  for( auto i = queuedRequests.begin();
-       i != queuedRequests.end(); )
-  {
-    if( ( *i )->isFinished() )
-    {
-      if( !( *i )->getErrorString().isEmpty() )
-      {
+  for ( auto i = queuedRequests.begin(); i != queuedRequests.end(); ) {
+    if ( ( *i )->isFinished() ) {
+      if ( !( *i )->getErrorString().isEmpty() ) {
         qDebug() << "error:" << ( *i )->getErrorString();
       }
 
-      if( ( *i )->matchesCount() )
-      {
+      if ( ( *i )->matchesCount() ) {
         auto allmatches = ( *i )->getAllMatches();
-        for( auto & match : allmatches )
+        for ( auto & match : allmatches )
           filterWords.append( QString::fromStdU32String( match.word ) );
       }
       queuedRequests.erase( i++ );
@@ -96,21 +93,18 @@ void HeadwordListModel::requestFinished()
       ++i;
   }
 
-  if( queuedRequests.empty() )
-  {
+  if ( queuedRequests.empty() ) {
     QStringList filtered;
-    for( auto & w : filterWords )
-    {
-      if( !containWord( w ) )
-      {
+    for ( auto & w : filterWords ) {
+      if ( !containWord( w ) ) {
         filtered << w;
       }
     }
-    if( filtered.isEmpty() )
+    if ( filtered.isEmpty() )
       return;
 
     beginInsertRows( QModelIndex(), words.size(), words.size() + filtered.count() - 1 );
-    for( const auto & word : filtered )
+    for ( const auto & word : filtered )
       appendWord( word );
     endInsertRows();
   }
@@ -123,14 +117,13 @@ int HeadwordListModel::wordCount() const
 
 QVariant HeadwordListModel::data( const QModelIndex & index, int role ) const
 {
-  if( !index.isValid() )
+  if ( !index.isValid() )
     return {};
 
-  if( index.row() >= totalSize || index.row() < 0 || index.row() >= words.size() )
+  if ( index.row() >= totalSize || index.row() < 0 || index.row() >= words.size() )
     return {};
 
-  if( role == Qt::DisplayRole )
-  {
+  if ( role == Qt::DisplayRole ) {
     return words.at( index.row() );
   }
   return {};
@@ -138,35 +131,32 @@ QVariant HeadwordListModel::data( const QModelIndex & index, int role ) const
 
 bool HeadwordListModel::canFetchMore( const QModelIndex & parent ) const
 {
-  if( parent.isValid() || filtering )
+  if ( parent.isValid() || filtering )
     return false;
   return ( words.size() < totalSize );
 }
 
 void HeadwordListModel::fetchMore( const QModelIndex & parent )
 {
-  if( parent.isValid() || filtering )
+  if ( parent.isValid() || filtering )
     return;
 
   QSet< QString > headword;
   QMutexLocker _( &lock );
 
   _dict->findHeadWordsWithLenth( index, &headword, 1000 );
-  if( headword.isEmpty() )
-  {
+  if ( headword.isEmpty() ) {
     return;
   }
 
   QSet< QString > filtered;
-  for( const auto & word : qAsConst( headword ) )
-  {
-    if( !containWord( word ) )
+  for ( const auto & word : qAsConst( headword ) ) {
+    if ( !containWord( word ) )
       filtered.insert( word );
   }
 
   beginInsertRows( QModelIndex(), words.size(), words.size() + filtered.count() - 1 );
-  for( const auto & word : filtered )
-  {
+  for ( const auto & word : filtered ) {
     appendWord( word );
   }
   endInsertRows();
@@ -191,9 +181,8 @@ QSet< QString > HeadwordListModel::getRemainRows( int & nodeIndex )
   _dict->findHeadWordsWithLenth( nodeIndex, &headword, 10000 );
 
   QSet< QString > filtered;
-  for( const auto & word : headword )
-  {
-    if( !containWord( word ) )
+  for ( const auto & word : headword ) {
+    if ( !containWord( word ) )
       filtered.insert( word );
   }
   return filtered;
diff --git a/src/headwordsmodel.hh b/src/headwordsmodel.hh
index 01aaff5c..5f2d19a0 100644
--- a/src/headwordsmodel.hh
+++ b/src/headwordsmodel.hh
@@ -6,7 +6,7 @@
 #include <QAbstractListModel>
 #include <QStringList>
 
-class HeadwordListModel : public QAbstractListModel
+class HeadwordListModel: public QAbstractListModel
 {
   Q_OBJECT
 
diff --git a/src/history.cc b/src/history.cc
index 12f302e6..502d8b1a 100644
--- a/src/history.cc
+++ b/src/history.cc
@@ -6,25 +6,28 @@
 #include "atomic_rename.hh"
 #include <QFile>
 
-History::History( unsigned size, unsigned maxItemLength_ ): maxSize( size ),
-  maxItemLength( maxItemLength_ ), addingEnabled( true )
-, dirty( false )
-, timerId ( 0 )
+History::History( unsigned size, unsigned maxItemLength_ ):
+  maxSize( size ),
+  maxItemLength( maxItemLength_ ),
+  addingEnabled( true ),
+  dirty( false ),
+  timerId( 0 )
 {
 }
 
-History::History( Load, unsigned size, unsigned maxItemLength_ ): maxSize( size ),
-   maxItemLength( maxItemLength_ ), addingEnabled( true )
- , dirty( false )
- , timerId ( 0 )
+History::History( Load, unsigned size, unsigned maxItemLength_ ):
+  maxSize( size ),
+  maxItemLength( maxItemLength_ ),
+  addingEnabled( true ),
+  dirty( false ),
+  timerId( 0 )
 {
   QFile file( Config::getHistoryFileName() );
 
   if ( !file.open( QFile::ReadOnly | QIODevice::Text ) )
     return; // No file -- no history
 
-  for( unsigned count = 0 ; count < maxSize; ++count )
-  {
+  for ( unsigned count = 0; count < maxSize; ++count ) {
     QByteArray lineUtf8 = file.readLine( 4096 );
 
     if ( lineUtf8.endsWith( '\n' ) )
@@ -54,8 +57,7 @@ History::History( Load, unsigned size, unsigned maxItemLength_ ): maxSize( size
 
 History::Item History::getItem( int index )
 {
-  if ( index < 0 || index >= items.size() )
-  {
+  if ( index < 0 || index >= items.size() ) {
     return Item();
   }
   return items.at( index );
@@ -64,11 +66,10 @@ History::Item History::getItem( int index )
 void History::addItem( Item const & item )
 {
   // qDebug() << "adding item " << item.word << ", enabled=" << enabled();
-  if( !enabled() )
+  if ( !enabled() )
     return;
 
-  if ( (unsigned)item.word.size() > getMaxItemLength() || item.word.isEmpty() )
-  {
+  if ( (unsigned)item.word.size() > getMaxItemLength() || item.word.isEmpty() ) {
     // The search looks bogus. Don't save it.
     return;
   }
@@ -94,11 +95,10 @@ void History::addItem( Item const & item )
 bool History::ensureSizeConstraints()
 {
   bool changed = false;
-  while( items.size() > (int)maxSize )
-  {
+  while ( items.size() > (int)maxSize ) {
     items.pop_back();
     changed = true;
-    dirty = true;
+    dirty   = true;
   }
 
   return changed;
@@ -107,8 +107,7 @@ bool History::ensureSizeConstraints()
 void History::setMaxSize( unsigned maxSize_ )
 {
   maxSize = maxSize_;
-  if ( ensureSizeConstraints() )
-  {
+  if ( ensureSizeConstraints() ) {
     emit itemsChanged();
   }
 }
@@ -120,7 +119,7 @@ int History::size() const
 
 bool History::save()
 {
-  if( !dirty )
+  if ( !dirty )
     return true;
 
   QFile file( Config::getHistoryFileName() + ".tmp" );
@@ -128,9 +127,7 @@ bool History::save()
   if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
     return false;
 
-  for( QList< Item >::const_iterator i = items.constBegin();
-       i != items.constEnd(); ++i )
-  {
+  for ( QList< Item >::const_iterator i = items.constBegin(); i != items.constEnd(); ++i ) {
     QByteArray line = i->word.toUtf8();
 
     // Those could ruin our format, so we replace them by spaces. They shouldn't
@@ -161,14 +158,12 @@ void History::clear()
 
 void History::setSaveInterval( unsigned interval )
 {
-  if( timerId )
-  {
+  if ( timerId ) {
     killTimer( timerId );
     timerId = 0;
   }
-  if( interval )
-  {
-    if( dirty )
+  if ( interval ) {
+    if ( dirty )
       save();
     timerId = startTimer( interval * 60000 );
   }
diff --git a/src/history.hh b/src/history.hh
index 1fc143c7..2fb924bc 100644
--- a/src/history.hh
+++ b/src/history.hh
@@ -25,25 +25,34 @@ public:
     /// The word that was searched
     QString word;
 
-    Item(): groupId( 0 )
-    {}
+    Item():
+      groupId( 0 )
+    {
+    }
 
     Item( unsigned groupId_, QString const & word_ ):
-      groupId( groupId_ ), word( word_ )
-    {}
+      groupId( groupId_ ),
+      word( word_ )
+    {
+    }
 
-    bool operator == ( Item const & other ) const
-    { return QString::compare( word, other.word, Qt::CaseInsensitive) == 0 && groupId == other.groupId; }
+    bool operator==( Item const & other ) const
+    {
+      return QString::compare( word, other.word, Qt::CaseInsensitive ) == 0 && groupId == other.groupId;
+    }
 
-    bool operator != ( Item const & other ) const
-    { return ! operator == ( other ); }
+    bool operator!=( Item const & other ) const
+    {
+      return !operator==( other );
+    }
   };
 
   /// Indicates an intention to load -- see the relevant History constructor.
-  struct Load {};
+  struct Load
+  {};
 
   /// Constructs an empty history which can hold at most "size" items.
-  History( unsigned size = 20 , unsigned maxItemLength = DEFAULT_MAX_HISTORY_ITEM_LENGTH );
+  History( unsigned size = 20, unsigned maxItemLength = DEFAULT_MAX_HISTORY_ITEM_LENGTH );
 
   /// Loads history from its file. If load fails, the result would be an empty
   /// history. The size parameter is same as in other constructor.
@@ -59,7 +68,11 @@ public:
 
   /// Remove item with given index from list
   void removeItem( int index )
-  { items.removeAt( index ); dirty = true; emit itemsChanged(); }
+  {
+    items.removeAt( index );
+    dirty = true;
+    emit itemsChanged();
+  }
 
   /// Attempts saving history. Returns true if succeeded - false otherwise.
   /// Since history isn't really that valuable, failures can be ignored.
@@ -73,23 +86,33 @@ public:
 
   /// Gets the current items. The first one is the newest one on the list.
   QList< Item > const & getItems() const
-  { return items; }
+  {
+    return items;
+  }
 
   /// Enable/disable add words to hystory
   void enableAdd( bool enable )
-  { addingEnabled = enable; }
+  {
+    addingEnabled = enable;
+  }
   bool enabled()
-  { return addingEnabled; }
+  {
+    return addingEnabled;
+  }
 
   void setMaxSize( unsigned maxSize_ );
 
   void setSaveInterval( unsigned interval );
 
   unsigned getMaxSize()
-  { return maxSize; }
+  {
+    return maxSize;
+  }
 
   unsigned getMaxItemLength() const
-  { return maxItemLength; }
+  {
+    return maxItemLength;
+  }
 
 signals:
 
diff --git a/src/hotkeywrapper.cc b/src/hotkeywrapper.cc
index 1d382d37..5efe49cd 100644
--- a/src/hotkeywrapper.cc
+++ b/src/hotkeywrapper.cc
@@ -1,833 +1,848 @@
-#ifdef __WIN32 // Q_OS_WIN32 isn't available at this point
-#define _WIN32_WINNT 0x0430
-#include <windows.h>
-#endif
-
-#include "hotkeywrapper.hh"
-#include "gddebug.hh"
-
-#include <QSessionManager>
-#include <QTimer>
-#include <QWidget>
-
-#ifdef Q_OS_WIN
-#include "mainwindow.hh"
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-
-QHotkeyApplication::QHotkeyApplication( int & argc, char ** argv ):
-  QtSingleApplication( argc, argv )
-{
-  connect( this,
-    &QGuiApplication::commitDataRequest,
-    this,
-    &QHotkeyApplication::hotkeyAppCommitData,
-    Qt::DirectConnection );
-
-  connect( this,
-    &QGuiApplication::saveStateRequest,
-    this,
-    &QHotkeyApplication::hotkeyAppSaveState,
-    Qt::DirectConnection );
-
-#if defined( Q_OS_WIN ) 
-  installNativeEventFilter( this );
-#endif
-}
-
-QHotkeyApplication::QHotkeyApplication( QString const & id,
-                                        int & argc, char ** argv ):
-  QtSingleApplication( id, argc, argv )
-{
-  connect( this,
-    &QGuiApplication::commitDataRequest,
-    this,
-    &QHotkeyApplication::hotkeyAppCommitData,
-    Qt::DirectConnection );
-
-  connect( this,
-    &QGuiApplication::saveStateRequest,
-    this,
-    &QHotkeyApplication::hotkeyAppSaveState,
-    Qt::DirectConnection );
-
-#if defined( Q_OS_WIN ) 
-  installNativeEventFilter( this );
-#endif
-}
-
-void QHotkeyApplication::addDataCommiter( DataCommitter & d )
-{
-  dataCommitters.append( &d );
-}
-
-void QHotkeyApplication::removeDataCommiter( DataCommitter & d )
-{
-  dataCommitters.removeAll( &d );
-}
-
-void QHotkeyApplication::hotkeyAppCommitData( QSessionManager & mgr )
-{
-  for( int x = 0; x < dataCommitters.size(); ++x )
-    dataCommitters[ x ]->commitData( mgr );
-}
-
-void QHotkeyApplication::hotkeyAppSaveState(QSessionManager & mgr )
-{
-  mgr.setRestartHint( QSessionManager::RestartNever );
-}
-
-void QHotkeyApplication::registerWrapper(HotkeyWrapper *wrapper)
-{
-  if (wrapper && !hotkeyWrappers.contains(wrapper))
-    hotkeyWrappers.append(wrapper);
-}
-
-void QHotkeyApplication::unregisterWrapper(HotkeyWrapper *wrapper)
-{
-  if (wrapper && hotkeyWrappers.contains(wrapper))
-    hotkeyWrappers.removeAll(wrapper);
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-HotkeyStruct::HotkeyStruct( quint32 key_, quint32 key2_, quint32 modifier_,
-                            int handle_, int id_ ):
-  key( key_ ),
-  key2( key2_ ),
-  modifier( modifier_ ),
-  handle( handle_ ),
-  id( id_ )
-#ifdef Q_OS_MAC
-  , hkRef( 0 )
-  , hkRef2( 0 )
-#endif
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-#if !defined(Q_OS_MAC) && !defined(Q_WS_QWS)
-HotkeyWrapper::HotkeyWrapper(QObject *parent) : QThread( parent ),
-    state2(false)
-{
-#ifdef Q_OS_WIN
-  hwnd=(HWND)((static_cast<QMainWindow*>(parent))->winId());
-
-  gdDebug( "Handle global hotkeys via RegisterHotkey()" );
-
-#else
-  init();
-#endif
-  (static_cast<QHotkeyApplication*>(qApp))->registerWrapper(this);
-}
-
-HotkeyWrapper::~HotkeyWrapper()
-{
-  unregister();
-}
-
-void HotkeyWrapper::waitKey2()
-{
-  state2 = false;
-
-#ifdef HAVE_X11
-
-  if ( keyToUngrab != grabbedKeys.end() )
-  {
-    ungrabKey( keyToUngrab );
-    keyToUngrab = grabbedKeys.end();
-  }
-
-#endif
-}
-
-bool HotkeyWrapper::checkState(quint32 vk, quint32 mod)
-{
-  if ( state2 )
-  { // wait for 2nd key
-
-    waitKey2(); // Cancel the 2nd-key wait stage
-
-    if (state2waiter.key2 == vk && state2waiter.modifier == mod)
-    {
-      emit hotkeyActivated( state2waiter.handle );
-      return true;
-    }
-  }
-
-  for (int i = 0; i < hotkeys.count(); i++) {
-
-    const HotkeyStruct &hs = hotkeys.at(i);
-
-    if (hs.key == vk && hs.modifier == mod) {
-
-      #ifdef Q_OS_WIN32
-
-      if( hs.key2 != 0 || ( mod == MOD_CONTROL && ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) ) )
-      {
-        // Pass-through first part of compound hotkey or clipdoard copy command
-
-        INPUT i[ 10 ];
-        memset( i, 0, sizeof( i ) );
-        int nextKeyNom = 0;
-        short emulateModKeys = 0;
-
-        // If modifier keys aren't pressed it looks like emulation
-        // We then also emulate full sequence
-
-        if( ( mod & MOD_ALT ) != 0 && ( GetAsyncKeyState( VK_MENU ) & 0x8000 ) == 0 )
-        {
-          emulateModKeys |= MOD_ALT;
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_MENU;
-          nextKeyNom += 1;
-        }
-        if( ( mod & MOD_CONTROL ) != 0 && ( GetAsyncKeyState( VK_CONTROL ) & 0x8000 ) == 0 )
-        {
-          emulateModKeys |= MOD_CONTROL;
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_CONTROL;
-          nextKeyNom += 1;
-        }
-        if( ( mod & MOD_SHIFT ) != 0 && ( GetAsyncKeyState( VK_SHIFT ) & 0x8000 ) == 0 )
-        {
-          emulateModKeys |= MOD_SHIFT;
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_SHIFT;
-          nextKeyNom += 1;
-        }
-        if( ( mod & MOD_WIN ) != 0 && ( GetAsyncKeyState( VK_LWIN ) & 0x8000 ) == 0
-            && ( GetAsyncKeyState( VK_RWIN ) & 0x8000 ) == 0 )
-        {
-          emulateModKeys |= MOD_WIN;
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_LWIN;
-          nextKeyNom += 1;
-        }
-
-        i[ nextKeyNom ].type = INPUT_KEYBOARD;
-        i[ nextKeyNom ].ki.wVk = vk;
-        nextKeyNom += 1;
-        i[ nextKeyNom ].type = INPUT_KEYBOARD;
-        i[ nextKeyNom ].ki.wVk = vk;
-        i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
-        nextKeyNom += 1;
-
-        if( emulateModKeys & MOD_WIN )
-        {
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_LWIN;
-          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
-          nextKeyNom += 1;
-        }
-        if( emulateModKeys & MOD_SHIFT )
-        {
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_SHIFT;
-          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
-          nextKeyNom += 1;
-        }
-        if( emulateModKeys & MOD_CONTROL )
-        {
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_CONTROL;
-          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
-          nextKeyNom += 1;
-        }
-        if( emulateModKeys & MOD_ALT )
-        {
-          i[ nextKeyNom ].type = INPUT_KEYBOARD;
-          i[ nextKeyNom ].ki.wVk = VK_MENU;
-          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
-          nextKeyNom += 1;
-        }
-
-        UnregisterHotKey( hwnd, hs.id );
-        SendInput( nextKeyNom, i, sizeof( *i ) );
-        RegisterHotKey(hwnd, hs.id, hs.modifier, hs.key);
-      }
-      #endif
-
-      if (hs.key2 == 0) {
-         emit hotkeyActivated( hs.handle );
-         return true;
-      }
-
-      state2 = true;
-      state2waiter = hs;
-      QTimer::singleShot( 500, this, &HotkeyWrapper::waitKey2 );
-
-      #ifdef HAVE_X11
-
-      // Grab the second key, unless it's grabbed already
-      // Note that we only grab the clipboard key only if
-      // the sequence didn't begin with it
-
-      if ( ( isCopyToClipboardKey( hs.key, hs.modifier ) ||
-             !isCopyToClipboardKey( hs.key2, hs.modifier ) ) &&
-           !isKeyGrabbed( hs.key2, hs.modifier ) )
-        keyToUngrab = grabKey( hs.key2, hs.modifier );
-
-      #endif
-
-      return true;
-    }
-  }
-
-  state2 = false;
-  return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-#ifdef Q_OS_WIN
-
-void HotkeyWrapper::init()
-{
-  QWidget *root = qApp->topLevelWidgets().value(0);
-  hwnd = (HWND)root->winId();
-}
-
-bool HotkeyWrapper::setGlobalKey( QKeySequence const & seq, int handle )
-{
-  Config::HotKey hk(seq);
-  return setGlobalKey(hk.key1,hk.key2,hk.modifiers,handle);
-}
-
-bool HotkeyWrapper::setGlobalKey( int key, int key2,
-                                  Qt::KeyboardModifiers modifier, int handle )
-{
-  if ( !key )
-    return false; // We don't monitor empty combinations
-
-  static int id = 0;
-  if( id > 0xBFFF - 1 )
-    id = 0;
-
-  quint32 mod = 0;
-  if (modifier & Qt::CTRL)
-    mod |= MOD_CONTROL;
-  if (modifier & Qt::ALT)
-    mod |= MOD_ALT;
-  if (modifier & Qt::SHIFT)
-    mod |= MOD_SHIFT;
-  if (modifier & Qt::META)
-    mod |= MOD_WIN;
-
-  quint32 vk = nativeKey( key );
-  quint32 vk2 = key2 ? nativeKey( key2 ) : 0;
-
-  hotkeys.append( HotkeyStruct( vk, vk2, mod, handle, id ) );
-
-  if (!RegisterHotKey(hwnd, id++, mod, vk))
-    return false;
-
-  if ( key2 && key2 != key )
-    return RegisterHotKey(hwnd, id++, mod, vk2);
-
-  return true;
-}
-
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-bool HotkeyWrapper::winEvent ( MSG * message, long * result )
-#else
-bool HotkeyWrapper::winEvent ( MSG * message, qintptr * result )
-#endif
-{
-  (void) result;
-  if (message->message == WM_HOTKEY)
-    return checkState( (message->lParam >> 16), (message->lParam & 0xffff) );
-
-  return false;
-}
-
-quint32 HotkeyWrapper::nativeKey(int key)
-{
-  if (key >= Qt::Key_0 && key <= Qt::Key_9)
-    return VK_NUMPAD0 + ( key - Qt::Key_0 );
-
-  if (key >= Qt::Key_A && key <= Qt::Key_Z)
-    return key;
-
-  switch (key) {
-    case Qt::Key_Space:     return VK_SPACE;
-    case Qt::Key_Asterisk:  return VK_MULTIPLY;
-    case Qt::Key_Plus:      return VK_ADD;
-    case Qt::Key_Comma:     return VK_SEPARATOR;
-    case Qt::Key_Minus:     return VK_SUBTRACT;
-    case Qt::Key_Slash:     return VK_DIVIDE;
-    case Qt::Key_Tab:
-    case Qt::Key_Backtab:   return VK_TAB;
-    case Qt::Key_Backspace: return VK_BACK;
-    case Qt::Key_Return:
-    case Qt::Key_Escape:    return VK_ESCAPE;
-    case Qt::Key_Enter:     return VK_RETURN;
-    case Qt::Key_Insert:    return VK_INSERT;
-    case Qt::Key_Delete:    return VK_DELETE;
-    case Qt::Key_Pause:     return VK_PAUSE;
-    case Qt::Key_Print:     return VK_PRINT;
-    case Qt::Key_Clear:     return VK_CLEAR;
-    case Qt::Key_Home:      return VK_HOME;
-    case Qt::Key_End:       return VK_END;
-    case Qt::Key_Up:        return VK_UP;
-    case Qt::Key_Down:      return VK_DOWN;
-    case Qt::Key_Left:      return VK_LEFT;
-    case Qt::Key_Right:     return VK_RIGHT;
-    case Qt::Key_PageUp:    return VK_PRIOR;
-    case Qt::Key_PageDown:  return VK_NEXT;
-    case Qt::Key_F1:        return VK_F1;
-    case Qt::Key_F2:        return VK_F2;
-    case Qt::Key_F3:        return VK_F3;
-    case Qt::Key_F4:        return VK_F4;
-    case Qt::Key_F5:        return VK_F5;
-    case Qt::Key_F6:        return VK_F6;
-    case Qt::Key_F7:        return VK_F7;
-    case Qt::Key_F8:        return VK_F8;
-    case Qt::Key_F9:        return VK_F9;
-    case Qt::Key_F10:       return VK_F10;
-    case Qt::Key_F11:       return VK_F11;
-    case Qt::Key_F12:       return VK_F12;
-    case Qt::Key_F13:       return VK_F13;
-    case Qt::Key_F14:       return VK_F14;
-    case Qt::Key_F15:       return VK_F15;
-    case Qt::Key_F16:       return VK_F16;
-    case Qt::Key_F17:       return VK_F17;
-    case Qt::Key_F18:       return VK_F18;
-    case Qt::Key_F19:       return VK_F19;
-    case Qt::Key_F20:       return VK_F20;
-    case Qt::Key_F21:       return VK_F21;
-    case Qt::Key_F22:       return VK_F22;
-    case Qt::Key_F23:       return VK_F23;
-    case Qt::Key_F24:       return VK_F24;
-    case Qt::Key_Colon:
-    case Qt::Key_Semicolon:    return VK_OEM_1;
-    case Qt::Key_Question:     return VK_OEM_2;
-    case Qt::Key_AsciiTilde:
-    case Qt::Key_QuoteLeft:    return VK_OEM_3;
-    case Qt::Key_BraceLeft:
-    case Qt::Key_BracketLeft:  return VK_OEM_4;
-    case Qt::Key_Bar:
-    case Qt::Key_Backslash:    return VK_OEM_5;
-    case Qt::Key_BraceRight:
-    case Qt::Key_BracketRight: return VK_OEM_6;
-    case Qt::Key_QuoteDbl:
-    case Qt::Key_Apostrophe:   return VK_OEM_7;
-    case Qt::Key_Less:         return VK_OEM_COMMA;
-    case Qt::Key_Greater:      return VK_OEM_PERIOD;
-    case Qt::Key_Equal:        return VK_OEM_PLUS;
-    case Qt::Key_ParenRight:   return 0x30;
-    case Qt::Key_Exclam:       return 0x31;
-    case Qt::Key_At:           return 0x32;
-    case Qt::Key_NumberSign:   return 0x33;
-    case Qt::Key_Dollar:       return 0x34;
-    case Qt::Key_Percent:      return 0x35;
-    case Qt::Key_AsciiCircum:  return 0x36;
-    case Qt::Key_Ampersand:    return 0x37;
-    case Qt::Key_copyright:    return 0x38;
-    case Qt::Key_ParenLeft:    return 0x39;
-    case Qt::Key_Underscore:   return VK_OEM_MINUS;
-    default:;
-  }
-
-  return key;
-}
-
-void HotkeyWrapper::unregister()
-{
-  for( int i = 0; i < hotkeys.count(); i++ )
-  {
-    HotkeyStruct const & hk = hotkeys.at( i );
-
-    UnregisterHotKey( hwnd, hk.id );
-
-    if( hk.key2 && hk.key2 != hk.key )
-      UnregisterHotKey( hwnd, hk.id + 1 );
-  }
-
-  (static_cast<QHotkeyApplication*>(qApp))->unregisterWrapper(this);
-}
-
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-bool QHotkeyApplication::nativeEventFilter( const QByteArray & /*eventType*/, void * message, long * result )
-#else
-bool QHotkeyApplication::nativeEventFilter( const QByteArray & /*eventType*/, void * message, qintptr * result )
-#endif
-{
-  MSG * msg = reinterpret_cast< MSG * >( message );
-
-  if( msg->message == WM_HOTKEY )
-  {
-    for (int i = 0; i < hotkeyWrappers.size(); i++)
-    {
-      if ( hotkeyWrappers.at(i)->winEvent( msg, result ) )
-        return true;
-    }
-  }
-
-  return false;
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-#else
-
-//////////////////////////////////////////////////////////////////////////
-
-#include <X11/keysym.h>
-
-void HotkeyWrapper::init()
-{
-  keyToUngrab = grabbedKeys.end();
-
-#if QT_VERSION < 0x060000
-  Display *displayID = QX11Info::display();
-#else
-  QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-  Display *displayID = x11AppInfo->display();
-#endif
-
-  // We use RECORD extension instead of XGrabKey. That's because XGrabKey
-  // prevents other clients from getting their input if it's grabbed.
-
-  Display * display = displayID;
-
-  lShiftCode = XKeysymToKeycode( display, XK_Shift_L );
-  rShiftCode = XKeysymToKeycode( display, XK_Shift_R );
-
-  lCtrlCode = XKeysymToKeycode( display, XK_Control_L );
-  rCtrlCode = XKeysymToKeycode( display, XK_Control_R );
-
-  lAltCode = XKeysymToKeycode( display, XK_Alt_L );
-  rAltCode = XKeysymToKeycode( display, XK_Alt_R );
-
-  lMetaCode = XKeysymToKeycode( display, XK_Super_L );
-  rMetaCode = XKeysymToKeycode( display, XK_Super_R );
-
-  cCode = XKeysymToKeycode( display, XK_c );
-  insertCode = XKeysymToKeycode( display, XK_Insert );
-  kpInsertCode = XKeysymToKeycode( display, XK_KP_Insert );
-
-  currentModifiers = 0;
-
-  // This one will be used to read the recorded content
-  dataDisplay = XOpenDisplay( 0 );
-
-  if ( !dataDisplay )
-    throw exInit();
-
-  recordRange = XRecordAllocRange();
-
-  if ( !recordRange )
-  {
-    XCloseDisplay( dataDisplay );
-    throw exInit();
-  }
-
-  recordRange->device_events.first = KeyPress;
-  recordRange->device_events.last = KeyRelease;
-  recordClientSpec = XRecordAllClients;
-
-  recordContext = XRecordCreateContext( display, 0,
-                                        &recordClientSpec, 1,
-                                        &recordRange, 1 );
-
-  if ( !recordContext )
-  {
-    XFree( recordRange );
-    XCloseDisplay( dataDisplay );
-    throw exInit();
-  }
-
-  // This is required to ensure context was indeed created
-  XSync( display, False );
-
-  connect( this, &HotkeyWrapper::keyRecorded, this, &HotkeyWrapper::checkState, Qt::QueuedConnection );
-
-  start();
-}
-
-void HotkeyWrapper::run() // Runs in a separate thread
-{
-  if ( !XRecordEnableContext( dataDisplay, recordContext,
-                              recordEventCallback,
-                              (XPointer) this ) )
-    GD_DPRINTF( "Failed to enable record context\n" );
-}
-
-
-void HotkeyWrapper::recordEventCallback( XPointer ptr, XRecordInterceptData * data )
-{
-  ((HotkeyWrapper * )ptr)->handleRecordEvent( data );
-}
-
-void HotkeyWrapper::handleRecordEvent( XRecordInterceptData * data )
-{
-  if ( data->category == XRecordFromServer )
-  {
-    xEvent * event = ( xEvent * ) data->data;
-
-    if ( event->u.u.type == KeyPress )
-    {
-      KeyCode key = event->u.u.detail;
-
-      if ( key == lShiftCode ||
-           key == rShiftCode )
-        currentModifiers |= ShiftMask;
-      else
-      if ( key == lCtrlCode ||
-           key == rCtrlCode )
-        currentModifiers |= ControlMask;
-      else
-      if ( key == lAltCode ||
-           key == rAltCode )
-        currentModifiers |= Mod1Mask;
-      else
-      if ( key == lMetaCode ||
-           key == rMetaCode )
-        currentModifiers |= Mod4Mask;
-      else
-      {
-        // Here we employ a kind of hack translating KP_Insert key
-        // to just Insert. This allows reacting to both Insert keys.
-        if ( key == kpInsertCode )
-          key = insertCode;
-
-        emit keyRecorded( key, currentModifiers );
-      }
-    }
-    else
-    if ( event->u.u.type == KeyRelease )
-    {
-      KeyCode key = event->u.u.detail;
-
-      if ( key == lShiftCode ||
-           key == rShiftCode )
-        currentModifiers &= ~ShiftMask;
-      else
-      if ( key == lCtrlCode ||
-           key == rCtrlCode )
-        currentModifiers &= ~ControlMask;
-      else
-      if ( key == lAltCode ||
-           key == rAltCode )
-        currentModifiers &= ~Mod1Mask;
-      else
-      if ( key == lMetaCode ||
-           key == rMetaCode )
-        currentModifiers &= ~Mod4Mask;
-    }
-  }
-
-  XRecordFreeData( data );
-}
-
-bool HotkeyWrapper::setGlobalKey( QKeySequence const & seq, int handle )
-{
-  Config::HotKey hk(seq);
-  return setGlobalKey(hk.key1,hk.key2,hk.modifiers,handle);
-}
-
-bool HotkeyWrapper::setGlobalKey( int key, int key2,
-                                  Qt::KeyboardModifiers modifier, int handle )
-{
-  if ( !key )
-    return false; // We don't monitor empty combinations
-
-  int vk = nativeKey( key );
-  int vk2 = key2 ? nativeKey( key2 ) : 0;
-
-  quint32 mod = 0;
-  if (modifier & Qt::ShiftModifier)
-      mod |= ShiftMask;
-  if (modifier & Qt::ControlModifier)
-      mod |= ControlMask;
-  if (modifier & Qt::AltModifier)
-      mod |= Mod1Mask;
-  if (modifier & Qt::MetaModifier)
-      mod |= Mod4Mask;
-
-  hotkeys.append( HotkeyStruct( vk, vk2, mod, handle, 0 ) );
-
-  if ( !isCopyToClipboardKey( vk, mod ) )
-    grabKey( vk, mod ); // Make sure it doesn't get caught by other apps
-
-  return true;
-}
-
-bool HotkeyWrapper::isCopyToClipboardKey( quint32 keyCode, quint32 modifiers ) const
-{
-  return modifiers == ControlMask &&
-         ( keyCode == cCode || keyCode == insertCode || keyCode == kpInsertCode );
-}
-
-bool HotkeyWrapper::isKeyGrabbed( quint32 keyCode, quint32 modifiers ) const
-{
-  GrabbedKeys::const_iterator i = grabbedKeys.find( std::make_pair( keyCode, modifiers ) );
-
-  return i != grabbedKeys.end();
-}
-
-namespace {
-
-typedef int (*X11ErrorHandler) ( Display * display, XErrorEvent * event );
-
-class X11GrabUngrabErrorHandler {
-public:
-  static bool error;
-
-  static int grab_ungrab_error_handler( Display *, XErrorEvent * event )
-  {
-    qDebug() << "grab_ungrab_error_handler is invoked";
-    switch ( event->error_code )
-    {
-      case BadAccess:
-      case BadValue:
-      case BadWindow:
-        if ( event->request_code == 33 /* X_GrabKey */ ||
-             event->request_code == 34 /* X_UngrabKey */)
-        {
-          error = true;
-        }
-    }
-    return 0;
-  }
-
-  X11GrabUngrabErrorHandler()
-  {
-    error = false;
-    previousErrorHandler_ = XSetErrorHandler( grab_ungrab_error_handler );
-  }
-
-  ~X11GrabUngrabErrorHandler()
-  {
-#if QT_VERSION < 0x060000
-    Display *displayID = QX11Info::display();
-#else
-    QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-    Display *displayID = x11AppInfo->display();
-#endif
-    XFlush( displayID );
-    (void) XSetErrorHandler( previousErrorHandler_ );
-  }
-
-  bool isError() const
-  {
-#if QT_VERSION < 0x060000
-    Display *displayID = QX11Info::display();
-#else
-    QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-    Display *displayID = x11AppInfo->display();
-#endif
-    XFlush( displayID );
-    return error;
-  }
-
-private:
-  X11ErrorHandler previousErrorHandler_;
-};
-
-bool X11GrabUngrabErrorHandler::error = false;
-
-} // anonymous namespace
-
-
-HotkeyWrapper::GrabbedKeys::iterator HotkeyWrapper::grabKey( quint32 keyCode,
-                                                             quint32 modifiers )
-{
-  std::pair< GrabbedKeys::iterator, bool > result =
-    grabbedKeys.insert( std::make_pair( keyCode, modifiers ) );
-
-
-  if ( result.second )
-  {
-#if QT_VERSION < 0x060000
-    Display *displayID = QX11Info::display();
-#else
-    QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-    Display *displayID = x11AppInfo->display();
-#endif
-    X11GrabUngrabErrorHandler errorHandler;
-    XGrabKey( displayID, keyCode, modifiers, DefaultRootWindow(displayID),
-              True, GrabModeAsync, GrabModeAsync );
-
-    if ( errorHandler.isError() )
-    {
-      gdWarning( "Possible hotkeys conflict. Check your hotkeys options." );
-      ungrabKey( result.first );
-    }
-  }
-
-  return result.first;
-}
-
-void HotkeyWrapper::ungrabKey( GrabbedKeys::iterator i )
-{
-#if QT_VERSION < 0x060000
-  Display *displayID = QX11Info::display();
-#else
-  QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-  Display *displayID = x11AppInfo->display();
-#endif
-  X11GrabUngrabErrorHandler errorHandler;
-  XUngrabKey( displayID, i->first, i->second, XDefaultRootWindow(displayID) );
-
-  grabbedKeys.erase( i );
-
-  if ( errorHandler.isError() )
-  {
-    gdWarning( "Cannot ungrab the hotkey" );
-  }
-}
-
-quint32 HotkeyWrapper::nativeKey(int key)
-{
-  QString keySymName;
-
-  switch( key )
-  {
-    case Qt::Key_Insert:
-      keySymName = "Insert";
-    break;
-    default:
-      keySymName = QKeySequence( key ).toString();
-    break;
-  }
-#if QT_VERSION < 0x060000
-    Display *displayID = QX11Info::display();
-#else
-    QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-    Display *displayID = x11AppInfo->display();
-#endif
-  Display * display = displayID;
-  return XKeysymToKeycode( display, XStringToKeysym( keySymName.toLatin1().data() ) );
-}
-
-void HotkeyWrapper::unregister()
-{
-#if QT_VERSION < 0x060000
-  Display *displayID = QX11Info::display();
-#else
-  QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-  Display *displayID = x11AppInfo->display();
-#endif
-  Display * display = displayID;
-
-  XRecordDisableContext( display, recordContext );
-  XSync( display, False );
-
-  wait();
-
-  XRecordFreeContext( display, recordContext );
-  XFree( recordRange );
-  XCloseDisplay( dataDisplay );
-
-  while( grabbedKeys.size() )
-    ungrabKey( grabbedKeys.begin() );
-
-  (static_cast<QHotkeyApplication*>(qApp))->unregisterWrapper(this);
-}
-
-#endif
-#endif
+#ifdef __WIN32 // Q_OS_WIN32 isn't available at this point
+  #define _WIN32_WINNT 0x0430
+  #include <windows.h>
+#endif
+
+#include "hotkeywrapper.hh"
+#include "gddebug.hh"
+
+#include <QSessionManager>
+#include <QTimer>
+#include <QWidget>
+
+#ifdef Q_OS_WIN
+  #include "mainwindow.hh"
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+
+QHotkeyApplication::QHotkeyApplication( int & argc, char ** argv ):
+  QtSingleApplication( argc, argv )
+{
+  connect( this,
+           &QGuiApplication::commitDataRequest,
+           this,
+           &QHotkeyApplication::hotkeyAppCommitData,
+           Qt::DirectConnection );
+
+  connect( this,
+           &QGuiApplication::saveStateRequest,
+           this,
+           &QHotkeyApplication::hotkeyAppSaveState,
+           Qt::DirectConnection );
+
+#if defined( Q_OS_WIN )
+  installNativeEventFilter( this );
+#endif
+}
+
+QHotkeyApplication::QHotkeyApplication( QString const & id, int & argc, char ** argv ):
+  QtSingleApplication( id, argc, argv )
+{
+  connect( this,
+           &QGuiApplication::commitDataRequest,
+           this,
+           &QHotkeyApplication::hotkeyAppCommitData,
+           Qt::DirectConnection );
+
+  connect( this,
+           &QGuiApplication::saveStateRequest,
+           this,
+           &QHotkeyApplication::hotkeyAppSaveState,
+           Qt::DirectConnection );
+
+#if defined( Q_OS_WIN )
+  installNativeEventFilter( this );
+#endif
+}
+
+void QHotkeyApplication::addDataCommiter( DataCommitter & d )
+{
+  dataCommitters.append( &d );
+}
+
+void QHotkeyApplication::removeDataCommiter( DataCommitter & d )
+{
+  dataCommitters.removeAll( &d );
+}
+
+void QHotkeyApplication::hotkeyAppCommitData( QSessionManager & mgr )
+{
+  for ( int x = 0; x < dataCommitters.size(); ++x )
+    dataCommitters[ x ]->commitData( mgr );
+}
+
+void QHotkeyApplication::hotkeyAppSaveState( QSessionManager & mgr )
+{
+  mgr.setRestartHint( QSessionManager::RestartNever );
+}
+
+void QHotkeyApplication::registerWrapper( HotkeyWrapper * wrapper )
+{
+  if ( wrapper && !hotkeyWrappers.contains( wrapper ) )
+    hotkeyWrappers.append( wrapper );
+}
+
+void QHotkeyApplication::unregisterWrapper( HotkeyWrapper * wrapper )
+{
+  if ( wrapper && hotkeyWrappers.contains( wrapper ) )
+    hotkeyWrappers.removeAll( wrapper );
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+HotkeyStruct::HotkeyStruct( quint32 key_, quint32 key2_, quint32 modifier_, int handle_, int id_ ):
+  key( key_ ),
+  key2( key2_ ),
+  modifier( modifier_ ),
+  handle( handle_ ),
+  id( id_ )
+#ifdef Q_OS_MAC
+  ,
+  hkRef( 0 ),
+  hkRef2( 0 )
+#endif
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+#if !defined( Q_OS_MAC ) && !defined( Q_WS_QWS )
+HotkeyWrapper::HotkeyWrapper( QObject * parent ):
+  QThread( parent ),
+  state2( false )
+{
+  #ifdef Q_OS_WIN
+  hwnd = (HWND)( ( static_cast< QMainWindow * >( parent ) )->winId() );
+
+  gdDebug( "Handle global hotkeys via RegisterHotkey()" );
+
+  #else
+  init();
+  #endif
+  ( static_cast< QHotkeyApplication * >( qApp ) )->registerWrapper( this );
+}
+
+HotkeyWrapper::~HotkeyWrapper()
+{
+  unregister();
+}
+
+void HotkeyWrapper::waitKey2()
+{
+  state2 = false;
+
+  #ifdef HAVE_X11
+
+  if ( keyToUngrab != grabbedKeys.end() ) {
+    ungrabKey( keyToUngrab );
+    keyToUngrab = grabbedKeys.end();
+  }
+
+  #endif
+}
+
+bool HotkeyWrapper::checkState( quint32 vk, quint32 mod )
+{
+  if ( state2 ) { // wait for 2nd key
+
+    waitKey2(); // Cancel the 2nd-key wait stage
+
+    if ( state2waiter.key2 == vk && state2waiter.modifier == mod ) {
+      emit hotkeyActivated( state2waiter.handle );
+      return true;
+    }
+  }
+
+  for ( int i = 0; i < hotkeys.count(); i++ ) {
+
+    const HotkeyStruct & hs = hotkeys.at( i );
+
+    if ( hs.key == vk && hs.modifier == mod ) {
+
+  #ifdef Q_OS_WIN32
+
+      if ( hs.key2 != 0 || ( mod == MOD_CONTROL && ( vk == VK_INSERT || vk == 'c' || vk == 'C' ) ) ) {
+        // Pass-through first part of compound hotkey or clipdoard copy command
+
+        INPUT i[ 10 ];
+        memset( i, 0, sizeof( i ) );
+        int nextKeyNom       = 0;
+        short emulateModKeys = 0;
+
+        // If modifier keys aren't pressed it looks like emulation
+        // We then also emulate full sequence
+
+        if ( ( mod & MOD_ALT ) != 0 && ( GetAsyncKeyState( VK_MENU ) & 0x8000 ) == 0 ) {
+          emulateModKeys |= MOD_ALT;
+          i[ nextKeyNom ].type   = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk = VK_MENU;
+          nextKeyNom += 1;
+        }
+        if ( ( mod & MOD_CONTROL ) != 0 && ( GetAsyncKeyState( VK_CONTROL ) & 0x8000 ) == 0 ) {
+          emulateModKeys |= MOD_CONTROL;
+          i[ nextKeyNom ].type   = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk = VK_CONTROL;
+          nextKeyNom += 1;
+        }
+        if ( ( mod & MOD_SHIFT ) != 0 && ( GetAsyncKeyState( VK_SHIFT ) & 0x8000 ) == 0 ) {
+          emulateModKeys |= MOD_SHIFT;
+          i[ nextKeyNom ].type   = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk = VK_SHIFT;
+          nextKeyNom += 1;
+        }
+        if ( ( mod & MOD_WIN ) != 0 && ( GetAsyncKeyState( VK_LWIN ) & 0x8000 ) == 0
+             && ( GetAsyncKeyState( VK_RWIN ) & 0x8000 ) == 0 ) {
+          emulateModKeys |= MOD_WIN;
+          i[ nextKeyNom ].type   = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk = VK_LWIN;
+          nextKeyNom += 1;
+        }
+
+        i[ nextKeyNom ].type   = INPUT_KEYBOARD;
+        i[ nextKeyNom ].ki.wVk = vk;
+        nextKeyNom += 1;
+        i[ nextKeyNom ].type       = INPUT_KEYBOARD;
+        i[ nextKeyNom ].ki.wVk     = vk;
+        i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
+        nextKeyNom += 1;
+
+        if ( emulateModKeys & MOD_WIN ) {
+          i[ nextKeyNom ].type       = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk     = VK_LWIN;
+          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
+          nextKeyNom += 1;
+        }
+        if ( emulateModKeys & MOD_SHIFT ) {
+          i[ nextKeyNom ].type       = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk     = VK_SHIFT;
+          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
+          nextKeyNom += 1;
+        }
+        if ( emulateModKeys & MOD_CONTROL ) {
+          i[ nextKeyNom ].type       = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk     = VK_CONTROL;
+          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
+          nextKeyNom += 1;
+        }
+        if ( emulateModKeys & MOD_ALT ) {
+          i[ nextKeyNom ].type       = INPUT_KEYBOARD;
+          i[ nextKeyNom ].ki.wVk     = VK_MENU;
+          i[ nextKeyNom ].ki.dwFlags = KEYEVENTF_KEYUP;
+          nextKeyNom += 1;
+        }
+
+        UnregisterHotKey( hwnd, hs.id );
+        SendInput( nextKeyNom, i, sizeof( *i ) );
+        RegisterHotKey( hwnd, hs.id, hs.modifier, hs.key );
+      }
+  #endif
+
+      if ( hs.key2 == 0 ) {
+        emit hotkeyActivated( hs.handle );
+        return true;
+      }
+
+      state2       = true;
+      state2waiter = hs;
+      QTimer::singleShot( 500, this, &HotkeyWrapper::waitKey2 );
+
+  #ifdef HAVE_X11
+
+      // Grab the second key, unless it's grabbed already
+      // Note that we only grab the clipboard key only if
+      // the sequence didn't begin with it
+
+      if ( ( isCopyToClipboardKey( hs.key, hs.modifier ) || !isCopyToClipboardKey( hs.key2, hs.modifier ) )
+           && !isKeyGrabbed( hs.key2, hs.modifier ) )
+        keyToUngrab = grabKey( hs.key2, hs.modifier );
+
+  #endif
+
+      return true;
+    }
+  }
+
+  state2 = false;
+  return false;
+}
+
+//////////////////////////////////////////////////////////////////////////
+
+  #ifdef Q_OS_WIN
+
+void HotkeyWrapper::init()
+{
+  QWidget * root = qApp->topLevelWidgets().value( 0 );
+  hwnd           = (HWND)root->winId();
+}
+
+bool HotkeyWrapper::setGlobalKey( QKeySequence const & seq, int handle )
+{
+  Config::HotKey hk( seq );
+  return setGlobalKey( hk.key1, hk.key2, hk.modifiers, handle );
+}
+
+bool HotkeyWrapper::setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier, int handle )
+{
+  if ( !key )
+    return false; // We don't monitor empty combinations
+
+  static int id = 0;
+  if ( id > 0xBFFF - 1 )
+    id = 0;
+
+  quint32 mod = 0;
+  if ( modifier & Qt::CTRL )
+    mod |= MOD_CONTROL;
+  if ( modifier & Qt::ALT )
+    mod |= MOD_ALT;
+  if ( modifier & Qt::SHIFT )
+    mod |= MOD_SHIFT;
+  if ( modifier & Qt::META )
+    mod |= MOD_WIN;
+
+  quint32 vk  = nativeKey( key );
+  quint32 vk2 = key2 ? nativeKey( key2 ) : 0;
+
+  hotkeys.append( HotkeyStruct( vk, vk2, mod, handle, id ) );
+
+  if ( !RegisterHotKey( hwnd, id++, mod, vk ) )
+    return false;
+
+  if ( key2 && key2 != key )
+    return RegisterHotKey( hwnd, id++, mod, vk2 );
+
+  return true;
+}
+
+    #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+bool HotkeyWrapper::winEvent( MSG * message, long * result )
+    #else
+bool HotkeyWrapper::winEvent( MSG * message, qintptr * result )
+    #endif
+{
+  (void)result;
+  if ( message->message == WM_HOTKEY )
+    return checkState( ( message->lParam >> 16 ), ( message->lParam & 0xffff ) );
+
+  return false;
+}
+
+quint32 HotkeyWrapper::nativeKey( int key )
+{
+  if ( key >= Qt::Key_0 && key <= Qt::Key_9 )
+    return VK_NUMPAD0 + ( key - Qt::Key_0 );
+
+  if ( key >= Qt::Key_A && key <= Qt::Key_Z )
+    return key;
+
+  switch ( key ) {
+    case Qt::Key_Space:
+      return VK_SPACE;
+    case Qt::Key_Asterisk:
+      return VK_MULTIPLY;
+    case Qt::Key_Plus:
+      return VK_ADD;
+    case Qt::Key_Comma:
+      return VK_SEPARATOR;
+    case Qt::Key_Minus:
+      return VK_SUBTRACT;
+    case Qt::Key_Slash:
+      return VK_DIVIDE;
+    case Qt::Key_Tab:
+    case Qt::Key_Backtab:
+      return VK_TAB;
+    case Qt::Key_Backspace:
+      return VK_BACK;
+    case Qt::Key_Return:
+    case Qt::Key_Escape:
+      return VK_ESCAPE;
+    case Qt::Key_Enter:
+      return VK_RETURN;
+    case Qt::Key_Insert:
+      return VK_INSERT;
+    case Qt::Key_Delete:
+      return VK_DELETE;
+    case Qt::Key_Pause:
+      return VK_PAUSE;
+    case Qt::Key_Print:
+      return VK_PRINT;
+    case Qt::Key_Clear:
+      return VK_CLEAR;
+    case Qt::Key_Home:
+      return VK_HOME;
+    case Qt::Key_End:
+      return VK_END;
+    case Qt::Key_Up:
+      return VK_UP;
+    case Qt::Key_Down:
+      return VK_DOWN;
+    case Qt::Key_Left:
+      return VK_LEFT;
+    case Qt::Key_Right:
+      return VK_RIGHT;
+    case Qt::Key_PageUp:
+      return VK_PRIOR;
+    case Qt::Key_PageDown:
+      return VK_NEXT;
+    case Qt::Key_F1:
+      return VK_F1;
+    case Qt::Key_F2:
+      return VK_F2;
+    case Qt::Key_F3:
+      return VK_F3;
+    case Qt::Key_F4:
+      return VK_F4;
+    case Qt::Key_F5:
+      return VK_F5;
+    case Qt::Key_F6:
+      return VK_F6;
+    case Qt::Key_F7:
+      return VK_F7;
+    case Qt::Key_F8:
+      return VK_F8;
+    case Qt::Key_F9:
+      return VK_F9;
+    case Qt::Key_F10:
+      return VK_F10;
+    case Qt::Key_F11:
+      return VK_F11;
+    case Qt::Key_F12:
+      return VK_F12;
+    case Qt::Key_F13:
+      return VK_F13;
+    case Qt::Key_F14:
+      return VK_F14;
+    case Qt::Key_F15:
+      return VK_F15;
+    case Qt::Key_F16:
+      return VK_F16;
+    case Qt::Key_F17:
+      return VK_F17;
+    case Qt::Key_F18:
+      return VK_F18;
+    case Qt::Key_F19:
+      return VK_F19;
+    case Qt::Key_F20:
+      return VK_F20;
+    case Qt::Key_F21:
+      return VK_F21;
+    case Qt::Key_F22:
+      return VK_F22;
+    case Qt::Key_F23:
+      return VK_F23;
+    case Qt::Key_F24:
+      return VK_F24;
+    case Qt::Key_Colon:
+    case Qt::Key_Semicolon:
+      return VK_OEM_1;
+    case Qt::Key_Question:
+      return VK_OEM_2;
+    case Qt::Key_AsciiTilde:
+    case Qt::Key_QuoteLeft:
+      return VK_OEM_3;
+    case Qt::Key_BraceLeft:
+    case Qt::Key_BracketLeft:
+      return VK_OEM_4;
+    case Qt::Key_Bar:
+    case Qt::Key_Backslash:
+      return VK_OEM_5;
+    case Qt::Key_BraceRight:
+    case Qt::Key_BracketRight:
+      return VK_OEM_6;
+    case Qt::Key_QuoteDbl:
+    case Qt::Key_Apostrophe:
+      return VK_OEM_7;
+    case Qt::Key_Less:
+      return VK_OEM_COMMA;
+    case Qt::Key_Greater:
+      return VK_OEM_PERIOD;
+    case Qt::Key_Equal:
+      return VK_OEM_PLUS;
+    case Qt::Key_ParenRight:
+      return 0x30;
+    case Qt::Key_Exclam:
+      return 0x31;
+    case Qt::Key_At:
+      return 0x32;
+    case Qt::Key_NumberSign:
+      return 0x33;
+    case Qt::Key_Dollar:
+      return 0x34;
+    case Qt::Key_Percent:
+      return 0x35;
+    case Qt::Key_AsciiCircum:
+      return 0x36;
+    case Qt::Key_Ampersand:
+      return 0x37;
+    case Qt::Key_copyright:
+      return 0x38;
+    case Qt::Key_ParenLeft:
+      return 0x39;
+    case Qt::Key_Underscore:
+      return VK_OEM_MINUS;
+    default:;
+  }
+
+  return key;
+}
+
+void HotkeyWrapper::unregister()
+{
+  for ( int i = 0; i < hotkeys.count(); i++ ) {
+    HotkeyStruct const & hk = hotkeys.at( i );
+
+    UnregisterHotKey( hwnd, hk.id );
+
+    if ( hk.key2 && hk.key2 != hk.key )
+      UnregisterHotKey( hwnd, hk.id + 1 );
+  }
+
+  ( static_cast< QHotkeyApplication * >( qApp ) )->unregisterWrapper( this );
+}
+
+    #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+bool QHotkeyApplication::nativeEventFilter( const QByteArray & /*eventType*/, void * message, long * result )
+    #else
+bool QHotkeyApplication::nativeEventFilter( const QByteArray & /*eventType*/, void * message, qintptr * result )
+    #endif
+{
+  MSG * msg = reinterpret_cast< MSG * >( message );
+
+  if ( msg->message == WM_HOTKEY ) {
+    for ( int i = 0; i < hotkeyWrappers.size(); i++ ) {
+      if ( hotkeyWrappers.at( i )->winEvent( msg, result ) )
+        return true;
+    }
+  }
+
+  return false;
+}
+
+  //////////////////////////////////////////////////////////////////////////
+
+  #else
+
+  //////////////////////////////////////////////////////////////////////////
+
+    #include <X11/keysym.h>
+
+void HotkeyWrapper::init()
+{
+  keyToUngrab = grabbedKeys.end();
+
+    #if QT_VERSION < 0x060000
+  Display * displayID = QX11Info::display();
+    #else
+  QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+  Display * displayID                            = x11AppInfo->display();
+    #endif
+
+  // We use RECORD extension instead of XGrabKey. That's because XGrabKey
+  // prevents other clients from getting their input if it's grabbed.
+
+  Display * display = displayID;
+
+  lShiftCode = XKeysymToKeycode( display, XK_Shift_L );
+  rShiftCode = XKeysymToKeycode( display, XK_Shift_R );
+
+  lCtrlCode = XKeysymToKeycode( display, XK_Control_L );
+  rCtrlCode = XKeysymToKeycode( display, XK_Control_R );
+
+  lAltCode = XKeysymToKeycode( display, XK_Alt_L );
+  rAltCode = XKeysymToKeycode( display, XK_Alt_R );
+
+  lMetaCode = XKeysymToKeycode( display, XK_Super_L );
+  rMetaCode = XKeysymToKeycode( display, XK_Super_R );
+
+  cCode = XKeysymToKeycode( display, XK_c );
+  insertCode = XKeysymToKeycode( display, XK_Insert );
+  kpInsertCode = XKeysymToKeycode( display, XK_KP_Insert );
+
+  currentModifiers = 0;
+
+  // This one will be used to read the recorded content
+  dataDisplay = XOpenDisplay( 0 );
+
+  if ( !dataDisplay )
+    throw exInit();
+
+  recordRange = XRecordAllocRange();
+
+  if ( !recordRange ) {
+    XCloseDisplay( dataDisplay );
+    throw exInit();
+  }
+
+  recordRange->device_events.first = KeyPress;
+  recordRange->device_events.last = KeyRelease;
+  recordClientSpec = XRecordAllClients;
+
+  recordContext = XRecordCreateContext( display, 0, &recordClientSpec, 1, &recordRange, 1 );
+
+  if ( !recordContext ) {
+    XFree( recordRange );
+    XCloseDisplay( dataDisplay );
+    throw exInit();
+  }
+
+  // This is required to ensure context was indeed created
+  XSync( display, False );
+
+  connect( this, &HotkeyWrapper::keyRecorded, this, &HotkeyWrapper::checkState, Qt::QueuedConnection );
+
+  start();
+}
+
+void HotkeyWrapper::run() // Runs in a separate thread
+{
+  if ( !XRecordEnableContext( dataDisplay, recordContext, recordEventCallback, (XPointer)this ) )
+    GD_DPRINTF( "Failed to enable record context\n" );
+}
+
+
+void HotkeyWrapper::recordEventCallback( XPointer ptr, XRecordInterceptData * data )
+{
+  ( (HotkeyWrapper *)ptr )->handleRecordEvent( data );
+}
+
+void HotkeyWrapper::handleRecordEvent( XRecordInterceptData * data )
+{
+  if ( data->category == XRecordFromServer ) {
+    xEvent * event = (xEvent *)data->data;
+
+    if ( event->u.u.type == KeyPress ) {
+      KeyCode key = event->u.u.detail;
+
+      if ( key == lShiftCode || key == rShiftCode )
+        currentModifiers |= ShiftMask;
+      else if ( key == lCtrlCode || key == rCtrlCode )
+        currentModifiers |= ControlMask;
+      else if ( key == lAltCode || key == rAltCode )
+        currentModifiers |= Mod1Mask;
+      else if ( key == lMetaCode || key == rMetaCode )
+        currentModifiers |= Mod4Mask;
+      else {
+        // Here we employ a kind of hack translating KP_Insert key
+        // to just Insert. This allows reacting to both Insert keys.
+        if ( key == kpInsertCode )
+          key = insertCode;
+
+        emit keyRecorded( key, currentModifiers );
+      }
+    }
+    else if ( event->u.u.type == KeyRelease ) {
+      KeyCode key = event->u.u.detail;
+
+      if ( key == lShiftCode || key == rShiftCode )
+        currentModifiers &= ~ShiftMask;
+      else if ( key == lCtrlCode || key == rCtrlCode )
+        currentModifiers &= ~ControlMask;
+      else if ( key == lAltCode || key == rAltCode )
+        currentModifiers &= ~Mod1Mask;
+      else if ( key == lMetaCode || key == rMetaCode )
+        currentModifiers &= ~Mod4Mask;
+    }
+  }
+
+  XRecordFreeData( data );
+}
+
+bool HotkeyWrapper::setGlobalKey( QKeySequence const & seq, int handle )
+{
+  Config::HotKey hk( seq );
+  return setGlobalKey( hk.key1, hk.key2, hk.modifiers, handle );
+}
+
+bool HotkeyWrapper::setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier, int handle )
+{
+  if ( !key )
+    return false; // We don't monitor empty combinations
+
+  int vk = nativeKey( key );
+  int vk2 = key2 ? nativeKey( key2 ) : 0;
+
+  quint32 mod = 0;
+  if ( modifier & Qt::ShiftModifier )
+    mod |= ShiftMask;
+  if ( modifier & Qt::ControlModifier )
+    mod |= ControlMask;
+  if ( modifier & Qt::AltModifier )
+    mod |= Mod1Mask;
+  if ( modifier & Qt::MetaModifier )
+    mod |= Mod4Mask;
+
+  hotkeys.append( HotkeyStruct( vk, vk2, mod, handle, 0 ) );
+
+  if ( !isCopyToClipboardKey( vk, mod ) )
+    grabKey( vk, mod ); // Make sure it doesn't get caught by other apps
+
+  return true;
+}
+
+bool HotkeyWrapper::isCopyToClipboardKey( quint32 keyCode, quint32 modifiers ) const
+{
+  return modifiers == ControlMask && ( keyCode == cCode || keyCode == insertCode || keyCode == kpInsertCode );
+}
+
+bool HotkeyWrapper::isKeyGrabbed( quint32 keyCode, quint32 modifiers ) const
+{
+  GrabbedKeys::const_iterator i = grabbedKeys.find( std::make_pair( keyCode, modifiers ) );
+
+  return i != grabbedKeys.end();
+}
+
+namespace {
+
+typedef int ( *X11ErrorHandler )( Display * display, XErrorEvent * event );
+
+class X11GrabUngrabErrorHandler
+{
+public:
+  static bool error;
+
+  static int grab_ungrab_error_handler( Display *, XErrorEvent * event )
+  {
+    qDebug() << "grab_ungrab_error_handler is invoked";
+    switch ( event->error_code ) {
+      case BadAccess:
+      case BadValue:
+      case BadWindow:
+        if ( event->request_code == 33 /* X_GrabKey */ || event->request_code == 34 /* X_UngrabKey */ ) {
+          error = true;
+        }
+    }
+    return 0;
+  }
+
+  X11GrabUngrabErrorHandler()
+  {
+    error = false;
+    previousErrorHandler_ = XSetErrorHandler( grab_ungrab_error_handler );
+  }
+
+  ~X11GrabUngrabErrorHandler()
+  {
+    #if QT_VERSION < 0x060000
+    Display * displayID = QX11Info::display();
+    #else
+    QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+    Display * displayID                            = x11AppInfo->display();
+    #endif
+    XFlush( displayID );
+    (void)XSetErrorHandler( previousErrorHandler_ );
+  }
+
+  bool isError() const
+  {
+    #if QT_VERSION < 0x060000
+    Display * displayID = QX11Info::display();
+    #else
+    QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+    Display * displayID                            = x11AppInfo->display();
+    #endif
+    XFlush( displayID );
+    return error;
+  }
+
+private:
+  X11ErrorHandler previousErrorHandler_;
+};
+
+bool X11GrabUngrabErrorHandler::error = false;
+
+} // anonymous namespace
+
+
+HotkeyWrapper::GrabbedKeys::iterator HotkeyWrapper::grabKey( quint32 keyCode, quint32 modifiers )
+{
+  std::pair< GrabbedKeys::iterator, bool > result = grabbedKeys.insert( std::make_pair( keyCode, modifiers ) );
+
+
+  if ( result.second ) {
+    #if QT_VERSION < 0x060000
+    Display * displayID = QX11Info::display();
+    #else
+    QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+    Display * displayID                            = x11AppInfo->display();
+    #endif
+    X11GrabUngrabErrorHandler errorHandler;
+    XGrabKey( displayID, keyCode, modifiers, DefaultRootWindow( displayID ), True, GrabModeAsync, GrabModeAsync );
+
+    if ( errorHandler.isError() ) {
+      gdWarning( "Possible hotkeys conflict. Check your hotkeys options." );
+      ungrabKey( result.first );
+    }
+  }
+
+  return result.first;
+}
+
+void HotkeyWrapper::ungrabKey( GrabbedKeys::iterator i )
+{
+    #if QT_VERSION < 0x060000
+  Display * displayID = QX11Info::display();
+    #else
+  QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+  Display * displayID                            = x11AppInfo->display();
+    #endif
+  X11GrabUngrabErrorHandler errorHandler;
+  XUngrabKey( displayID, i->first, i->second, XDefaultRootWindow( displayID ) );
+
+  grabbedKeys.erase( i );
+
+  if ( errorHandler.isError() ) {
+    gdWarning( "Cannot ungrab the hotkey" );
+  }
+}
+
+quint32 HotkeyWrapper::nativeKey( int key )
+{
+  QString keySymName;
+
+  switch ( key ) {
+    case Qt::Key_Insert:
+      keySymName = "Insert";
+      break;
+    default:
+      keySymName = QKeySequence( key ).toString();
+      break;
+  }
+    #if QT_VERSION < 0x060000
+  Display * displayID = QX11Info::display();
+    #else
+  QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+  Display * displayID                            = x11AppInfo->display();
+    #endif
+  Display * display = displayID;
+  return XKeysymToKeycode( display, XStringToKeysym( keySymName.toLatin1().data() ) );
+}
+
+void HotkeyWrapper::unregister()
+{
+    #if QT_VERSION < 0x060000
+  Display * displayID = QX11Info::display();
+    #else
+  QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+  Display * displayID                            = x11AppInfo->display();
+    #endif
+  Display * display = displayID;
+
+  XRecordDisableContext( display, recordContext );
+  XSync( display, False );
+
+  wait();
+
+  XRecordFreeContext( display, recordContext );
+  XFree( recordRange );
+  XCloseDisplay( dataDisplay );
+
+  while ( grabbedKeys.size() )
+    ungrabKey( grabbedKeys.begin() );
+
+  ( static_cast< QHotkeyApplication * >( qApp ) )->unregisterWrapper( this );
+}
+
+  #endif
+#endif
diff --git a/src/hotkeywrapper.hh b/src/hotkeywrapper.hh
index 3f543a84..718ef82a 100644
--- a/src/hotkeywrapper.hh
+++ b/src/hotkeywrapper.hh
@@ -1,255 +1,260 @@
-#ifndef HOTKEYWRAPPER_H
-#define HOTKEYWRAPPER_H
-
-#include <QGuiApplication>
-#include <QThread>
-
-#include "config.hh"
-#include "ex.hh"
-#include "qtsingleapplication.h"
-#include "utils.hh"
-
-#ifdef HAVE_X11
-
-  #include <set>
-
-  #include <X11/Xlib.h>
-  #include <X11/extensions/record.h>
-  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-    #include <QX11Info>
-  #endif
-  #include <X11/Xlibint.h>
-
-  #undef Bool
-  #undef min
-  #undef max
-
-#endif
-
-#ifdef Q_OS_WIN
-  #include <QAbstractNativeEventFilter>
-#endif
-
-#ifdef Q_OS_MAC
-#define __SECURITYHI__
-#include <Carbon/Carbon.h>
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-
-struct HotkeyStruct
-{
-  HotkeyStruct() {}
-  HotkeyStruct( quint32 key, quint32 key2, quint32 modifier, int handle, int id );
-
-  quint32 key, key2;
-  quint32 modifier;
-  int handle;
-  int id;
-#ifdef Q_OS_MAC
-  EventHotKeyRef hkRef, hkRef2;
-#endif
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-#if !defined(Q_WS_QWS)
-class HotkeyWrapper : public QThread // Thread is actually only used on X11
-{
-  Q_OBJECT
-
-  friend class QHotkeyApplication;
-
-public:
-
-  DEF_EX( exInit, "Hotkey wrapper failed to init", std::exception )
-
-  HotkeyWrapper(QObject *parent);
-  virtual ~HotkeyWrapper();
-
-  /// The handle is passed back in hotkeyActivated() to inform which hotkey
-  /// was activated.
-  bool setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier,
-                     int handle );
-
-  bool setGlobalKey( QKeySequence const  & , int );
-
-  /// Unregisters everything
-  void unregister();
-
-signals:
-
-  void hotkeyActivated( int );
-
-protected slots:
-
-  void waitKey2();
-
-#ifndef Q_OS_MAC
-private slots:
-
-  bool checkState( quint32 vk, quint32 mod );
-#endif
-
-private:
-
-  void init();
-  quint32 nativeKey(int key);
-
-  QList<HotkeyStruct> hotkeys;
-
-  bool state2;
-  HotkeyStruct state2waiter;
-
-#ifdef Q_OS_WIN32
-
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-  virtual bool winEvent ( MSG * message, long * result );
-#else
-  virtual bool winEvent ( MSG * message, qintptr * result );
-#endif
-  HWND hwnd;
-
-#elif defined(Q_OS_MAC)
-
-public:
-  void activated( int hkId );
-private:
-  void sendCmdC();
-
-  static EventHandlerUPP hotKeyFunction;
-  quint32 keyC;
-  EventHandlerRef handlerRef;
-
-#else
-
-  static void recordEventCallback( XPointer, XRecordInterceptData * );
-
-  /// Called by recordEventCallback()
-  void handleRecordEvent( XRecordInterceptData * );
-
-  void run(); // QThread
-
-  // We do one-time init of those, translating keysyms to keycodes
-  KeyCode lShiftCode, rShiftCode, lCtrlCode, rCtrlCode, lAltCode, rAltCode,
-          cCode, insertCode, kpInsertCode, lMetaCode, rMetaCode;
-
-  quint32 currentModifiers;
-
-  Display * dataDisplay;
-  XRecordRange * recordRange;
-  XRecordContext recordContext;
-  XRecordClientSpec recordClientSpec;
-
-  /// Holds all the keys currently grabbed.
-  /// The first value is keycode, the second is modifiers
-  typedef std::set< std::pair< quint32, quint32 > > GrabbedKeys;
-  GrabbedKeys grabbedKeys;
-
-  GrabbedKeys::iterator keyToUngrab; // Used for second stage grabs
-
-  /// Returns true if the given key is usually used to copy from clipboard,
-  /// false otherwise.
-  bool isCopyToClipboardKey( quint32 keyCode, quint32 modifiers ) const;
-  /// Returns true if the given key is grabbed, false otherwise
-  bool isKeyGrabbed( quint32 keyCode, quint32 modifiers ) const;
-  /// Grabs the given key, recording the fact in grabbedKeys. If the key's
-  /// already grabbed, does nothing.
-  /// Returns the key's iterator in grabbedKeys.
-  GrabbedKeys::iterator grabKey( quint32 keyCode, quint32 modifiers );
-  /// Ungrabs the given key. erasing it from grabbedKeys. The key's provided
-  /// as an interator inside the grabbedKeys set.
-  void ungrabKey( GrabbedKeys::iterator );
-
-signals:
-
-  /// Emitted from the thread
-  void keyRecorded( quint32 vk, quint32 mod );
-
-#endif
-};
-#else
-
-class HotkeyWrapper : public QObject
-{
-  Q_OBJECT
-
-  friend class QHotkeyApplication;
-
-public:
-
-  DEF_EX( exInit, "Hotkey wrapper failed to init", std::exception )
-
-  HotkeyWrapper(QObject *parent): QObject( parent )
-  {}
-
-  bool setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier,
-                     int handle )
-  { return true; }
-
-  bool setGlobalKey( QKeySequence const &, int ) { return true; }
-
-  void unregister()
-  {}
-
-signals:
-
-  void hotkeyActivated( int );
-};
-#endif
-
-//////////////////////////////////////////////////////////////////////////
-
-class DataCommitter
-{
-public:
-
-  virtual void commitData( QSessionManager & )=0;
-  virtual ~DataCommitter()
-  {}
-};
-
+#ifndef HOTKEYWRAPPER_H
+#define HOTKEYWRAPPER_H
+
+#include <QGuiApplication>
+#include <QThread>
+
+#include "config.hh"
+#include "ex.hh"
+#include "qtsingleapplication.h"
+#include "utils.hh"
+
+#ifdef HAVE_X11
+
+  #include <set>
+
+  #include <X11/Xlib.h>
+  #include <X11/extensions/record.h>
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QX11Info>
+  #endif
+  #include <X11/Xlibint.h>
+
+  #undef Bool
+  #undef min
+  #undef max
+
+#endif
+
+#ifdef Q_OS_WIN
+  #include <QAbstractNativeEventFilter>
+#endif
+
+#ifdef Q_OS_MAC
+  #define __SECURITYHI__
+  #include <Carbon/Carbon.h>
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+
+struct HotkeyStruct
+{
+  HotkeyStruct() {}
+  HotkeyStruct( quint32 key, quint32 key2, quint32 modifier, int handle, int id );
+
+  quint32 key, key2;
+  quint32 modifier;
+  int handle;
+  int id;
+#ifdef Q_OS_MAC
+  EventHotKeyRef hkRef, hkRef2;
+#endif
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+#if !defined( Q_WS_QWS )
+class HotkeyWrapper: public QThread // Thread is actually only used on X11
+{
+  Q_OBJECT
+
+  friend class QHotkeyApplication;
+
+public:
+
+  DEF_EX( exInit, "Hotkey wrapper failed to init", std::exception )
+
+  HotkeyWrapper( QObject * parent );
+  virtual ~HotkeyWrapper();
+
+  /// The handle is passed back in hotkeyActivated() to inform which hotkey
+  /// was activated.
+  bool setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier, int handle );
+
+  bool setGlobalKey( QKeySequence const &, int );
+
+  /// Unregisters everything
+  void unregister();
+
+signals:
+
+  void hotkeyActivated( int );
+
+protected slots:
+
+  void waitKey2();
+
+  #ifndef Q_OS_MAC
+private slots:
+
+  bool checkState( quint32 vk, quint32 mod );
+  #endif
+
+private:
+
+  void init();
+  quint32 nativeKey( int key );
+
+  QList< HotkeyStruct > hotkeys;
+
+  bool state2;
+  HotkeyStruct state2waiter;
+
+  #ifdef Q_OS_WIN32
+
+    #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  virtual bool winEvent( MSG * message, long * result );
+    #else
+  virtual bool winEvent( MSG * message, qintptr * result );
+    #endif
+  HWND hwnd;
+
+  #elif defined( Q_OS_MAC )
+
+public:
+  void activated( int hkId );
+
+private:
+  void sendCmdC();
+
+  static EventHandlerUPP hotKeyFunction;
+  quint32 keyC;
+  EventHandlerRef handlerRef;
+
+  #else
+
+  static void recordEventCallback( XPointer, XRecordInterceptData * );
+
+  /// Called by recordEventCallback()
+  void handleRecordEvent( XRecordInterceptData * );
+
+  void run(); // QThread
+
+  // We do one-time init of those, translating keysyms to keycodes
+  KeyCode lShiftCode, rShiftCode, lCtrlCode, rCtrlCode, lAltCode, rAltCode, cCode, insertCode, kpInsertCode, lMetaCode,
+    rMetaCode;
+
+  quint32 currentModifiers;
+
+  Display * dataDisplay;
+  XRecordRange * recordRange;
+  XRecordContext recordContext;
+  XRecordClientSpec recordClientSpec;
+
+  /// Holds all the keys currently grabbed.
+  /// The first value is keycode, the second is modifiers
+  typedef std::set< std::pair< quint32, quint32 > > GrabbedKeys;
+  GrabbedKeys grabbedKeys;
+
+  GrabbedKeys::iterator keyToUngrab; // Used for second stage grabs
+
+  /// Returns true if the given key is usually used to copy from clipboard,
+  /// false otherwise.
+  bool isCopyToClipboardKey( quint32 keyCode, quint32 modifiers ) const;
+  /// Returns true if the given key is grabbed, false otherwise
+  bool isKeyGrabbed( quint32 keyCode, quint32 modifiers ) const;
+  /// Grabs the given key, recording the fact in grabbedKeys. If the key's
+  /// already grabbed, does nothing.
+  /// Returns the key's iterator in grabbedKeys.
+  GrabbedKeys::iterator grabKey( quint32 keyCode, quint32 modifiers );
+  /// Ungrabs the given key. erasing it from grabbedKeys. The key's provided
+  /// as an interator inside the grabbedKeys set.
+  void ungrabKey( GrabbedKeys::iterator );
+
+signals:
+
+  /// Emitted from the thread
+  void keyRecorded( quint32 vk, quint32 mod );
+
+  #endif
+};
+#else
+
+class HotkeyWrapper: public QObject
+{
+  Q_OBJECT
+
+  friend class QHotkeyApplication;
+
+public:
+
+  DEF_EX( exInit, "Hotkey wrapper failed to init", std::exception )
+
+  HotkeyWrapper( QObject * parent ):
+    QObject( parent )
+  {
+  }
+
+  bool setGlobalKey( int key, int key2, Qt::KeyboardModifiers modifier, int handle )
+  {
+    return true;
+  }
+
+  bool setGlobalKey( QKeySequence const &, int )
+  {
+    return true;
+  }
+
+  void unregister() {}
+
+signals:
+
+  void hotkeyActivated( int );
+};
+#endif
+
+//////////////////////////////////////////////////////////////////////////
+
+class DataCommitter
+{
+public:
+
+  virtual void commitData( QSessionManager & ) = 0;
+  virtual ~DataCommitter() {}
+};
+
 class QHotkeyApplication: public QtSingleApplication
 #if defined( Q_OS_WIN )
-  ,public QAbstractNativeEventFilter
+  ,
+                          public QAbstractNativeEventFilter
 #endif
-{
-  Q_OBJECT
-
-  friend class HotkeyWrapper;
-
-  QList< DataCommitter * > dataCommitters;
-
-public:
-  QHotkeyApplication( int & argc, char ** argv );
-  QHotkeyApplication( QString const & id, int & argc, char ** argv );
-
-  void addDataCommiter( DataCommitter & );
-  void removeDataCommiter( DataCommitter & );
-
-private slots:
-  /// This calls all data committers.
-  void hotkeyAppCommitData( QSessionManager & );
-
-  void hotkeyAppSaveState( QSessionManager & );
-
-protected:
-  void registerWrapper(HotkeyWrapper *wrapper);
-  void unregisterWrapper(HotkeyWrapper *wrapper);
-
-#ifdef Q_OS_WIN32
-
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-  virtual bool nativeEventFilter( const QByteArray & eventType, void * message, long * result );
-#else
-  virtual bool nativeEventFilter( const QByteArray & eventType, void * message, qintptr * result );
-#endif
-
-protected:
-#endif // Q_OS_WIN32
-  QList<HotkeyWrapper*> hotkeyWrappers;
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-#endif // HOTKEYWRAPPER_H
+{
+  Q_OBJECT
+
+  friend class HotkeyWrapper;
+
+  QList< DataCommitter * > dataCommitters;
+
+public:
+  QHotkeyApplication( int & argc, char ** argv );
+  QHotkeyApplication( QString const & id, int & argc, char ** argv );
+
+  void addDataCommiter( DataCommitter & );
+  void removeDataCommiter( DataCommitter & );
+
+private slots:
+  /// This calls all data committers.
+  void hotkeyAppCommitData( QSessionManager & );
+
+  void hotkeyAppSaveState( QSessionManager & );
+
+protected:
+  void registerWrapper( HotkeyWrapper * wrapper );
+  void unregisterWrapper( HotkeyWrapper * wrapper );
+
+#ifdef Q_OS_WIN32
+
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  virtual bool nativeEventFilter( const QByteArray & eventType, void * message, long * result );
+  #else
+  virtual bool nativeEventFilter( const QByteArray & eventType, void * message, qintptr * result );
+  #endif
+
+protected:
+#endif // Q_OS_WIN32
+  QList< HotkeyWrapper * > hotkeyWrappers;
+};
+
+//////////////////////////////////////////////////////////////////////////
+
+#endif // HOTKEYWRAPPER_H
diff --git a/src/iframeschemehandler.cc b/src/iframeschemehandler.cc
index ed11fe50..73b69f9e 100644
--- a/src/iframeschemehandler.cc
+++ b/src/iframeschemehandler.cc
@@ -2,10 +2,11 @@
 
 #include <QTextCodec>
 
-IframeSchemeHandler::IframeSchemeHandler(QObject * parent):QWebEngineUrlSchemeHandler(parent){
-
+IframeSchemeHandler::IframeSchemeHandler( QObject * parent ):
+  QWebEngineUrlSchemeHandler( parent )
+{
 }
-void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
+void IframeSchemeHandler::requestStarted( QWebEngineUrlRequestJob * requestJob )
 {
   QUrl url = requestJob->requestUrl();
 
@@ -13,41 +14,40 @@ void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
   url = QUrl( Utils::Url::queryItemValue( url, "url" ) );
   QNetworkRequest request;
   request.setUrl( url );
-  request.setAttribute(QNetworkRequest::RedirectPolicyAttribute,QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy);
+  request.setAttribute( QNetworkRequest::RedirectPolicyAttribute,
+                        QNetworkRequest::RedirectPolicy::NoLessSafeRedirectPolicy );
 
   QNetworkReply * reply = mgr.get( request );
 
   auto finishAction = [ = ]() {
-
     QByteArray contentType = "text/html";
     QString codecName;
     const auto ctHeader = reply->header( QNetworkRequest::ContentTypeHeader );
-    if (  ctHeader.isValid() ) {
-      contentType = ctHeader.toByteArray();
-      const auto ct     = ctHeader.toString();
-      const auto index  = ct.indexOf( "charset=" );
+    if ( ctHeader.isValid() ) {
+      contentType      = ctHeader.toByteArray();
+      const auto ct    = ctHeader.toString();
+      const auto index = ct.indexOf( "charset=" );
       if ( index > -1 ) {
         codecName = ct.mid( index + 8 );
       }
     }
-    QBuffer * buffer = new QBuffer( requestJob );
+    auto buffer = new QBuffer( requestJob );
 
     QByteArray replyData = reply->readAll();
     QString articleString;
 
     QTextCodec * codec = QTextCodec::codecForUtfText( replyData, QTextCodec::codecForName( codecName.toUtf8() ) );
-    if(codec)
-      articleString      = codec->toUnicode( replyData );
+    if ( codec )
+      articleString = codec->toUnicode( replyData );
     else
-      articleString = QString::fromUtf8(replyData);
+      articleString = QString::fromUtf8( replyData );
     // Handle reply data
     // 404 response may have response body.
-    if( reply->error() != QNetworkReply::NoError && articleString.isEmpty())
-    {
-      if(reply->error()==QNetworkReply::ContentNotFoundError){
+    if ( reply->error() != QNetworkReply::NoError && articleString.isEmpty() ) {
+      if ( reply->error() == QNetworkReply::ContentNotFoundError ) {
         buffer->deleteLater();
         //work around to fix QTBUG-106573
-        requestJob->redirect(url);
+        requestJob->redirect( url );
         return;
       }
       QString emptyHtml = QString( "<html><body>%1</body></html>" ).arg( reply->errorString() );
@@ -61,42 +61,46 @@ void IframeSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
     QString root = reply->url().scheme() + "://" + reply->url().host();
     QString base = root + reply->url().path();
 
-    QRegularExpression baseTag( "<base\\s+.*?>",
-                             QRegularExpression::CaseInsensitiveOption | QRegularExpression::DotMatchesEverythingOption );
-    
-    QString baseTagHtml = "<base href=\"" + base + "\">";
+    QRegularExpression baseTag( R"(<base\s+.*?>)",
+                                QRegularExpression::CaseInsensitiveOption
+                                  | QRegularExpression::DotMatchesEverythingOption );
+
+    QString baseTagHtml = QString( R"(<base href="%1">)" ).arg( base );
+
+    QString depressionFocus =
+      R"(<script type="application/javascript"> HTMLElement.prototype.focus=function(){console.log("focus() has been disabled.");}</script>
+<script type="text/javascript" src="qrc:///scripts/iframeResizer.contentWindow.min.js">
+</script><script type="text/javascript" src="qrc:///scripts/iframe-defer.js"></script>)";
 
-    QString depressionFocus ="<script type=\"application/javascript\"> HTMLElement.prototype.focus=function(){console.log(\"focus() has been disabled.\");}</script>"
-                      "<script type=\"text/javascript\" src=\"qrc:///scripts/iframeResizer.contentWindow.min.js\"></script>"
-                      "<script type=\"text/javascript\" src=\"qrc:///scripts/iframe-defer.js\"></script>";
-    
     // remove existed base tag
-    articleString.remove( baseTag ) ;
+    articleString.remove( baseTag );
+    articleString.replace( "window.location", "window.location;_window_location" );
 
-    QRegularExpression headTag( "<head\\b.*?>",
+    QRegularExpression headTag( R"(<head\b.*?>)",
                                 QRegularExpression::CaseInsensitiveOption
                                   | QRegularExpression::DotMatchesEverythingOption );
     auto match = headTag.match( articleString, 0 );
-    if( match.hasMatch() )
-    {
+    if ( match.hasMatch() ) {
       articleString.insert( match.capturedEnd(), baseTagHtml );
       articleString.insert( match.capturedEnd(), depressionFocus );
     }
-    else
-    {
+    else {
       // the html contain no head element
       // just insert at the beginning of the html ,and leave it at the mercy of browser(chrome webengine)
       articleString.insert( 0, baseTagHtml );
       articleString.insert( 0, depressionFocus );
     }
 
-    buffer->setData(articleString.toUtf8());
+    buffer->setData( articleString.toUtf8() );
 
-    //"text/html;charset=utf-8" will be treated as text/plain in Linux .
-#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
-    requestJob->reply( contentType, buffer );
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
+    requestJob->reply( "text/html; charset=utf-8", buffer );
 #else
+  #if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
+    requestJob->reply( contentType, buffer );
+  #else
     requestJob->reply( "text/html", buffer );
+  #endif
 #endif
   };
   connect( reply, &QNetworkReply::finished, requestJob, finishAction );
diff --git a/src/iframeschemehandler.hh b/src/iframeschemehandler.hh
index 2b8005a8..700de6ae 100644
--- a/src/iframeschemehandler.hh
+++ b/src/iframeschemehandler.hh
@@ -1,19 +1,20 @@
 #ifndef IFRAMESCHEMEHANDLER_H
 #define IFRAMESCHEMEHANDLER_H
 
-#include"article_netmgr.hh"
+#include "article_netmgr.hh"
 
-class IframeSchemeHandler : public QWebEngineUrlSchemeHandler
+class IframeSchemeHandler: public QWebEngineUrlSchemeHandler
 {
-    Q_OBJECT
+  Q_OBJECT
+
 public:
-    IframeSchemeHandler(QObject * parent=nullptr);
-    void requestStarted(QWebEngineUrlRequestJob *requestJob);
+  IframeSchemeHandler( QObject * parent = nullptr );
+  void requestStarted( QWebEngineUrlRequestJob * requestJob );
 
 protected:
 
 private:
-      QNetworkAccessManager mgr;
+  QNetworkAccessManager mgr;
 };
 
 #endif // IFRAMESCHEMEHANDLER_H
diff --git a/src/indexedzip.cc b/src/indexedzip.cc
index 18b99a35..67e26c4d 100644
--- a/src/indexedzip.cc
+++ b/src/indexedzip.cc
@@ -8,10 +8,10 @@
 #include "utf8.hh"
 #include "iconv.hh"
 #include "wstring_qt.hh"
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QTextCodec>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QTextCodec>
 #else
-#include <QTextCodec>
+  #include <QTextCodec>
 #endif
 
 using namespace BtreeIndexing;
@@ -61,23 +61,20 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
 
   ZipFile::LocalFileHeader header;
 
-  if ( !ZipFile::readLocalHeader( zip, header ) )
-  {
+  if ( !ZipFile::readLocalHeader( zip, header ) ) {
     GD_DPRINTF( "Failed to load header" );
     return false;
   }
 
   // Which algorithm was used?
 
-  switch( header.compressionMethod )
-  {
+  switch ( header.compressionMethod ) {
     case ZipFile::Uncompressed:
       GD_DPRINTF( "Uncompressed" );
       data.resize( header.uncompressedSize );
-      return (size_t) zip.read( &data.front(), data.size() ) == data.size();
+      return (size_t)zip.read( &data.front(), data.size() ) == data.size();
 
-    case ZipFile::Deflated:
-    {
+    case ZipFile::Deflated: {
       // Now do the deflation
 
       QByteArray compressedData = zip.read( header.compressedSize );
@@ -91,19 +88,17 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
 
       memset( &stream, 0, sizeof( stream ) );
 
-      stream.next_in = ( Bytef * ) compressedData.data();
-      stream.avail_in = compressedData.size();
-      stream.next_out = ( Bytef * ) &data.front();
+      stream.next_in   = (Bytef *)compressedData.data();
+      stream.avail_in  = compressedData.size();
+      stream.next_out  = (Bytef *)&data.front();
       stream.avail_out = data.size();
 
-      if ( inflateInit2( &stream, -MAX_WBITS ) != Z_OK )
-      {
-        data.clear();        
+      if ( inflateInit2( &stream, -MAX_WBITS ) != Z_OK ) {
+        data.clear();
         return false;
       }
 
-      if ( inflate( &stream, Z_FINISH ) != Z_STREAM_END )
-      {
+      if ( inflate( &stream, Z_FINISH ) != Z_STREAM_END ) {
         GD_DPRINTF( "Not zstream end!" );
 
         data.clear();
@@ -124,158 +119,126 @@ bool IndexedZip::loadFile( uint32_t offset, vector< char > & data )
   }
 }
 
-bool IndexedZip::indexFile( BtreeIndexing::IndexedWords &zipFileNames, quint32 * filesCount )
+bool IndexedZip::indexFile( BtreeIndexing::IndexedWords & zipFileNames, quint32 * filesCount )
 {
-    if ( !zipIsOpen )
-        return false;
-    if ( !ZipFile::positionAtCentralDir( zip ) )
-        return false;
+  if ( !zipIsOpen )
+    return false;
+  if ( !ZipFile::positionAtCentralDir( zip ) )
+    return false;
 
-    // File seems to be a valid zip file
+  // File seems to be a valid zip file
 
 
-    QTextCodec * localeCodec = QTextCodec::codecForLocale();
+  QTextCodec * localeCodec = QTextCodec::codecForLocale();
 
-    ZipFile::CentralDirEntry entry;
+  ZipFile::CentralDirEntry entry;
 
-    bool alreadyCounted;
-    if( filesCount )
-      *filesCount = 0;
+  bool alreadyCounted;
+  if ( filesCount )
+    *filesCount = 0;
 
-    while( ZipFile::readNextEntry( zip, entry ) )
-    {
-      if ( entry.compressionMethod == ZipFile::Unsupported )
-      {
-        qWarning( "Zip warning: compression method unsupported -- skipping file \"%s\"\n",
-                  entry.fileName.data() );
-        continue;
+  while ( ZipFile::readNextEntry( zip, entry ) ) {
+    if ( entry.compressionMethod == ZipFile::Unsupported ) {
+      qWarning( "Zip warning: compression method unsupported -- skipping file \"%s\"\n", entry.fileName.data() );
+      continue;
+    }
+
+    // Check if the file name has some non-ascii letters.
+
+    unsigned char const * ptr = (unsigned char const *)entry.fileName.constData();
+
+    bool hasNonAscii = false;
+
+    for ( ;; ) {
+      if ( *ptr & 0x80 ) {
+        hasNonAscii = true;
+        break;
       }
+      else if ( !*ptr++ )
+        break;
+    }
 
-      // Check if the file name has some non-ascii letters.
+    alreadyCounted = false;
 
-      unsigned char const * ptr = ( unsigned char const * )
-                                    entry.fileName.constData();
+    if ( !hasNonAscii ) {
+      // Add entry as is
 
-      bool hasNonAscii = false;
+      zipFileNames.addSingleWord( Utf8::decode( entry.fileName.data() ), entry.localHeaderOffset );
+      if ( filesCount )
+        *filesCount += 1;
+    }
+    else {
+      // 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.
 
-      for( ; ; )
-      {
-        if ( *ptr & 0x80 )
-        {
-          hasNonAscii = true;
-          break;
-        }
-        else
-        if ( !*ptr++ )
-          break;
-      }
+      // Utf8
+      try {
+        wstring decoded = Utf8::decode( entry.fileName.constData() );
 
-      alreadyCounted = false;
-
-      if ( !hasNonAscii )
-      {
-        // Add entry as is
-
-        zipFileNames.addSingleWord( Utf8::decode( entry.fileName.data() ),
-                                    entry.localHeaderOffset );
-        if( filesCount )
+        zipFileNames.addSingleWord( decoded, entry.localHeaderOffset );
+        if ( filesCount != 0 && !alreadyCounted ) {
           *filesCount += 1;
+          alreadyCounted = true;
+        }
+      }
+      catch ( Utf8::exCantDecode & ) {
+        // Failed to decode
       }
-      else
-      {
-        // 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.
 
-        // Utf8
-        try
-        {
-          wstring decoded = Utf8::decode( entry.fileName.constData() );
+      if ( !entry.fileNameInUTF8 ) {
+        wstring nameInSystemLocale;
 
-          zipFileNames.addSingleWord( decoded,
-                                      entry.localHeaderOffset );
-          if( filesCount != 0 && !alreadyCounted )
-          {
-            *filesCount += 1;
-            alreadyCounted = true;
+        // 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;
+            }
           }
         }
-        catch( Utf8::exCantDecode & )
-        {
+
+
+        // CP866
+        try {
+          wstring decoded = Iconv::toWstring( "CP866", entry.fileName.constData(), entry.fileName.size() );
+
+          if ( nameInSystemLocale != decoded ) {
+            zipFileNames.addSingleWord( decoded, entry.localHeaderOffset );
+
+            if ( filesCount != 0 && !alreadyCounted ) {
+              *filesCount += 1;
+              alreadyCounted = true;
+            }
+          }
+        }
+        catch ( Iconv::Ex & ) {
           // Failed to decode
         }
 
-        if( !entry.fileNameInUTF8 )
-        {
-          wstring nameInSystemLocale;
+        // CP1251
+        try {
+          wstring decoded = Iconv::toWstring( "CP1251", entry.fileName.constData(), entry.fileName.size() );
 
-          // 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 ( nameInSystemLocale != decoded ) {
+            zipFileNames.addSingleWord( decoded, entry.localHeaderOffset );
 
-              if( filesCount != 0 && !alreadyCounted )
-              {
-                *filesCount += 1;
-                alreadyCounted = true;
-              }
+            if ( filesCount != 0 && !alreadyCounted ) {
+              *filesCount += 1;
+              alreadyCounted = true;
             }
           }
-
-
-          // CP866
-          try
-          {
-            wstring decoded = Iconv::toWstring( "CP866", entry.fileName.constData(),
-                                                entry.fileName.size() );
-
-            if( nameInSystemLocale != decoded )
-            {
-              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 != decoded )
-            {
-              zipFileNames.addSingleWord( decoded,
-                                          entry.localHeaderOffset );
-
-              if( filesCount != 0 && !alreadyCounted )
-              {
-                *filesCount += 1;
-                alreadyCounted = true;
-              }
-            }
-          }
-          catch( Iconv::Ex & )
-          {
-            // Failed to decode
-          }
+        }
+        catch ( Iconv::Ex & ) {
+          // Failed to decode
         }
       }
     }
-    return true;
+  }
+  return true;
 }
diff --git a/src/indexedzip.hh b/src/indexedzip.hh
index 30448d54..d904a170 100644
--- a/src/indexedzip.hh
+++ b/src/indexedzip.hh
@@ -17,8 +17,10 @@ class IndexedZip: public BtreeIndexing::BtreeIndex
 
 public:
 
-  IndexedZip(): zipIsOpen( false )
-  {}
+  IndexedZip():
+    zipIsOpen( false )
+  {
+  }
 
   /// Opens the index. The values are those previously returned by buildIndex().
   using BtreeIndexing::BtreeIndex::openIndex;
@@ -28,7 +30,9 @@ public:
 
   /// Returns true if the zip is open, false otherwise.
   bool isOpen() const
-  { return zipIsOpen; }
+  {
+    return zipIsOpen;
+  }
 
   /// Checks whether the given file exists in the zip file or not.
   /// Note that this function is thread-safe, since it does not access zip file.
@@ -40,7 +44,7 @@ public:
   bool loadFile( uint32_t offset, std::vector< char > & );
 
   /// Index compressed files in zip file
-  bool indexFile( BtreeIndexing::IndexedWords &zipFileNames, quint32 * filesCount = 0 );
+  bool indexFile( BtreeIndexing::IndexedWords & zipFileNames, quint32 * filesCount = 0 );
 };
 
 #endif
diff --git a/src/initializing.cc b/src/initializing.cc
index 1489d902..92ae5b68 100644
--- a/src/initializing.cc
+++ b/src/initializing.cc
@@ -5,20 +5,16 @@
 #include "initializing.hh"
 #include <QCloseEvent>
 
-Initializing::Initializing( QWidget * parent, bool showOnStartup ): QDialog( parent )
+Initializing::Initializing( QWidget * parent, bool showOnStartup ):
+  QDialog( parent )
 {
   ui.setupUi( this );
-  setWindowFlags( Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
-                  Qt::WindowMinimizeButtonHint );
 
-  #ifndef Q_OS_MAC
-    setWindowIcon( QIcon( ":/icons/programicon.png" ) );
-  #else
-    setWindowIcon( QIcon( ":/icons/macicon.png" ) );
-  #endif
+  setWindowFlags( Qt::Dialog | Qt::FramelessWindowHint );
 
-  if ( showOnStartup )
-  {
+  setWindowIcon( QIcon( ":/icons/programicon.png" ) );
+
+  if ( showOnStartup ) {
     ui.operation->setText( tr( "Please wait..." ) );
     ui.dictionary->hide();
     ui.progressBar->hide();
@@ -28,7 +24,7 @@ Initializing::Initializing( QWidget * parent, bool showOnStartup ): QDialog( par
 
 void Initializing::indexing( QString const & dictionaryName )
 {
-  ui.operation->setText( tr( "Please wait while indexing dictionary" ) );
+  ui.operation->setText( tr( "Indexing..." ) );
   ui.dictionary->setText( dictionaryName );
   ui.dictionary->show();
   ui.progressBar->show();
@@ -41,7 +37,4 @@ void Initializing::closeEvent( QCloseEvent * ev )
   ev->ignore();
 }
 
-void Initializing::reject()
-{
-}
-
+void Initializing::reject() {}
diff --git a/src/initializing.hh b/src/initializing.hh
index 0f7f1713..c6cbe592 100644
--- a/src/initializing.hh
+++ b/src/initializing.hh
@@ -27,4 +27,3 @@ private:
 };
 
 #endif
-
diff --git a/src/instances.cc b/src/instances.cc
index e3843ead..2e8be0de 100644
--- a/src/instances.cc
+++ b/src/instances.cc
@@ -22,39 +22,36 @@ Group::Group( Config::Group const & cfgGroup,
   if ( !cfgGroup.iconData.isEmpty() )
     iconData = iconFromData( cfgGroup.iconData );
 
-  QMap<string, sptr< Dictionary::Class > > groupDicts;
-  QVector<string> dictOrderList;
+  QMap< string, sptr< Dictionary::Class > > groupDicts;
+  QVector< string > dictOrderList;
   auto dictMap = Dictionary::dictToMap( allDictionaries );
 
-  for( auto const & dict: cfgGroup.dictionaries )
-  {
+  for ( auto const & dict : cfgGroup.dictionaries ) {
     std::string dictId = dict.id.toStdString();
 
-    if( dictMap.contains( dictId ) )
-    {
+    if ( dictMap.contains( dictId ) ) {
       groupDicts.insert( dictId, dictMap[ dictId ] );
-      dictOrderList.push_back(dictId);
+      dictOrderList.push_back( dictId );
     }
   }
 
   // Remove inactive dictionaries
-  if( !inactiveGroup.dictionaries.isEmpty() )
-  {
+  if ( !inactiveGroup.dictionaries.isEmpty() ) {
     set< string, std::less<> > inactiveSet;
-    for(auto const & dict: inactiveGroup.dictionaries)
-    {
+    for ( auto const & dict : inactiveGroup.dictionaries ) {
       string dictId = dict.id.toStdString();
-      groupDicts.remove(dictId);
-      dictOrderList.removeOne(dictId);
+      groupDicts.remove( dictId );
+      dictOrderList.removeOne( dictId );
     }
   }
-  for(const auto & dictId : dictOrderList)
-  {
-    dictionaries.push_back(groupDicts[dictId]);
+  for ( const auto & dictId : dictOrderList ) {
+    dictionaries.push_back( groupDicts[ dictId ] );
   }
 }
 
-Group::Group( QString const & name_ ): id( 0 ), name( name_ )
+Group::Group( QString const & name_ ):
+  id( 0 ),
+  name( name_ )
 {
 }
 
@@ -68,14 +65,13 @@ Config::Group Group::makeConfigGroup()
 {
   Config::Group result;
 
-  result.id = id;
-  result.name = name;
-  result.icon = icon;
-  result.shortcut = shortcut;
+  result.id              = id;
+  result.name            = name;
+  result.icon            = icon;
+  result.shortcut        = shortcut;
   result.favoritesFolder = favoritesFolder;
 
-  if ( !iconData.isNull() )
-  {
+  if ( !iconData.isNull() ) {
     QDataStream stream( &result.iconData, QIODevice::WriteOnly );
 
     stream << iconData;
@@ -94,8 +90,7 @@ QIcon Group::makeIcon() const
   if ( !iconData.isNull() )
     return iconData;
 
-  QIcon i = icon.size() ?
-                 QIcon( ":/flags/" + icon ) : QIcon();
+  QIcon i = icon.size() ? QIcon( ":/flags/" + icon ) : QIcon();
 
   return i;
 }
@@ -104,29 +99,28 @@ void Group::checkMutedDictionaries( Config::MutedDictionaries * mutedDictionarie
 {
   Config::MutedDictionaries temp;
 
-  for ( auto const & dict : dictionaries )
-  {
+  for ( auto const & dict : dictionaries ) {
     QString id = QString::fromStdString( dict->getId() );
-    if( mutedDictionaries->contains( id ) )
+    if ( mutedDictionaries->contains( id ) )
       temp.insert( id );
   }
-  * mutedDictionaries = temp;
+  *mutedDictionaries = temp;
 }
 
 Group * Groups::findGroup( unsigned id )
 {
-  for( unsigned x = 0; x < size(); ++x )
-    if ( operator [] ( x ).id == id )
-      return &( operator [] ( x ) );
+  for ( unsigned x = 0; x < size(); ++x )
+    if ( operator[]( x ).id == id )
+      return &( operator[]( x ) );
 
   return nullptr;
 }
 
 Group const * Groups::findGroup( unsigned id ) const
 {
-  for( unsigned x = 0; x < size(); ++x )
-    if ( operator [] ( x ).id == id )
-      return &( operator [] ( x ) );
+  for ( unsigned x = 0; x < size(); ++x )
+    if ( operator[]( x ).id == id )
+      return &( operator[]( x ) );
 
   return nullptr;
 }
@@ -137,45 +131,39 @@ void complementDictionaryOrder( Group & group,
 {
   set< string, std::less<> > presentIds;
 
-  for( unsigned x = group.dictionaries.size(); x--; )
-    presentIds.insert( group.dictionaries[ x ]->getId());
+  for ( unsigned x = group.dictionaries.size(); x--; )
+    presentIds.insert( group.dictionaries[ x ]->getId() );
 
-  for( unsigned x = inactiveDictionaries.dictionaries.size(); x--; )
+  for ( unsigned x = inactiveDictionaries.dictionaries.size(); x--; )
     presentIds.insert( inactiveDictionaries.dictionaries[ x ]->getId() );
 
-  for( unsigned x = 0; x < dicts.size(); ++x )
-  {
+  for ( unsigned x = 0; x < dicts.size(); ++x ) {
     if ( presentIds.find( dicts[ x ]->getId() ) == presentIds.end() )
       group.dictionaries.push_back( dicts[ x ] );
   }
 }
 
-void updateNames( Config::Group & group,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries )
+void updateNames( Config::Group & group, vector< sptr< Dictionary::Class > > const & allDictionaries )
 {
 
-  for( unsigned x = group.dictionaries.size(); x--; )
-  {
+  for ( unsigned x = group.dictionaries.size(); x--; ) {
     std::string id = group.dictionaries[ x ].id.toStdString();
 
-    for( unsigned y = allDictionaries.size(); y--; )
-      if ( allDictionaries[ y ]->getId() == id )
-      {
+    for ( unsigned y = allDictionaries.size(); y--; )
+      if ( allDictionaries[ y ]->getId() == id ) {
         group.dictionaries[ x ].name = QString::fromUtf8( allDictionaries[ y ]->getName().c_str() );
         break;
       }
   }
 }
 
-void updateNames( Config::Groups & groups,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries )
+void updateNames( Config::Groups & groups, vector< sptr< Dictionary::Class > > const & allDictionaries )
 {
-  for( int x = 0; x < groups.size(); ++x )
+  for ( int x = 0; x < groups.size(); ++x )
     updateNames( groups[ x ], allDictionaries );
 }
 
-void updateNames( Config::Class & cfg,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries )
+void updateNames( Config::Class & cfg, vector< sptr< Dictionary::Class > > const & allDictionaries )
 {
   updateNames( cfg.dictionaryOrder, allDictionaries );
   updateNames( cfg.inactiveDictionaries, allDictionaries );
@@ -193,4 +181,4 @@ QIcon iconFromData( QByteArray const & iconData )
   return result;
 }
 
-}
+} // namespace Instances
diff --git a/src/instances.hh b/src/instances.hh
index 2e9d18cb..fdf7b2b7 100644
--- a/src/instances.hh
+++ b/src/instances.hh
@@ -35,7 +35,7 @@ struct Group
   /// Creates an empty group.
   explicit Group( QString const & name_ );
 
-  Group(unsigned id, QString const & name_);
+  Group( unsigned id, QString const & name_ );
 
   /// Makes the configuration group from the current contents.
   Config::Group makeConfigGroup();
@@ -71,28 +71,24 @@ struct Groups: public vector< Group >
 /// special group.
 void complementDictionaryOrder( Group & dictionaryOrder,
                                 Group const & inactiveDictionaries,
-                                vector< sptr< Dictionary::Class > > const &
-                                allDictionaries );
+                                vector< sptr< Dictionary::Class > > const & allDictionaries );
 
 /// For any dictionaries present in the group, updates their names to match
 /// the dictionaries they refer to in their current form, if they exist.
 /// If the dictionary instance can't be located, the name is left untouched.
-void updateNames( Config::Group &,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries );
+void updateNames( Config::Group &, vector< sptr< Dictionary::Class > > const & allDictionaries );
 
 /// Does updateNames() for a set of given groups.
-void updateNames( Config::Groups &,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries );
+void updateNames( Config::Groups &, vector< sptr< Dictionary::Class > > const & allDictionaries );
 
 /// Does updateNames() for any relevant dictionary groups present in the
 /// configuration.
-void updateNames( Config::Class &,
-                  vector< sptr< Dictionary::Class > > const & allDictionaries );
+void updateNames( Config::Class &, vector< sptr< Dictionary::Class > > const & allDictionaries );
 
 /// Creates icon from icon data. Used by Group, but also by others who work
 /// with icon data directly.
 QIcon iconFromData( QByteArray const & );
 
-}
+} // namespace Instances
 
 #endif
diff --git a/src/keyboardstate.cc b/src/keyboardstate.cc
index 2d336ed0..c201b85b 100644
--- a/src/keyboardstate.cc
+++ b/src/keyboardstate.cc
@@ -5,62 +5,56 @@
 #include <QObject> // To get Qt Q_OS defines
 
 #ifdef Q_OS_WIN32
-#include <windows.h>
-#elif defined(HAVE_X11)
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QGuiApplication>
-#else
-#include <QX11Info>
-#endif
-#include <X11/X.h>
-#include <X11/XKBlib.h>
+  #include <windows.h>
+#elif defined( HAVE_X11 )
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QGuiApplication>
+  #else
+    #include <QX11Info>
+  #endif
+  #include <X11/X.h>
+  #include <X11/XKBlib.h>
 #elif defined Q_OS_MAC
-#define __SECURITYHI__
-#include <Carbon/Carbon.h>
+  #define __SECURITYHI__
+  #include <Carbon/Carbon.h>
 #endif
 
 bool KeyboardState::checkModifiersPressed( int mask )
 {
-  #if defined(Q_WS_QWS)
-    return false;
-  #elif defined(Q_OS_WIN32)
+#if defined( Q_WS_QWS )
+  return false;
+#elif defined( Q_OS_WIN32 )
 
-  return !(
-    ( mask & Alt && !( GetAsyncKeyState( VK_MENU ) & 0x8000 ) ) ||
-    ( mask & Ctrl && !( GetAsyncKeyState( VK_CONTROL ) & 0x8000 ) ) ||
-    ( mask & Shift && !( GetAsyncKeyState( VK_SHIFT ) & 0x8000 ) ) ||
-    ( mask & LeftAlt && !( GetAsyncKeyState( VK_LMENU ) & 0x8000 ) ) ||
-    ( mask & RightAlt && !( GetAsyncKeyState( VK_RMENU ) & 0x8000 ) ) ||
-    ( mask & LeftCtrl && !( GetAsyncKeyState( VK_LCONTROL ) & 0x8000 ) ) ||
-    ( mask & RightCtrl && !( GetAsyncKeyState( VK_RCONTROL ) & 0x8000 ) ) ||
-    ( mask & LeftShift && !( GetAsyncKeyState( VK_LSHIFT ) & 0x8000 ) ) ||
-    ( mask & RightShift && !( GetAsyncKeyState( VK_RSHIFT ) & 0x8000 ) ) );
+  return !( ( mask & Alt && !( GetAsyncKeyState( VK_MENU ) & 0x8000 ) )
+            || ( mask & Ctrl && !( GetAsyncKeyState( VK_CONTROL ) & 0x8000 ) )
+            || ( mask & Shift && !( GetAsyncKeyState( VK_SHIFT ) & 0x8000 ) )
+            || ( mask & LeftAlt && !( GetAsyncKeyState( VK_LMENU ) & 0x8000 ) )
+            || ( mask & RightAlt && !( GetAsyncKeyState( VK_RMENU ) & 0x8000 ) )
+            || ( mask & LeftCtrl && !( GetAsyncKeyState( VK_LCONTROL ) & 0x8000 ) )
+            || ( mask & RightCtrl && !( GetAsyncKeyState( VK_RCONTROL ) & 0x8000 ) )
+            || ( mask & LeftShift && !( GetAsyncKeyState( VK_LSHIFT ) & 0x8000 ) )
+            || ( mask & RightShift && !( GetAsyncKeyState( VK_RSHIFT ) & 0x8000 ) ) );
 
-  #elif defined Q_OS_MAC
+#elif defined Q_OS_MAC
   UInt32 keys = GetCurrentKeyModifiers();
-  return !(
-    ( mask & Alt && !( keys & ( 1 << optionKeyBit ) ) ) ||
-    ( mask & Ctrl && !( keys & ( 1 << cmdKeyBit ) ) ) ||
-    ( mask & Shift && !( keys & ( 1 << shiftKeyBit ) ) ) ||
-    ( mask & Win && !( keys & ( 1 << controlKeyBit ) ) ) );
-  #else
-
-#if QT_VERSION < 0x060000
-  Display *displayID = QX11Info::display();
+  return !( ( mask & Alt && !( keys & ( 1 << optionKeyBit ) ) ) || ( mask & Ctrl && !( keys & ( 1 << cmdKeyBit ) ) )
+            || ( mask & Shift && !( keys & ( 1 << shiftKeyBit ) ) )
+            || ( mask & Win && !( keys & ( 1 << controlKeyBit ) ) ) );
 #else
-  QNativeInterface::QX11Application *x11AppInfo = qApp->nativeInterface<QNativeInterface::QX11Application>();
-  Display *displayID = x11AppInfo->display();
-#endif
+
+  #if QT_VERSION < 0x060000
+  Display * displayID = QX11Info::display();
+  #else
+  QNativeInterface::QX11Application * x11AppInfo = qApp->nativeInterface< QNativeInterface::QX11Application >();
+  Display * displayID                            = x11AppInfo->display();
+  #endif
 
   XkbStateRec state;
 
   XkbGetState( displayID, XkbUseCoreKbd, &state );
 
-  return !(
-    ( mask & Alt && !( state.base_mods & Mod1Mask ) ) ||
-    ( mask & Ctrl && !( state.base_mods & ControlMask ) ) ||
-    ( mask & Shift && !( state.base_mods & ShiftMask ) ) ||
-    ( mask & Win && !( state.base_mods & Mod4Mask ) ) );
-  #endif
+  return !( ( mask & Alt && !( state.base_mods & Mod1Mask ) ) || ( mask & Ctrl && !( state.base_mods & ControlMask ) )
+            || ( mask & Shift && !( state.base_mods & ShiftMask ) )
+            || ( mask & Win && !( state.base_mods & Mod4Mask ) ) );
+#endif
 }
-
diff --git a/src/keyboardstate.hh b/src/keyboardstate.hh
index 9272cf42..71ca8b6a 100644
--- a/src/keyboardstate.hh
+++ b/src/keyboardstate.hh
@@ -11,17 +11,16 @@ class KeyboardState
 {
 public:
 
-  enum Modifier
-  {
-    Alt = 1,
-    Ctrl = 2,
-    Shift = 4,
-    Win = 8, // Ironically, Linux only, since it's no use under Windows
-    LeftAlt = 16, // Those Left-Right are Windows-only, at least for now
-    RightAlt = 32,
-    LeftCtrl = 64,
-    RightCtrl = 128,
-    LeftShift = 256,
+  enum Modifier {
+    Alt        = 1,
+    Ctrl       = 2,
+    Shift      = 4,
+    Win        = 8,  // Ironically, Linux only, since it's no use under Windows
+    LeftAlt    = 16, // Those Left-Right are Windows-only, at least for now
+    RightAlt   = 32,
+    LeftCtrl   = 64,
+    RightCtrl  = 128,
+    LeftShift  = 256,
     RightShift = 512
   };
 
diff --git a/src/langcoder.cc b/src/langcoder.cc
index 2862992f..cfae0f81 100644
--- a/src/langcoder.cc
+++ b/src/langcoder.cc
@@ -9,10 +9,10 @@
 #include <QLocale>
 
 #ifdef _MSC_VER
-#include <stub_msvc.h>
+  #include <stub_msvc.h>
 #endif
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
 #endif
 
 // Language codes
@@ -222,7 +222,7 @@ QIcon LangCoder::icon( quint32 _code )
 {
   if ( auto code = intToCode2( _code ); exists( code ) ) {
     const GDLangCode & lc = LANG_CODE_MAP[ code ];
-    return QIcon( ":/flags/" + QString(lc.code) + ".png" );
+    return QIcon( ":/flags/" + QString( lc.code ) + ".png" );
   }
 
   return {};
@@ -233,12 +233,11 @@ QString LangCoder::intToCode2( quint32 val )
   if ( !val || val == 0xFFffFFff )
     return {};
 
-  char code[ 2 ];
+  QByteArray ba;
+  ba.append( val & 0xFF );
+  ba.append( ( val >> 8 ) & 0xFF );
 
-  code[ 0 ] = val & 0xFF;
-  code[ 1 ] = ( val >> 8 ) & 0xFF;
-
-  return QString::fromLatin1( code, 2 );
+  return QString::fromLatin1( ba );
 }
 
 quint32 LangCoder::findIdForLanguage( gd::wstring const & lang )
@@ -246,7 +245,7 @@ quint32 LangCoder::findIdForLanguage( gd::wstring const & lang )
   const auto langFolded = Utf8::encode( lang );
 
   for ( auto const & lc : LANG_CODE_MAP ) {
-    if ( langFolded == lc.lang ) {
+    if ( strcasecmp( langFolded.c_str(), lc.lang.c_str() ) == 0 ) {
       return code2toInt( lc.code.toStdString().c_str() );
     }
   }
@@ -270,12 +269,11 @@ quint32 LangCoder::guessId( const QString & lang )
   QString lstr = lang.simplified().toLower();
 
   // too small to guess
-  if (lstr.size() < 2)
+  if ( lstr.size() < 2 )
     return 0;
 
   // check if it could be the whole language name
-  if (lstr.size() >= 3)
-  {
+  if ( lstr.size() >= 3 ) {
     for ( auto const & lc : LANG_CODE_MAP ) {
       if ( lstr == ( lstr.size() == 3 ? QString::fromStdString( lc.code3 ) : QString::fromStdString( lc.lang ) ) ) {
         return code2toInt( lc.code );
@@ -284,29 +282,29 @@ quint32 LangCoder::guessId( const QString & lang )
   }
 
   // still not found - try to match by 2-symbol code
-  return code2toInt( lstr.left(2).toLatin1().data() );
+  return code2toInt( lstr.left( 2 ).toLatin1().data() );
 }
 
-QPair<quint32,quint32> LangCoder::findIdsForName( QString const & name )
+QPair< quint32, quint32 > LangCoder::findIdsForName( QString const & name )
 {
   QString nameFolded = "|" + name.toCaseFolded() + "|";
-  QRegExp reg( "[^a-z]([a-z]{2,3})-([a-z]{2,3})[^a-z]" ); reg.setMinimal(true);
+  QRegExp reg( "[^a-z]([a-z]{2,3})-([a-z]{2,3})[^a-z]" );
+  reg.setMinimal( true );
   int off = 0;
 
-  while ( reg.indexIn( nameFolded, off ) >= 0 )
-  {
-    quint32 from = guessId( reg.cap(1) );
-    quint32 to = guessId( reg.cap(2) );
-    if (from && to)
-      return QPair<quint32,quint32>(from, to);
+  while ( reg.indexIn( nameFolded, off ) >= 0 ) {
+    quint32 from = guessId( reg.cap( 1 ) );
+    quint32 to   = guessId( reg.cap( 2 ) );
+    if ( from && to )
+      return QPair< quint32, quint32 >( from, to );
 
     off += reg.matchedLength();
   }
 
-  return QPair<quint32,quint32>(0, 0);
+  return QPair< quint32, quint32 >( 0, 0 );
 }
 
-QPair<quint32,quint32> LangCoder::findIdsForFilename( QString const & name )
+QPair< quint32, quint32 > LangCoder::findIdsForFilename( QString const & name )
 {
   return findIdsForName( QFileInfo( name ).fileName() );
 }
diff --git a/src/language.cc b/src/language.cc
index bfe17fb3..ff233c2a 100644
--- a/src/language.cc
+++ b/src/language.cc
@@ -35,55 +35,51 @@ private:
 
   QMap< QString, LangData > iso2LangData;
 
-  QMap< QString, QString > localeLanguage = {
-    {"fr_FR", QT_TR_NOOP( "French" )},
-    {"es_ES", QT_TR_NOOP( "Spanish" )},
-    {"be_BY", QT_TR_NOOP( "Belarusian" )},
-    {"bg_BG", QT_TR_NOOP( "Bulgarian" )},
-    {"cs_CZ", QT_TR_NOOP( "Czech" )},
-    {"de_DE", QT_TR_NOOP( "German" )},
-    {"el_GR", QT_TR_NOOP( "Greek" )},
-    {"fi_FI", QT_TR_NOOP( "Finnish" )},
-    {"it_IT", QT_TR_NOOP( "Italian" )},
-    {"ja_JP", QT_TR_NOOP( "Japanese" )},
-    {"ko_KR", QT_TR_NOOP( "Korean" )},
-    {"lt_LT", QT_TR_NOOP( "Lithuanian" )},
-    {"mk_MK", QT_TR_NOOP( "Macedonian" )},
-    {"nl_NL", QT_TR_NOOP( "Dutch" )},
-    {"pl_PL", QT_TR_NOOP( "Polish" )},
-    {"pt_PT", QT_TR_NOOP( "Portuguese" )},
-    {"ru_RU", QT_TR_NOOP( "Russian" )},
-    {"sk_SK", QT_TR_NOOP( "Slovak" )},
-    {"sq_AL", QT_TR_NOOP( "Albanian" )},
-    {"sr_SP", QT_TR_NOOP( "Serbian (Cyrillic)" )},
-    {"sv_SE", QT_TR_NOOP( "Swedish" )},
-    {"tr_TR", QT_TR_NOOP( "Turkish" )},
-    {"uk_UA", QT_TR_NOOP( "Ukrainian" )},
-    {"zh_CN", QT_TR_NOOP( "Chinese Simplified" )},
-    {"zh_TW", QT_TR_NOOP( "Chinese Traditional" )},
-    {"vi_VN", QT_TR_NOOP( "Vietnamese" )},
-    {"pt_BR", QT_TR_NOOP( "Portuguese, Brazilian" )},
-    {"fa_IR", QT_TR_NOOP( "Persian" )},
-    {"es_AR", QT_TR_NOOP( "Spanish, Argentina" )},
-    {"hi_IN", QT_TR_NOOP( "Hindi" )},
-    {"eo_UY", QT_TR_NOOP( "Esperanto" )},
-    {"de_CH", QT_TR_NOOP( "German, Switzerland" )},
-    {"es_BO", QT_TR_NOOP( "Spanish, Bolivia" )},
-    {"tg_TJ", QT_TR_NOOP( "Tajik" )},
-    {"qu_PE", QT_TR_NOOP( "Quechua" )},
-    {"ay_BO", QT_TR_NOOP( "Aymara" )},
-    {"ar_SA", QT_TR_NOOP( "Arabic, Saudi Arabia" )},
-    {"tk_TM", QT_TR_NOOP( "Turkmen" )},
-    {"ie_001", QT_TR_NOOP( "Interlingue" )},
-    {"jbo_EN", QT_TR_NOOP( "Lojban" )},
-    {"en_US", QT_TR_NOOP( "English" )}
-  };
+  QMap< QString, QString > localeLanguage = { { "fr_FR", QT_TR_NOOP( "French" ) },
+                                              { "es_ES", QT_TR_NOOP( "Spanish" ) },
+                                              { "be_BY", QT_TR_NOOP( "Belarusian" ) },
+                                              { "bg_BG", QT_TR_NOOP( "Bulgarian" ) },
+                                              { "cs_CZ", QT_TR_NOOP( "Czech" ) },
+                                              { "de_DE", QT_TR_NOOP( "German" ) },
+                                              { "el_GR", QT_TR_NOOP( "Greek" ) },
+                                              { "fi_FI", QT_TR_NOOP( "Finnish" ) },
+                                              { "it_IT", QT_TR_NOOP( "Italian" ) },
+                                              { "ja_JP", QT_TR_NOOP( "Japanese" ) },
+                                              { "ko_KR", QT_TR_NOOP( "Korean" ) },
+                                              { "lt_LT", QT_TR_NOOP( "Lithuanian" ) },
+                                              { "mk_MK", QT_TR_NOOP( "Macedonian" ) },
+                                              { "nl_NL", QT_TR_NOOP( "Dutch" ) },
+                                              { "pl_PL", QT_TR_NOOP( "Polish" ) },
+                                              { "pt_PT", QT_TR_NOOP( "Portuguese" ) },
+                                              { "ru_RU", QT_TR_NOOP( "Russian" ) },
+                                              { "sk_SK", QT_TR_NOOP( "Slovak" ) },
+                                              { "sq_AL", QT_TR_NOOP( "Albanian" ) },
+                                              { "sr_SP", QT_TR_NOOP( "Serbian (Cyrillic)" ) },
+                                              { "sv_SE", QT_TR_NOOP( "Swedish" ) },
+                                              { "tr_TR", QT_TR_NOOP( "Turkish" ) },
+                                              { "uk_UA", QT_TR_NOOP( "Ukrainian" ) },
+                                              { "zh_CN", QT_TR_NOOP( "Chinese Simplified" ) },
+                                              { "zh_TW", QT_TR_NOOP( "Chinese Traditional" ) },
+                                              { "vi_VN", QT_TR_NOOP( "Vietnamese" ) },
+                                              { "pt_BR", QT_TR_NOOP( "Portuguese, Brazilian" ) },
+                                              { "fa_IR", QT_TR_NOOP( "Persian" ) },
+                                              { "es_AR", QT_TR_NOOP( "Spanish, Argentina" ) },
+                                              { "hi_IN", QT_TR_NOOP( "Hindi" ) },
+                                              { "eo_UY", QT_TR_NOOP( "Esperanto" ) },
+                                              { "de_CH", QT_TR_NOOP( "German, Switzerland" ) },
+                                              { "es_BO", QT_TR_NOOP( "Spanish, Bolivia" ) },
+                                              { "tg_TJ", QT_TR_NOOP( "Tajik" ) },
+                                              { "qu_PE", QT_TR_NOOP( "Quechua" ) },
+                                              { "ay_BO", QT_TR_NOOP( "Aymara" ) },
+                                              { "ar_SA", QT_TR_NOOP( "Arabic, Saudi Arabia" ) },
+                                              { "tk_TM", QT_TR_NOOP( "Turkmen" ) },
+                                              { "ie_001", QT_TR_NOOP( "Interlingue" ) },
+                                              { "jbo_EN", QT_TR_NOOP( "Lojban" ) },
+                                              { "en_US", QT_TR_NOOP( "English" ) } };
 
   Db();
 
-  void addEntry( QString const & iso2,
-                 QString const & english,
-                 QString const & localized );
+  void addEntry( QString const & iso2, QString const & english, QString const & localized );
 
   void addExtraCountry( QString const & iso2, QString const & country );
 };
@@ -95,17 +91,17 @@ Db const & Db::instance()
   return v;
 }
 
-void Db::addEntry( QString const & iso2, QString const & english,
-                   QString const & localized )
+void Db::addEntry( QString const & iso2, QString const & english, QString const & localized )
 {
   LangData lang_data;
-  lang_data.english = english;
+  lang_data.english   = english;
   lang_data.localized = localized;
   iso2LangData.insert( iso2, lang_data );
 }
 
-void Db::addExtraCountry( QString const & iso2, QString const & country ) {
-  if(!iso2LangData.contains( iso2 )) {
+void Db::addExtraCountry( QString const & iso2, QString const & country )
+{
+  if ( !iso2LangData.contains( iso2 ) ) {
     return;
   }
   iso2LangData[ iso2 ].country = country;
@@ -427,29 +423,41 @@ Db::Db()
   addExtraCountry( "zu", "za" );
 }
 
-}
+} // namespace
 
 /// babylon languages
 #ifndef blgCode2Int
-#define blgCode2Int( index, code0, code1 ) (((uint32_t)index) << 16 ) + (((uint32_t)code1) << 8 ) + (uint32_t)code0
+  #define blgCode2Int( index, code0, code1 ) \
+    ( ( (uint32_t)index ) << 16 ) + ( ( (uint32_t)code1 ) << 8 ) + (uint32_t)code0
 #endif
-const BabylonLang BabylonDb[] ={
-    { blgCode2Int( 1, 'z', 'h' ), "tw", "Traditional Chinese", QT_TR_NOOP( "Traditional Chinese" ) },
-    { blgCode2Int( 2, 'z', 'h' ), "cn", "Simplified Chinese", QT_TR_NOOP( "Simplified Chinese" ) },
-    { blgCode2Int( 3, 0, 0 ), "other", "Other", QT_TR_NOOP( "Other" ) },
-    { blgCode2Int( 4, 'z', 'h' ), "cn", "Other Simplified Chinese dialects", QT_TR_NOOP( "Other Simplified Chinese dialects" ) },
-    { blgCode2Int( 5, 'z', 'h' ), "tw", "Other Traditional Chinese dialects", QT_TR_NOOP( "Other Traditional Chinese dialects" ) },
-    { blgCode2Int( 6, 0, 0 ), "other", "Other Eastern-European languages", QT_TR_NOOP( "Other Eastern-European languages" ) },
-    { blgCode2Int( 7, 0, 0 ), "other", "Other Western-European languages", QT_TR_NOOP( "Other Western-European languages" )},
-    { blgCode2Int( 8, 'r', 'u' ), "ru", "Other Russian languages", QT_TR_NOOP( "Other Russian languages" ) },
-    { blgCode2Int( 9, 'j', 'a' ), "jp", "Other Japanese languages", QT_TR_NOOP( "Other Japanese languages" ) },
-    { blgCode2Int( 10, 0, 0 ), "other", "Other Baltic languages", QT_TR_NOOP( "Other Baltic languages" )},
-    { blgCode2Int( 11, 'e', 'l' ), "gr", "Other Greek languages", QT_TR_NOOP( "Other Greek languages" ) },
-    { blgCode2Int( 12, 'k', 'o' ), "kr", "Other Korean dialects", QT_TR_NOOP( "Other Korean dialects" ) },
-    { blgCode2Int( 13, 't', 'r' ), "tr", "Other Turkish dialects", QT_TR_NOOP( "Other Turkish dialects" ) },
-    { blgCode2Int( 14, 't', 'h' ), "th", "Other Thai dialects", QT_TR_NOOP( "Other Thai dialects" ) },
-    { blgCode2Int( 15, 0, 0 ), "dz", "Tamazight", QT_TR_NOOP( "Tamazight" ) }
-};
+const BabylonLang BabylonDb[] = {
+  { blgCode2Int( 1, 'z', 'h' ), "tw", "Traditional Chinese", QT_TR_NOOP( "Traditional Chinese" ) },
+  { blgCode2Int( 2, 'z', 'h' ), "cn", "Simplified Chinese", QT_TR_NOOP( "Simplified Chinese" ) },
+  { blgCode2Int( 3, 0, 0 ), "other", "Other", QT_TR_NOOP( "Other" ) },
+  { blgCode2Int( 4, 'z', 'h' ),
+    "cn",
+    "Other Simplified Chinese dialects",
+    QT_TR_NOOP( "Other Simplified Chinese dialects" ) },
+  { blgCode2Int( 5, 'z', 'h' ),
+    "tw",
+    "Other Traditional Chinese dialects",
+    QT_TR_NOOP( "Other Traditional Chinese dialects" ) },
+  { blgCode2Int( 6, 0, 0 ),
+    "other",
+    "Other Eastern-European languages",
+    QT_TR_NOOP( "Other Eastern-European languages" ) },
+  { blgCode2Int( 7, 0, 0 ),
+    "other",
+    "Other Western-European languages",
+    QT_TR_NOOP( "Other Western-European languages" ) },
+  { blgCode2Int( 8, 'r', 'u' ), "ru", "Other Russian languages", QT_TR_NOOP( "Other Russian languages" ) },
+  { blgCode2Int( 9, 'j', 'a' ), "jp", "Other Japanese languages", QT_TR_NOOP( "Other Japanese languages" ) },
+  { blgCode2Int( 10, 0, 0 ), "other", "Other Baltic languages", QT_TR_NOOP( "Other Baltic languages" ) },
+  { blgCode2Int( 11, 'e', 'l' ), "gr", "Other Greek languages", QT_TR_NOOP( "Other Greek languages" ) },
+  { blgCode2Int( 12, 'k', 'o' ), "kr", "Other Korean dialects", QT_TR_NOOP( "Other Korean dialects" ) },
+  { blgCode2Int( 13, 't', 'r' ), "tr", "Other Turkish dialects", QT_TR_NOOP( "Other Turkish dialects" ) },
+  { blgCode2Int( 14, 't', 'h' ), "th", "Other Thai dialects", QT_TR_NOOP( "Other Thai dialects" ) },
+  { blgCode2Int( 15, 0, 0 ), "dz", "Tamazight", QT_TR_NOOP( "Tamazight" ) } };
 
 BabylonLang getBabylonLangByIndex( int index )
 {
@@ -472,8 +480,7 @@ QString englishNameForId( Id id )
   {
     return BabylonDb[ ( ( id >> 16 ) & 0x0f ) - 1 ].englishName;
   }
-  const auto i =
-    Db::instance().getIso2ToLangData().find( LangCoder::intToCode2( id ) );
+  const auto i = Db::instance().getIso2ToLangData().find( LangCoder::intToCode2( id ) );
 
   if ( i == Db::instance().getIso2ToLangData().end() )
     return {};
@@ -501,8 +508,7 @@ QString countryCodeForId( Id id )
   {
     return BabylonDb[ ( ( id >> 16 ) & 0x0f ) - 1 ].contryCode;
   }
-  const auto i =
-    Db::instance().getIso2ToLangData().find( LangCoder::intToCode2( id ) );
+  const auto i = Db::instance().getIso2ToLangData().find( LangCoder::intToCode2( id ) );
 
   if ( i == Db::instance().getIso2ToLangData().end() )
     return {};
@@ -526,6 +532,7 @@ QString localizedStringForId( Id langId )
 
 QString languageForLocale( const QString & locale )
 {
-  return QCoreApplication::translate( "Language::Db", Db::instance().locale2LanguageMap()[ locale ].toStdString().c_str() );
-}
+  return QCoreApplication::translate( "Language::Db",
+                                      Db::instance().locale2LanguageMap()[ locale ].toStdString().c_str() );
 }
+} // namespace Language
diff --git a/src/language.hh b/src/language.hh
index ac616cc0..bdcb5a96 100644
--- a/src/language.hh
+++ b/src/language.hh
@@ -13,12 +13,11 @@ namespace Language {
 /// two special meanings - Unknown and Any.
 typedef quint32 Id;
 
-enum
-{
+enum {
   /// Value for Id which signifies that the language is unknown or unspecified.
   Unknown = 0,
   /// Value for Id which signifies that the language can be any, or all of them.
-  Any =  0xFFffFFff
+  Any = 0xFFffFFff
 };
 
 /// Returns name in English for the given Id. If the Id is incorrect, or has
@@ -38,17 +37,18 @@ QString countryCodeForId( Id );
 /// If the Id is incorrect, or has Unknown/Any values, returns empty string.
 QString localizedStringForId( Id );
 QString languageForLocale( const QString & locale );
-  // All other functions are to be used from LangCoder, which is supposed to
+// All other functions are to be used from LangCoder, which is supposed to
 // be migrated here over time.
 
-struct BabylonLang{
-    Id id;
-    const QString contryCode;
-    const QString englishName;
-    const char * localizedName;
+struct BabylonLang
+{
+  Id id;
+  const QString contryCode;
+  const QString englishName;
+  const char * localizedName;
 };
 BabylonLang getBabylonLangByIndex( int index );
 quint32 findBlgLangIDByEnglishName( gd::wstring const & lang );
-}
+} // namespace Language
 
 #endif
diff --git a/src/macos/gd_clipboard.cc b/src/macos/gd_clipboard.cc
index 00ec316a..243afa20 100644
--- a/src/macos/gd_clipboard.cc
+++ b/src/macos/gd_clipboard.cc
@@ -1,40 +1,44 @@
 #ifdef __APPLE__
 
-#include "gd_clipboard.hh"
-#include <QGuiApplication>
+  #include "gd_clipboard.hh"
+  #include <QGuiApplication>
 
-gd_clipboard::gd_clipboard(QObject *parent)
-        : QObject{parent},
-          sysClipboard(QGuiApplication::clipboard()) {
+gd_clipboard::gd_clipboard( QObject * parent ):
+  QObject{ parent },
+  sysClipboard( QGuiApplication::clipboard() )
+{
 
-    connect(&m_monitoringTimer, &QTimer::timeout, this, [this]() {
-        updateClipboard();
-    });
+  connect( &m_monitoringTimer, &QTimer::timeout, this, [ this ]() {
+    updateClipboard();
+  } );
 }
 
-QString gd_clipboard::text() const {
-    return m_currentContent;
+QString gd_clipboard::text() const
+{
+  return m_currentContent;
 }
 
-void gd_clipboard::updateClipboard() {
-    const QString newContent = this->sysClipboard->text().trimmed();
+void gd_clipboard::updateClipboard()
+{
+  const QString newContent = this->sysClipboard->text().trimmed();
 
-    // get rid of change if new clipboard content is equal to previous version
-    if (newContent == m_currentContent ||
-        newContent.length() == 0) { // avoid spaces
-        return;
-    }
+  // get rid of change if new clipboard content is equal to previous version
+  if ( newContent == m_currentContent || newContent.length() == 0 ) { // avoid spaces
+    return;
+  }
 
-    m_currentContent = newContent;
-    emit changed(QClipboard::Clipboard);
+  m_currentContent = newContent;
+  emit changed( QClipboard::Clipboard );
 }
 
-void gd_clipboard::stop() {
-    m_monitoringTimer.stop();
+void gd_clipboard::stop()
+{
+  m_monitoringTimer.stop();
 }
 
-void gd_clipboard::start() {
-    m_monitoringTimer.start(1000); // 1s
+void gd_clipboard::start()
+{
+  m_monitoringTimer.start( 1000 ); // 1s
 }
 
 #endif
diff --git a/src/macos/gd_clipboard.hh b/src/macos/gd_clipboard.hh
index 390ad6c3..9c35515d 100644
--- a/src/macos/gd_clipboard.hh
+++ b/src/macos/gd_clipboard.hh
@@ -1,10 +1,10 @@
 #ifdef __APPLE__
-#pragma once
+  #pragma once
 
-#include <QClipboard>
-#include <QObject>
-#include <QString>
-#include <QTimer>
+  #include <QClipboard>
+  #include <QObject>
+  #include <QString>
+  #include <QTimer>
 
 /**
 A custom clipboard monitor that read keep reading clipboard in background.
@@ -13,28 +13,30 @@ Code was inspired by
 https://github.com/KDE/kdeconnect-kde/blob/v22.12.2/plugins/clipboard/clipboardlistener.cpp
 */
 
-class gd_clipboard : public QObject {
-Q_OBJECT
+class gd_clipboard: public QObject
+{
+  Q_OBJECT
+
 public:
-    explicit gd_clipboard(QObject * parent = nullptr);
+  explicit gd_clipboard( QObject * parent = nullptr );
 
-    [[nodiscard]] QString text() const;
+  [[nodiscard]] QString text() const;
 
-    void stop();
+  void stop();
 
-    void start();
+  void start();
 
 private:
 
-    QClipboard * sysClipboard;
-    QString curClipboardContent;
+  QClipboard * sysClipboard;
+  QString curClipboardContent;
 
-    QTimer m_monitoringTimer;
-    QString m_currentContent;
-    void updateClipboard();
+  QTimer m_monitoringTimer;
+  QString m_currentContent;
+  void updateClipboard();
 
 signals:
-    void changed(QClipboard::Mode mode);
+  void changed( QClipboard::Mode mode );
 };
 
 #endif
diff --git a/src/main.cc b/src/main.cc
index 76a54e8e..4768c34b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -7,12 +7,13 @@
 #include "config.hh"
 #include <QWebEngineProfile>
 #include "hotkeywrapper.hh"
+#include "version.hh"
 #ifdef HAVE_X11
-#include <fixx11h.h>
+  #include <fixx11h.h>
 #endif
 
 #if defined( Q_OS_UNIX )
-#include <clocale>
+  #include <clocale>
 #endif
 
 #ifdef Q_OS_WIN32
@@ -31,35 +32,66 @@
 #include "gddebug.hh"
 #include <QMutex>
 
-#if defined(USE_BREAKPAD)
-  #include "client/windows/handler/exception_handler.h"
+#if defined( USE_BREAKPAD )
+  #if defined( Q_OS_MAC )
+    #include "client/mac/handler/exception_handler.h"
+  #elif defined( Q_OS_LINUX )
+    #include "client/linux/handler/exception_handler.h"
+  #elif defined( Q_OS_WIN32 )
+    #include "client/windows/handler/exception_handler.h"
+  #endif
 #endif
 
-#if defined(USE_BREAKPAD)
-bool callback(const wchar_t* dump_path, const wchar_t* id,
-               void* context, EXCEPTION_POINTERS* exinfo,
-               MDRawAssertionInfo* assertion,
-               bool succeeded) {
-  if (succeeded) {
+#if defined( USE_BREAKPAD )
+  #ifdef Q_OS_WIN32
+bool callback( const wchar_t * dump_path,
+               const wchar_t * id,
+               void * context,
+               EXCEPTION_POINTERS * exinfo,
+               MDRawAssertionInfo * assertion,
+               bool succeeded )
+{
+  if ( succeeded ) {
     qDebug() << "Create dump file success";
-  } else {
+  }
+  else {
     qDebug() << "Create dump file failed";
   }
   return succeeded;
 }
+  #endif
+  #ifdef Q_OS_LINUX
+bool callback( const google_breakpad::MinidumpDescriptor & descriptor, void * context, bool succeeded )
+{
+  if ( succeeded ) {
+    qDebug() << "Create dump file success";
+  }
+  else {
+    qDebug() << "Create dump file failed";
+  }
+  return succeeded;
+}
+  #endif
+  #ifdef Q_OS_MAC
+bool callback( const char * dump_dir, const char * minidump_id, void * context, bool succeeded )
+{
+  if ( succeeded ) {
+    qDebug() << "Create dump file success";
+  }
+  else {
+    qDebug() << "Create dump file failed";
+  }
+  return succeeded;
+}
+  #endif
 #endif
 
 QMutex logMutex;
 
-void gdMessageHandler( QtMsgType type, const QMessageLogContext &context, const QString &mess )
+void gdMessageHandler( QtMsgType type, const QMessageLogContext & context, const QString & mess )
 {
   QString strTime = QDateTime::currentDateTime().toString( "MM-dd hh:mm:ss" );
-  QString message = QString( "%1 file:%2,line:%3,function:%4 %5\r\n" )
-                      .arg( strTime )
-                      .arg( context.file )
-                      .arg( context.line )
-                      .arg( context.function )
-                      .arg( mess );
+  QString message = QString( "%1 %2\r\n" ).arg( strTime, mess );
 
   if ( ( logFilePtr != nullptr ) && logFilePtr->isOpen() ) {
     //without the lock ,on multithread,there would be assert error.
@@ -118,32 +150,49 @@ struct GDOptions
   QString word, groupName, popupGroupName;
 
   inline bool needSetGroup() const
-  { return !groupName.isEmpty(); }
+  {
+    return !groupName.isEmpty();
+  }
 
   inline QString getGroupName() const
-  { return groupName; }
+  {
+    return groupName;
+  }
 
   inline bool needSetPopupGroup() const
-  { return !popupGroupName.isEmpty(); }
+  {
+    return !popupGroupName.isEmpty();
+  }
 
   inline QString getPopupGroupName() const
-  { return popupGroupName; }
+  {
+    return popupGroupName;
+  }
 
   inline bool needLogFile() const
-  { return logFile; }
+  {
+    return logFile;
+  }
 
   inline bool needTranslateWord() const
-  { return !word.isEmpty(); }
+  {
+    return !word.isEmpty();
+  }
 
   inline QString wordToTranslate() const
-  { return word; }
+  {
+    return word;
+  }
 
   inline bool needTogglePopup() const
-  { return togglePopup; }
+  {
+    return togglePopup;
+  }
   bool notts;
+  bool resetState = false;
 };
 
-void processCommandLine( QCoreApplication * app, GDOptions * result)
+void processCommandLine( QCoreApplication * app, GDOptions * result )
 {
   QCommandLineParser qcmd;
 
@@ -156,6 +205,10 @@ void processCommandLine( QCoreApplication * app, GDOptions * result)
                                                   << "log-to-file",
                                     QObject::tr( "Save debug messages to gd_log.txt in the config folder." ) );
 
+  QCommandLineOption resetState( QStringList() << "r"
+                                               << "reset-window-state",
+                                 QObject::tr( "Reset window state." ) );
+
   QCommandLineOption notts( "no-tts", QObject::tr( "Disable tts." ) );
 
   QCommandLineOption groupNameOption( QStringList() << "g"
@@ -171,11 +224,17 @@ void processCommandLine( QCoreApplication * app, GDOptions * result)
                                                       << "toggle-scan-popup",
                                         QObject::tr( "Toggle scan popup." ) );
 
+  QCommandLineOption printVersion( QStringList() << "v"
+                                                 << "version",
+                                   QObject::tr( "Print version and diagnosis info." ) );
+
   qcmd.addOption( logFileOption );
   qcmd.addOption( groupNameOption );
   qcmd.addOption( popupGroupNameOption );
   qcmd.addOption( togglePopupOption );
   qcmd.addOption( notts );
+  qcmd.addOption( resetState );
+  qcmd.addOption( printVersion );
 
   QCommandLineOption doNothingOption( "disable-web-security" ); // ignore the --disable-web-security
   doNothingOption.setFlags( QCommandLineOption::HiddenFromHelp );
@@ -203,6 +262,15 @@ void processCommandLine( QCoreApplication * app, GDOptions * result)
     result->notts = true;
   }
 
+  if ( qcmd.isSet( resetState ) ) {
+    result->resetState = true;
+  }
+
+  if ( qcmd.isSet( printVersion ) ) {
+    qInfo() << qPrintable( Version::everything() );
+    std::exit( 0 );
+  }
+
   const QStringList posArgs = qcmd.positionalArguments();
   if ( !posArgs.empty() ) {
     result->word = posArgs.at( 0 );
@@ -271,29 +339,43 @@ int main( int argc, char ** argv )
 
   QHotkeyApplication::setApplicationName( "GoldenDict-ng" );
   QHotkeyApplication::setOrganizationDomain( "https://github.com/xiaoyifang/goldendict-ng" );
-#ifndef Q_OS_MAC
   QHotkeyApplication::setWindowIcon( QIcon( ":/icons/programicon.png" ) );
-#endif
 
-#if defined(USE_BREAKPAD)
-  QString appDirPath = QCoreApplication::applicationDirPath() + "/crash";
+#if defined( USE_BREAKPAD )
+  QString appDirPath = Config::getConfigDir() + "crash";
 
   QDir dir;
   if ( !dir.exists( appDirPath ) ) {
     dir.mkpath( appDirPath );
   }
+  #ifdef Q_OS_WIN32
 
-  google_breakpad::ExceptionHandler eh(
-    appDirPath.toStdWString(), NULL, callback, NULL,
-    google_breakpad::ExceptionHandler::HANDLER_ALL);
+  google_breakpad::ExceptionHandler eh( appDirPath.toStdWString(),
+                                        NULL,
+                                        callback,
+                                        NULL,
+                                        google_breakpad::ExceptionHandler::HANDLER_ALL );
+  #elif defined( Q_OS_MAC )
 
 
+  google_breakpad::ExceptionHandler eh( appDirPath.toStdString(), 0, callback, 0, true, NULL );
+
+  #else
+
+  google_breakpad::ExceptionHandler eh( google_breakpad::MinidumpDescriptor( appDirPath.toStdString() ),
+                                        /*FilterCallback*/ 0,
+                                        callback,
+                                        /*context*/ 0,
+                                        true,
+                                        -1 );
   #endif
 
+#endif
+
   GDOptions gdcl{};
 
   if ( argc > 1 ) {
-        processCommandLine( &app, &gdcl );
+    processCommandLine( &app, &gdcl );
   }
 
   installTerminationHandler();
@@ -310,10 +392,10 @@ int main( int argc, char ** argv )
     { "gdlookup", "gdau", "gico", "qrcx", "bres", "bword", "gdprg", "gdvideo", "gdpicture", "gdtts", "ifr", "entry" };
 
   for ( const auto & localScheme : localSchemes ) {
-        QWebEngineUrlScheme webUiScheme( localScheme.toLatin1() );
-        webUiScheme.setFlags( QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::LocalScheme
-                              | QWebEngineUrlScheme::LocalAccessAllowed | QWebEngineUrlScheme::CorsEnabled );
-        QWebEngineUrlScheme::registerScheme( webUiScheme );
+    QWebEngineUrlScheme webUiScheme( localScheme.toLatin1() );
+    webUiScheme.setFlags( QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::LocalScheme
+                          | QWebEngineUrlScheme::LocalAccessAllowed | QWebEngineUrlScheme::CorsEnabled );
+    QWebEngineUrlScheme::registerScheme( webUiScheme );
   }
 
   QFile file;
@@ -329,24 +411,20 @@ int main( int argc, char ** argv )
   f.setStyleStrategy( QFont::PreferAntialias );
   QApplication::setFont( f );
 
-  if ( app.isRunning() )
-  {
+  if ( app.isRunning() ) {
     bool wasMessage = false;
 
-    if( gdcl.needSetGroup() )
-    {
+    if ( gdcl.needSetGroup() ) {
       app.sendMessage( QString( "setGroup: " ) + gdcl.getGroupName() );
       wasMessage = true;
     }
 
-    if( gdcl.needSetPopupGroup() )
-    {
+    if ( gdcl.needSetPopupGroup() ) {
       app.sendMessage( QString( "setPopupGroup: " ) + gdcl.getPopupGroupName() );
       wasMessage = true;
     }
 
-    if( gdcl.needTranslateWord() )
-    {
+    if ( gdcl.needTranslateWord() ) {
       app.sendMessage( QString( "translateWord: " ) + gdcl.wordToTranslate() );
       wasMessage = true;
     }
@@ -356,8 +434,8 @@ int main( int argc, char ** argv )
       wasMessage = true;
     }
 
-    if( !wasMessage )
-      app.sendMessage("bringToFront");
+    if ( !wasMessage )
+      app.sendMessage( "bringToFront" );
 
     return 0; // Another instance is running
   }
@@ -371,17 +449,16 @@ int main( int argc, char ** argv )
   QString localeName = QLocale::system().name();
 
   Config::Class cfg;
-  for( ; ; )
-  {
-    try
-    {
+  for ( ;; ) {
+    try {
       cfg = Config::load();
     }
-    catch( Config::exError & )
-    {
-      QMessageBox mb( QMessageBox::Warning, QHotkeyApplication::applicationName(),
-                      QHotkeyApplication::translate( "Main", "Error in configuration file. Continue with default settings?" ),
-                      QMessageBox::Yes | QMessageBox::No );
+    catch ( Config::exError & ) {
+      QMessageBox mb(
+        QMessageBox::Warning,
+        QHotkeyApplication::applicationName(),
+        QHotkeyApplication::translate( "Main", "Error in configuration file. Continue with default settings?" ),
+        QMessageBox::Yes | QMessageBox::No );
       mb.exec();
       if ( mb.result() != QMessageBox::Yes )
         return -1;
@@ -395,8 +472,11 @@ int main( int argc, char ** argv )
 
   if ( gdcl.notts ) {
     cfg.notts = true;
+    cfg.voiceEngines.clear();
   }
 
+  cfg.resetState = gdcl.resetState;
+
   if ( gdcl.needLogFile() ) {
     // Open log file
     logFilePtr->setFileName( Config::getConfigDir() + "gd_log.txt" );
@@ -412,8 +492,7 @@ int main( int argc, char ** argv )
     qInstallMessageHandler( gdMessageHandler );
   }
 
-  if ( Config::isPortableVersion() )
-  {
+  if ( Config::isPortableVersion() ) {
     // For portable version, hardcode some settings
 
     cfg.paths.clear();
@@ -425,15 +504,13 @@ int main( int argc, char ** argv )
   // Reload translations for user selected locale is nesessary
   QTranslator qtTranslator;
   QTranslator translator;
-  if( !cfg.preferences.interfaceLanguage.isEmpty() && localeName != cfg.preferences.interfaceLanguage )
-  {
+  if ( !cfg.preferences.interfaceLanguage.isEmpty() && localeName != cfg.preferences.interfaceLanguage ) {
     localeName = cfg.preferences.interfaceLanguage;
   }
 
   QLocale locale( localeName );
   QLocale::setDefault( locale );
-  if( !qtTranslator.load( "qt_extra_" + localeName, Config::getLocDir() ) )
-  {
+  if ( !qtTranslator.load( "qt_extra_" + localeName, Config::getLocDir() ) ) {
     qtTranslator.load( "qt_extra_" + localeName, QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
     app.installTranslator( &qtTranslator );
   }
@@ -442,8 +519,7 @@ int main( int argc, char ** argv )
   app.installTranslator( &translator );
 
   QTranslator webengineTs;
-  if( webengineTs.load( "qtwebengine_" + localeName, Config::getLocDir() ) )
-  {
+  if ( webengineTs.load( "qtwebengine_" + localeName, Config::getLocDir() ) ) {
     app.installTranslator( &webengineTs );
   }
 
@@ -457,20 +533,20 @@ int main( int argc, char ** argv )
 
   QObject::connect( &app, &QtSingleApplication::messageReceived, &m, &MainWindow::messageFromAnotherInstanceReceived );
 
-  if( gdcl.needSetGroup() )
+  if ( gdcl.needSetGroup() )
     m.setGroupByName( gdcl.getGroupName(), true );
 
-  if( gdcl.needSetPopupGroup() )
+  if ( gdcl.needSetPopupGroup() )
     m.setGroupByName( gdcl.getPopupGroupName(), false );
 
-  if( gdcl.needTranslateWord() )
+  if ( gdcl.needTranslateWord() )
     m.wordReceived( gdcl.wordToTranslate() );
 
   int r = app.exec();
 
   app.removeDataCommiter( m );
 
-  if( logFilePtr->isOpen() )
+  if ( logFilePtr->isOpen() )
     logFilePtr->close();
 
   return r;
diff --git a/src/metadata.cc b/src/metadata.cc
index 83aacff5..3a8b86b8 100644
--- a/src/metadata.cc
+++ b/src/metadata.cc
@@ -17,8 +17,8 @@ std::optional< Metadata::result > Metadata::load( std::string_view filepath )
     tbl = toml::parse_file( filepath );
   }
   catch ( toml::parse_error & e ) {
-    qWarning()<< "Failed to load metadata: " << QString::fromUtf8(filepath.data(),filepath.size())
-              << "Reason:" << e.what();
+    qWarning() << "Failed to load metadata: " << QString::fromUtf8( filepath.data(), filepath.size() )
+               << "Reason:" << e.what();
 
     return std::nullopt;
   }
diff --git a/src/multimediaaudioplayer.cc b/src/multimediaaudioplayer.cc
index 466996cf..cbe692cf 100644
--- a/src/multimediaaudioplayer.cc
+++ b/src/multimediaaudioplayer.cc
@@ -3,27 +3,29 @@
 
 #ifdef MAKE_QTMULTIMEDIA_PLAYER
 
-#include <QByteArray>
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
-#include <QMediaContent>
-#endif
-#include "multimediaaudioplayer.hh"
+  #include <QByteArray>
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QMediaContent>
+  #endif
+  #include "multimediaaudioplayer.hh"
 
 MultimediaAudioPlayer::MultimediaAudioPlayer()
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
-  : player( 0, QMediaPlayer::StreamPlayback )
-#endif
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  :
+  player( 0, QMediaPlayer::StreamPlayback )
+  #endif
 {
-  typedef void( QMediaPlayer::* ErrorSignal )( QMediaPlayer::Error );
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
-  connect( &player, static_cast< ErrorSignal >( &QMediaPlayer::error ),
-           this, &MultimediaAudioPlayer::onMediaPlayerError );
-#else
-  player.setAudioOutput(&audioOutput);
+  typedef void ( QMediaPlayer::*ErrorSignal )( QMediaPlayer::Error );
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  connect( &player,
+           static_cast< ErrorSignal >( &QMediaPlayer::error ),
+           this,
+           &MultimediaAudioPlayer::onMediaPlayerError );
+  #else
+  player.setAudioOutput( &audioOutput );
 
-  connect( &player,  &QMediaPlayer::errorChanged ,
-           this, &MultimediaAudioPlayer::onMediaPlayerError );
-#endif
+  connect( &player, &QMediaPlayer::errorChanged, this, &MultimediaAudioPlayer::onMediaPlayerError );
+  #endif
 }
 
 QString MultimediaAudioPlayer::play( const char * data, int size )
@@ -31,13 +33,13 @@ QString MultimediaAudioPlayer::play( const char * data, int size )
   stop();
   audioBuffer = new QBuffer();
   audioBuffer->setData( data, size );
-  if( !audioBuffer->open( QIODevice::ReadOnly ) )
+  if ( !audioBuffer->open( QIODevice::ReadOnly ) )
     return tr( "Couldn't open audio buffer for reading." );
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
   player.setSourceDevice( audioBuffer );
-#else
+  #else
   player.setMedia( QMediaContent(), audioBuffer );
-#endif
+  #endif
   player.play();
   return QString();
 }
@@ -45,11 +47,10 @@ QString MultimediaAudioPlayer::play( const char * data, int size )
 void MultimediaAudioPlayer::stop()
 {
   player.stop();
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
+  #if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
   player.setMedia( QMediaContent() ); // Forget about audioBuffer.
-#endif
-  if( audioBuffer )
-  {
+  #endif
+  if ( audioBuffer ) {
     audioBuffer->close();
     audioBuffer->setData( QByteArray() ); // Free memory.
     audioBuffer.clear();
diff --git a/src/multimediaaudioplayer.hh b/src/multimediaaudioplayer.hh
index 2a9e5ea5..c976b3af 100644
--- a/src/multimediaaudioplayer.hh
+++ b/src/multimediaaudioplayer.hh
@@ -6,17 +6,18 @@
 
 #ifdef MAKE_QTMULTIMEDIA_PLAYER
 
-#include <QBuffer>
-#include <QMediaPlayer>
-#include "audioplayerinterface.hh"
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QAudioOutput>
-#endif
-#include <QPointer>
+  #include <QBuffer>
+  #include <QMediaPlayer>
+  #include "audioplayerinterface.hh"
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QAudioOutput>
+  #endif
+  #include <QPointer>
 
-class MultimediaAudioPlayer : public AudioPlayerInterface
+class MultimediaAudioPlayer: public AudioPlayerInterface
 {
   Q_OBJECT
+
 public:
   MultimediaAudioPlayer();
 
@@ -27,11 +28,11 @@ private slots:
   void onMediaPlayerError();
 
 private:
-  QPointer<QBuffer> audioBuffer;
+  QPointer< QBuffer > audioBuffer;
   QMediaPlayer player; ///< Depends on audioBuffer.
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
   QAudioOutput audioOutput;
-#endif
+  #endif
 };
 
 #endif // MAKE_QTMULTIMEDIA_PLAYER
diff --git a/src/parsecmdline.cc b/src/parsecmdline.cc
index ce6ae3ab..b2d7b064 100644
--- a/src/parsecmdline.cc
+++ b/src/parsecmdline.cc
@@ -4,20 +4,15 @@ QStringList parseCommandLine( QString const & commandLine )
 {
   // Parse arguments. Handle quotes correctly.
   QStringList args;
-  bool openQuote = false;
+  bool openQuote           = false;
   bool possibleDoubleQuote = false;
-  bool startNew = true;
-  for( QString::const_iterator c = commandLine.begin(),
-       e = commandLine.end(); c != e; )
-  {
-    if ( *c == '"' && !possibleDoubleQuote )
-    {
+  bool startNew            = true;
+  for ( QString::const_iterator c = commandLine.begin(), e = commandLine.end(); c != e; ) {
+    if ( *c == '"' && !possibleDoubleQuote ) {
       ++c;
-      if ( !openQuote )
-      {
+      if ( !openQuote ) {
         openQuote = true;
-        if ( startNew )
-        {
+        if ( startNew ) {
           args.push_back( QString() );
           startNew = false;
         }
@@ -25,22 +20,16 @@ QStringList parseCommandLine( QString const & commandLine )
       else
         possibleDoubleQuote = true;
     }
-    else
-    if ( possibleDoubleQuote && *c != '"' )
-    {
-      openQuote = false;
+    else if ( possibleDoubleQuote && *c != '"' ) {
+      openQuote           = false;
       possibleDoubleQuote = false;
     }
-    else
-    if ( *c == ' ' && !openQuote )
-    {
+    else if ( *c == ' ' && !openQuote ) {
       ++c;
       startNew = true;
     }
-    else
-    {
-      if ( startNew )
-      {
+    else {
+      if ( startNew ) {
         args.push_back( QString() );
         startNew = false;
       }
diff --git a/src/pronounceengine.cc b/src/pronounceengine.cc
new file mode 100644
index 00000000..789a584a
--- /dev/null
+++ b/src/pronounceengine.cc
@@ -0,0 +1,44 @@
+#include "pronounceengine.hh"
+#include <QMutexLocker>
+
+PronounceEngine::PronounceEngine( QObject * parent ):
+  QObject{ parent }
+{
+}
+
+
+void PronounceEngine::reset()
+{
+  QMutexLocker _( &mutex );
+  state = PronounceState::AVAILABLE;
+
+  dictAudioMap.clear();
+}
+
+
+void PronounceEngine::sendAudio( std::string dictId, QString audioLink )
+{
+  if ( state == PronounceState::OCCUPIED )
+    return;
+
+  QMutexLocker _( &mutex );
+
+  dictAudioMap.operator[]( dictId ).push_back( audioLink );
+}
+
+void PronounceEngine::finishDictionary( std::string dictId )
+{
+  if ( state == PronounceState::OCCUPIED )
+    return;
+
+  if ( dictAudioMap.contains( dictId ) ) {
+    {
+      //limit the mutex scope.
+      QMutexLocker _( &mutex );
+      if ( state == PronounceState::OCCUPIED )
+        return;
+      state = PronounceState::OCCUPIED;
+    }
+    emit emitAudio( dictAudioMap[ dictId ].first() );
+  }
+}
diff --git a/src/pronounceengine.hh b/src/pronounceengine.hh
new file mode 100644
index 00000000..4a807469
--- /dev/null
+++ b/src/pronounceengine.hh
@@ -0,0 +1,31 @@
+#ifndef PRONOUNCEENGINE_HH
+#define PRONOUNCEENGINE_HH
+
+#include <QObject>
+#include <QMap>
+#include <QMutex>
+
+
+enum class PronounceState {
+  AVAILABLE,
+  OCCUPIED
+};
+
+class PronounceEngine: public QObject
+{
+  Q_OBJECT
+  PronounceState state = PronounceState::AVAILABLE;
+  QMutex mutex;
+
+  QMap< std::string, QList< QString > > dictAudioMap;
+
+public:
+  explicit PronounceEngine( QObject * parent = nullptr );
+  void reset();
+  void sendAudio( std::string dictId, QString audioLink );
+  void finishDictionary( std::string dictId );
+signals:
+  void emitAudio( QString audioLink );
+};
+
+#endif // PRONOUNCEENGINE_HH
diff --git a/src/resourceschemehandler.cc b/src/resourceschemehandler.cc
index ac9ae3f6..1e97543e 100644
--- a/src/resourceschemehandler.cc
+++ b/src/resourceschemehandler.cc
@@ -1,31 +1,32 @@
 #include "resourceschemehandler.hh"
 
-ResourceSchemeHandler::ResourceSchemeHandler(ArticleNetworkAccessManager& articleNetMgr, QObject *parent):
-    QWebEngineUrlSchemeHandler(parent),
-    mManager(articleNetMgr){
-}
-void ResourceSchemeHandler::requestStarted(QWebEngineUrlRequestJob *requestJob)
+ResourceSchemeHandler::ResourceSchemeHandler( ArticleNetworkAccessManager & articleNetMgr, QObject * parent ):
+  QWebEngineUrlSchemeHandler( parent ),
+  mManager( articleNetMgr )
 {
-    QUrl url = requestJob->requestUrl();
-
-    QNetworkRequest request;
-    request.setUrl(url);
-    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-    QNetworkReply *reply = this->mManager.getArticleReply( request);
-    connect(reply, &QNetworkReply::finished, requestJob, [=]() {
-      if (reply->error() == QNetworkReply::ContentNotFoundError) {
-        requestJob->fail(QWebEngineUrlRequestJob::UrlNotFound);
-        return;
-      }
-      if (reply->error() != QNetworkReply::NoError) {
-        qDebug() << "resource handler failed:" << reply->error() << ":" << reply->request().url();
-        requestJob->fail(QWebEngineUrlRequestJob::RequestFailed);
-        return;
-      }
-      QMimeType mineType = db.mimeTypeForUrl(url);
-      QString contentType = mineType.name();
-      // Reply segment
-      requestJob->reply(contentType.toLatin1(), reply);
-    });
-    connect(requestJob, &QObject::destroyed, reply, &QObject::deleteLater);
+}
+void ResourceSchemeHandler::requestStarted( QWebEngineUrlRequestJob * requestJob )
+{
+  QUrl url = requestJob->requestUrl();
+
+  QNetworkRequest request;
+  request.setUrl( url );
+  request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache );
+  QNetworkReply * reply = this->mManager.getArticleReply( request );
+  connect( reply, &QNetworkReply::finished, requestJob, [ = ]() {
+    if ( reply->error() == QNetworkReply::ContentNotFoundError ) {
+      requestJob->fail( QWebEngineUrlRequestJob::UrlNotFound );
+      return;
+    }
+    if ( reply->error() != QNetworkReply::NoError ) {
+      qDebug() << "resource handler failed:" << reply->error() << ":" << reply->request().url();
+      requestJob->fail( QWebEngineUrlRequestJob::RequestFailed );
+      return;
+    }
+    QMimeType mineType  = db.mimeTypeForUrl( url );
+    QString contentType = mineType.name();
+    // Reply segment
+    requestJob->reply( contentType.toLatin1(), reply );
+  } );
+  connect( requestJob, &QObject::destroyed, reply, &QObject::deleteLater );
 }
diff --git a/src/resourceschemehandler.hh b/src/resourceschemehandler.hh
index 367439fe..1f8cf248 100644
--- a/src/resourceschemehandler.hh
+++ b/src/resourceschemehandler.hh
@@ -1,20 +1,21 @@
 #ifndef RESOURCESCHEMEHANDLER_H
 #define RESOURCESCHEMEHANDLER_H
 
-#include"article_netmgr.hh"
+#include "article_netmgr.hh"
 
-class ResourceSchemeHandler : public QWebEngineUrlSchemeHandler
+class ResourceSchemeHandler: public QWebEngineUrlSchemeHandler
 {
-    Q_OBJECT
+  Q_OBJECT
+
 public:
-    ResourceSchemeHandler(ArticleNetworkAccessManager& articleNetMgr, QObject *parent = nullptr);
-    void requestStarted(QWebEngineUrlRequestJob *requestJob);
+  ResourceSchemeHandler( ArticleNetworkAccessManager & articleNetMgr, QObject * parent = nullptr );
+  void requestStarted( QWebEngineUrlRequestJob * requestJob );
 
 protected:
 
 private:
-    ArticleNetworkAccessManager& mManager;
-    QMimeDatabase db;
+  ArticleNetworkAccessManager & mManager;
+  QMimeDatabase db;
 };
 
 #endif // RESOURCESCHEMEHANDLER_H
diff --git a/src/scripts/.clang-format b/src/scripts/.clang-format
new file mode 100644
index 00000000..f54a540f
--- /dev/null
+++ b/src/scripts/.clang-format
@@ -0,0 +1,4 @@
+---
+DisableFormat: true
+SortIncludes: Never
+...
diff --git a/src/scripts/gd-builtin.js b/src/scripts/gd-builtin.js
index 184ddc39..583ba0ce 100644
--- a/src/scripts/gd-builtin.js
+++ b/src/scripts/gd-builtin.js
@@ -1,127 +1,124 @@
 // seperate from cpp code.
 var gdAudioLinks = {
-    "first": null,
-    "current": null
+  first: null,
+  current: null,
 };
 
-function gdMakeArticleActive(newId,noEvent) {
-    var gdCurrentArticle = $_$(".gdactivearticle").attr("id")
-    if (gdCurrentArticle !== 'gdfrom-' + newId) {
-        $_$(".gdactivearticle").removeClass("gdactivearticle")
-        var newFormId = 'gdfrom-' + newId
-        $_$("#" + newFormId).addClass("gdactivearticle")
-        gdCurrentArticle = 'gdfrom-' + newId
-        gdAudioLinks.current = newId
-        if(!noEvent)
-            articleview.onJsActiveArticleChanged('gdfrom-' + newId);
-    }
+//store dictionary audio link.
+var gdAudioMap = new Map();
+
+function gdMakeArticleActive(newId, noEvent) {
+  var gdCurrentArticle = $_$(".gdactivearticle").attr("id");
+  if (gdCurrentArticle !== "gdfrom-" + newId) {
+    $_$(".gdactivearticle").removeClass("gdactivearticle");
+    var newFormId = "gdfrom-" + newId;
+    $_$("#" + newFormId).addClass("gdactivearticle");
+    gdCurrentArticle = "gdfrom-" + newId;
+    gdAudioLinks.current = newId;
+    if (!noEvent) articleview.onJsActiveArticleChanged("gdfrom-" + newId);
+  }
 }
 
 var overIframeId = null;
 
 function gdSelectArticle(id) {
-    var selection = window.getSelection()
-    var range = document.createRange()
-    range.selectNodeContents(document.getElementById('gdfrom-' + id))
-    selection.removeAllRanges()
-    selection.addRange(range)
+  var selection = window.getSelection();
+  var range = document.createRange();
+  range.selectNodeContents(document.getElementById("gdfrom-" + id));
+  selection.removeAllRanges();
+  selection.addRange(range);
 }
 
 function processIframeMouseOut() {
-    overIframeId = null
-    top.focus()
+  overIframeId = null;
+  top.focus();
 }
 
 function processIframeMouseOver(newId) {
-    overIframeId = newId
+  overIframeId = newId;
 }
 
 function processIframeClick() {
-    if (overIframeId != null) {
-        overIframeId = overIframeId.replace('gdexpandframe-', '')
-        gdMakeArticleActive(overIframeId)
-    }
+  if (overIframeId != null) {
+    overIframeId = overIframeId.replace("gdexpandframe-", "");
+    gdMakeArticleActive(overIframeId);
+  }
 }
 
 function init() {
-    window.addEventListener('blur', processIframeClick, false)
+  window.addEventListener("blur", processIframeClick, false);
 }
-window.addEventListener('load', init, false)
+window.addEventListener("load", init, false);
 
 function gdExpandOptPart(expanderId, optionalId) {
-    var d1 = document.getElementById(expanderId)
-    var i = 0
-    if (d1.alt == '[+]') {
-        d1.alt = '[-]'
-        d1.src = 'qrc:///icons/collapse_opt.png'
-        for (i = 0; i < 1000; i++) {
-            var d2 = document.getElementById(optionalId + i)
-            if (!d2)
-                break
-            d2.style.display = 'inline'
-        }
-    } else {
-        d1.alt = '[+]'
-        d1.src = 'qrc:///icons/expand_opt.png'
-        for (i = 0; i < 1000; i++) {
-            var d2 = document.getElementById(optionalId + i)
-            if (!d2)
-                break
-            d2.style.display = 'none'
-        }
+  var d1 = document.getElementById(expanderId);
+  var i = 0;
+  if (d1.alt == "[+]") {
+    d1.alt = "[-]";
+    d1.src = "qrc:///icons/collapse_opt.png";
+    for (i = 0; i < 1000; i++) {
+      var d2 = document.getElementById(optionalId + i);
+      if (!d2) break;
+      d2.style.display = "inline";
     }
+  } else {
+    d1.alt = "[+]";
+    d1.src = "qrc:///icons/expand_opt.png";
+    for (i = 0; i < 1000; i++) {
+      var d2 = document.getElementById(optionalId + i);
+      if (!d2) break;
+      d2.style.display = "none";
+    }
+  }
 }
 
 function emitClickedEvent(link) {
-    try {
-        if ('string' != typeof(link)) {
-            return;
-        }
-        articleview.linkClickedInHtml(link)
-    } catch (error) {
-        console.error(error)
+  try {
+    if ("string" != typeof link) {
+      return;
     }
+    articleview.linkClickedInHtml(link);
+  } catch (error) {
+    console.error(error);
+  }
 }
 
 function gdExpandArticle(id) {
-    emitClickedEvent()
-    elem = document.getElementById('gdarticlefrom-' + id)
-    ico = document.getElementById('expandicon-' + id)
-    art = document.getElementById('gdfrom-' + id)
-    ev = window.event
-    t = null
-    if (ev)
-        t = ev.target || ev.srcElement
-    if (elem.style.display == 'inline') {
-        elem.style.display = 'none'
-        ico.className = 'gdexpandicon'
-        art.className = art.className + ' gdcollapsedarticle'
-        nm = document.getElementById('gddictname-' + id)
-        nm.style.cursor = 'pointer'
-        if (ev)
-            ev.stopPropagation()
-        ico.title = tr("Expand article")
-        nm.title = ''
-        articleview.collapseInHtml(id,true);
-    } else if (elem.style.display == 'none') {
-        elem.style.display = 'inline'
-        ico.className = 'gdcollapseicon'
-        art.className = art.className.replace(' gdcollapsedarticle', '')
-        nm = document.getElementById('gddictname-' + id)
-        nm.style.cursor = 'default'
-        nm.title = ''
-        ico.title = tr("Collapse article")
-        articleview.collapseInHtml(id,false);
-    }
+  emitClickedEvent();
+  elem = document.getElementById("gdarticlefrom-" + id);
+  ico = document.getElementById("expandicon-" + id);
+  art = document.getElementById("gdfrom-" + id);
+  ev = window.event;
+  t = null;
+  if (ev) t = ev.target || ev.srcElement;
+  if (elem.style.display == "inline") {
+    elem.style.display = "none";
+    ico.className = "gdexpandicon";
+    art.className = art.className + " gdcollapsedarticle";
+    nm = document.getElementById("gddictname-" + id);
+    nm.style.cursor = "pointer";
+    if (ev) ev.stopPropagation();
+    ico.title = tr("Expand article");
+    nm.title = "";
+    articleview.collapseInHtml(id, true);
+  } else if (elem.style.display == "none") {
+    elem.style.display = "inline";
+    ico.className = "gdcollapseicon";
+    art.className = art.className.replace(" gdcollapsedarticle", "");
+    nm = document.getElementById("gddictname-" + id);
+    nm.style.cursor = "default";
+    nm.title = "";
+    ico.title = tr("Collapse article");
+    articleview.collapseInHtml(id, false);
+  }
 }
 
 function gdCheckArticlesNumber() {
-    elems = document.getElementsByClassName('gddictname')
-    if (elems.length == 1) {
-        el = elems.item(0)
-        s = el.id.replace('gddictname-', '')
-        el = document.getElementById('gdfrom-' + s)
-        if (el && el.className.search('gdcollapsedarticle') > 0)
-            gdExpandArticle(s)
-    }
+  elems = document.getElementsByClassName("gddictname");
+  if (elems.length == 1) {
+    el = elems.item(0);
+    s = el.id.replace("gddictname-", "");
+    el = document.getElementById("gdfrom-" + s);
+    if (el && el.className.search("gdcollapsedarticle") > 0) gdExpandArticle(s);
+  }
 }
diff --git a/src/scripts/gd-custom.js b/src/scripts/gd-custom.js
index f71bfc39..1d9a989d 100644
--- a/src/scripts/gd-custom.js
+++ b/src/scripts/gd-custom.js
@@ -1,63 +1,68 @@
 //document ready
 (function ($) {
-    $(function () {
-        $(document).on("click", "a", function (event) {
-            var link = $(this).attr("href");
-            if ('string' != typeof (link)) {
-                return;
-            }
+  $(function () {
+    $(document).on("click", "a", function (event) {
+      var link = $(this).attr("href");
+      if ("string" != typeof link) {
+        return;
+      }
 
-            if (link.indexOf("javascript:") >= 0) {
-                return;
-            }
+      if (link.indexOf("javascript:") >= 0) {
+        return;
+      }
 
-            //return if the link is like gdlookup:// or other valid url.
-            if (link.indexOf(":") >= 0) {
-                emitClickedEvent(link);
-                return false;
-            }
-            emitClickedEvent("");
+      //return if the link is like gdlookup:// or other valid url.
+      if (link.indexOf(":") >= 0) {
+        emitClickedEvent(link);
+        return false;
+      }
+      emitClickedEvent("");
 
-            var newLink;
-            var href = window.location.href;
-            var index = -1;
-            if (link.startsWith("#")) {
-                //the href may contain # fragment already.remove them before append the new #fragment
-                index = href.indexOf("#");
-                if (index > -1) {
-                    newLink = href.substring(0, index) + link;
-                }
-                else {
-                    newLink = href + link;
-                }
-            }
-            //if hashtag # is not in the start position,it must greater than 0
-            else if (link.indexOf("#")>0) {
-                index = link.indexOf("#");
-                newLink = "gdlookup://localhost/"+link.substring(0,index)+"?gdanchor="+link.substring(index+1);
-            }
-            else {
-                index = href.indexOf("?");
+      var newLink;
+      var href = window.location.href;
+      var index = -1;
+      if (link.startsWith("#")) {
+        //the href may contain # fragment already.remove them before append the new #fragment
+        index = href.indexOf("#");
+        if (index > -1) {
+          newLink = href.substring(0, index) + link;
+        } else {
+          newLink = href + link;
+        }
+      }
+      //if hashtag # is not in the start position,it must greater than 0
+      else if (link.indexOf("#") > 0) {
+        index = link.indexOf("#");
+        newLink =
+          "gdlookup://localhost/" +
+          link.substring(0, index) +
+          "?gdanchor=" +
+          link.substring(index + 1);
+      } else {
+        index = href.indexOf("?");
 
-                if (link.indexOf("?gdanchor") > -1) {
-                    newLink = "gdlookup://localhost/" + link;
-                }
-                else {
-                    if (index > -1) {
-                        newLink = href.substring(0, index) + "?word=" + link;
-                    }
-                    else {
-                        newLink = href + "?word=" + link;
-                    }
-                }
-            }
-            $(this).attr("href", newLink);
-
-        });
-
-        //monitor iframe height.
-        $('iframe').iFrameResize({ checkOrigin:false,maxHeight :800,scrolling:true,warningTimeout:0,minHeight :250,log:true,autoResize:false});
+        if (link.indexOf("?gdanchor") > -1) {
+          newLink = "gdlookup://localhost/" + link;
+        } else {
+          if (index > -1) {
+            newLink = href.substring(0, index) + "?word=" + link;
+          } else {
+            newLink = href + "?word=" + link;
+          }
+        }
+      }
+      $(this).attr("href", newLink);
     });
+
+    //monitor iframe height.
+    $("iframe").iFrameResize({
+      checkOrigin: false,
+      maxHeight: 800,
+      scrolling: true,
+      warningTimeout: 0,
+      minHeight: 250,
+      log: true,
+      autoResize: false,
+    });
+  });
 })($_$);
-
-
diff --git a/src/speechclient.cc b/src/speechclient.cc
index 73f583a9..92ae9ccd 100644
--- a/src/speechclient.cc
+++ b/src/speechclient.cc
@@ -1,9 +1,11 @@
 #include "speechclient.hh"
 
 #include <QtCore>
+#include <QLocale>
+#include <QDebug>
 SpeechClient::SpeechClient( Config::VoiceEngine const & e, QObject * parent ):
   QObject( parent ),
-  internalData( std::make_unique< InternalData >( e ) )
+  internalData( new InternalData( e ) )
 {
 }
 
@@ -14,28 +16,30 @@ SpeechClient::Engines SpeechClient::availableEngines()
   const auto innerEngines = QTextToSpeech::availableEngines();
 
   for ( const auto & engine_name : innerEngines ) {
-    const auto sp = new QTextToSpeech( engine_name == "default" ? nullptr : engine_name );
+    const auto sp = new QTextToSpeech( engine_name );
 
-    #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
-    if ( !sp || sp->state() == QTextToSpeech::Error )
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    if ( sp->state() == QTextToSpeech::Error )
       continue;
-    #else
-      if ( !sp || sp->state() == QTextToSpeech::BackendError )
-        continue;
-    #endif
+#else
+    if ( !sp || sp->state() == QTextToSpeech::BackendError )
+      continue;
+#endif
 
     qDebug() << engine_name << sp->state();
 
-    const QVector< QLocale > locales = sp->availableLocales();
-    for ( const QLocale & locale : locales ) {
+    //    const QVector< QLocale > locales = sp->availableLocales();
+    //    for ( const QLocale & locale : locales )
+    {
+      QLocale locale;
       //on some platforms ,change the locale will change voices too.
       sp->setLocale( locale );
       for ( const QVoice & voice : sp->availableVoices() ) {
         const QString name( QString( "%4 - %3 %1 (%2)" )
-          .arg( QLocale::languageToString( locale.language() ),
-                ( QLocale::countryToString( locale.country() ) ),
-                voice.name(),
-                engine_name ) );
+                              .arg( QLocale::languageToString( locale.language() ),
+                                    ( QLocale::countryToString( locale.country() ) ),
+                                    voice.name(),
+                                    engine_name ) );
         Engine engine( Config::VoiceEngine( engine_name, name, voice.name(), QLocale( locale ), 50, 0 ) );
         engines.push_back( engine );
       }
@@ -49,7 +53,7 @@ SpeechClient::Engines SpeechClient::availableEngines()
 
 bool SpeechClient::tell( QString const & text, int volume, int rate ) const
 {
-  if( internalData->sp->state() != QTextToSpeech::Ready )
+  if ( !internalData || !internalData->sp || internalData->sp->state() != QTextToSpeech::Ready )
     return false;
 
   internalData->sp->setVolume( volume / 100.0 );
@@ -61,5 +65,5 @@ bool SpeechClient::tell( QString const & text, int volume, int rate ) const
 
 bool SpeechClient::tell( QString const & text ) const
 {
-  return tell(text, internalData->engine.volume, internalData->engine.rate);
+  return tell( text, internalData->engine.volume, internalData->engine.rate );
 }
diff --git a/src/speechclient.hh b/src/speechclient.hh
index e0070f61..826adef7 100644
--- a/src/speechclient.hh
+++ b/src/speechclient.hh
@@ -5,10 +5,12 @@
 #include "config.hh"
 #include <QTextToSpeech>
 #include <memory>
+#include <QDebug>
+#include <QSharedPointer>
 
 class SpeechClient: public QObject
 {
-Q_OBJECT
+  Q_OBJECT
 
 public:
 
@@ -37,13 +39,21 @@ public:
   struct InternalData
   {
     explicit InternalData( Config::VoiceEngine const & e ):
-      sp( std::make_unique< QTextToSpeech >( e.engine_name ) ),
+      sp( new QTextToSpeech( e.engine_name ) ),
       engine( e )
     {
+      qDebug() << QStringLiteral( "initialize tts" ) << e.engine_name;
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+      if ( !sp || sp->state() == QTextToSpeech::Error )
+        return;
+#else
+      if ( !sp || sp->state() == QTextToSpeech::BackendError )
+        return;
+#endif
       sp->setLocale( e.locale );
       auto voices = sp->availableVoices();
-      for( const auto & voice : voices ) {
-        if( voice.name() == e.voice_name ) {
+      for ( const auto & voice : voices ) {
+        if ( voice.name() == e.voice_name ) {
           sp->setVoice( voice );
 
           break;
@@ -54,7 +64,7 @@ public:
       sp->setRate( e.rate / 10.0 );
     }
 
-    std::unique_ptr< QTextToSpeech > sp;
+    QSharedPointer< QTextToSpeech > sp;
     Engine engine;
   };
 
@@ -67,12 +77,8 @@ public:
   bool tell( QString const & text, int volume, int rate ) const;
   bool tell( QString const & text ) const;
 
- signals:
-  void started( bool ok );
-  void finished();
-
- private:
-  std::unique_ptr< InternalData > internalData;
+private:
+  QSharedPointer< InternalData > internalData;
 };
 
 #endif // __SPEECHCLIENT_HH_INCLUDED__
diff --git a/src/splitfile.cc b/src/splitfile.cc
index b5e5eb96..55ca3a69 100644
--- a/src/splitfile.cc
+++ b/src/splitfile.cc
@@ -4,10 +4,9 @@
 #include "splitfile.hh"
 
 
-namespace SplitFile
-{
+namespace SplitFile {
 
-SplitFile::SplitFile() :
+SplitFile::SplitFile():
   currentFile( 0 )
 {
 }
@@ -19,7 +18,7 @@ SplitFile::~SplitFile()
 
 void SplitFile::appendFile( const QString & name )
 {
-  if( offsets.isEmpty() )
+  if ( offsets.isEmpty() )
     offsets.append( 0 );
   else
     offsets.append( offsets.last() + files.last()->size() );
@@ -28,10 +27,9 @@ void SplitFile::appendFile( const QString & name )
 
 void SplitFile::close()
 {
-  for( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i )
-  {
-    (*i)->close();
-    delete (*i);
+  for ( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i ) {
+    ( *i )->close();
+    delete ( *i );
   }
 
   files.clear();
@@ -40,17 +38,16 @@ void SplitFile::close()
   currentFile = 0;
 }
 
-void SplitFile::getFilenames( vector< string > &names ) const
+void SplitFile::getFilenames( vector< string > & names ) const
 {
-  for( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i )
+  for ( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i )
     names.push_back( ( *i )->fileName().toStdString() );
 }
 
 bool SplitFile::open( QFile::OpenMode mode )
 {
-  for( QVector< QFile * >::iterator i = files.begin(); i != files.end(); ++i )
-    if( !(*i)->open( mode ) )
-    {
+  for ( QVector< QFile * >::iterator i = files.begin(); i != files.end(); ++i )
+    if ( !( *i )->open( mode ) ) {
       close();
       return false;
     }
@@ -60,13 +57,13 @@ bool SplitFile::open( QFile::OpenMode mode )
 
 bool SplitFile::seek( quint64 pos )
 {
-  if( offsets.isEmpty() )
+  if ( offsets.isEmpty() )
     return false;
 
   int fileNom;
 
-  for( fileNom = 0; fileNom < offsets.size() - 1; fileNom++ )
-    if( pos < offsets.at( fileNom + 1 ) )
+  for ( fileNom = 0; fileNom < offsets.size() - 1; fileNom++ )
+    if ( pos < offsets.at( fileNom + 1 ) )
       break;
 
   pos -= offsets.at( fileNom );
@@ -75,28 +72,26 @@ bool SplitFile::seek( quint64 pos )
   return files.at( fileNom )->seek( pos );
 }
 
-qint64 SplitFile::read( char *data, qint64 maxSize )
+qint64 SplitFile::read( char * data, qint64 maxSize )
 {
-  if( offsets.isEmpty() )
+  if ( offsets.isEmpty() )
     return 0;
 
   quint64 bytesReaded = 0;
-  for( int i = currentFile; i < files.size(); i++ )
-  {
-    if( i != currentFile )
-    {
+  for ( int i = currentFile; i < files.size(); i++ ) {
+    if ( i != currentFile ) {
       files.at( i )->seek( 0 );
       currentFile = i;
     }
 
     qint64 ret = files.at( i )->read( data + bytesReaded, maxSize );
-    if( ret < 0 )
+    if ( ret < 0 )
       break;
 
     bytesReaded += ret;
     maxSize -= ret;
 
-    if( maxSize <= 0 )
+    if ( maxSize <= 0 )
       break;
   }
   return bytesReaded;
@@ -109,13 +104,13 @@ QByteArray SplitFile::read( qint64 maxSize )
 
   qint64 ret = read( data.data(), maxSize );
 
-  if( ret != maxSize )
+  if ( ret != maxSize )
     data.resize( ret );
 
   return data;
 }
 
-bool SplitFile::getChar( char *c )
+bool SplitFile::getChar( char * c )
 {
   char ch;
   return read( c ? c : &ch, 1 ) == 1;
@@ -123,7 +118,7 @@ bool SplitFile::getChar( char *c )
 
 qint64 SplitFile::pos() const
 {
-  if( offsets.isEmpty() )
+  if ( offsets.isEmpty() )
     return 0;
 
   return offsets.at( currentFile ) + files.at( currentFile )->pos();
diff --git a/src/splitfile.hh b/src/splitfile.hh
index 0a8edc2f..2b308094 100644
--- a/src/splitfile.hh
+++ b/src/splitfile.hh
@@ -8,8 +8,7 @@
 #include <vector>
 #include <string>
 
-namespace SplitFile
-{
+namespace SplitFile {
 
 using std::vector;
 using std::string;
@@ -36,13 +35,17 @@ public:
   bool open( QFile::OpenMode mode );
   void close();
   bool seek( quint64 pos );
-  qint64 read(  char * data, qint64 maxSize );
+  qint64 read( char * data, qint64 maxSize );
   QByteArray read( qint64 maxSize );
   bool getChar( char * c );
   qint64 size() const
-  { return files.isEmpty() ? 0 : offsets.last() + files.last()->size(); }
+  {
+    return files.isEmpty() ? 0 : offsets.last() + files.last()->size();
+  }
   bool exists() const
-  { return !files.isEmpty(); }
+  {
+    return !files.isEmpty();
+  }
   qint64 pos() const;
 };
 
diff --git a/src/stylesheets/.clang-format b/src/stylesheets/.clang-format
new file mode 100644
index 00000000..f54a540f
--- /dev/null
+++ b/src/stylesheets/.clang-format
@@ -0,0 +1,4 @@
+---
+DisableFormat: true
+SortIncludes: Never
+...
diff --git a/src/stylesheets/article-style-darkmode.css b/src/stylesheets/article-style-darkmode.css
index 153a0f05..e8929f20 100644
--- a/src/stylesheets/article-style-darkmode.css
+++ b/src/stylesheets/article-style-darkmode.css
@@ -1,4 +1,4 @@
 div.gdactivearticle .gddictname {
-    color:initial;
-    background: rgb(0, 102, 184);
+  color: initial;
+  background: rgb(0, 102, 184);
 }
diff --git a/src/stylesheets/article-style-print.css b/src/stylesheets/article-style-print.css
index 6c8f1d49..84276df5 100644
--- a/src/stylesheets/article-style-print.css
+++ b/src/stylesheets/article-style-print.css
@@ -1,13 +1,13 @@
 /* This stylesheet is used for printing only, overriding article-style.css */
 
-html, body, .gdarticle
-{
+html,
+body,
+.gdarticle {
   background: white;
 }
 
 /* Hide audio icons */
 
-.dsl_s_wav
-{
+.dsl_s_wav {
   display: none;
 }
diff --git a/src/stylesheets/article-style-st-babylon.css b/src/stylesheets/article-style-st-babylon.css
index 3dd0c05d..fe8520ef 100644
--- a/src/stylesheets/article-style-st-babylon.css
+++ b/src/stylesheets/article-style-st-babylon.css
@@ -1,99 +1,101 @@
-html
-{
+html {
   background-color: white;
 }
 
-body
-{
-	background: white;
+body {
+  background: white;
 }
 
-.gdarticle
-{
+.gdarticle {
   background: white;
 }
 
 h3 {
-	font-size: 1em;
+  font-size: 1em;
 }
 
-::selection
-{
-	background: #4492E8;
-	color: white;
+::selection {
+  background: #4492e8;
+  color: white;
 }
 
 /* Dictionary's name heading */
-.gddictname
-{
-	font-weight: normal; 
-	font-size: 11px;
-	border: none; 
-	border-top-left-radius: 8px; 
-	border-top-right-radius: 0px;
-	background: #F0EDED;
-	padding-top: 5px; 
-	padding-bottom: 5px;
+.gddictname {
+  font-weight: normal;
+  font-size: 11px;
+  border: none;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 0px;
+  background: #f0eded;
+  padding-top: 5px;
+  padding-bottom: 5px;
 }
 
-.gddicticon
-{
-	display: inline;
-	padding-right: 5px;
+.gddicticon {
+  display: inline;
+  padding-right: 5px;
 }
 
-.gddicticon img
-{
-	border: 0;
-	height: 16px;
-	vertical-align: text-top;
+.gddicticon img {
+  border: 0;
+  height: 16px;
+  vertical-align: text-top;
 }
 
 /* The 'From ' string which precedes dictionary name in the heading */
-.gdfromprefix
-{
-	display: none;
+.gdfromprefix {
+  display: none;
 }
 
 /* Move the collapse/expand buttons to the right */
-.collapse_expand_area
-{
+.collapse_expand_area {
   float: right;
   margin-right: 2px;
 }
 
-.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover
-{
-    width:15px;
-    background-position: center;
-    background-repeat:no-repeat;
-    vertical-align: text-bottom;
-    padding-left: -5px;
-    margin-left: 0px;
+.gdexpandicon,
+.gdexpandicon:hover,
+.gdcollapseicon,
+.gdcollapseicon:hover {
+  width: 15px;
+  background-position: center;
+  background-repeat: no-repeat;
+  vertical-align: text-bottom;
+  padding-left: -5px;
+  margin-left: 0px;
 }
 
 .gdexpandicon {
-	content:url('qrc:///icons/expand_article.png');
+  content: url("qrc:///icons/expand_article.png");
 }
 
 .gdexpandicon:hover {
-	content:url('qrc:///icons/expand_article_hovered.png');
+  content: url("qrc:///icons/expand_article_hovered.png");
 }
 
 .gdcollapseicon {
-	content:url('qrc:///icons/collapse_article.png');
+  content: url("qrc:///icons/collapse_article.png");
 }
 
 .gdcollapseicon:hover {
-	content:url('qrc:///icons/collapse_article_hovered.png');
+  content: url("qrc:///icons/collapse_article_hovered.png");
 }
 
-.bglpos { color: black; font-weight: bold; font-size: 11px; background: #F0EDED; display: inline; }
-
-.bgltrn { color: #808080; font-size: 12px; display: inline; }
-
-a, .mwiki a
-{
-	color: #0066CC;
+.bglpos {
+  color: black;
+  font-weight: bold;
+  font-size: 11px;
+  background: #f0eded;
+  display: inline;
 }
 
+.bgltrn {
+  color: #808080;
+  font-size: 12px;
+  display: inline;
+}
+
+a,
+.mwiki a {
+  color: #0066cc;
+}
diff --git a/src/stylesheets/article-style-st-classic.css b/src/stylesheets/article-style-st-classic.css
index 37900c82..d27a28c5 100644
--- a/src/stylesheets/article-style-st-classic.css
+++ b/src/stylesheets/article-style-st-classic.css
@@ -1,11 +1,10 @@
 /******** Global, non-dictionary-specific classes ***********/
 
 html {
-        height: 100%;
+  height: 100%;
 }
 
-body
-{
+body {
   background: #fefdeb;
   font-family: Tahoma, Verdana, "Lucida Sans Unicode", sans-serif;
   height: 100%;
@@ -22,76 +21,73 @@ body
 }
 
 /* Don't allow to select [] */
-:before, :after {
+:before,
+:after {
   user-select: none;
 }
 
 /* Plaintext dictionaries are usually 80-column formatted and take a lot
  * of space. We try to use smaller fonts for them therefore. */
-pre
-{
+pre {
   font-size: 12px;
 }
 
 /* Dictionary's name heading */
-.gddictname
-{
-  border: 1px dotted black; padding: 0.2em; padding-left: 0.5em;
-  margin-top: 1.2em; margin-bottom: 9px; font-weight: bold; font-size: 14px;
+.gddictname {
+  border: 1px dotted black;
+  padding: 0.2em;
+  padding-left: 0.5em;
+  margin-top: 1.2em;
+  margin-bottom: 9px;
+  font-weight: bold;
+  font-size: 14px;
   /*background: #ffffdd;*/
 }
 
-.gddicttitle
-{
-	user-select: none;
+.gddicttitle {
+  user-select: none;
 }
 
-.gddictnamebodyseparator
-{
+.gddictnamebodyseparator {
   clear: both;
 }
 
 /* The 'From ' string which precedes dictionary name in the heading */
-.gdfromprefix
-{
-    display:none;
+.gdfromprefix {
+  display: none;
 }
 
 /* The article span. Here we have a padding/margin hack to make fragment links
    behave better (have some space before the start of article) */
-.gdarticle
-{
+.gdarticle {
   display: block;
   padding-top: 1px;
   margin-top: -8px;
   margin-bottom: 8px;
   background: #fefdeb;
-/*fix for invalid blg*/
-  font-style:normal;
+  /*fix for invalid blg*/
+  font-style: normal;
   content-visibility: auto;
   contain-intrinsic-height: auto 600px;
 }
 
 /* CSS trick to prevent the floating elements to overflow
    the article boundaries, see Issue #333. */
-.gdarticle:after
-{
-   content: "";
-   display: block;
-   height: 0;
-   clear: both;
+.gdarticle:after {
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
 }
 
 /* Appears between the articles */
-.gdarticleseparator
-{
+.gdarticleseparator {
   display: inline-block;
   clear: both;
 }
 
 /* Dictionary query error description string */
-.gderrordesc
-{
+.gderrordesc {
   font-style: italic;
   background: url("qrc:///icons/warning.png") center left no-repeat !important;
   padding-left: 22px !important;
@@ -101,78 +97,69 @@ pre
 /********* Babylon dictionaries' classes *********/
 
 /* Transcriptions in Babylon dictionaries */
-.bgltrn:before
-{
-  content:"[";
+.bgltrn:before {
+  content: "[";
 }
 
-.bgltrn:after
-{
-  content:"]";
+.bgltrn:after {
+  content: "]";
 }
 
-.bgltrn { display:block; }
+.bgltrn {
+  display: block;
+}
 
 /* Part of speech in Babylon dictionaries. Usually irrelevant,
  * therefore hidden */
-.bglpos { display: none; }
+.bglpos {
+  display: none;
+}
 
 /* Right-to-left text */
-.bglrtl
-{
+.bglrtl {
   text-align: right;
   direction: rtl;
 }
 
 /******** StarDict dictionaries' classes *********/
 
-
 /* StarDict type 'h' -- Html content. We don't normally do anything here. */
-div.sdct_h
-{
+div.sdct_h {
 }
 
-.sdict_h_wav img
-{
+.sdict_h_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
 
 /* StarDict type 'm' -- Pure meaning. Presented as <pre> */
-pre.sdct_m
-{
+pre.sdct_m {
 }
 
 /* StarDict type 'l' -- Pure meaning which used to be in locale encoding. */
-pre.sdct_l
-{
+pre.sdct_l {
 }
 
 /* StarDict type 'g' -- Pango Markup */
-div.sdct_g
-{
+div.sdct_g {
 }
 
 /* StarDict type 't' -- Transcription */
-div.sdct_t
-{
+div.sdct_t {
   font-weight: bold;
 }
 
 /* StarDict type 'y' -- Chinese YinBiao or Japanese KANA */
-div.sdct_y
-{
+div.sdct_y {
 }
 
 /* StarDict type 'x'. Should have xdxf_*-styled elements inside */
-div.sdct_x
-{
+div.sdct_x {
 }
 
 /* Blockquotes in XDXF-styled elements are used
    for indentation purposes, see Issue #305. */
-.sdct_x blockquote
-{
+.sdct_x blockquote {
   margin: 0px;
   padding-left: 9px;
   display: inline-block;
@@ -180,52 +167,45 @@ div.sdct_x
 
 /******** XDXF markup classes *********/
 
-div.xdxf
-{
+div.xdxf {
 }
 
 /* Key -- keys shouldn't normally be present in the article's body since they
  * are accounted for separately, hence we hide them */
-.xdxf_k
-{
+.xdxf_k {
   display: none;
 }
 
 /* ...and if there's a break after it, we hide it too so we don't have an
  * extra vertical spacing. */
-.xdxf_k + br
-{
+.xdxf_k + br {
   display: none;
 }
 
 /* Article structure tag */
-.xdxf_num
-{
-    color: red;
-    font-weight: bold;
-    padding-left:-15px;
+.xdxf_num {
+  color: red;
+  font-weight: bold;
+  padding-left: -15px;
 }
-.xdxf_def
-{
-    display: block;
-    border-color: #e3e3e3;
-    border-width: 1px;
-    border-style: dashed;
-    margin: 1px;
-    margin-left: 15px;
+.xdxf_def {
+  display: block;
+  border-color: #e3e3e3;
+  border-width: 1px;
+  border-style: dashed;
+  margin: 1px;
+  margin-left: 15px;
 }
 
-.xdxf_def:target
-{
-    /* this pseudoclass is used to marked out the referenced <def> that was just clicked */
-    border-color: red;
-    border-width: 1px;
-    border-style: double;
+.xdxf_def:target {
+  /* this pseudoclass is used to marked out the referenced <def> that was just clicked */
+  border-color: red;
+  border-width: 1px;
+  border-style: double;
 }
 
 /* Abbreviation */
-.xdxf_abbr
-{
+.xdxf_abbr {
   font-style: italic;
   color: seagreen;
   cursor: default;
@@ -233,96 +213,81 @@ div.xdxf
 }
 
 /* Editorial comment */
-.xdxf_co, .xdxf_co_old
-{
-    color: darkslateblue;
-    font-style: italic;
+.xdxf_co,
+.xdxf_co_old {
+  color: darkslateblue;
+  font-style: italic;
 }
-.xdxf_co:before
-{
-    content:"("
+.xdxf_co:before {
+  content: "(";
 }
-.xdxf_co:after
-{
-    content:")"
+.xdxf_co:after {
+  content: ")";
 }
 
 /* Grammar information */
-.xdxf_gr
-{
-    color: orangered;
-    display: block;
+.xdxf_gr {
+  color: orangered;
+  display: block;
 }
 
-.xdxf_gr_old
-{
-    color: blue; /*orangered;*/
+.xdxf_gr_old {
+  color: blue; /*orangered;*/
 }
 
 /* Example */
-.xdxf_ex
-{
-    color: #808080;
-    display: block;
-    margin-left: 14px;
+.xdxf_ex {
+  color: #808080;
+  display: block;
+  margin-left: 14px;
 }
 
-.xdxf_ex_old
-{
-    color: #808080;
+.xdxf_ex_old {
+  color: #808080;
 }
 
-.xdxf_ex_source:before
-{
-    content:"["
+.xdxf_ex_source:before {
+  content: "[";
 }
-.xdxf_ex_source:after
-{
-    content:"]"
+.xdxf_ex_source:after {
+  content: "]";
 }
 
-.xdxf_ex_tran:before
-{
-    content:"— "
+.xdxf_ex_tran:before {
+  content: "— ";
 }
 
-.xdxf_ex_tran
-{
-    font-style: italic;
+.xdxf_ex_tran {
+  font-style: italic;
 }
 
 /* Direct translation */
-.xdxf_dtrn
-{
-    font-weight: bold;
-    color: #dd7800;
+.xdxf_dtrn {
+  font-weight: bold;
+  color: #dd7800;
 }
 
 /* Transcription */
-.xdxf_tr:before
-{
-  content:"[";
+.xdxf_tr:before {
+  content: "[";
 }
 
-.xdxf_tr:after
-{
-  content:"]";
+.xdxf_tr:after {
+  content: "]";
 }
 
-.xdxf_tr, .xdxf_tr_old
-{
+.xdxf_tr,
+.xdxf_tr_old {
   font-weight: bold;
 }
 
 /* Resource reference -- for now just a span. Since there's not yet a mechanism
  * to load resources off XDXF articles in GoldenDict, we just hide them. */
-.xdxf_rref
-{
+.xdxf_rref {
   display: none;
 }
 
-.xdxf_headwords
-{
+.xdxf_headwords {
   font-size: 116%;
   font-weight: bold;
   margin-top: 10px;
@@ -330,123 +295,103 @@ div.xdxf
 }
 
 /* The words in examples that are meaked out; they are marked out only when placed into <ex> tag */
-.xdxf_ex .xdxf_ex_markd, .xdxf_ex_old .xdxf_ex_markd
-{
-  color:black;
-  background-color:lightgray;
+.xdxf_ex .xdxf_ex_markd,
+.xdxf_ex_old .xdxf_ex_markd {
+  color: black;
+  background-color: lightgray;
 }
 
-.xdxf_opt
-{
+.xdxf_opt {
   color: #808080;
 }
 
 /******** SDictionary markup classes *********/
 
-.sdict_forms
-{
+.sdict_forms {
   font-style: italic;
 }
 
 /* Transcription */
-.sdict_tr:before
-{
-  content:"[";
+.sdict_tr:before {
+  content: "[";
 }
 
-.sdict_tr:after
-{
-  content:"] ";
+.sdict_tr:after {
+  content: "] ";
 }
 
-.sdict_tr
-{
+.sdict_tr {
   font-weight: bold;
 }
 
 /************* LSA audio archives **************/
 
 /* A table which contains a play icon and a word's link */
-.lsa_play
-{
+.lsa_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.lsa_play a
-{
+.lsa_play a {
   text-decoration: none;
 }
 
 /************* DSL dictionaries **************/
 
-.dsl_u
-{
+.dsl_u {
   text-decoration: underline;
 }
 
-.dsl_article
-{
-  display:inline;
+.dsl_article {
+  display: inline;
 }
 
-.dsl_article .c_default_color
-{
+.dsl_article .c_default_color {
   color: green;
 }
 
-.dsl_m, .dsl_m0
-{
+.dsl_m,
+.dsl_m0 {
   padding-left: 0px;
 }
 
-.dsl_m1
-{
+.dsl_m1 {
   padding-left: 9px;
 }
 
-.dsl_m2
-{
+.dsl_m2 {
   padding-left: 18px;
 }
 
-.dsl_m3
-{
+.dsl_m3 {
   padding-left: 27px;
 }
 
-.dsl_m4
-{
+.dsl_m4 {
   padding-left: 36px;
 }
 
-.dsl_m5
-{
+.dsl_m5 {
   padding-left: 45px;
 }
 
-.dsl_m6
-{
+.dsl_m6 {
   padding-left: 54px;
 }
 
-.dsl_m7
-{
+.dsl_m7 {
   padding-left: 63px;
 }
 
-.dsl_m8
-{
+.dsl_m8 {
   padding-left: 72px;
 }
 
-.dsl_m9
-{
+.dsl_m9 {
   padding-left: 81px;
 }
 
-.dsl_p, .dsl_p :not(a) /* DSL Feature: Enforce the style even if the children tags say otherwise, except links */
-{
+.dsl_p, .dsl_p :not(a) /* DSL Feature: Enforce the style even if the children tags say otherwise, except links */ {
   color: green !important; /* DSL label color must have highest priority */
   font-style: italic;
   cursor: default;
@@ -457,66 +402,57 @@ div.xdxf
   display: none;
 }
 
-.dsl_t
-{
+.dsl_t {
   font-weight: bold;
 }
 
-.dsl_headwords
-{
+.dsl_headwords {
   font-weight: bold;
   margin-top: 15px;
   margin-bottom: 10px;
 }
 
-.dsl_headwords p
-{
+.dsl_headwords p {
   font-weight: bold;
   font-size: 15px;
   margin: 0;
 }
 
-.dsl_definition p
-{
+.dsl_definition p {
   margin: 0;
 }
 
-.dsl_opt
-{
+.dsl_opt {
   display: none;
 }
 
 .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 children tags say otherwise */
-{
+.dsl_opt .dsl_ex font[color] /* DSL Feature: Enforce the optional zone color even if the children tags say otherwise */ {
   color: gray;
 }
 
-.dsl_ex, .dsl_ex .dsl_opt
-{
+.dsl_ex,
+.dsl_ex .dsl_opt {
   color: gray;
 }
 
 /* Style for expand optional parts button */
-.hidden_expand_opt
-{
+.hidden_expand_opt {
   color: blue;
   cursor: pointer;
   vertical-align: text-bottom;
 }
 
-.dsl_s_wav img
-{
+.dsl_s_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
 
-.dsl_video .img
-{
+.dsl_video .img {
   display: inline-block;
-  background: url('qrc:///icons/video.png');
+  background: url("qrc:///icons/video.png");
   background-repeat: no-repeat;
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
@@ -526,132 +462,111 @@ div.xdxf
   padding: 0;
 }
 
-.dsl_video .filename
-{
+.dsl_video .filename {
   display: none; /* by default, the file name is hidden */
   padding-left: 5px;
 }
 
 /************* MDict dictionaries **************/
-.mdict
-{
-
+.mdict {
 }
 
-.mdict a[name]
-{
+.mdict a[name] {
   text-decoration: none;
   color: inherit;
 }
 
 /************* Zim dictionaries **************/
 
-.zimdict
-{
-  font-size: 110%!important;
+.zimdict {
+  font-size: 110% !important;
 }
 
-.zimdict_headword
-{
-  font-weight: bold!important;
+.zimdict_headword {
+  font-weight: bold !important;
 }
 
 /************* Spelling suggestions *****************/
 
-.gdspellsuggestion
-{
+.gdspellsuggestion {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
 /************* Stemmed suggestions *****************/
 
-.gdstemmedsuggestion
-{
+.gdstemmedsuggestion {
   /* Add some horizontal and vertical space */
   margin-top: 1em;
   margin-left: 1px;
 }
 
-
-.gdstemmedsuggestion_head
-{
+.gdstemmedsuggestion_head {
   margin-left: 11px;
   font-style: italic;
 }
 
-.gdstemmedsuggestion_body
-{
+.gdstemmedsuggestion_body {
 }
 
 /************* Dictd articles *****************/
-.dictd_article
-{
+.dictd_article {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
-.dictd_phonetic:before, .dictd_phonetic:after
-{
+.dictd_phonetic:before,
+.dictd_phonetic:after {
   content: "\\";
   font-style: normal;
 }
 
-.dictd_phonetic:after
-{
+.dictd_phonetic:after {
   margin-left: 3px;
 }
 
-.dictd_phonetic
-{
+.dictd_phonetic {
   font-style: italic;
   color: #009900;
 }
 
-.dictd_article a:link
-{
-  color: #0000FF;
+.dictd_article a:link {
+  color: #0000ff;
 }
 
-.dictserver_from
-{
+.dictserver_from {
   font-size: 110%;
   font-weight: 600;
 }
 
 /************* Epwing dictionaries *****************/
 
-.epwing_narrow_font
-{
+.epwing_narrow_font {
   width: 0.5em;
   height: 1em;
   vertical-align: -15%;
 }
 
-.epwing_wide_font
-{
+.epwing_wide_font {
   width: 1em;
   height: 1em;
   vertical-align: -15%;
 }
 
-.epwing_article
-{
-  display:inline;
+.epwing_article {
+  display: inline;
 }
 
 /************* Websites *****************/
 
-.website_padding
-{
+.website_padding {
   height: 1em;
-  clear:both;
+  clear: both;
 }
 
 /************* Forvo **************/
 
-.forvo_headword
-{
+.forvo_headword {
   margin-top: 15px;
   margin-bottom: 10px;
   font-weight: bold;
@@ -659,31 +574,26 @@ div.xdxf
 }
 
 /* A table which contains a play icon and information about the sound */
-.forvo_play
-{
+.forvo_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.forvo_user
-{
+.forvo_user {
   text-decoration: none;
   color: green;
 }
 
-.forvo_location
-{
+.forvo_location {
   color: grey;
 }
 
-.forvo_positive_votes
-{
+.forvo_positive_votes {
   font-weight: bold;
   color: green;
 }
 
-.forvo_negative_votes
-{
+.forvo_negative_votes {
   font-weight: bold;
   color: red;
 }
@@ -691,32 +601,28 @@ div.xdxf
 /************* Programs **************/
 
 /* A table which contains a play icon and a word's link */
-.programs_play
-{
+.programs_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.programs_play a
-{
+.programs_play a {
   text-decoration: none;
 }
 
-.programs_plaintext, .programs_html
-{
+.programs_plaintext,
+.programs_html {
   margin-top: 15px;
 }
 
 /************* Voice engines **************/
 
-.voiceengines_play
-{
+.voiceengines_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.voiceengines_play a
-{
+.voiceengines_play a {
   text-decoration: none;
 }
 
@@ -725,14 +631,12 @@ div.xdxf
  with a .mwiki prepended to each record.
 */
 
-.mwiki
-{
+.mwiki {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
-.mwiki .topicon
-{
+.mwiki .topicon {
   /* Those are padlocks on top and such -- we disable those for GoldenDict
      since they look really ugly here */
   display: none;
@@ -745,241 +649,294 @@ div.xdxf
  * careful what you put in here, since what looks good in one skin may not in
  * another, but don't ignore the poor non-Monobook users either.
  */
-.mwiki .mw-plusminus-null { color: #aaa; }
+.mwiki .mw-plusminus-null {
+  color: #aaa;
+}
 
-.mwiki .texvc { direction: ltr; unicode-bidi: embed; }
-.mwiki img.tex { vertical-align: middle; }
-.mwiki span.texhtml { font-family: serif; }
+.mwiki .texvc {
+  direction: ltr;
+  unicode-bidi: embed;
+}
+.mwiki img.tex {
+  vertical-align: middle;
+}
+.mwiki span.texhtml {
+  font-family: serif;
+}
 
 /* add a bit of margin space between the preview and the toolbar */
 /* this replaces the ugly <p><br /></p> we used to insert into the page source */
-.mwiki #wikiPreview.ontop { margin-bottom: 1em; }
+.mwiki #wikiPreview.ontop {
+  margin-bottom: 1em;
+}
 
 /* Stop floats from intruding into edit area in previews */
-.mwiki #toolbar, .mwiki #wpTextbox1 { clear: both; }
+.mwiki #toolbar,
+.mwiki #wpTextbox1 {
+  clear: both;
+}
 
 .mwiki div#mw-js-message {
-	margin: 1em 5%;
-	padding: 0.5em 2.5%;
-	border: solid 1px #ddd;
-	background-color: #fcfcfc;
+  margin: 1em 5%;
+  padding: 0.5em 2.5%;
+  border: solid 1px #ddd;
+  background-color: #fcfcfc;
 }
 
 /* Edit section links */
 .mwiki .editsection {
-	float: right;
-	margin-left: 5px;
+  float: right;
+  margin-left: 5px;
 }
 
 /**
  * File histories
  */
 .mwiki table.filehistory {
-	border:1px solid #ccc;
-	border-collapse:collapse;
+  border: 1px solid #ccc;
+  border-collapse: collapse;
 }
 
 .mwiki table.filehistory th,
 .mwiki table.filehistory td {
-	padding: 0 0.2em 0 0.2em;
-	vertical-align:top;
-	border:1px solid #ccc;
+  padding: 0 0.2em 0 0.2em;
+  vertical-align: top;
+  border: 1px solid #ccc;
 }
 .mwiki table.filehistory th {
-	text-align: left;
+  text-align: left;
 }
 .mwiki table.filehistory td.mw-imagepage-filesize,
 .mwiki table.filehistory th.mw-imagepage-filesize {
-	white-space:nowrap;
+  white-space: nowrap;
 }
 
 .mwiki table.filehistory td.filehistory-selected {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 /*
  * rev_deleted stuff
  */
-.mwiki li span.deleted, .mwiki span.history-deleted {
-	text-decoration: line-through;
-	color: #888;
-	font-style: italic;
+.mwiki li span.deleted,
+.mwiki span.history-deleted {
+  text-decoration: line-through;
+  color: #888;
+  font-style: italic;
 }
 
-.mwiki td.mw-label { vertical-align: top; }
-.mwiki td.mw-submit { white-space: nowrap; }
+.mwiki td.mw-label {
+  vertical-align: top;
+}
+.mwiki td.mw-submit {
+  white-space: nowrap;
+}
 /**
  * Forms
  */
-.mwiki body.ltr td.mw-label { text-align: right; }
-.mwiki body.ltr td.mw-input { text-align: left; }
-.mwiki body.ltr td.mw-submit { text-align: left; }
-.mwiki body.rtl td.mw-label { text-align: left; }
-.mwiki body.rtl td.mw-input { text-align: right; }
-.mwiki body.rtl td.mw-submit { text-align: right; }
+.mwiki body.ltr td.mw-label {
+  text-align: right;
+}
+.mwiki body.ltr td.mw-input {
+  text-align: left;
+}
+.mwiki body.ltr td.mw-submit {
+  text-align: left;
+}
+.mwiki body.rtl td.mw-label {
+  text-align: left;
+}
+.mwiki body.rtl td.mw-input {
+  text-align: right;
+}
+.mwiki body.rtl td.mw-submit {
+  text-align: right;
+}
 
 /**
  * Image captions
  */
-.mwiki body.rtl .thumbcaption { text-align:right; }
-.mwiki body.rtl .magnify { float:left; }
+.mwiki body.rtl .thumbcaption {
+  text-align: right;
+}
+.mwiki body.rtl .magnify {
+  float: left;
+}
 
-.mwiki body.ltr .thumbcaption { text-align:left; }
-.mwiki body.ltr .magnify { float:right; }
+.mwiki body.ltr .thumbcaption {
+  text-align: left;
+}
+.mwiki body.ltr .magnify {
+  float: right;
+}
 
 /**
  * Hidden categories
  */
-.mwiki .mw-hidden-cats-hidden { display: none; }
-.mwiki .catlinks-allhidden { display: none; }
+.mwiki .mw-hidden-cats-hidden {
+  display: none;
+}
+.mwiki .catlinks-allhidden {
+  display: none;
+}
 
 /* Convenience links to edit block, delete and protect reasons */
-.mwiki p.mw-ipb-conveniencelinks, .mwiki p.mw-protect-editreasons,
-.mwiki p.mw-filedelete-editreasons, .mwiki p.mw-delete-editreasons {
-	font-size: 90%;
-	float: right;
+.mwiki p.mw-ipb-conveniencelinks,
+.mwiki p.mw-protect-editreasons,
+.mwiki p.mw-filedelete-editreasons,
+.mwiki p.mw-delete-editreasons {
+  font-size: 90%;
+  float: right;
 }
 
 /* Search results */
 .mwiki div.searchresult {
-	font-size: 95%;
-	width:38em;
+  font-size: 95%;
+  width: 38em;
 }
 .mwiki .mw-search-results li {
-	padding-bottom: 1em;
-	list-style:none;
+  padding-bottom: 1em;
+  list-style: none;
 }
 .mwiki .mw-search-result-data {
-	color: green;
-	font-size: 97%;
+  color: green;
+  font-size: 97%;
 }
 
 .mwiki td#mw-search-menu {
-	padding-left:6em;
-	font-size:85%;
+  padding-left: 6em;
+  font-size: 85%;
 }
 
 .mwiki div#mw-search-interwiki {
-	float: right;
-	width: 18em;
-	border-style: solid;
-	border-color: #AAAAAA;
-	border-width: 1px;
-	margin-top: 2ex;
+  float: right;
+  width: 18em;
+  border-style: solid;
+  border-color: #aaaaaa;
+  border-width: 1px;
+  margin-top: 2ex;
 }
 
 .mwiki div#mw-search-interwiki li {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki .mw-search-interwiki-more {
-	float: right;
-	font-size: 90%;
+  float: right;
+  font-size: 90%;
 }
 
 .mwiki span.searchalttitle {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki div.searchdidyoumean {
-	font-size: 127%;
-	margin-bottom: 1ex;
-	margin-top: 1ex;
-	/* Note that this color won't affect the link, as desired. */
-	color: #c00;
+  font-size: 127%;
+  margin-bottom: 1ex;
+  margin-top: 1ex;
+  /* Note that this color won't affect the link, as desired. */
+  color: #c00;
 }
 
 .mwiki div.searchdidyoumean em {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki .searchmatch {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki div.searchresults {
-	border:1px solid darkblue;
-	padding-top: 10px;
-	padding-bottom: 10px;
-	padding-left: 20px;
-	padding-right: 20px;
+  border: 1px solid darkblue;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
 /*
  * UserRights stuff
  */
 .mwiki .mw-userrights-disabled {
-	color: #888;
+  color: #888;
 }
 
-.mwiki table.mw-userrights-groups * td,.mwiki table.mw-userrights-groups * th {
-	padding-right: 1.5em;
+.mwiki table.mw-userrights-groups * td,
+.mwiki table.mw-userrights-groups * th {
+  padding-right: 1.5em;
 }
 
 /*
  * OpenSearch ajax suggestions
  */
 .mwiki .os-suggest {
-	overflow: auto;
-	overflow-x: hidden;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	width: 0px;
-	background-color: white;
-	border-style: solid;
-	border-color: #AAAAAA;
-	border-width: 1px;
-	z-index:99;
-	visibility:hidden;
-	font-size:95%;
+  overflow: auto;
+  overflow-x: hidden;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 0px;
+  background-color: white;
+  border-style: solid;
+  border-color: #aaaaaa;
+  border-width: 1px;
+  z-index: 99;
+  visibility: hidden;
+  font-size: 95%;
 }
 
 .mwiki table.os-suggest-results {
-	font-size: 95%;
-	cursor: pointer;
-	border: 0;
-	border-collapse: collapse;
-	width: 100%;
+  font-size: 95%;
+  cursor: pointer;
+  border: 0;
+  border-collapse: collapse;
+  width: 100%;
 }
 
-.mwiki td.os-suggest-result, .mwiki td.os-suggest-result-hl {
-	white-space: nowrap;
-	background-color: white;
-	color: black;
-	padding: 2px;
+.mwiki td.os-suggest-result,
+.mwiki td.os-suggest-result-hl {
+  white-space: nowrap;
+  background-color: white;
+  color: black;
+  padding: 2px;
 }
 .mwiki td.os-suggest-result-hl,
 .mwiki td.os-suggest-result-hl-webkit {
-	background-color: #4C59A6;
-	color: white;
+  background-color: #4c59a6;
+  color: white;
 }
 
 .mwiki .os-suggest-toggle {
-	position: relative;
-	left: 1ex;
-	font-size: 65%;
+  position: relative;
+  left: 1ex;
+  font-size: 65%;
 }
 .mwiki .os-suggest-toggle-def {
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	font-size: 65%;
-	visibility: hidden;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  font-size: 65%;
+  visibility: hidden;
 }
 
 /* Page history styling */
 /* the auto-generated edit comments */
-.mwiki .autocomment { color: gray; }
-.mwiki #pagehistory .history-user {
-    margin-left: 0.4em;
-    margin-right: 0.2em;
+.mwiki .autocomment {
+  color: gray;
+}
+.mwiki #pagehistory .history-user {
+  margin-left: 0.4em;
+  margin-right: 0.2em;
+}
+.mwiki #pagehistory span.minor {
+  font-weight: bold;
+}
+.mwiki #pagehistory li {
+  border: 1px solid white;
 }
-.mwiki #pagehistory span.minor { font-weight: bold; }
-.mwiki #pagehistory li { border: 1px solid white; }
 .mwiki #pagehistory li.selected {
-    background-color: #f9f9f9;
-    border: 1px dashed #aaa;
+  background-color: #f9f9f9;
+  border: 1px dashed #aaa;
 }
 
 /*
@@ -989,57 +946,61 @@ div.xdxf
 
 .mwiki table.mw-listgrouprights-table,
 .mwiki table.mw-statistics-table {
-	border: 1px solid #ccc;
-	border-collapse: collapse;
+  border: 1px solid #ccc;
+  border-collapse: collapse;
 }
 
-.mwiki table.mw-listgrouprights-table tr  {
-	vertical-align: top;
+.mwiki table.mw-listgrouprights-table tr {
+  vertical-align: top;
 }
 
-.mwiki table.mw-listgrouprights-table td, .mwiki table.mw-listgrouprights-table th,
-.mwiki table.mw-statistics-table td, .mwiki table.mw-statistics-table th {
-	padding: 0.5em 0.2em 0.5em 0.2em;
-	border: 1px solid #ccc;
+.mwiki table.mw-listgrouprights-table td,
+.mwiki table.mw-listgrouprights-table th,
+.mwiki table.mw-statistics-table td,
+.mwiki table.mw-statistics-table th {
+  padding: 0.5em 0.2em 0.5em 0.2em;
+  border: 1px solid #ccc;
 }
 
 .mwiki td.mw-statistics-numbers {
-	text-align: right;
+  text-align: right;
 }
 
 /* Special:SpecialPages styling */
 .mwiki h4.mw-specialpagesgroup {
-	background-color: #dcdcdc;
-	padding: 2px;
-	margin: .3em 0em 0em 0em;
+  background-color: #dcdcdc;
+  padding: 2px;
+  margin: 0.3em 0em 0em 0em;
 }
 .mwiki .mw-specialpagerestricted {
-	font-weight: bold;
+  font-weight: bold;
 }
 
-.mwiki #shared-image-dup, .mwiki #shared-image-conflict {
-	font-style: italic;
+.mwiki #shared-image-dup,
+.mwiki #shared-image-conflict {
+  font-style: italic;
 }
 
 /* Special:EmailUser styling */
 .mwiki table.mw-emailuser-table {
-	width: 98%;
+  width: 98%;
 }
-.mwiki td#mw-emailuser-sender, .mwiki td#mw-emailuser-recipient {
-	font-weight: bold;
+.mwiki td#mw-emailuser-sender,
+.mwiki td#mw-emailuser-recipient {
+  font-weight: bold;
 }
 
 /* Special:Prefixindex styling */
 .mwiki table#mw-prefixindex-list-table,
 .mwiki table#mw-prefixindex-nav-table {
-	width: 98%;
-	background-color: transparent;
+  width: 98%;
+  background-color: transparent;
 }
-.mwiki td#mw-prefixindex-nav-form  {
-	font-size: smaller;
-	margin-bottom: 1em;
-	text-align: right;
-	vertical-align: top;
+.mwiki td#mw-prefixindex-nav-form {
+  font-size: smaller;
+  margin-bottom: 1em;
+  text-align: right;
+  vertical-align: top;
 }
 
 /*
@@ -1049,25 +1010,25 @@ div.xdxf
  * incl. log entries for these warnings
  */
 .mwiki div.mw-warning-with-logexcerpt {
-	padding: 3px;
-	margin-bottom: 3px;
-	border: 2px solid #2F6FAB;
+  padding: 3px;
+  margin-bottom: 3px;
+  border: 2px solid #2f6fab;
 }
 .mwiki div.mw-warning-with-logexcerpt ul li {
-	font-size: 90%;
+  font-size: 90%;
 }
 
 /* (show/hide) revision deletion links */
 .mwiki span.mw-revdelundel-link,
 .mwiki strong.mw-revdelundel-link {
-	font-family: monospace;
-	font-size: smaller
+  font-family: monospace;
+  font-size: smaller;
 }
 
 /* feed links */
 .mwiki a.feedlink {
-	background: url("images/feed-icon.png") center left no-repeat;
-	padding-left: 16px;
+  background: url("images/feed-icon.png") center left no-repeat;
+  padding-left: 16px;
 }
 
 /************ monobook/main.css **************/
@@ -1084,26 +1045,26 @@ div.xdxf
 */
 
 .mwiki #column-content {
-	width: 100%;
-	float: right;
-	margin: 0 0 .6em -12.2em;
-	padding: 0;
+  width: 100%;
+  float: right;
+  margin: 0 0 0.6em -12.2em;
+  padding: 0;
 }
 .mwiki #content {
-	margin: 2.8em 0 0 12.2em;
-	padding: 0 1em 1em 1em;
-	position: relative;
-	z-index: 2;
+  margin: 2.8em 0 0 12.2em;
+  padding: 0 1em 1em 1em;
+  position: relative;
+  z-index: 2;
 }
 .mwiki #column-one {
-	padding-top: 160px;
+  padding-top: 160px;
 }
 .mwiki #content {
-	background: white;
-	color: black;
-	border: 1px solid #aaa;
-	border-right: none;
-	line-height: 1.5em;
+  background: white;
+  color: black;
+  border: 1px solid #aaa;
+  border-right: none;
+  line-height: 1.5em;
 }
 /* the left column width is specified in class .portlet */
 
@@ -1125,171 +1086,210 @@ body {
 
 /* scale back up to a sane default */
 .mwiki #globalWrapper {
-	font-size: 127%;
-	width: 100%;
-	margin: 0;
-	padding: 0;
+  font-size: 127%;
+  width: 100%;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .visualClear {
-	clear: both;
+  clear: both;
 }
 
 /* general styles */
 
 .mwiki table {
-	font-size: 100%;
-	color: black;
-	/* we don't want the bottom borders of <h2>s to be visible through
+  font-size: 100%;
+  color: black;
+  /* we don't want the bottom borders of <h2>s to be visible through
 	   floated tables */
-	background-color: white;
+  background-color: white;
 }
 .mwiki fieldset table {
-	/* but keep table layouts in forms clean... */
-	background: none;
+  /* but keep table layouts in forms clean... */
+  background: none;
 }
 .mwiki a {
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
+  text-decoration: none;
+  color: #002bb8;
+  background: none;
 }
 .mwiki a:visited {
-	color: #5a3696;
+  color: #5a3696;
 }
 .mwiki a:active {
-	color: #faa700;
+  color: #faa700;
 }
 .mwiki a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 .mwiki a.stub {
-	color: #772233;
+  color: #772233;
 }
-.mwiki a.new, .mwiki #p-personal a.new {
-	color: #ba0000;
+.mwiki a.new,
+.mwiki #p-personal a.new {
+  color: #ba0000;
 }
-.mwiki a.new:visited, .mwiki #p-personal a.new:visited {
-	color: #a55858;
+.mwiki a.new:visited,
+.mwiki #p-personal a.new:visited {
+  color: #a55858;
 }
 
 .mwiki img {
-	border: none;
-	vertical-align: middle;
+  border: none;
+  vertical-align: middle;
 }
 .mwiki p {
-	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
+  margin: 0.4em 0 0.5em 0;
+  line-height: 1.5em;
 }
 .mwiki p img {
-	margin: 0;
+  margin: 0;
 }
 
 .mwiki hr {
-	height: 1px;
-	color: #aaa;
-	background-color: #aaa;
-	border: 0;
-	margin: .2em 0 .2em 0;
+  height: 1px;
+  color: #aaa;
+  background-color: #aaa;
+  border: 0;
+  margin: 0.2em 0 0.2em 0;
 }
 
-.mwiki h1, .mwiki h2, .mwiki h3, .mwiki h4, .mwiki h5, .mwiki h6 {
-	color: black;
-	background: none;
-	font-weight: normal;
-	margin: 0;
-	padding-top: .5em;
-	padding-bottom: .17em;
-	border-bottom: 1px solid #aaa;
+.mwiki h1,
+.mwiki h2,
+.mwiki h3,
+.mwiki h4,
+.mwiki h5,
+.mwiki h6 {
+  color: black;
+  background: none;
+  font-weight: normal;
+  margin: 0;
+  padding-top: 0.5em;
+  padding-bottom: 0.17em;
+  border-bottom: 1px solid #aaa;
 }
-.mwiki h1 { font-size: 188%; }
-.mwiki h1 .editsection { font-size: 53%; }
-.mwiki h2 { font-size: 150%; }
-.mwiki h2 .editsection { font-size: 67%; }
-.mwiki h3, .mwiki h4, .mwiki h5, .mwiki h6 {
-	border-bottom: none;
-	font-weight: bold;
+.mwiki h1 {
+  font-size: 188%;
+}
+.mwiki h1 .editsection {
+  font-size: 53%;
+}
+.mwiki h2 {
+  font-size: 150%;
+}
+.mwiki h2 .editsection {
+  font-size: 67%;
+}
+.mwiki h3,
+.mwiki h4,
+.mwiki h5,
+.mwiki h6 {
+  border-bottom: none;
+  font-weight: bold;
+}
+.mwiki h3 {
+  font-size: 132%;
+}
+.mwiki h3 .editsection {
+  font-size: 76%;
+  font-weight: normal;
+}
+.mwiki h4 {
+  font-size: 116%;
+}
+.mwiki h4 .editsection {
+  font-size: 86%;
+  font-weight: normal;
+}
+.mwiki h5 {
+  font-size: 100%;
+}
+.mwiki h5 .editsection {
+  font-weight: normal;
+}
+.mwiki h6 {
+  font-size: 80%;
+}
+.mwiki h6 .editsection {
+  font-size: 125%;
+  font-weight: normal;
 }
-.mwiki h3 { font-size: 132%; }
-.mwiki h3 .editsection { font-size: 76%; font-weight: normal; }
-.mwiki h4 { font-size: 116%; }
-.mwiki h4 .editsection { font-size: 86%; font-weight: normal; }
-.mwiki h5 { font-size: 100%; }
-.mwiki h5 .editsection { font-weight: normal; }
-.mwiki h6 { font-size: 80%;  }
-.mwiki h6 .editsection { font-size: 125%; font-weight: normal; }
 
 .mwiki ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: .3em 0 0 1.5em;
-	padding: 0;
-	list-style-image: url(bullet.gif);
+  line-height: 1.5em;
+  list-style-type: square;
+  margin: 0.3em 0 0 1.5em;
+  padding: 0;
+  list-style-image: url(bullet.gif);
 }
 .mwiki ol {
-	line-height: 1.5em;
-	margin: .3em 0 0 3.2em;
-	padding: 0;
-	list-style-image: none;
+  line-height: 1.5em;
+  margin: 0.3em 0 0 3.2em;
+  padding: 0;
+  list-style-image: none;
 }
 .mwiki li {
-	margin-bottom: .1em;
+  margin-bottom: 0.1em;
 }
 .mwiki dt {
-	font-weight: bold;
-	margin-bottom: .1em;
+  font-weight: bold;
+  margin-bottom: 0.1em;
 }
 .mwiki dl {
-	margin-top: .2em;
-	margin-bottom: .5em;
+  margin-top: 0.2em;
+  margin-bottom: 0.5em;
 }
 .mwiki dd {
-	line-height: 1.5em;
-	margin-left: 2em;
-	margin-bottom: .1em;
+  line-height: 1.5em;
+  margin-left: 2em;
+  margin-bottom: 0.1em;
 }
 
 .mwiki fieldset {
-	border: 1px solid #2f6fab;
-	margin: 1em 0 1em 0;
-	padding: 0 1em 1em;
-	line-height: 1.5em;
+  border: 1px solid #2f6fab;
+  margin: 1em 0 1em 0;
+  padding: 0 1em 1em;
+  line-height: 1.5em;
 }
 .mwiki fieldset.nested {
-	margin: 0 0 0.5em 0;
-	padding: 0 0.5em 0.5em;
+  margin: 0 0 0.5em 0;
+  padding: 0 0.5em 0.5em;
 }
 .mwiki legend {
-	padding: .5em;
-	font-size: 95%;
+  padding: 0.5em;
+  font-size: 95%;
 }
 .mwiki form {
-	border: none;
-	margin: 0;
+  border: none;
+  margin: 0;
 }
 
 .mwiki textarea {
-	width: 100%;
-	padding: .1em;
+  width: 100%;
+  padding: 0.1em;
 }
 
 .mwiki input.historysubmit {
-	padding: 0 .3em .3em .3em !important;
-	font-size: 94%;
-	cursor: pointer;
-	height: 1.7em !important;
-	margin-left: 1.6em;
+  padding: 0 0.3em 0.3em 0.3em !important;
+  font-size: 94%;
+  cursor: pointer;
+  height: 1.7em !important;
+  margin-left: 1.6em;
 }
 .mwiki select {
-	vertical-align: top;
+  vertical-align: top;
 }
-.mwiki abbr, .mwiki acronym, .mwiki .explain {
-	border-bottom: 1px dotted black;
-	color: black;
-	background: none;
-	cursor: help;
+.mwiki abbr,
+.mwiki acronym,
+.mwiki .explain {
+  border-bottom: 1px dotted black;
+  color: black;
+  background: none;
+  cursor: help;
 }
 .mwiki q {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+  font-family: Times, "Times New Roman", serif;
+  font-style: italic;
 }
 /* disabled for now
 .mwiki blockquote {
@@ -1297,14 +1297,14 @@ body {
 	font-style: italic;
 }*/
 .mwiki code {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 .mwiki pre {
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
+  padding: 1em;
+  border: 1px dashed #2f6fab;
+  color: black;
+  background-color: #f9f9f9;
+  line-height: 1.1em;
 }
 
 /*
@@ -1312,128 +1312,135 @@ body {
 */
 
 .mwiki #siteSub {
-	display: none;
+  display: none;
 }
 .mwiki #jump-to-nav {
-	display: none;
+  display: none;
 }
 
-.mwiki #contentSub, .mwiki #contentSub2 {
-	font-size: 84%;
-	line-height: 1.2em;
-	margin: 0 0 1.4em 1em;
-	color: #7d7d7d;
-	width: auto;
+.mwiki #contentSub,
+.mwiki #contentSub2 {
+  font-size: 84%;
+  line-height: 1.2em;
+  margin: 0 0 1.4em 1em;
+  color: #7d7d7d;
+  width: auto;
 }
 .mwiki span.subpages {
-	display: block;
+  display: block;
 }
 
 /* Some space under the headers in the content area */
-.mwiki #bodyContent h1, .mwiki #bodyContent h2 {
-	margin-bottom: .6em;
+.mwiki #bodyContent h1,
+.mwiki #bodyContent h2 {
+  margin-bottom: 0.6em;
 }
-.mwiki #bodyContent h3, .mwiki #bodyContent h4, .mwiki #bodyContent h5 {
-	margin-bottom: .3em;
+.mwiki #bodyContent h3,
+.mwiki #bodyContent h4,
+.mwiki #bodyContent h5 {
+  margin-bottom: 0.3em;
 }
 .mwiki #firstHeading {
-	margin-bottom: .1em;
-	/* These two rules hack around bug 2013 (fix for more limited bug 11325).
+  margin-bottom: 0.1em;
+  /* These two rules hack around bug 2013 (fix for more limited bug 11325).
 	   When bug 2013 is fixed properly, they should be removed. */
-	line-height: 1.2em;
-	padding-bottom: 0;
+  line-height: 1.2em;
+  padding-bottom: 0;
 }
 
 /* user notification thing */
 .mwiki .usermessage {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
-	color: black;
-	font-weight: bold;
-	margin: 2em 0 1em;
-	padding: .5em 1em;
-	vertical-align: middle;
+  background-color: #ffce7b;
+  border: 1px solid #ffa500;
+  color: black;
+  font-weight: bold;
+  margin: 2em 0 1em;
+  padding: 0.5em 1em;
+  vertical-align: middle;
 }
 .mwiki #siteNotice {
-	text-align: center;
-	font-size: 95%;
-	padding: 0 .9em;
+  text-align: center;
+  font-size: 95%;
+  padding: 0 0.9em;
 }
 .mwiki #siteNotice p {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .success {
-	color: green;
-	font-size: larger;
+  color: green;
+  font-size: larger;
 }
 .mwiki .error {
-	color: red;
-	font-size: larger;
+  color: red;
+  font-size: larger;
 }
-.mwiki .errorbox, .mwiki .successbox {
-	font-size: larger;
-	border: 2px solid;
-	padding: .5em 1em;
-	float: left;
-	margin-bottom: 2em;
-	color: #000;
+.mwiki .errorbox,
+.mwiki .successbox {
+  font-size: larger;
+  border: 2px solid;
+  padding: 0.5em 1em;
+  float: left;
+  margin-bottom: 2em;
+  color: #000;
 }
 .mwiki .errorbox {
-	border-color: red;
-	background-color: #fff2f2;
+  border-color: red;
+  background-color: #fff2f2;
 }
 .mwiki .successbox {
-	border-color: green;
-	background-color: #dfd;
+  border-color: green;
+  background-color: #dfd;
 }
-.mwiki .errorbox h2, .mwiki .successbox h2 {
-	font-size: 1em;
-	font-weight: bold;
-	display: inline;
-	margin: 0 .5em 0 0;
-	border: none;
+.mwiki .errorbox h2,
+.mwiki .successbox h2 {
+  font-size: 1em;
+  font-weight: bold;
+  display: inline;
+  margin: 0 0.5em 0 0;
+  border: none;
 }
 
 .mwiki .catlinks {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-top: 1em;
-	clear: both;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  margin-top: 1em;
+  clear: both;
 }
 /* currently unused, intended to be used by a metadata box
 in the bottom-right corner of the content area */
 .mwiki .documentDescription {
-	/* The summary text describing the document */
-	font-weight: bold;
-	display: block;
-	margin: 1em 0;
-	line-height: 1.5em;
+  /* The summary text describing the document */
+  font-weight: bold;
+  display: block;
+  margin: 1em 0;
+  line-height: 1.5em;
 }
 .mwiki .documentByLine {
-	text-align: right;
-	font-size: 90%;
-	clear: both;
-	font-weight: normal;
-	color: #76797c;
+  text-align: right;
+  font-size: 90%;
+  clear: both;
+  font-weight: normal;
+  color: #76797c;
 }
 
 /* emulate center */
 .mwiki .center {
-	width: 100%;
-	text-align: center;
+  width: 100%;
+  text-align: center;
 }
 .mwiki *.center * {
-	margin-left: auto;
-	margin-right: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 /* small for tables and similar */
-.mwiki .small, .mwiki .small * {
-	font-size: 94%;
+.mwiki .small,
+.mwiki .small * {
+  font-size: 94%;
 }
 .mwiki table.small {
-	font-size: 100%;
+  font-size: 100%;
 }
 
 /*
@@ -1443,125 +1450,132 @@ in the bottom-right corner of the content area */
 .mwiki #toc,
 .mwiki .toc,
 .mwiki .mw-warning {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
 }
 .mwiki #toc h2,
 .mwiki .toc h2 {
-	display: inline;
-	border: none;
-	padding: 0;
-	font-size: 100%;
-	font-weight: bold;
+  display: inline;
+  border: none;
+  padding: 0;
+  font-size: 100%;
+  font-weight: bold;
 }
 .mwiki #toc #toctitle,
 .mwiki .toc #toctitle,
 .mwiki #toc .toctitle,
 .mwiki .toc .toctitle {
-	text-align: center;
+  text-align: center;
 }
 .mwiki #toc ul,
 .mwiki .toc ul {
-	list-style-type: none;
-	list-style-image: none;
-	margin-left: 0;
-	padding-left: 0;
-	text-align: left;
+  list-style-type: none;
+  list-style-image: none;
+  margin-left: 0;
+  padding-left: 0;
+  text-align: left;
 }
 .mwiki #toc ul ul,
 .mwiki .toc ul ul {
-	margin: 0 0 0 2em;
+  margin: 0 0 0 2em;
 }
 .mwiki #toc .toctoggle,
 .mwiki .toc .toctoggle {
-	font-size: 94%;
+  font-size: 94%;
 }
 
 .mwiki .mw-warning {
-	margin-left: 50px;
-	margin-right: 50px;
-	text-align: center;
+  margin-left: 50px;
+  margin-right: 50px;
+  text-align: center;
 }
 
 /* images */
-.mwiki div.floatright, .mwiki table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
-	margin: 0 0 .5em .5em;
-	border: 0;
-/*
+.mwiki div.floatright,
+.mwiki table.floatright {
+  clear: right;
+  float: right;
+  position: relative;
+  margin: 0 0 0.5em 0.5em;
+  border: 0;
+  /*
 	border: .5em solid white;
 	border-width: .5em 0 .8em 1.4em;
 */
 }
-.mwiki div.floatright p { font-style: italic; }
-.mwiki div.floatleft, .mwiki table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
-	margin: 0 .5em .5em 0;
-	border: 0;
-/*
+.mwiki div.floatright p {
+  font-style: italic;
+}
+.mwiki div.floatleft,
+.mwiki table.floatleft {
+  float: left;
+  clear: left;
+  position: relative;
+  margin: 0 0.5em 0.5em 0;
+  border: 0;
+  /*
 	margin: .3em .5em .5em 0;
 	border: .5em solid white;
 	border-width: .5em 1.4em .8em 0;
 */
 }
-.mwiki div.floatleft p { font-style: italic; }
+.mwiki div.floatleft p {
+  font-style: italic;
+}
 /* thumbnails */
 .mwiki div.thumb {
-	margin-bottom: .5em;
-	border-style: solid;
-	border-color: white;
-	width: auto;
+  margin-bottom: 0.5em;
+  border-style: solid;
+  border-color: white;
+  width: auto;
 }
 .mwiki div.thumbinner {
-	border: 1px solid #ccc;
-	padding: 3px !important;
-	background-color: #f9f9f9;
-	font-size: 94%;
-	text-align: center;
-	overflow: hidden;
+  border: 1px solid #ccc;
+  padding: 3px !important;
+  background-color: #f9f9f9;
+  font-size: 94%;
+  text-align: center;
+  overflow: hidden;
 }
 .mwiki html .thumbimage {
-	border: 1px solid #ccc;
+  border: 1px solid #ccc;
 }
 .mwiki html .thumbcaption {
-	border: none;
-	text-align: left;
-	line-height: 1.4em;
-	padding: 3px !important;
-	font-size: 94%;
+  border: none;
+  text-align: left;
+  line-height: 1.4em;
+  padding: 3px !important;
+  font-size: 94%;
 }
 .mwiki div.magnify {
-	float: right;
-	border: none !important;
-	background: none !important;
+  float: right;
+  border: none !important;
+  background: none !important;
 }
-.mwiki div.magnify a, .mwiki div.magnify img {
-	display: block;
-	border: none !important;
-	background: none !important;
+.mwiki div.magnify a,
+.mwiki div.magnify img {
+  display: block;
+  border: none !important;
+  background: none !important;
 }
 .mwiki div.tright {
-	clear: right;
-	float: right;
-	border-width: .5em 0 .8em 1.4em;
+  clear: right;
+  float: right;
+  border-width: 0.5em 0 0.8em 1.4em;
 }
 .mwiki div.tleft {
-	float: left;
-	clear: left;
-	margin-right: .5em;
-	border-width: .5em 1.4em .8em 0;
+  float: left;
+  clear: left;
+  margin-right: 0.5em;
+  border-width: 0.5em 1.4em 0.8em 0;
 }
 .mwiki img.thumbborder {
-	border: 1px solid #dddddd;
+  border: 1px solid #dddddd;
 }
 .mwiki .hiddenStructure {
-	display: none;
+  display: none;
 }
 
 /*
@@ -1574,26 +1588,26 @@ in the bottom-right corner of the content area */
 */
 /* table standards */
 .mwiki table.rimage {
-	float: right;
-	position: relative;
-	margin-left: 1em;
-	margin-bottom: 1em;
-	text-align: center;
+  float: right;
+  position: relative;
+  margin-left: 1em;
+  margin-bottom: 1em;
+  text-align: center;
 }
 .mwiki .toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
 }
 
 /*
 ** edit views etc
 */
 .mwiki .special li {
-	line-height: 1.4em;
-	margin: 0;
-	padding: 0;
+  line-height: 1.4em;
+  margin: 0;
+  padding: 0;
 }
 
 /*
@@ -1601,77 +1615,93 @@ in the bottom-right corner of the content area */
 ** this is css3, the validator doesn't like it when validating as css2
 */
 .mwiki #bodyContent a.external,
-.mwiki #bodyContent a[href ^="gopher://"] {
-	background: url(external.png) center right no-repeat;
-        padding-right: 1em;
+.mwiki #bodyContent a[href ^="gopher://"]
+{
+  background: url(external.png) center right no-repeat;
+  padding-right: 1em;
 }
 .mwiki #bodyContent a[href ^="https://"],
 .mwiki .link-https {
-	background: url(lock_icon.gif) center right no-repeat;
-	padding-right: 16px;
+  background: url(lock_icon.gif) center right no-repeat;
+  padding-right: 16px;
 }
-.mwiki #bodyContent a[href ^="mailto:"],
+.mwiki #bodyContent a[href^="mailto:"],
 .mwiki .link-mailto {
-	background: url(mail_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(mail_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
-.mwiki #bodyContent a[href ^="news://"] {
-	background: url(news_icon.png) center right no-repeat;
-	padding-right: 18px;
+.mwiki #bodyContent a[href ^="news://"]
+{
+  background: url(news_icon.png) center right no-repeat;
+  padding-right: 18px;
 }
 .mwiki #bodyContent a[href ^="ftp://"],
 .mwiki .link-ftp {
-	background: url(file_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(file_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
 .mwiki #bodyContent a[href ^="irc://"],
 .mwiki #bodyContent a.extiw[href ^="irc://"],
 .mwiki .link-irc {
-	background: url(discussionitem_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(discussionitem_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
-.mwiki #bodyContent a.external[href $=".ogg"], .mwiki #bodyContent a.external[href $=".OGG"],
-.mwiki #bodyContent a.external[href $=".oga"], .mwiki #bodyContent a.external[href $=".OGA"],
-.mwiki #bodyContent a.external[href $=".mid"], .mwiki #bodyContent a.external[href $=".MID"],
-.mwiki #bodyContent a.external[href $=".midi"], .mwiki #bodyContent a.external[href $=".MIDI"],
-.mwiki #bodyContent a.external[href $=".mp3"], .mwiki #bodyContent a.external[href $=".MP3"],
-.mwiki #bodyContent a.external[href $=".wav"], .mwiki #bodyContent a.external[href $=".WAV"],
-.mwiki #bodyContent a.external[href $=".wma"], .mwiki #bodyContent a.external[href $=".WMA"],
+.mwiki #bodyContent a.external[href$=".ogg"],
+.mwiki #bodyContent a.external[href$=".OGG"],
+.mwiki #bodyContent a.external[href$=".oga"],
+.mwiki #bodyContent a.external[href$=".OGA"],
+.mwiki #bodyContent a.external[href$=".mid"],
+.mwiki #bodyContent a.external[href$=".MID"],
+.mwiki #bodyContent a.external[href$=".midi"],
+.mwiki #bodyContent a.external[href$=".MIDI"],
+.mwiki #bodyContent a.external[href$=".mp3"],
+.mwiki #bodyContent a.external[href$=".MP3"],
+.mwiki #bodyContent a.external[href$=".wav"],
+.mwiki #bodyContent a.external[href$=".WAV"],
+.mwiki #bodyContent a.external[href$=".wma"],
+.mwiki #bodyContent a.external[href$=".WMA"],
 .mwiki .link-audio {
-	background: url("audio.png") center right no-repeat;
-        padding-right: 1em;
+  background: url("audio.png") center right no-repeat;
+  padding-right: 1em;
 }
-.mwiki #bodyContent a.external[href $=".ogm"], .mwiki #bodyContent a.external[href $=".OGM"],
-.mwiki #bodyContent a.external[href $=".avi"], .mwiki #bodyContent a.external[href $=".AVI"],
-.mwiki #bodyContent a.external[href $=".mpeg"], .mwiki #bodyContent a.external[href $=".MPEG"],
-.mwiki #bodyContent a.external[href $=".mpg"], .mwiki #bodyContent a.external[href $=".MPG"],
+.mwiki #bodyContent a.external[href$=".ogm"],
+.mwiki #bodyContent a.external[href$=".OGM"],
+.mwiki #bodyContent a.external[href$=".avi"],
+.mwiki #bodyContent a.external[href$=".AVI"],
+.mwiki #bodyContent a.external[href$=".mpeg"],
+.mwiki #bodyContent a.external[href$=".MPEG"],
+.mwiki #bodyContent a.external[href$=".mpg"],
+.mwiki #bodyContent a.external[href$=".MPG"],
 .mwiki .link-video {
-	background: url("video.png") center right no-repeat;
-        padding-right: 1em;
+  background: url("video.png") center right no-repeat;
+  padding-right: 1em;
 }
-.mwiki #bodyContent a.external[href $=".pdf"], .mwiki #bodyContent a.external[href $=".PDF"],
-.mwiki #bodyContent a.external[href *=".pdf#"], .mwiki #bodyContent a.external[href *=".PDF#"],
-.mwiki #bodyContent a.external[href *=".pdf?"], .mwiki #bodyContent a.external[href *=".PDF?"],
+.mwiki #bodyContent a.external[href$=".pdf"],
+.mwiki #bodyContent a.external[href$=".PDF"],
+.mwiki #bodyContent a.external[href*=".pdf#"],
+.mwiki #bodyContent a.external[href*=".PDF#"],
+.mwiki #bodyContent a.external[href*=".pdf?"],
+.mwiki #bodyContent a.external[href*=".PDF?"],
 .mwiki .link-document {
-	background: url("document.png") center right no-repeat;
-	padding-right: 12px;
+  background: url("document.png") center right no-repeat;
+  padding-right: 12px;
 }
 
 /* disable interwiki styling */
 .mwiki #bodyContent a.extiw,
 .mwiki #bodyContent a.extiw:active {
-	color: #36b;
-	background: none;
-	padding: 0;
+  color: #36b;
+  background: none;
+  padding: 0;
 }
 .mwiki #bodyContent a.external {
-	color: #36b;
+  color: #36b;
 }
 /* this can be used in the content area to switch off
 special external link styling */
 .mwiki #bodyContent .plainlinks a {
-	background: none !important;
-	padding: 0 !important;
+  background: none !important;
+  padding: 0 !important;
 }
 /*
 ** Structural Elements
@@ -1681,64 +1711,64 @@ special external link styling */
 ** general portlet styles (elements in the quickbar)
 */
 .mwiki .portlet {
-	border: none;
-	margin: 0 0 .5em;
-	padding: 0;
-	float: none;
-	width: 11.6em;
-	overflow: hidden;
+  border: none;
+  margin: 0 0 0.5em;
+  padding: 0;
+  float: none;
+  width: 11.6em;
+  overflow: hidden;
 }
 .mwiki .portlet h4 {
-	font-size: 95%;
-	font-weight: normal;
-	white-space: nowrap;
+  font-size: 95%;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .portlet h5 {
-	background: transparent;
-	padding: 0 1em 0 .5em;
-	display: inline;
-	height: 1em;
-	text-transform: lowercase;
-	font-size: 91%;
-	font-weight: normal;
-	white-space: nowrap;
+  background: transparent;
+  padding: 0 1em 0 0.5em;
+  display: inline;
+  height: 1em;
+  text-transform: lowercase;
+  font-size: 91%;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .portlet h6 {
-	background: #ffae2e;
-	border: 1px solid #2f6fab;
-	border-style: solid solid none solid;
-	padding: 0 1em 0 1em;
-	text-transform: lowercase;
-	display: block;
-	font-size: 1em;
-	height: 1.2em;
-	font-weight: normal;
-	white-space: nowrap;
+  background: #ffae2e;
+  border: 1px solid #2f6fab;
+  border-style: solid solid none solid;
+  padding: 0 1em 0 1em;
+  text-transform: lowercase;
+  display: block;
+  font-size: 1em;
+  height: 1.2em;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .pBody {
-	font-size: 95%;
-	background-color: white;
-	color: black;
-	border-collapse: collapse;
-	border: 1px solid #aaa;
-	padding: 0 .8em .3em .5em;
+  font-size: 95%;
+  background-color: white;
+  color: black;
+  border-collapse: collapse;
+  border: 1px solid #aaa;
+  padding: 0 0.8em 0.3em 0.5em;
 }
 .mwiki .portlet h1,
 .mwiki .portlet h2,
 .mwiki .portlet h3,
 .mwiki .portlet h4 {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .portlet ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url(bullet.gif);
-	font-size: 95%;
+  line-height: 1.5em;
+  list-style-type: square;
+  list-style-image: url(bullet.gif);
+  font-size: 95%;
 }
 .mwiki .portlet li {
-	padding: 0;
-	margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 /*
@@ -1746,755 +1776,776 @@ special external link styling */
 */
 
 .mwiki #p-logo {
-	top: 0;
-	left: 0;
-	position: absolute; /*needed to use z-index */
-	z-index: 3;
-	height: 155px;
-	width: 12em;
-	overflow: visible;
+  top: 0;
+  left: 0;
+  position: absolute; /*needed to use z-index */
+  z-index: 3;
+  height: 155px;
+  width: 12em;
+  overflow: visible;
 }
 .mwiki #p-logo h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-logo a,
 .mwiki #p-logo a:hover {
-	display: block;
-	height: 155px;
-	width: 12.2em;
-	background-repeat: no-repeat;
-	background-position: 35% 50% !important;
-	text-decoration: none;
+  display: block;
+  height: 155px;
+  width: 12.2em;
+  background-repeat: no-repeat;
+  background-position: 35% 50% !important;
+  text-decoration: none;
 }
 
 /*
 ** Search portlet
 */
 .mwiki #p-search {
-	position: relative;
-	z-index: 3;
+  position: relative;
+  z-index: 3;
 }
 .mwiki input.searchButton {
-	margin-top: 1px;
-	font-size: 95%;
+  margin-top: 1px;
+  font-size: 95%;
 }
 .mwiki #searchGoButton {
-	padding-left: .5em;
-	padding-right: .5em;
-	font-weight: bold;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  font-weight: bold;
 }
 .mwiki #searchInput {
-	width: 10.9em;
-	margin: 0;
-	font-size: 95%;
+  width: 10.9em;
+  margin: 0;
+  font-size: 95%;
 }
 .mwiki #p-search .pBody {
-	padding: .5em .4em .4em .4em;
-	text-align: center;
+  padding: 0.5em 0.4em 0.4em 0.4em;
+  text-align: center;
 }
 .mwiki #p-search #searchform div div {
-	margin-top: .4em;
-	font-size: 95%;
+  margin-top: 0.4em;
+  font-size: 95%;
 }
 /*
 ** the personal toolbar
 */
 .mwiki #p-personal {
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 0;
 }
 .mwiki #p-personal {
-	width: 100%;
-	white-space: nowrap;
-	padding: 0;
-	margin: 0;
-	border: none;
-	background: none;
-	overflow: visible;
-	line-height: 1.2em;
+  width: 100%;
+  white-space: nowrap;
+  padding: 0;
+  margin: 0;
+  border: none;
+  background: none;
+  overflow: visible;
+  line-height: 1.2em;
 }
 .mwiki #p-personal h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-personal .portlet,
 .mwiki #p-personal .pBody {
-	z-index: 0;
-	padding: 0;
-	margin: 0;
-	border: none;
-	overflow: visible;
-	background: none;
+  z-index: 0;
+  padding: 0;
+  margin: 0;
+  border: none;
+  overflow: visible;
+  background: none;
 }
 /* this is the ul contained in the portlet */
 .mwiki #p-personal ul {
-	border: none;
-	line-height: 1.4em;
-	color: #2f6fab;
-	padding: 0 2em 0 3em;
-	margin: 0;
-	text-align: right;
-	list-style: none;
-	z-index: 0;
-	background: none;
-	cursor: default;
+  border: none;
+  line-height: 1.4em;
+  color: #2f6fab;
+  padding: 0 2em 0 3em;
+  margin: 0;
+  text-align: right;
+  list-style: none;
+  z-index: 0;
+  background: none;
+  cursor: default;
 }
 .mwiki #p-personal li {
-	z-index: 0;
-	border: none;
-	padding: 0;
-	display: inline;
-	color: #2f6fab;
-	margin-left: 1em;
-	line-height: 1.2em;
-	background: none;
+  z-index: 0;
+  border: none;
+  padding: 0;
+  display: inline;
+  color: #2f6fab;
+  margin-left: 1em;
+  line-height: 1.2em;
+  background: none;
 }
 .mwiki #p-personal li a {
-	text-decoration: none;
-	color: #005896;
-	padding-bottom: .2em;
-	background: none;
+  text-decoration: none;
+  color: #005896;
+  padding-bottom: 0.2em;
+  background: none;
 }
 .mwiki #p-personal li a:hover {
-	background-color: white;
-	padding-bottom: .2em;
-	text-decoration: none;
+  background-color: white;
+  padding-bottom: 0.2em;
+  text-decoration: none;
 }
 .mwiki #p-personal li.active a:hover {
-	background-color: transparent;
+  background-color: transparent;
 }
 /* the icon in front of the user name, single quotes
 in bg url to hide it from iemac */
 .mwiki li#pt-userpage,
 .mwiki li#pt-anonuserpage,
 .mwiki li#pt-login {
-	background: url(user.gif) top left no-repeat;
-	padding-left: 20px;
-	text-transform: none;
+  background: url(user.gif) top left no-repeat;
+  padding-left: 20px;
+  text-transform: none;
 }
 .mwiki #p-personal ul {
-	text-transform: lowercase;
+  text-transform: lowercase;
 }
 .mwiki #p-personal li.active {
-	font-weight: bold;
+  font-weight: bold;
 }
 /*
 ** the page-related actions- page/talk, edit etc
 */
 .mwiki #p-cactions {
-	position: absolute;
-	top: 1.3em;
-	left: 11.5em;
-	margin: 0;
-	white-space: nowrap;
-	width: 76%;
-	line-height: 1.1em;
-	overflow: visible;
-	background: none;
-	border-collapse: collapse;
-	padding-left: 1em;
-	list-style: none;
-	font-size: 95%;
+  position: absolute;
+  top: 1.3em;
+  left: 11.5em;
+  margin: 0;
+  white-space: nowrap;
+  width: 76%;
+  line-height: 1.1em;
+  overflow: visible;
+  background: none;
+  border-collapse: collapse;
+  padding-left: 1em;
+  list-style: none;
+  font-size: 95%;
 }
 .mwiki #p-cactions ul {
-	list-style: none;
+  list-style: none;
 }
 .mwiki #p-cactions li {
-	display: inline;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	padding: 0 0 .1em 0;
-	margin: 0 .3em 0 0;
-	overflow: visible;
-	background: white;
+  display: inline;
+  border: 1px solid #aaa;
+  border-bottom: none;
+  padding: 0 0 0.1em 0;
+  margin: 0 0.3em 0 0;
+  overflow: visible;
+  background: white;
 }
 .mwiki #p-cactions li.selected {
-	border-color: #fabd23;
-	padding: 0 0 .2em 0;
-	font-weight: bold;
+  border-color: #fabd23;
+  padding: 0 0 0.2em 0;
+  font-weight: bold;
 }
 .mwiki #p-cactions li a {
-	background-color: #fbfbfb;
-	color: #002bb8;
-	border: none;
-	padding: 0 .8em .3em;
-	position: relative;
-	z-index: 0;
-	margin: 0;
-	text-decoration: none;
+  background-color: #fbfbfb;
+  color: #002bb8;
+  border: none;
+  padding: 0 0.8em 0.3em;
+  position: relative;
+  z-index: 0;
+  margin: 0;
+  text-decoration: none;
 }
 .mwiki #p-cactions li.selected a {
-	z-index: 3;
-	padding: 0 1em .2em!important;
-	background-color: white;
+  z-index: 3;
+  padding: 0 1em 0.2em !important;
+  background-color: white;
 }
 .mwiki #p-cactions .new a {
-	color: #ba0000;
+  color: #ba0000;
 }
 .mwiki #p-cactions li a:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: white;
+  z-index: 3;
+  text-decoration: none;
+  background-color: white;
 }
 .mwiki #p-cactions h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-cactions li.istalk {
-	margin-right: 0;
+  margin-right: 0;
 }
 .mwiki #p-cactions li.istalk a {
-	padding-right: .5em;
+  padding-right: 0.5em;
 }
 .mwiki #p-cactions #ca-addsection a {
-	padding-left: .4em;
-	padding-right: .4em;
+  padding-left: 0.4em;
+  padding-right: 0.4em;
 }
 /* offsets to distinguish the tab groups */
 .mwiki li#ca-talk {
-	margin-right: 1.6em;
+  margin-right: 1.6em;
 }
-.mwiki li#ca-watch, .mwiki li#ca-unwatch, .mwiki li#ca-varlang-0, .mwiki li#ca-print {
-	margin-left: 1.6em;
+.mwiki li#ca-watch,
+.mwiki li#ca-unwatch,
+.mwiki li#ca-varlang-0,
+.mwiki li#ca-print {
+  margin-left: 1.6em;
 }
 .mwiki #p-cactions .pBody {
-	font-size: 1em;
-	background-color: transparent;
-	color: inherit;
-	border-collapse: inherit;
-	border: 0;
-	padding: 0;
+  font-size: 1em;
+  background-color: transparent;
+  color: inherit;
+  border-collapse: inherit;
+  border: 0;
+  padding: 0;
 }
 .mwiki #p-cactions .hiddenStructure {
-	display: none;
+  display: none;
 }
 .mwiki #p-cactions li a {
-	text-transform: lowercase;
+  text-transform: lowercase;
 }
 
 .mwiki #p-lang {
-	position: relative;
-	z-index: 3;
+  position: relative;
+  z-index: 3;
 }
 
 /* TODO: #t-iscite is only used by the Cite extension, come up with some
  * system which allows extensions to add to this file on the fly
  */
-.mwiki #t-ispermalink, .mwiki #t-iscite {
-	color: #999;
+.mwiki #t-ispermalink,
+.mwiki #t-iscite {
+  color: #999;
 }
 /*
 ** footer
 */
 .mwiki #footer {
-	background-color: white;
-	border-top: 1px solid #fabd23;
-	border-bottom: 1px solid #fabd23;
-	margin: .6em 0 1em 0;
-	padding: .4em 0 1.2em 0;
-	text-align: center;
-	font-size: 90%;
+  background-color: white;
+  border-top: 1px solid #fabd23;
+  border-bottom: 1px solid #fabd23;
+  margin: 0.6em 0 1em 0;
+  padding: 0.4em 0 1.2em 0;
+  text-align: center;
+  font-size: 90%;
 }
 .mwiki #footer li {
-	display: inline;
-	margin: 0 1.3em;
+  display: inline;
+  margin: 0 1.3em;
 }
-.mwiki #f-poweredbyico, .mwiki #f-copyrightico {
-	margin: 0 8px;
-	position: relative;
-	top: -2px; /* Bump it up just a tad */
+.mwiki #f-poweredbyico,
+.mwiki #f-copyrightico {
+  margin: 0 8px;
+  position: relative;
+  top: -2px; /* Bump it up just a tad */
 }
 .mwiki #f-poweredbyico {
-	float: right;
-	height: 1%;
+  float: right;
+  height: 1%;
 }
 .mwiki #f-copyrightico {
-	float: left;
-	height: 1%;
+  float: left;
+  height: 1%;
 }
 
 /* js pref toc */
 .mwiki #preftoc {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	clear: both;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  clear: both;
 }
 .mwiki #preftoc li {
-	background-color: #f0f0f0;
-	color: #000;
+  background-color: #f0f0f0;
+  color: #000;
 }
 .mwiki #preftoc li {
-	margin: 1px -2px 1px 2px;
-	float: left;
-	padding: 2px 0 3px 0;
-	border: 1px solid #fff;
-	border-right-color: #716f64;
-	border-bottom: 0;
-	position: relative;
-	white-space: nowrap;
-	list-style-type: none;
-	list-style-image: none;
-	z-index: 3;
+  margin: 1px -2px 1px 2px;
+  float: left;
+  padding: 2px 0 3px 0;
+  border: 1px solid #fff;
+  border-right-color: #716f64;
+  border-bottom: 0;
+  position: relative;
+  white-space: nowrap;
+  list-style-type: none;
+  list-style-image: none;
+  z-index: 3;
 }
 .mwiki #preftoc li.selected {
-	font-weight: bold;
-	background-color: #f9f9f9;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	cursor: default;
-	top: 1px;
-	padding-top: 2px;
-	margin-right: -3px;
+  font-weight: bold;
+  background-color: #f9f9f9;
+  border: 1px solid #aaa;
+  border-bottom: none;
+  cursor: default;
+  top: 1px;
+  padding-top: 2px;
+  margin-right: -3px;
 }
 .mwiki #preftoc > li.selected {
-	top: 2px;
+  top: 2px;
 }
 .mwiki #preftoc a,
 .mwiki #preftoc a:active {
-	display: block;
-	color: #000;
-	padding: 0 .7em;
-	position: relative;
-	text-decoration: none;
+  display: block;
+  color: #000;
+  padding: 0 0.7em;
+  position: relative;
+  text-decoration: none;
 }
 .mwiki #preftoc li.selected a {
-	cursor: default;
-	text-decoration: none;
+  cursor: default;
+  text-decoration: none;
 }
 .mwiki #prefcontrol {
-	padding-top: 2em;
-	clear: both;
+  padding-top: 2em;
+  clear: both;
 }
 .mwiki #preferences {
-	margin: 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em;
-	background-color: #F9F9F9;
+  margin: 0;
+  border: 1px solid #aaa;
+  clear: both;
+  padding: 1.5em;
+  background-color: #f9f9f9;
 }
 .mwiki .prefsection {
-	border: none;
-	padding: 0;
-	margin: 0;
+  border: none;
+  padding: 0;
+  margin: 0;
 }
 .mwiki .prefsection fieldset {
-	border: 1px solid #aaa;
-	float: left;
-	margin-right: 2em;
+  border: 1px solid #aaa;
+  float: left;
+  margin-right: 2em;
 }
 .mwiki .prefsection legend {
-	font-weight: bold;
+  font-weight: bold;
 }
-.mwiki .prefsection table, .mwiki .prefsection legend {
-	background-color: #F9F9F9;
+.mwiki .prefsection table,
+.mwiki .prefsection legend {
+  background-color: #f9f9f9;
 }
 .mwiki .mainLegend {
-	display: none;
+  display: none;
 }
 .mwiki div.prefsectiontip {
-	font-size: x-small;
-	padding: .2em 2em;
-	color: #666;
+  font-size: x-small;
+  padding: 0.2em 2em;
+  color: #666;
 }
 .mwiki .btnSavePrefs {
-	font-weight: bold;
-	padding-left: .3em;
-	padding-right: .3em;
+  font-weight: bold;
+  padding-left: 0.3em;
+  padding-right: 0.3em;
 }
 
 .mwiki .preferences-login {
-	clear: both;
-	margin-bottom: 1.5em;
+  clear: both;
+  margin-bottom: 1.5em;
 }
 
 .mwiki .prefcache {
-	font-size: 90%;
-	margin-top: 2em;
+  font-size: 90%;
+  margin-top: 2em;
 }
 
 .mwiki div#userloginForm form,
 .mwiki div#userlogin form#userlogin2 {
-	margin: 0 3em 1em 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em 2em;
-	background-color: #f9f9f9;
-	float: left;
+  margin: 0 3em 1em 0;
+  border: 1px solid #aaa;
+  clear: both;
+  padding: 1.5em 2em;
+  background-color: #f9f9f9;
+  float: left;
 }
 .mwiki .rtl div#userloginForm form,
 .mwiki .rtl div#userlogin form#userlogin2 {
-	float: right;
+  float: right;
 }
 
 .mwiki div#userloginForm table,
 .mwiki div#userlogin form#userlogin2 table {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 
 .mwiki div#userloginForm h2,
 .mwiki div#userlogin form#userlogin2 h2 {
-	padding-top: 0;
+  padding-top: 0;
 }
 
 .mwiki div#userlogin .captcha,
 .mwiki div#userloginForm .captcha {
-	border: 1px solid #bbb;
-	padding: 1.5em 2em;
-	background-color: white;
+  border: 1px solid #bbb;
+  padding: 1.5em 2em;
+  background-color: white;
 }
 
-.mwiki #loginend, .mwiki #signupend {
-	clear: both;
+.mwiki #loginend,
+.mwiki #signupend {
+  clear: both;
 }
 
-.mwiki #userloginprompt, .mwiki #languagelinks {
-	font-size: 85%;
+.mwiki #userloginprompt,
+.mwiki #languagelinks {
+  font-size: 85%;
 }
 
 .mwiki #login-sectiontip {
-	font-size: 85%;
-	line-height: 1.2;
-	padding-top: 2em;
+  font-size: 85%;
+  line-height: 1.2;
+  padding-top: 2em;
 }
 
-.mwiki #userlogin .loginText, .mwiki #userlogin .loginPassword {
-	width: 12em;
+.mwiki #userlogin .loginText,
+.mwiki #userlogin .loginPassword {
+  width: 12em;
 }
 
-.mwiki #userloginlink a, .mwiki #wpLoginattempt, .mwiki #wpCreateaccount {
-	font-weight: bold;
+.mwiki #userloginlink a,
+.mwiki #wpLoginattempt,
+.mwiki #wpCreateaccount {
+  font-weight: bold;
 }
 
-
 /* IE/Mac fixes were cut out */
 
 .mwiki .redirectText {
-	font-size: 150%;
-	margin: 5px;
+  font-size: 150%;
+  margin: 5px;
 }
 
 .mwiki .printfooter {
-	display: none;
+  display: none;
 }
 
 .mwiki .not-patrolled {
-	background-color: #ffa;
+  background-color: #ffa;
 }
 .mwiki div.patrollink {
-	clear: both;
-	font-size: 75%;
-	text-align: right;
+  clear: both;
+  font-size: 75%;
+  text-align: right;
 }
-.mwiki span.newpage, .mwiki span.minor, .mwiki span.bot {
-	font-weight: bold;
+.mwiki span.newpage,
+.mwiki span.minor,
+.mwiki span.bot {
+  font-weight: bold;
 }
 .mwiki span.unpatrolled {
-	font-weight: bold;
-	color: red;
+  font-weight: bold;
+  color: red;
 }
 
 .mwiki .sharedUploadNotice {
-	font-style: italic;
+  font-style: italic;
 }
 
 .mwiki span.updatedmarker {
-	color: black;
-	background-color: #0f0;
+  color: black;
+  background-color: #0f0;
 }
 
 .mwiki table.gallery {
-	border: 1px solid #ccc;
-	margin: 2px;
-	padding: 2px;
-	background-color: white;
+  border: 1px solid #ccc;
+  margin: 2px;
+  padding: 2px;
+  background-color: white;
 }
 
 .mwiki table.gallery tr {
-	vertical-align: top;
+  vertical-align: top;
 }
 
 .mwiki table.gallery td {
-	vertical-align: top;
-	background-color: #f9f9f9;
-	border: solid 2px white;
+  vertical-align: top;
+  background-color: #f9f9f9;
+  border: solid 2px white;
 }
 /* Keep this temporarily so that cached pages will display right */
 .mwiki table.gallery td.galleryheader {
-    text-align: center;
-	font-weight: bold;
+  text-align: center;
+  font-weight: bold;
 }
 .mwiki table.gallery caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki div.gallerybox {
-	margin: 2px;
+  margin: 2px;
 }
 
 .mwiki div.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
+  text-align: center;
+  border: 1px solid #ccc;
+  margin: 2px;
 }
 
 .mwiki div.gallerytext {
-	overflow: hidden;
-	font-size: 94%;
-	padding: 2px 4px;
+  overflow: hidden;
+  font-size: 94%;
+  padding: 2px 4px;
 }
 
 .mwiki span.comment {
-	font-style: italic;
+  font-style: italic;
 }
 
 .mwiki span.changedby {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki .previewnote {
-	text-indent: 3em;
-	color: #c00;
-	border-bottom: 1px solid #aaa;
-	padding-bottom: 1em;
-	margin-bottom: 1em;
+  text-indent: 3em;
+  color: #c00;
+  border-bottom: 1px solid #aaa;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
 }
 
 .mwiki .previewnote p {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 .mwiki .editExternally {
-	border: 1px solid gray;
-	background-color: #ffffff;
-	padding: 3px;
-	margin-top: 0.5em;
-	float: left;
-	font-size: small;
-	text-align: center;
+  border: 1px solid gray;
+  background-color: #ffffff;
+  padding: 3px;
+  margin-top: 0.5em;
+  float: left;
+  font-size: small;
+  text-align: center;
 }
 .mwiki .editExternallyHelp {
-	font-style: italic;
-	color: gray;
+  font-style: italic;
+  color: gray;
 }
 
 .mwiki .toggle {
-	margin-left: 2em;
-	text-indent: -2em;
+  margin-left: 2em;
+  text-indent: -2em;
 }
 
 /* Classes for EXIF data display */
 .mwiki table.mw_metadata {
-	font-size: 0.8em;
-	margin-left: 0.5em;
-	margin-bottom: 0.5em;
-	width: 300px;
+  font-size: 0.8em;
+  margin-left: 0.5em;
+  margin-bottom: 0.5em;
+  width: 300px;
 }
 
 .mwiki table.mw_metadata caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki table.mw_metadata th {
-	font-weight: normal;
+  font-weight: normal;
 }
 
 .mwiki table.mw_metadata td {
-	padding: 0.1em;
+  padding: 0.1em;
 }
 
 .mwiki table.mw_metadata {
-	border: none;
-	border-collapse: collapse;
+  border: none;
+  border-collapse: collapse;
 }
 
-.mwiki table.mw_metadata td, .mwiki table.mw_metadata th {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
+.mwiki table.mw_metadata td,
+.mwiki table.mw_metadata th {
+  text-align: center;
+  border: 1px solid #aaaaaa;
+  padding-left: 0.1em;
+  padding-right: 0.1em;
 }
 
 .mwiki table.mw_metadata th {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 
 .mwiki table.mw_metadata td {
-	background-color: #fcfcfc;
+  background-color: #fcfcfc;
 }
 
 .mwiki table.collapsed tr.collapsable {
-	display: none;
+  display: none;
 }
 
-
 /* filetoc */
 .mwiki ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
+  text-align: center;
+  border: 1px solid #aaaaaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
+  margin-bottom: 0.5em;
+  margin-left: 0;
+  margin-right: 0;
 }
 
 .mwiki #filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
+  display: inline;
+  list-style-type: none;
+  padding-right: 2em;
 }
 
 .mwiki input#wpSummary {
-	width: 80%;
+  width: 80%;
 }
 
 /* @bug 1714 */
-.mwiki input#wpSave, .mwiki input#wpDiff {
-	margin-right: 0.33em;
+.mwiki input#wpSave,
+.mwiki input#wpDiff {
+  margin-right: 0.33em;
 }
 
 .mwiki #wpSave {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 /* Classes for article validation */
 
 .mwiki table.revisionform_default {
-	border: 1px solid #000000;
+  border: 1px solid #000000;
 }
 
 .mwiki table.revisionform_focus {
-	border: 1px solid #000000;
-	background-color:#00BBFF;
+  border: 1px solid #000000;
+  background-color: #00bbff;
 }
 
 .mwiki tr.revision_tr_default {
-	background-color:#EEEEEE;
+  background-color: #eeeeee;
 }
 
 .mwiki tr.revision_tr_first {
-	background-color:#DDDDDD;
+  background-color: #dddddd;
 }
 
 .mwiki p.revision_saved {
-	color: green;
-	font-weight:bold;
+  color: green;
+  font-weight: bold;
 }
 
 .mwiki #mw_trackbacks {
-	border: solid 1px #bbbbff;
-	background-color: #eeeeff;
-	padding: 0.2em;
+  border: solid 1px #bbbbff;
+  background-color: #eeeeff;
+  padding: 0.2em;
 }
 
-
 /* Allmessages table */
 
 .mwiki #allmessagestable th {
-	background-color: #b2b2ff;
+  background-color: #b2b2ff;
 }
 
 .mwiki #allmessagestable tr.orig {
-	background-color: #ffe2e2;
+  background-color: #ffe2e2;
 }
 
 .mwiki #allmessagestable tr.new {
-	background-color: #e2ffe2;
+  background-color: #e2ffe2;
 }
 
 .mwiki #allmessagestable tr.def {
-	background-color: #f0f0ff;
+  background-color: #f0f0ff;
 }
 
-
 /* noarticletext */
 .mwiki div.noarticletext {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: .2em 1em;
-	color: #000;
+  border: 1px solid #ccc;
+  background: #fff;
+  padding: 0.2em 1em;
+  color: #000;
 }
 
 .mwiki div#searchTargetContainer {
-	left:       10px;
-	top:        10px;
-	width:      90%;
-	background: white;
+  left: 10px;
+  top: 10px;
+  width: 90%;
+  background: white;
 }
 
 .mwiki div#searchTarget {
-	padding:    3px;
-	margin:     5px;
-	background: #F0F0F0;
-	border:     solid 1px blue;
+  padding: 3px;
+  margin: 5px;
+  background: #f0f0f0;
+  border: solid 1px blue;
 }
 
 .mwiki div#searchTarget ul li {
-	list-style: none;
+  list-style: none;
 }
 
 .mwiki div#searchTarget ul li:before {
-	color: orange;
-	content: "\00BB \0020";
+  color: orange;
+  content: "\00BB \0020";
 }
 
 .mwiki div#searchTargetHide {
-	float:right;
-	border:solid 1px black;
-	background:#DCDCDC;
-	padding:2px;
+  float: right;
+  border: solid 1px black;
+  background: #dcdcdc;
+  padding: 2px;
 }
 
 .mwiki #powersearch p {
-	margin-top:0px;
+  margin-top: 0px;
 }
 
 .mwiki div.multipageimagenavbox {
-   border: solid 1px silver;
-   padding: 4px;
-   margin: 1em;
-   background: #f0f0f0;
+  border: solid 1px silver;
+  padding: 4px;
+  margin: 1em;
+  background: #f0f0f0;
 }
 
 .mwiki div.multipageimagenavbox div.thumb {
-   border: none;
-   margin-left: 2em;
-   margin-right: 2em;
+  border: none;
+  margin-left: 2em;
+  margin-right: 2em;
 }
 
 .mwiki div.multipageimagenavbox hr {
-   margin: 6px;
+  margin: 6px;
 }
 
 .mwiki table.multipageimage td {
-   text-align: center;
+  text-align: center;
 }
 
 /** Special:Version */
 
-.mwiki table#sv-ext, table#sv-hooks, .mwiki table#sv-software {
-	margin: 1em;
-	padding:0em;
+.mwiki table#sv-ext,
+table#sv-hooks,
+.mwiki table#sv-software {
+  margin: 1em;
+  padding: 0em;
 }
 
-.mwiki #sv-ext td, .mwiki #sv-hooks td, .mwiki #sv-software td,
-.mwiki #sv-ext th, .mwiki #sv-hooks th, .mwiki #sv-software th {
-	border: 1px solid #A0A0A0;
-	padding: 0 0.15em 0 0.15em;
+.mwiki #sv-ext td,
+.mwiki #sv-hooks td,
+.mwiki #sv-software td,
+.mwiki #sv-ext th,
+.mwiki #sv-hooks th,
+.mwiki #sv-software th {
+  border: 1px solid #a0a0a0;
+  padding: 0 0.15em 0 0.15em;
 }
-.mwiki #sv-ext th, .mwiki #sv-hooks th, .mwiki #sv-software th {
-	background-color: #F0F0F0;
-	color: black;
-	padding: 0 0.15em 0 0.15em;
+.mwiki #sv-ext th,
+.mwiki #sv-hooks th,
+.mwiki #sv-software th {
+  background-color: #f0f0f0;
+  color: black;
+  padding: 0 0.15em 0 0.15em;
 }
-.mwiki tr.sv-space{
-	height: 0.8em;
-	border:none;
+.mwiki tr.sv-space {
+  height: 0.8em;
+  border: none;
+}
+.mwiki tr.sv-space td {
+  display: none;
 }
-.mwiki tr.sv-space td { display: none; }
 
 /*
   Table pager (e.g. Special:Imagelist)
@@ -2504,90 +2555,113 @@ in bg url to hide it from iemac */
   - remove line wrapping for all td and th, set background color
   - restore line wrapping for the last two table cells (description and size)
 */
-.mwiki .TablePager { min-width: 80%; }
-.mwiki .TablePager_nav a { text-decoration: none; }
-.mwiki .TablePager { border-collapse: collapse; }
-.mwiki .TablePager, .mwiki .TablePager td, .mwiki .TablePager th {
-	border: 1px solid #aaaaaa;
-	padding: 0 0.15em 0 0.15em;
+.mwiki .TablePager {
+  min-width: 80%;
+}
+.mwiki .TablePager_nav a {
+  text-decoration: none;
+}
+.mwiki .TablePager {
+  border-collapse: collapse;
+}
+.mwiki .TablePager,
+.mwiki .TablePager td,
+.mwiki .TablePager th {
+  border: 1px solid #aaaaaa;
+  padding: 0 0.15em 0 0.15em;
+}
+.mwiki .TablePager th {
+  background-color: #eeeeff;
+}
+.mwiki .TablePager td {
+  background-color: #ffffff;
+}
+.mwiki .TablePager tr:hover td {
+  background-color: #eeeeff;
 }
-.mwiki .TablePager th { background-color: #eeeeff }
-.mwiki .TablePager td { background-color: #ffffff }
-.mwiki .TablePager tr:hover td { background-color: #eeeeff }
 
-.mwiki .imagelist td, .mwiki .imagelist th { white-space: nowrap }
-.mwiki .imagelist .TablePager_col_links { background-color: #eeeeff }
-.mwiki .imagelist .TablePager_col_img_description { white-space: normal }
-.mwiki .imagelist th.TablePager_sort { background-color: #ccccff }
+.mwiki .imagelist td,
+.mwiki .imagelist th {
+  white-space: nowrap;
+}
+.mwiki .imagelist .TablePager_col_links {
+  background-color: #eeeeff;
+}
+.mwiki .imagelist .TablePager_col_img_description {
+  white-space: normal;
+}
+.mwiki .imagelist th.TablePager_sort {
+  background-color: #ccccff;
+}
 
-.mwiki .templatesUsed { margin-top: 1.5em; }
+.mwiki .templatesUsed {
+  margin-top: 1.5em;
+}
 
 .mwiki .mw-summary-preview {
-	margin: 0.1em 0;
+  margin: 0.1em 0;
 }
 
 /* Friendlier slave lag warnings */
 .mwiki div.mw-lag-warn-normal,
 .mwiki div.mw-lag-warn-high {
-	padding: 3px;
-	text-align: center;
-	margin: 3px auto;
+  padding: 3px;
+  text-align: center;
+  margin: 3px auto;
 }
 .mwiki div.mw-lag-warn-normal {
-	border: 1px solid #FFCC66;
-	background-color: #FFFFCC;
+  border: 1px solid #ffcc66;
+  background-color: #ffffcc;
 }
 .mwiki div.mw-lag-warn-high {
-	font-weight: bold;
-	border: 2px solid #FF0033;
-	background-color: #FFCCCC;
+  font-weight: bold;
+  border: 2px solid #ff0033;
+  background-color: #ffcccc;
 }
 
 .mwiki .MediaTransformError {
-	background-color: #ccc;
-	padding: 0.1em;
+  background-color: #ccc;
+  padding: 0.1em;
 }
 .mwiki .MediaTransformError td {
-	text-align: center;
-	vertical-align: middle;
-	font-size: 90%;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 90%;
 }
 
 /** Special:Search stuff */
 .mwiki div#mw-search-interwiki-caption {
-	text-align: center;
-	font-weight: bold;
-	font-size: 95%;
+  text-align: center;
+  font-weight: bold;
+  font-size: 95%;
 }
 
 .mwiki .mw-search-interwiki-project {
-	font-size: 97%;
-	text-align: left;
-	padding-left: 0.2em;
-	padding-right: 0.15em;
-	padding-bottom: 0.2em;
-	padding-top: 0.15em;
-	background: #cae8ff;
+  font-size: 97%;
+  text-align: left;
+  padding-left: 0.2em;
+  padding-right: 0.15em;
+  padding-bottom: 0.2em;
+  padding-top: 0.15em;
+  background: #cae8ff;
 }
 
 /* God-damned hack for the crappy layout */
 .mwiki .os-suggest {
-	font-size: 127%;
+  font-size: 127%;
 }
 
-
 /**** Excerpts from http://en.wikipedia.org/wiki/MediaWiki:Common.css ******/
 /* Since GoldenDict support is not Wikipedia-specific, we don't include all
  * of it, and besides, it's large and volatile anyway. */
 /* It was also edited for the usually narrow article view */
 
-
 /* Make the list of references smaller */
 .mwiki ol.references {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki .references-small {
-    font-size: 90%;
+  font-size: 90%;
 }
 
 /* VALIDATOR NOTICE: the following is correct, but the W3C validator doesn't accept it */
@@ -2595,350 +2669,368 @@ in bg url to hide it from iemac */
 /* column-count is from the CSS3 module "CSS Multi-column Layout" */
 /* Please ignore any validator errors caused by these two lines */
 .mwiki .references-2column {
-    font-size: 90%;
-    -moz-column-count: 2;
-    -webkit-column-count: 2;
-    column-count: 2;
+  font-size: 90%;
+  -moz-column-count: 2;
+  -webkit-column-count: 2;
+  column-count: 2;
 }
 
 /* Highlight clicked reference in blue to help navigation */
 .mwiki ol.references > li:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .mwiki sup.reference:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 /* Styling for citations */
 .mwiki cite {
-    font-style: normal;
-    word-wrap: break-word;
+  font-style: normal;
+  word-wrap: break-word;
 }
 
 /* If there is an inline link to a full citation, the full citation will turn blue when the inline link is clicked */
 .mwiki cite:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 /* wikitable/prettytable class for skinning normal tables */
 .mwiki table.wikitable,
 .mwiki table.prettytable {
-    margin: 1em 1em 1em 0;
-    background: #f9f9f9;
-    border: 1px #aaa solid;
-    border-collapse: collapse;
+  margin: 1em 1em 1em 0;
+  background: #f9f9f9;
+  border: 1px #aaa solid;
+  border-collapse: collapse;
 }
-.mwiki .wikitable th, .mwiki .wikitable td,
-.mwiki .prettytable th, .mwiki .prettytable td {
-    border: 1px #aaa solid;
-    padding: 0.2em;
+.mwiki .wikitable th,
+.mwiki .wikitable td,
+.mwiki .prettytable th,
+.mwiki .prettytable td {
+  border: 1px #aaa solid;
+  padding: 0.2em;
 }
 .mwiki .wikitable th,
 .mwiki .prettytable th {
-    background: #f2f2f2;
-    text-align: center;
+  background: #f2f2f2;
+  text-align: center;
 }
 .mwiki .wikitable caption,
 .mwiki .prettytable caption {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 /* default skin for navigation boxes */
-.mwiki table.navbox {            /* navbox container style */
-  border:1px solid #aaa;
-  width:100%;
-  margin:auto;
-  clear:both;
-  font-size:88%;
-  text-align:center;
-  padding:1px;
+.mwiki table.navbox {
+  /* navbox container style */
+  border: 1px solid #aaa;
+  width: 100%;
+  margin: auto;
+  clear: both;
+  font-size: 88%;
+  text-align: center;
+  padding: 1px;
 }
 .mwiki table.navbox + table.navbox {
-  margin-top:-1px;        /* single pixel border between adjacent navboxes (doesn't work for IE6, but that's okay) */
+  margin-top: -1px; /* single pixel border between adjacent navboxes (doesn't work for IE6, but that's okay) */
 }
-.mwiki .navbox-title, .mwiki .navbox-abovebelow, .mwiki table.navbox th {
-  text-align:center;      /* title and above/below styles */
-  padding-left:1em;
-  padding-right:1em;
+.mwiki .navbox-title,
+.mwiki .navbox-abovebelow,
+.mwiki table.navbox th {
+  text-align: center; /* title and above/below styles */
+  padding-left: 1em;
+  padding-right: 1em;
 }
-.mwiki .navbox-group {           /* group style */
-  white-space:nowrap;
-  text-align:right;
-  font-weight:bold;
-  padding-left:1em;
-  padding-right:1em;
+.mwiki .navbox-group {
+  /* group style */
+  white-space: nowrap;
+  text-align: right;
+  font-weight: bold;
+  padding-left: 1em;
+  padding-right: 1em;
 }
-.mwiki .navbox, .mwiki .navbox-subgroup {
-  background:#fdfdfd;     /* Background color */
+.mwiki .navbox,
+.mwiki .navbox-subgroup {
+  background: #fdfdfd; /* Background color */
 }
 .mwiki .navbox-list {
-  border-color:#fdfdfd;   /* Must match background color */
+  border-color: #fdfdfd; /* Must match background color */
 }
-.mwiki .navbox-title, .mwiki table.navbox th {
-  background:#ccccff;     /* Level 1 color */
+.mwiki .navbox-title,
+.mwiki table.navbox th {
+  background: #ccccff; /* Level 1 color */
 }
-.mwiki .navbox-abovebelow, .mwiki .navbox-group, .mwiki .navbox-subgroup .navbox-title {
-  background:#ddddff;     /* Level 2 color */
+.mwiki .navbox-abovebelow,
+.mwiki .navbox-group,
+.mwiki .navbox-subgroup .navbox-title {
+  background: #ddddff; /* Level 2 color */
 }
-.mwiki .navbox-subgroup .navbox-group, .mwiki .navbox-subgroup .navbox-abovebelow {
-  background:#e6e6ff;     /* Level 3 color */
+.mwiki .navbox-subgroup .navbox-group,
+.mwiki .navbox-subgroup .navbox-abovebelow {
+  background: #e6e6ff; /* Level 3 color */
 }
 .mwiki .navbox-even {
-  background:#f7f7f7;     /* Even row striping */
+  background: #f7f7f7; /* Even row striping */
 }
 .mwiki .navbox-odd {
-  background:transparent; /* Odd row striping */
+  background: transparent; /* Odd row striping */
 }
 
-.mwiki .collapseButton {         /* 'show'/'hide' buttons created dynamically by the        */
-    float: right;         /* CollapsibleTables javascript in [[MediaWiki:Common.js]] */
-    font-weight: normal;  /* are styled here so they can be customised.              */
-    text-align: right;
-    width: auto;
+.mwiki .collapseButton {
+  /* 'show'/'hide' buttons created dynamically by the        */
+  float: right; /* CollapsibleTables javascript in [[MediaWiki:Common.js]] */
+  font-weight: normal; /* are styled here so they can be customised.              */
+  text-align: right;
+  width: auto;
 }
-.mwiki .navbox .collapseButton { /* In navboxes, the show/hide button balances the vde links from */
-    width: 6em;           /* [[Template:Tnavbar]], so they need to be the same width.      */
+.mwiki .navbox .collapseButton {
+  /* In navboxes, the show/hide button balances the vde links from */
+  width: 6em; /* [[Template:Tnavbar]], so they need to be the same width.      */
 }
 
-
-
 /* Infobox template style */
 .mwiki .infobox {
-    border: 1px solid #aaa;
-    background-color: #f9f9f9;
-    color: black;
-/*    margin: 0.5em 0 0.5em 1em;*/
-    margin: 10px auto 0;
-    padding: 0.2em;
-/*
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  color: black;
+  /*    margin: 0.5em 0 0.5em 1em;*/
+  margin: 10px auto 0;
+  padding: 0.2em;
+  /*
     float: right;
     clear: right;*/
 }
 
 .mwiki .infobox td,
 .mwiki .infobox th {
-    vertical-align: top;
+  vertical-align: top;
 }
 .mwiki .infobox caption {
-    font-size: larger;
+  font-size: larger;
 }
 .mwiki .infobox.bordered {
-    border-collapse: collapse;
+  border-collapse: collapse;
 }
 .mwiki .infobox.bordered td,
 .mwiki .infobox.bordered th {
-    border: 1px solid #aaa;
+  border: 1px solid #aaa;
 }
 .mwiki .infobox.bordered .borderless td,
 .mwiki .infobox.bordered .borderless th {
-    border: 0;
+  border: 0;
 }
 
 .mwiki .infobox.sisterproject {
-    width: 20em;
-    font-size: 90%;
+  width: 20em;
+  font-size: 90%;
 }
 
 .mwiki .infobox.standard-talk {
-    border: 1px solid #c0c090;
-    background-color: #f8eaba;
+  border: 1px solid #c0c090;
+  background-color: #f8eaba;
 }
 .mwiki .infobox.standard-talk.bordered td,
 .mwiki .infobox.standard-talk.bordered th {
-    border: 1px solid #c0c090;
+  border: 1px solid #c0c090;
 }
 
 /* styles for bordered infobox with merged rows */
 .mwiki .infobox.bordered .mergedtoprow td,
 .mwiki .infobox.bordered .mergedtoprow th {
-    border: 0;
-    border-top: 1px solid #aaa;
-    border-right: 1px solid #aaa;
+  border: 0;
+  border-top: 1px solid #aaa;
+  border-right: 1px solid #aaa;
 }
 
 .mwiki .infobox.bordered .mergedrow td,
 .mwiki .infobox.bordered .mergedrow th {
-    border: 0;
-    border-right: 1px solid #aaa;
+  border: 0;
+  border-right: 1px solid #aaa;
 }
 
 /* Styles for geography infoboxes, e.g. countries, country subdivisions, cities, etc. */
 .mwiki .infobox.geography {
-    text-align: left;
-    border-collapse: collapse;
-    line-height: 1.2em;
-    font-size: 90%;
+  text-align: left;
+  border-collapse: collapse;
+  line-height: 1.2em;
+  font-size: 90%;
 }
 
-.mwiki .infobox.geography  td,
-.mwiki .infobox.geography  th {
-    border-top: solid 1px #aaa;
-    padding: 0.4em 0.6em 0.4em 0.6em;
+.mwiki .infobox.geography td,
+.mwiki .infobox.geography th {
+  border-top: solid 1px #aaa;
+  padding: 0.4em 0.6em 0.4em 0.6em;
 }
 .mwiki .infobox.geography .mergedtoprow td,
 .mwiki .infobox.geography .mergedtoprow th {
-    border-top: solid 1px #aaa;
-    padding: 0.4em 0.6em 0.2em 0.6em;
+  border-top: solid 1px #aaa;
+  padding: 0.4em 0.6em 0.2em 0.6em;
 }
 
 .mwiki .infobox.geography .mergedrow td,
 .mwiki .infobox.geography .mergedrow th {
-    border: 0;
-    padding: 0 0.6em 0.2em 0.6em;
+  border: 0;
+  padding: 0 0.6em 0.2em 0.6em;
 }
 
 .mwiki .infobox.geography .mergedbottomrow td,
 .mwiki .infobox.geography .mergedbottomrow th {
-    border-top: 0;
-    border-bottom: solid 1px #aaa;
-    padding: 0 0.6em 0.4em 0.6em;
+  border-top: 0;
+  border-bottom: solid 1px #aaa;
+  padding: 0 0.6em 0.4em 0.6em;
 }
 
 .mwiki .infobox.geography .maptable td,
 .mwiki .infobox.geography .maptable th {
-    border: 0;
-    padding: 0;
+  border: 0;
+  padding: 0;
 }
 
 /* Style for "notices" */
 .mwiki .notice {
-    margin: 1em;
-    padding: 0.2em;
+  margin: 1em;
+  padding: 0.2em;
 }
 
 .mwiki #disambig {
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
 }
 
 .mwiki .rellink,
 .mwiki .dablink {
-    font-style: italic;
-    padding-left: 2em;
+  font-style: italic;
+  padding-left: 2em;
 }
 .mwiki .rellink i,
 .mwiki .dablink i {
-    font-style: normal;
+  font-style: normal;
 }
 
 /* Article message box styles */
-.mwiki table.ambox {            /* 10% = Will not overlap with other elements */
-    margin: -1px 10% 0px;    /* -1px = Single border between stacked boxes in all browsers */
-    border: 1px solid #aaa;
-    border-left: 10px solid #1e90ff;    /* Default "notice" blue */
-    background: #fbfbfb;
+.mwiki table.ambox {
+  /* 10% = Will not overlap with other elements */
+  margin: -1px 10% 0px; /* -1px = Single border between stacked boxes in all browsers */
+  border: 1px solid #aaa;
+  border-left: 10px solid #1e90ff; /* Default "notice" blue */
+  background: #fbfbfb;
 }
 .mwiki .ambox th.mbox-text,
-.mwiki .ambox td.mbox-text {            /* The message body cell(s) */
-    padding: 0.25em 0.5em;       /* 0.5em left/right */
+.mwiki .ambox td.mbox-text {
+  /* The message body cell(s) */
+  padding: 0.25em 0.5em; /* 0.5em left/right */
 }
-.mwiki .ambox td.mbox-image {           /* The left image cell */
-    padding: 2px 0 2px 0.5em;    /* 0.5em left, 0px right */
+.mwiki .ambox td.mbox-image {
+  /* The left image cell */
+  padding: 2px 0 2px 0.5em; /* 0.5em left, 0px right */
 }
-.mwiki .ambox td.mbox-imageright {      /* The right image cell */
-    padding: 2px 0.5em 2px 0;    /* 0px left, 0.5em right */
+.mwiki .ambox td.mbox-imageright {
+  /* The right image cell */
+  padding: 2px 0.5em 2px 0; /* 0px left, 0.5em right */
 }
 
 /* Standard Navigationsleisten, aka box hiding thingy from .de.  Documentation at [[Wikipedia:NavFrame]]. */
 .mwiki div.NavFrame {
-    margin: 0;
-    padding: 4px;
-    border: 1px solid #aaa;
-    text-align: center;
-    border-collapse: collapse;
-    font-size: 95%;
+  margin: 0;
+  padding: 4px;
+  border: 1px solid #aaa;
+  text-align: center;
+  border-collapse: collapse;
+  font-size: 95%;
 }
 .mwiki div.NavFrame + div.NavFrame {
-    border-top-style: none;
-    border-top-style: hidden;
+  border-top-style: none;
+  border-top-style: hidden;
 }
 .mwiki div.NavPic {
-    background-color: #fff;
-    margin: 0;
-    padding: 2px;
-    float: left;
+  background-color: #fff;
+  margin: 0;
+  padding: 2px;
+  float: left;
 }
 .mwiki div.NavFrame div.NavHead {
-    height: 1.6em;
-    font-weight: bold;
-    background-color: #ccf;
-    position:relative;
+  height: 1.6em;
+  font-weight: bold;
+  background-color: #ccf;
+  position: relative;
 }
 .mwiki div.NavFrame p {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavFrame div.NavContent {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavFrame div.NavContent p {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavEnd {
-    margin: 0;
-    padding: 0;
-    line-height: 1px;
-    clear: both;
+  margin: 0;
+  padding: 0;
+  line-height: 1px;
+  clear: both;
 }
 .mwiki a.NavToggle {
-    position: absolute;
-    top: 0;
-    right: 3px;
-    font-weight: normal;
-    font-size: 90%;
+  position: absolute;
+  top: 0;
+  right: 3px;
+  font-weight: normal;
+  font-size: 90%;
 }
 
-
 /****** Wiktionary-specific excerpts *********/
 
 .mwiki .audiolink a {
-    background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png") center left no-repeat !important;
-    padding-left: 20px !important;
-    padding-right: 0 !important;
+  background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png")
+    center left no-repeat !important;
+  padding-left: 20px !important;
+  padding-right: 0 !important;
 }
 
 /* default setting for [[:Category:Inflection templates]] */
 
-.mwiki .infl-inline { display: inline }
-.mwiki .infl-table { display: none }
+.mwiki .infl-inline {
+  display: inline;
+}
+.mwiki .infl-table {
+  display: none;
+}
 /****default hide dict icon ***/
-.gddicticon{display:none;}
+.gddicticon {
+  display: none;
+}
 
 .gdexpandicon {
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    vertical-align: text-bottom;
-    content:url('qrc:///icons/old-arrow.png');
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-bottom;
+  content: url("qrc:///icons/old-arrow.png");
 }
 
 .gdcollapseicon {
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    vertical-align: text-bottom;
-    content:url('qrc:///icons/old-downarrow.png');
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-bottom;
+  content: url("qrc:///icons/old-downarrow.png");
 }
 
 /********** Slob dictionaries ***********/
 
-.slobdict img.imgtex
-{
-    vertical-align: baseline !important;
+.slobdict img.imgtex {
+  vertical-align: baseline !important;
 }
 
 /************* GLS dictionaries **************/
 
-.glsdict_headwords
-{
+.glsdict_headwords {
   font-weight: bold;
   margin-top: 15px;
   margin-bottom: 10px;
   font-size: 116%;
 }
 
-.gls_wav img
-{
+.gls_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
diff --git a/src/stylesheets/article-style-st-lingoes-blue.css b/src/stylesheets/article-style-st-lingoes-blue.css
index 0246604f..212c0fab 100644
--- a/src/stylesheets/article-style-st-lingoes-blue.css
+++ b/src/stylesheets/article-style-st-lingoes-blue.css
@@ -1,94 +1,99 @@
 body {
-	background: #EAF0F8;
-	margin: 0.3em;
-	font-family: "Arial Unicode MS", "Lucida Sans Unicode", Tahoma, Verdana, "Palatino Linotype", sans-serif;
-	line-height: 120%;
+  background: #eaf0f8;
+  margin: 0.3em;
+  font-family: "Arial Unicode MS", "Lucida Sans Unicode", Tahoma, Verdana,
+    "Palatino Linotype", sans-serif;
+  line-height: 120%;
 }
 
 a {
-	text-decoration: none;
-	color: darkblue;
+  text-decoration: none;
+  color: darkblue;
 }
- 
+
 a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 .gdarticle {
-	background: #FFFEF2;
-	margin-top: 0.1em;
-	margin-bottom: 0.35em;
-	padding: 5px;
-	padding-top: -10px;
-	border: 1px solid #C7D4DC;
-	border-radius: 8px;
+  background: #fffef2;
+  margin-top: 0.1em;
+  margin-bottom: 0.35em;
+  padding: 5px;
+  padding-top: -10px;
+  border: 1px solid #c7d4dc;
+  border-radius: 8px;
 }
 
 .gdactivearticle {
-	background: #FFFEF2;
-	border: 1px solid #92B0DD;
+  background: #fffef2;
+  border: 1px solid #92b0dd;
 }
 
 .gdarticleseparator + script + .gdactivearticle .gddictname {
-	border-top: 1px solid #92B0DD;
-	border-right: 1px solid #92B0DD;
+  border-top: 1px solid #92b0dd;
+  border-right: 1px solid #92b0dd;
 }
 
 .gddictname {
-    display: flex; /* needed to be able to reorder elements, e.g. icon, dictionary name, collapse icon */
-	font-size: 12px;
-	font-weight: normal;
-	float: right;
-	border: 0px;
-	border-top: 1px solid #C7D4DC;
-	border-right: 1px solid #C7D4DC;
-	border-top-right-radius: 8px;
-	border-bottom-left-radius: 6px;
-	margin: -6px;
-	margin-bottom: 5px;
-	margin-left: 2px;
-	padding-right: 0.4em;
-	color: #34517D;
-	background: #DDE6F5;
-	user-select: none;
-	cursor: default;
+  display: flex; /* needed to be able to reorder elements, e.g. icon, dictionary name, collapse icon */
+  font-size: 12px;
+  font-weight: normal;
+  float: right;
+  border: 0px;
+  border-top: 1px solid #c7d4dc;
+  border-right: 1px solid #c7d4dc;
+  border-top-right-radius: 8px;
+  border-bottom-left-radius: 6px;
+  margin: -6px;
+  margin-bottom: 5px;
+  margin-left: 2px;
+  padding-right: 0.4em;
+  color: #34517d;
+  background: #dde6f5;
+  user-select: none;
+  cursor: default;
 }
 
 /* Actual text with the dictionary title */
-.gddicttitle
-{
-  display:block;
+.gddicttitle {
+  display: block;
   order: 1;
 }
 
 .gdactivearticle .gddictname {
-	border-top: 1px solid #92B0DD;
-	border-right: 1px solid #92B0DD;
-	color: darkblue;
-	background: #CFDDF0;
+  border-top: 1px solid #92b0dd;
+  border-right: 1px solid #92b0dd;
+  color: darkblue;
+  background: #cfddf0;
 }
 
-.gdcollapsedarticle .gddictname
-{
+.gdcollapsedarticle .gddictname {
   opacity: 0.7;
 }
 
 /* Nice diagonal pattern for the collapsed article */
-.gdcollapsedarticle
-{
-	background-image: -webkit-linear-gradient(left top, #ccc 0%, #ccc 25%, #bbb 25%, #bbb 50%, #ccc 50%, #ccc 75%, #bbb 75%);
-	background-size: 50px 50px;
+.gdcollapsedarticle {
+  background-image: -webkit-linear-gradient(
+    left top,
+    #ccc 0%,
+    #ccc 25%,
+    #bbb 25%,
+    #bbb 50%,
+    #ccc 50%,
+    #ccc 75%,
+    #bbb 75%
+  );
+  background-size: 50px 50px;
 }
 
 /* Move the collapse/expand buttons to the last, 3rd position */
-.collapse_expand_area
-{
+.collapse_expand_area {
   display: block;
   order: 3;
 }
 
-.gddicticon
-{
+.gddicticon {
   display: block;
   vertical-align: text-bottom;
   padding-right: -1em;
@@ -96,270 +101,293 @@ a:hover {
   order: 2;
 }
 
-.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover
-{
-    width:15px;
-    background-position: center 25%;
-    background-repeat:no-repeat;
-    vertical-align: top;
-    padding-left: -5px;
-    margin-left: 0px;
+.gdexpandicon,
+.gdexpandicon:hover,
+.gdcollapseicon,
+.gdcollapseicon:hover {
+  width: 15px;
+  background-position: center 25%;
+  background-repeat: no-repeat;
+  vertical-align: top;
+  padding-left: -5px;
+  margin-left: 0px;
 }
 
 .gdexpandicon {
-	content:url('qrc:///icons/expand_article.png');
+  content: url("qrc:///icons/expand_article.png");
 }
 
 .gdexpandicon:hover {
-	content:url('qrc:///icons/expand_article_hovered.png');
+  content: url("qrc:///icons/expand_article_hovered.png");
 }
 
 .gdcollapseicon {
-	content:url('qrc:///icons/collapse_article.png');
+  content: url("qrc:///icons/collapse_article.png");
 }
 
 .gdcollapseicon:hover {
-	content:url('qrc:///icons/collapse_article_hovered.png');
+  content: url("qrc:///icons/collapse_article_hovered.png");
 }
 
 .gdarticleseparator {
-	display: none;
-    clear:both;
+  display: none;
+  clear: both;
 }
 
 /* The 'From ' string which preceeds dictionary name in the heading */
 .gdfromprefix {
-	display: none;
+  display: none;
 }
 
 /* Headers */
 h3 {
-    color: inherit;
-    font-family: Arial;
+  color: inherit;
+  font-family: Arial;
 }
 
 /* The first headword in a (possibly) multi-headword DSL article */
-.gdarticlebody > div:first-child .dsl_headwords,
-{
-	margin-top: -3px;
-	display: inline-block;
+.gdarticlebody > div:first-child .dsl_headwords {
+  margin-top: -3px;
+  display: inline-block;
 }
 
-.mwiki .toc, .mwiki .metadata mbox-small plainlinks {
-	display:none
+.mwiki .toc,
+.mwiki .metadata mbox-small plainlinks {
+  display: none;
 }
 
-
 .gddicticon img {
-	border: 0;
-	height: 15px;
-	vertical-align: text-top; 
+  border: 0;
+  height: 15px;
+  vertical-align: text-top;
 }
 
 /* Text selection */
 ::selection {
-	background: #839EC7;
-	color:#fff;
+  background: #839ec7;
+  color: #fff;
 }
 
 code::selection {
-	background: #839EC7;
+  background: #839ec7;
 }
 
 /******** DSL Dictionaries ****************/
 
 /* DSL headwords */
 .dsl_headwords {
-	color: inherit;
-	font-family: Arial;
+  color: inherit;
+  font-family: Arial;
 }
 
 /* Formatting */
 .dsl_b {
-	font-family: Arial;
+  font-family: Arial;
 }
 
-.dsl_ex, .dsl_ex .dsl_opt
-{
-	color: slategray;
+.dsl_ex,
+.dsl_ex .dsl_opt {
+  color: slategray;
 }
 
 .dsl_ref {
-	color: #0000DD; 
+  color: #0000dd;
 }
 
-.dsl_url { 
-	color: #0000DD; 
+.dsl_url {
+  color: #0000dd;
 }
 
 /* Stress settings */
 .dsl_stress_without_accent,
 .dsl_opt .dsl_ex .dsl_stress_without_accent {
-	display: none;
-	color: green;
+  display: none;
+  color: green;
 }
 
 .dsl_stress_with_accent,
 .dsl_opt .dsl_ex .dsl_stress_with_accent {
-	display: inline;
-	color: #DD0000;
+  display: inline;
+  color: #dd0000;
 }
 .dsl_stress,
 .dsl_opt .dsl_ex .dsl_stress {
-	display: inline;
-	color: blue;
+  display: inline;
+  color: blue;
 }
 
 /* Sound icon */
 .dsl_s_wav img {
-	display: none;
+  display: none;
 }
 
 .dsl_s_wav a {
-	text-decoration: none;
-        user-select: none;
-	display: inline-block;
-	width: 18px;
-	height: 18px;
-	-webkit-border-radius: 100px;
-	text-align: center;
-	vertical-align: text-bottom;
-	color: #FFF;
-	border: 1px solid #798415;
-	-webkit-box-shadow: 1px 1px #CCC, inset -1px -1px #4E7500;
+  text-decoration: none;
+  user-select: none;
+  display: inline-block;
+  width: 18px;
+  height: 18px;
+  -webkit-border-radius: 100px;
+  text-align: center;
+  vertical-align: text-bottom;
+  color: #fff;
+  border: 1px solid #798415;
+  -webkit-box-shadow:
+    1px 1px #ccc,
+    inset -1px -1px #4e7500;
 
-	background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,rgba(191,210,85,1)), color-stop(50%,rgba(142,185,42,1)), color-stop(51%,rgba(114,170,0,1)), color-stop(100%,rgba(158,203,45,1)));
+  background: -webkit-gradient(
+    linear,
+    left top,
+    right bottom,
+    color-stop(0%, rgba(191, 210, 85, 1)),
+    color-stop(50%, rgba(142, 185, 42, 1)),
+    color-stop(51%, rgba(114, 170, 0, 1)),
+    color-stop(100%, rgba(158, 203, 45, 1))
+  );
 }
 
 .dsl_s_wav a:hover {
-	background: -webkit-gradient(linear, left top, right bottom, color-stop(0%,#e6f0a3), color-stop(50%,#d2e638), color-stop(51%,#c3d825), color-stop(100%,#dbf043));
+  background: -webkit-gradient(
+    linear,
+    left top,
+    right bottom,
+    color-stop(0%, #e6f0a3),
+    color-stop(50%, #d2e638),
+    color-stop(51%, #c3d825),
+    color-stop(100%, #dbf043)
+  );
 
-	border: 1px solid #A2B01C;
-	-webkit-box-shadow: 1px 1px #CCC, inset -1px -1px #8A991A;
+  border: 1px solid #a2b01c;
+  -webkit-box-shadow:
+    1px 1px #ccc,
+    inset -1px -1px #8a991a;
 }
 
 .dsl_s_wav a:active {
-	-webkit-box-shadow: 1px 1px #CCC, inset 1px 1px #B1C421;
+  -webkit-box-shadow:
+    1px 1px #ccc,
+    inset 1px 1px #b1c421;
 }
 
 .dsl_s_wav a:after {
-	display: inline-block;
-	font-family: "Webdings";
-	content:"X";
-	width: 18px;
-	height: 18px;
-	font-size: 16px;
-	text-align: center;
-	vertical-align: center;
-	-webkit-background-clip: text;
-	color: #E6EF8F;
-	-webkit-text-stroke: 1px #51580E;
+  display: inline-block;
+  font-family: "Webdings";
+  content: "X";
+  width: 18px;
+  height: 18px;
+  font-size: 16px;
+  text-align: center;
+  vertical-align: center;
+  -webkit-background-clip: text;
+  color: #e6ef8f;
+  -webkit-text-stroke: 1px #51580e;
 }
 
 .dsl_s_wav a:hover:after {
-	-webkit-text-stroke: 1px #656E11;
+  -webkit-text-stroke: 1px #656e11;
 }
 
-
 /******** Verbix Dictionaries ****************/
 
 .sdct_h .normal {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#000000;
-	font-weight: normal;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #000000;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .sdct_h .irregular {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#FF0000;
-	font-weight: bold;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #ff0000;
+  font-weight: bold;
+  text-decoration: none;
 }
 
 .sdct_h .orto {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#0000FF;
-	font-weight: normal;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #0000ff;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .sdct_h .archaic {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#800080;
-	font-weight: normal;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #800080;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .sdct_h .notused {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#808080;
-	font-weight: normal;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #808080;
+  font-weight: normal;
+  text-decoration: none;
 }
 
 .sdct_h .pronoun {
-	font-family: Arial;
-	font-size: 10pt;
-	color:#008000;
-	font-weight: normal;
-	text-decoration:none;
+  font-family: Arial;
+  font-size: 10pt;
+  color: #008000;
+  font-weight: normal;
+  text-decoration: none;
 }
 
-
 .sdct_h > table {
-	border: 1px solid #444444;
-	border-collapse: collapse;
+  border: 1px solid #444444;
+  border-collapse: collapse;
 }
 
 .sdct_h td.verbtable {
-	border: 1px solid #444444;
+  border: 1px solid #444444;
 }
 
 .sdct_h th {
-	background-color: #A6C9EF;
-	font-weight: bold;
+  background-color: #a6c9ef;
+  font-weight: bold;
 }
 
 .sdct_h .mini {
-	font-size: 8pt; font-weight: normal; color: #808080;
+  font-size: 8pt;
+  font-weight: normal;
+  color: #808080;
 }
 
 .sdct_h div.spacerline {
-	clear: both;
-	margin-left: 8px;
-	width:100%;
-	border-top: 1px solid #ccc;
+  clear: both;
+  margin-left: 8px;
+  width: 100%;
+  border-top: 1px solid #ccc;
 }
 
 .sdct_h div.spacer {
-	clear: both;
+  clear: both;
 }
 
 .sdct_h div.float {
-	margin-left: 8px;
-	float: left;
+  margin-left: 8px;
+  float: left;
 }
 
 .sdct_h div.float400 {
-	margin-left: 8px;
-	float: left;
-	width: 400px;
+  margin-left: 8px;
+  float: left;
+  width: 400px;
 }
-	
+
 .sdct_h div.float250color {
-	margin-left: 8px;
-	float: left;
-	width: 250px;
-	border-style: dashed;
-	border-color:#0033CC;
-	border-collapse:collapse;
-	border-width:1px;
-	background-color:#eeeeee;
-	padding: 8px 8px 8px 8px;
-} 
+  margin-left: 8px;
+  float: left;
+  width: 250px;
+  border-style: dashed;
+  border-color: #0033cc;
+  border-collapse: collapse;
+  border-width: 1px;
+  background-color: #eeeeee;
+  padding: 8px 8px 8px 8px;
+}
diff --git a/src/stylesheets/article-style-st-lingoes.css b/src/stylesheets/article-style-st-lingoes.css
index d3facc54..870b9ccc 100644
--- a/src/stylesheets/article-style-st-lingoes.css
+++ b/src/stylesheets/article-style-st-lingoes.css
@@ -1,56 +1,47 @@
-a 
-{
+a {
   color: #2233bb;
   text-decoration: none;
 }
 
-a:hover
-{
+a:hover {
   color: #6677ff;
 }
 
-::selection
-{
+::selection {
   background: #3399ff;
   color: white;
 }
 
-body
-{
+body {
   background: #fffef2;
   color: black;
   font-family: Tahoma, Verdana, SimSun, SimSun-ExtB, sans-serif;
   margin: 5px;
 }
 
-.gdarticle
-{
+.gdarticle {
   background: #fffef2;
   margin-top: -8px;
   position: relative;
 }
 
-.gddicticon
-{
+.gddicticon {
   display: inline;
   margin-left: -3px;
   padding-right: 5px;
 }
 
-.gddicticon img
-{
+.gddicticon img {
   border: 0px;
   height: 16px;
   vertical-align: text-top;
 }
 
-.gdfromprefix
-{
+.gdfromprefix {
   display: none;
 }
 
-.gddictname
-{
+.gddictname {
   display: inline-block;
   /* border: 1px solid #92b0dd; */
   padding: 0.2em;
@@ -64,37 +55,36 @@ body
   font-size: 12px;
 }
 
-.collapse_expand_area
-{
+.collapse_expand_area {
   position: absolute;
   right: 0px;
 }
 
-.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover
-{
+.gdexpandicon,
+.gdexpandicon:hover,
+.gdcollapseicon,
+.gdcollapseicon:hover {
   background-position: center 35%;
-  background-repeat:no-repeat;
+  background-repeat: no-repeat;
 }
 
-
 .gdexpandicon {
-  content:url('qrc:///icons/expand_article.png');
+  content: url("qrc:///icons/expand_article.png");
 }
 
 .gdexpandicon:hover {
-  content:url('qrc:///icons/expand_article_hovered.png');
+  content: url("qrc:///icons/expand_article_hovered.png");
 }
 
 .gdcollapseicon {
-  content:url('qrc:///icons/collapse_article.png');
+  content: url("qrc:///icons/collapse_article.png");
 }
 
 .gdcollapseicon:hover {
-  content:url('qrc:///icons/collapse_article_hovered.png');
+  content: url("qrc:///icons/collapse_article_hovered.png");
 }
 
-.gddictnamebodyseparator
-{
+.gddictnamebodyseparator {
   clear: both;
   border-top: 1px solid #92b0dd;
   margin-bottom: 1em;
diff --git a/src/stylesheets/article-style-st-lingvo.css b/src/stylesheets/article-style-st-lingvo.css
index 20974124..2ce873a8 100644
--- a/src/stylesheets/article-style-st-lingvo.css
+++ b/src/stylesheets/article-style-st-lingvo.css
@@ -1,40 +1,34 @@
-html
-{
+html {
   background-color: white;
 }
 
-body
-{
+body {
   background: white;
 }
 
-a
-{
+a {
   text-decoration: none;
   color: darkblue;
 }
 
-a:hover
-{
+a:hover {
   text-decoration: underline;
 }
 
-.gdarticle
-{
+.gdarticle {
   background: white;
 }
 
 /* The 'From ' string which preceeds dictionary name in the heading */
-.gdfromprefix
-{
+.gdfromprefix {
   display: none;
 }
 
 /* Dictionary's name heading */
-.gddictname
-{
-  padding: 0.2em; padding-left: 0.5em;
-  margin-bottom: 0.1em; 
+.gddictname {
+  padding: 0.2em;
+  padding-left: 0.5em;
+  margin-bottom: 0.1em;
   font-size: 14px;
   font-weight: normal;
   float: right;
@@ -44,16 +38,14 @@ a:hover
   background: white;
 }
 
-.gdarticleseparator + script + .gdarticle .gddictname
-{
+.gdarticleseparator + script + .gdarticle .gddictname {
   border-top: 1px solid #ccc;
-/*  margin-top: 11px;*/
+  /*  margin-top: 11px;*/
 }
 
-.gdactivearticle .gddictname
-{
+.gdactivearticle .gddictname {
   font-weight: normal;
-  
+
   float: right;
   border: 1px solid #b3d7f7;
   margin-top: 7px;
@@ -61,14 +53,12 @@ a:hover
   background: #deecf8;
 }
 
-.gdarticleseparator + script + .gdactivearticle .gddictname
-{
+.gdarticleseparator + script + .gdactivearticle .gddictname {
   border-top: 1px solid #b3d7f7;
-/*  margin-top: 11px;*/
+  /*  margin-top: 11px;*/
 }
 
-.gdarticleseparator
-{
+.gdarticleseparator {
   margin-top: 10px;
   border-bottom: 1px solid #cccccc;
   margin-bottom: 0px;
@@ -77,17 +67,16 @@ a:hover
   clear: both;
 }
 
-.gddictname + h3, .gddictname + .dsl_article > .dsl_headwords
-{
+.gddictname + h3,
+.gddictname + .dsl_article > .dsl_headwords {
   margin-top: 10px;
 }
 
-.dsl_ex, .dsl_ex .dsl_opt
-{
+.dsl_ex,
+.dsl_ex .dsl_opt {
   color: inherit;
 }
 
-.dsl_com
-{
+.dsl_com {
   color: black;
 }
diff --git a/src/stylesheets/article-style-st-modern.css b/src/stylesheets/article-style-st-modern.css
index 611940ca..eaa2051a 100644
--- a/src/stylesheets/article-style-st-modern.css
+++ b/src/stylesheets/article-style-st-modern.css
@@ -1,27 +1,22 @@
-html
-{
+html {
   background-color: white;
 }
 
-body
-{
+body {
   margin: 0;
   background: white;
 }
 
-a
-{
+a {
   text-decoration: none;
   color: darkblue;
 }
 
-a:hover
-{
+a:hover {
   text-decoration: underline;
 }
 
-.gdarticle
-{
+.gdarticle {
   margin-top: 0.1em;
   margin-bottom: 0.4em;
   padding: 5px;
@@ -32,30 +27,25 @@ a:hover
   padding-right: 2em;
 }
 
-.gdactivearticle
-{
-  border: 1px solid #3399FF;
+.gdactivearticle {
+  border: 1px solid #3399ff;
 }
 
-.gdarticleseparator + script + .gdactivearticle .gddictname
-{
-  border-top: 1px solid #3399FF;
+.gdarticleseparator + script + .gdactivearticle .gddictname {
+  border-top: 1px solid #3399ff;
 }
 
-.gdarticleseparator
-{
+.gdarticleseparator {
   display: none;
   clear: both;
 }
 
 /* Hide the 'From ' string which precedes dictionary name in the heading */
-.gdfromprefix
-{
+.gdfromprefix {
   display: none;
 }
 
-.gddictname
-{
+.gddictname {
   display: flex;
   font-size: 12px;
   font-weight: normal;
@@ -68,52 +58,55 @@ a:hover
   margin-left: 2px;
   padding-right: 0.3em;
   color: #4480f8;
-  background: #E0E8F0;
+  background: #e0e8f0;
   user-select: none;
   cursor: default;
 }
 
 /* Actual text with the dictionary title */
-.gddicttitle
-{
-  display:block;
+.gddicttitle {
+  display: block;
   order: 1;
 }
 
-.gdactivearticle .gddictname
-{
+.gdactivearticle .gddictname {
   font-weight: normal;
   margin: -6px;
   margin-bottom: 5px;
   margin-left: 2px;
 
   float: right;
-  border: 1px solid #3399FF;
+  border: 1px solid #3399ff;
   color: #0066cc;
   background: #deecf8;
 }
 
-.gdcollapsedarticle .gddictname
-{
+.gdcollapsedarticle .gddictname {
   opacity: 0.7;
 }
 
 /* Nice diagonal pattern for the collapsed article */
-.gdcollapsedarticle
-{
-	background-image: -webkit-linear-gradient(left top, #ccc 0%, #ccc 25%, #bbb 25%, #bbb 50%, #ccc 50%, #ccc 75%, #bbb 75%);
-	background-size: 50px 50px;
+.gdcollapsedarticle {
+  background-image: -webkit-linear-gradient(
+    left top,
+    #ccc 0%,
+    #ccc 25%,
+    #bbb 25%,
+    #bbb 50%,
+    #ccc 50%,
+    #ccc 75%,
+    #bbb 75%
+  );
+  background-size: 50px 50px;
 }
 
 /* Move the collapse/expand buttons to the last, 3rd position */
-.collapse_expand_area
-{
+.collapse_expand_area {
   display: block;
   order: 3;
 }
 
-.gddicticon
-{
+.gddicticon {
   display: block;
   vertical-align: text-bottom;
   padding-right: -1em;
@@ -122,60 +115,60 @@ a:hover
 }
 
 .gddicticon img {
-    height: 1.3em;
+  height: 1.3em;
 }
 
-.gdexpandicon, .gdexpandicon:hover, .gdcollapseicon, .gdcollapseicon:hover
-{
-    width:15px;
-    background-position: center 35%;
-    background-repeat:no-repeat;
-    vertical-align: text-bottom;
-    padding-left: -5px;
-    margin-left: 0px;
+.gdexpandicon,
+.gdexpandicon:hover,
+.gdcollapseicon,
+.gdcollapseicon:hover {
+  width: 15px;
+  background-position: center 35%;
+  background-repeat: no-repeat;
+  vertical-align: text-bottom;
+  padding-left: -5px;
+  margin-left: 0px;
 }
 
 .gdexpandicon {
-  content:url('qrc:///icons/expand_article.png');
+  content: url("qrc:///icons/expand_article.png");
 }
 
 .gdexpandicon:hover {
-  content:url('qrc:///icons/expand_article_hovered.png');
+  content: url("qrc:///icons/expand_article_hovered.png");
 }
 
 .gdcollapseicon {
-  content:url('qrc:///icons/collapse_article.png');
+  content: url("qrc:///icons/collapse_article.png");
 }
 
 .gdcollapseicon:hover {
-  content:url('qrc:///icons/collapse_article_hovered.png');
+  content: url("qrc:///icons/collapse_article_hovered.png");
 }
 
-.gdarticlebody{
+.gdarticlebody {
   position: relative;
 }
 
 /* The first headword in a (possibly) multi-headword DSL article */
-.gdarticlebody > div:first-child .dsl_headwords,
-{
+.gdarticlebody > div:first-child .dsl_headwords {
   margin-top: -3px;
   display: inline-block;
 }
 
-.gdspellsuggestion
-{
+.gdspellsuggestion {
   /* Add some vertical space before the article */
   margin-top: 1.5em;
 }
 
-.dsl_ex, .dsl_ex .dsl_opt
-{
+.dsl_ex,
+.dsl_ex .dsl_opt {
   color: steelblue;
 }
 
 ::selection {
-  background:#cc0000;
-  color:#fff;
+  background: #cc0000;
+  color: #fff;
 }
 
 code::selection {
diff --git a/src/stylesheets/article-style.css b/src/stylesheets/article-style.css
index f174d32f..fd85450a 100644
--- a/src/stylesheets/article-style.css
+++ b/src/stylesheets/article-style.css
@@ -1,15 +1,30 @@
 /******** Global, non-dictionary-specific classes ***********/
 
 html {
-        height: 100%;
+  height: 100%;
 }
 
-body
-{
-   font-family: system-ui,-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen,Ubuntu,Cantarell,"Open Sans","Helvetica Neue",sans-serif;
+body {
+  font-family:
+    system-ui,
+    -apple-system,
+    BlinkMacSystemFont,
+    "Segoe UI",
+    Roboto,
+    Oxygen,
+    Ubuntu,
+    Cantarell,
+    "Open Sans",
+    "Helvetica Neue",
+    sans-serif;
 }
 
-h1,h2,h3,h4,h5,h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   unicode-bidi: plaintext;
 }
 /* This stylesheet is used to highligh current selection when doing a search.
@@ -23,20 +38,19 @@ h1,h2,h3,h4,h5,h6 {
 }
 
 /* Don't allow to select [] */
-:before, :after {
+:before,
+:after {
   user-select: none;
 }
 
 /* Plaintext dictionaries are usually 80-column formatted and take a lot
  * of space. We try to use smaller fonts for them therefore. */
-pre
-{
+pre {
   font-size: 12px;
 }
 
 /* Dictionary's name heading */
-.gddictname
-{
+.gddictname {
   margin-top: 0.5em;
   margin-bottom: 0.5em;
   font-weight: bold;
@@ -61,61 +75,53 @@ pre
   background-color: hsl(0deg 0% 70%);
 }
 
-.gddicttitle
-{
-	user-select: none;
+.gddicttitle {
+  user-select: none;
 }
 
-.gddictnamebodyseparator
-{
+.gddictnamebodyseparator {
   clear: both;
 }
 
 /* The 'From ' string which precedes dictionary name in the heading */
-.gdfromprefix
-{
-    display:none;
+.gdfromprefix {
+  display: none;
 }
 
 /* The article span. Here we have a padding/margin hack to make fragment links
    behave better (have some space before the start of article) */
-.gdarticle
-{
+.gdarticle {
   display: block;
   padding-top: 1px;
   margin-top: -8px;
   margin-bottom: 8px;
-/*fix for invalid blg*/
-  font-style:normal;
+  /*fix for invalid blg*/
+  font-style: normal;
   content-visibility: auto;
   contain-intrinsic-height: auto 600px;
 }
 
-.empty-space
-{
-  height:400px;
+.empty-space {
+  height: 400px;
 }
 
 /* CSS trick to prevent the floating elements to overflow
    the article boundaries, see Issue #333. */
-.gdarticle:after
-{
-   content: "";
-   display: block;
-   height: 0;
-   clear: both;
+.gdarticle:after {
+  content: "";
+  display: block;
+  height: 0;
+  clear: both;
 }
 
 /* Appears between the articles */
-.gdarticleseparator
-{
+.gdarticleseparator {
   display: inline-block;
   clear: both;
 }
 
 /* Dictionary query error description string */
-.gderrordesc
-{
+.gderrordesc {
   font-style: italic;
   background: url("qrc:///icons/warning.png") center left no-repeat !important;
   padding-left: 22px !important;
@@ -125,79 +131,70 @@ pre
 /********* Babylon dictionaries' classes *********/
 
 /* Transcriptions in Babylon dictionaries */
-.bgltrn:before
-{
-  content:"[";
+.bgltrn:before {
+  content: "[";
 }
 
-.bgltrn:after
-{
-  content:"]";
+.bgltrn:after {
+  content: "]";
 }
 
-.bgltrn { display:block; }
+.bgltrn {
+  display: block;
+}
 
 /* Part of speech in Babylon dictionaries. Usually irrelevant,
  * therefore hidden */
-.bglpos { display: none; }
+.bglpos {
+  display: none;
+}
 
 /* Right-to-left text */
-.bglrtl
-{
+.bglrtl {
   text-align: right;
   direction: rtl;
 }
 
 /******** StarDict dictionaries' classes *********/
 
-
 /* StarDict type 'h' -- Html content. We don't normally do anything here. */
-div.sdct_h
-{
+div.sdct_h {
   unicode-bidi: plaintext;
 }
 
-.sdict_h_wav img
-{
+.sdict_h_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
 
 /* StarDict type 'm' -- Pure meaning. Presented as <pre> */
-pre.sdct_m
-{
+pre.sdct_m {
 }
 
 /* StarDict type 'l' -- Pure meaning which used to be in locale encoding. */
-pre.sdct_l
-{
+pre.sdct_l {
 }
 
 /* StarDict type 'g' -- Pango Markup */
-div.sdct_g
-{
+div.sdct_g {
 }
 
 /* StarDict type 't' -- Transcription */
-div.sdct_t
-{
+div.sdct_t {
   font-weight: bold;
 }
 
 /* StarDict type 'y' -- Chinese YinBiao or Japanese KANA */
-div.sdct_y
-{
+div.sdct_y {
 }
 
 /* StarDict type 'x'. Should have xdxf_*-styled elements inside */
-div.sdct_x
-{
+div.sdct_x {
 }
 
 /* Blockquotes in XDXF-styled elements are used
    for indentation purposes, see Issue #305. */
-.sdct_x blockquote
-{
+.sdct_x blockquote {
   margin: 0px;
   padding-left: 9px;
   display: inline-block;
@@ -205,52 +202,45 @@ div.sdct_x
 
 /******** XDXF markup classes *********/
 
-div.xdxf
-{
+div.xdxf {
 }
 
 /* Key -- keys shouldn't normally be present in the article's body since they
  * are accounted for separately, hence we hide them */
-.xdxf_k
-{
+.xdxf_k {
   display: none;
 }
 
 /* ...and if there's a break after it, we hide it too so we don't have an
  * extra vertical spacing. */
-.xdxf_k + br
-{
+.xdxf_k + br {
   display: none;
 }
 
 /* Article structure tag */
-.xdxf_num
-{
-    color: red;
-    font-weight: bold;
-    padding-left:-15px;
+.xdxf_num {
+  color: red;
+  font-weight: bold;
+  padding-left: -15px;
 }
-.xdxf_def
-{
-    display: block;
-    border-color: #e3e3e3;
-    border-width: 1px;
-    border-style: dashed;
-    margin: 1px;
-    margin-left: 15px;
+.xdxf_def {
+  display: block;
+  border-color: #e3e3e3;
+  border-width: 1px;
+  border-style: dashed;
+  margin: 1px;
+  margin-left: 15px;
 }
 
-.xdxf_def:target
-{
-    /* this pseudoclass is used to marked out the referenced <def> that was just clicked */
-    border-color: red;
-    border-width: 1px;
-    border-style: double;
+.xdxf_def:target {
+  /* this pseudoclass is used to marked out the referenced <def> that was just clicked */
+  border-color: red;
+  border-width: 1px;
+  border-style: double;
 }
 
 /* Abbreviation */
-.xdxf_abbr
-{
+.xdxf_abbr {
   font-style: italic;
   color: seagreen;
   cursor: default;
@@ -258,96 +248,85 @@ div.xdxf
 }
 
 /* Editorial comment */
-.xdxf_co, .xdxf_co_old
-{
-    color: darkslateblue;
-    font-style: italic;
+.xdxf_co,
+.xdxf_co_old {
+  color: darkslateblue;
+  font-style: italic;
 }
-.xdxf_co:before
-{
-    content:"("
+.xdxf_co:before {
+  content: "(";
 }
-.xdxf_co:after
-{
-    content:")"
+.xdxf_co:after {
+  content: ")";
 }
 
 /* Grammar information */
-.xdxf_gr
-{
-    color: orangered;
-    display: block;
+.xdxf_gr {
+  color: orangered;
+  display: block;
 }
 
-.xdxf_gr_old
-{
-    color: blue; /*orangered;*/
+.xdxf_gr_old {
+  color: blue; /*orangered;*/
 }
 
 /* Example */
-.xdxf_ex
-{
-    color: #808080;
-    display: block;
-    margin-left: 14px;
+.xdxf_ex {
+  color: #808080;
+  display: block;
+  margin-left: 14px;
 }
 
-.xdxf_ex_old
-{
-    color: #808080;
+.xdxf_ex_old {
+  color: #808080;
 }
 
-.xdxf_ex_source:before
-{
-    content:"["
+.xdxf_ex_source:before {
+  content: "[";
 }
-.xdxf_ex_source:after
-{
-    content:"]"
+.xdxf_ex_source:after {
+  content: "]";
 }
 
-.xdxf_ex_tran:before
-{
-    content:"— "
+.xdxf_ex_orig {
+  color: #8761d9;
 }
 
-.xdxf_ex_tran
-{
-    font-style: italic;
+.xdxf_ex_tran:before {
+  content: "— ";
+}
+
+.xdxf_ex_tran {
+  font-style: italic;
 }
 
 /* Direct translation */
-.xdxf_dtrn
-{
-    font-weight: bold;
-    color: #dd7800;
+.xdxf_dtrn {
+  font-weight: bold;
+  color: #dd7800;
 }
 
 /* Transcription */
-.xdxf_tr:before
-{
-  content:"[";
+.xdxf_tr:before {
+  content: "[";
 }
 
-.xdxf_tr:after
-{
-  content:"]";
+.xdxf_tr:after {
+  content: "]";
 }
 
-.xdxf_tr, .xdxf_tr_old
-{
+.xdxf_tr,
+.xdxf_tr_old {
   font-weight: bold;
 }
 
 /* Resource reference -- for now just a span. Since there's not yet a mechanism
  * to load resources off XDXF articles in GoldenDict, we just hide them. */
-.xdxf_rref
-{
+.xdxf_rref {
   display: none;
 }
 
-.xdxf_headwords
-{
+.xdxf_headwords {
   font-size: 116%;
   font-weight: bold;
   margin-top: 10px;
@@ -355,123 +334,106 @@ div.xdxf
 }
 
 /* The words in examples that are meaked out; they are marked out only when placed into <ex> tag */
-.xdxf_ex .xdxf_ex_markd, .xdxf_ex_old .xdxf_ex_markd
-{
-  color:black;
-  background-color:lightgray;
+.xdxf_ex .xdxf_ex_markd,
+.xdxf_ex_old .xdxf_ex_markd {
+  background-color: lightgray;
+  margin-left: 0.2em;
+  margin-right: 0.2em;
+  padding-left: 0.1em;
+  padding-right: 0.1em;
 }
 
-.xdxf_opt
-{
+.xdxf_opt {
   color: #808080;
 }
 
 /******** SDictionary markup classes *********/
 
-.sdict_forms
-{
+.sdict_forms {
   font-style: italic;
 }
 
 /* Transcription */
-.sdict_tr:before
-{
-  content:"[";
+.sdict_tr:before {
+  content: "[";
 }
 
-.sdict_tr:after
-{
-  content:"] ";
+.sdict_tr:after {
+  content: "] ";
 }
 
-.sdict_tr
-{
+.sdict_tr {
   font-weight: bold;
 }
 
 /************* LSA audio archives **************/
 
 /* A table which contains a play icon and a word's link */
-.lsa_play
-{
+.lsa_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.lsa_play a
-{
+.lsa_play a {
   text-decoration: none;
 }
 
 /************* DSL dictionaries **************/
 
-.dsl_u
-{
+.dsl_u {
   text-decoration: underline;
 }
 
-.dsl_article
-{
-  display:inline;
+.dsl_article {
+  display: inline;
 }
 
-.dsl_article .c_default_color
-{
+.dsl_article .c_default_color {
   color: green;
 }
 
-.dsl_m, .dsl_m0
-{
+.dsl_m,
+.dsl_m0 {
   padding-left: 0px;
 }
 
-.dsl_m1
-{
+.dsl_m1 {
   padding-left: 9px;
 }
 
-.dsl_m2
-{
+.dsl_m2 {
   padding-left: 18px;
 }
 
-.dsl_m3
-{
+.dsl_m3 {
   padding-left: 27px;
 }
 
-.dsl_m4
-{
+.dsl_m4 {
   padding-left: 36px;
 }
 
-.dsl_m5
-{
+.dsl_m5 {
   padding-left: 45px;
 }
 
-.dsl_m6
-{
+.dsl_m6 {
   padding-left: 54px;
 }
 
-.dsl_m7
-{
+.dsl_m7 {
   padding-left: 63px;
 }
 
-.dsl_m8
-{
+.dsl_m8 {
   padding-left: 72px;
 }
 
-.dsl_m9
-{
+.dsl_m9 {
   padding-left: 81px;
 }
 
-.dsl_p, .dsl_p :not(a) /* DSL Feature: Enforce the style even if the children tags say otherwise, except links */
-{
+.dsl_p, .dsl_p :not(a) /* DSL Feature: Enforce the style even if the children tags say otherwise, except links */ {
   color: green !important; /* DSL label color must have highest priority */
   font-style: italic;
   cursor: default;
@@ -482,66 +444,61 @@ div.xdxf
   display: none;
 }
 
-.dsl_t
-{
+.dsl_t {
   font-weight: bold;
 }
 
-.dsl_headwords
-{
+.dsl_headwords {
   font-weight: bold;
   margin-top: 15px;
   margin-bottom: 10px;
 }
 
-.dsl_headwords p
-{
+.dsl_headwords p {
   font-weight: bold;
   font-size: 15px;
   margin: 0;
 }
 
-.dsl_definition p
-{
+.dsl_definition p {
   margin: 0;
 }
 
-.dsl_opt
-{
+.dsl_opt {
   display: none;
 }
 
 .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 children tags say otherwise */
-{
+.dsl_opt .dsl_ex font[color] /* DSL Feature: Enforce the optional zone color even if the children tags say otherwise */ {
   color: gray;
 }
 
-.dsl_ex, .dsl_ex .dsl_opt
-{
+.dsl_ex,
+.dsl_ex .dsl_opt {
   color: gray;
 }
 
+.dsl_unknown {
+  border-bottom: 3px double red;
+}
+
 /* Style for expand optional parts button */
-.hidden_expand_opt
-{
+.hidden_expand_opt {
   color: blue;
   cursor: pointer;
   vertical-align: text-bottom;
 }
 
-.dsl_s_wav img
-{
+.dsl_s_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
 
-.dsl_video .img
-{
+.dsl_video .img {
   display: inline-block;
-  background: url('qrc:///icons/video.png');
+  background: url("qrc:///icons/video.png");
   background-repeat: no-repeat;
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
@@ -551,133 +508,112 @@ div.xdxf
   padding: 0;
 }
 
-.dsl_video .filename
-{
+.dsl_video .filename {
   display: none; /* by default, the file name is hidden */
   padding-left: 5px;
 }
 
 /************* MDict dictionaries **************/
-.mdict
-{
-
+.mdict {
 }
 
-.mdict a[name]
-{
+.mdict a[name] {
   text-decoration: none;
   color: inherit;
 }
 
 /************* Zim dictionaries **************/
 
-.zimdict
-{
-  font-size: 110%!important;
+.zimdict {
+  font-size: 110% !important;
 }
 
-.zimdict_headword
-{
-  font-weight: bold!important;
+.zimdict_headword {
+  font-weight: bold !important;
   display: none;
 }
 
 /************* Spelling suggestions *****************/
 
-.gdspellsuggestion
-{
+.gdspellsuggestion {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
 /************* Stemmed suggestions *****************/
 
-.gdstemmedsuggestion
-{
+.gdstemmedsuggestion {
   /* Add some horizontal and vertical space */
   margin-top: 1em;
   margin-left: 1px;
 }
 
-
-.gdstemmedsuggestion_head
-{
+.gdstemmedsuggestion_head {
   margin-left: 11px;
   font-style: italic;
 }
 
-.gdstemmedsuggestion_body
-{
+.gdstemmedsuggestion_body {
 }
 
 /************* Dictd articles *****************/
-.dictd_article
-{
+.dictd_article {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
-.dictd_phonetic:before, .dictd_phonetic:after
-{
+.dictd_phonetic:before,
+.dictd_phonetic:after {
   content: "\\";
   font-style: normal;
 }
 
-.dictd_phonetic:after
-{
+.dictd_phonetic:after {
   margin-left: 3px;
 }
 
-.dictd_phonetic
-{
+.dictd_phonetic {
   font-style: italic;
   color: #009900;
 }
 
-.dictd_article a:link
-{
-  color: #0000FF;
+.dictd_article a:link {
+  color: #0000ff;
 }
 
-.dictserver_from
-{
+.dictserver_from {
   font-size: 110%;
   font-weight: 600;
 }
 
 /************* Epwing dictionaries *****************/
 
-.epwing_narrow_font
-{
+.epwing_narrow_font {
   width: 0.5em;
   height: 1em;
   vertical-align: -15%;
 }
 
-.epwing_wide_font
-{
+.epwing_wide_font {
   width: 1em;
   height: 1em;
   vertical-align: -15%;
 }
 
-.epwing_article
-{
-  display:inline;
+.epwing_article {
+  display: inline;
 }
 
 /************* Websites *****************/
 
-.website_padding
-{
+.website_padding {
   height: 1em;
-  clear:both;
+  clear: both;
 }
 
 /************* Forvo **************/
 
-.forvo_headword
-{
+.forvo_headword {
   margin-top: 15px;
   margin-bottom: 10px;
   font-weight: bold;
@@ -685,31 +621,26 @@ div.xdxf
 }
 
 /* A table which contains a play icon and information about the sound */
-.forvo_play
-{
+.forvo_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.forvo_user
-{
+.forvo_user {
   text-decoration: none;
   color: green;
 }
 
-.forvo_location
-{
+.forvo_location {
   color: grey;
 }
 
-.forvo_positive_votes
-{
+.forvo_positive_votes {
   font-weight: bold;
   color: green;
 }
 
-.forvo_negative_votes
-{
+.forvo_negative_votes {
   font-weight: bold;
   color: red;
 }
@@ -717,32 +648,28 @@ div.xdxf
 /************* Programs **************/
 
 /* A table which contains a play icon and a word's link */
-.programs_play
-{
+.programs_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.programs_play a
-{
+.programs_play a {
   text-decoration: none;
 }
 
-.programs_plaintext, .programs_html
-{
+.programs_plaintext,
+.programs_html {
   margin-top: 15px;
 }
 
 /************* Voice engines **************/
 
-.voiceengines_play
-{
+.voiceengines_play {
   margin-top: 8px;
   margin-left: 8px;
 }
 
-.voiceengines_play a
-{
+.voiceengines_play a {
   text-decoration: none;
 }
 
@@ -751,14 +678,12 @@ div.xdxf
  with a .mwiki prepended to each record.
 */
 
-.mwiki
-{
+.mwiki {
   /* Add some vertical space before the article */
   margin-top: 1em;
 }
 
-.mwiki .topicon
-{
+.mwiki .topicon {
   /* Those are padlocks on top and such -- we disable those for GoldenDict
      since they look really ugly here */
   display: none;
@@ -771,241 +696,294 @@ div.xdxf
  * careful what you put in here, since what looks good in one skin may not in
  * another, but don't ignore the poor non-Monobook users either.
  */
-.mwiki .mw-plusminus-null { color: #aaa; }
+.mwiki .mw-plusminus-null {
+  color: #aaa;
+}
 
-.mwiki .texvc { direction: ltr; unicode-bidi: embed; }
-.mwiki img.tex { vertical-align: middle; }
-.mwiki span.texhtml { font-family: serif; }
+.mwiki .texvc {
+  direction: ltr;
+  unicode-bidi: embed;
+}
+.mwiki img.tex {
+  vertical-align: middle;
+}
+.mwiki span.texhtml {
+  font-family: serif;
+}
 
 /* add a bit of margin space between the preview and the toolbar */
 /* this replaces the ugly <p><br /></p> we used to insert into the page source */
-.mwiki #wikiPreview.ontop { margin-bottom: 1em; }
+.mwiki #wikiPreview.ontop {
+  margin-bottom: 1em;
+}
 
 /* Stop floats from intruding into edit area in previews */
-.mwiki #toolbar, .mwiki #wpTextbox1 { clear: both; }
+.mwiki #toolbar,
+.mwiki #wpTextbox1 {
+  clear: both;
+}
 
 .mwiki div#mw-js-message {
-	margin: 1em 5%;
-	padding: 0.5em 2.5%;
-	border: solid 1px #ddd;
-	background-color: #fcfcfc;
+  margin: 1em 5%;
+  padding: 0.5em 2.5%;
+  border: solid 1px #ddd;
+  background-color: #fcfcfc;
 }
 
 /* Edit section links */
 .mwiki .editsection {
-	float: right;
-	margin-left: 5px;
+  float: right;
+  margin-left: 5px;
 }
 
 /**
  * File histories
  */
 .mwiki table.filehistory {
-	border:1px solid #ccc;
-	border-collapse:collapse;
+  border: 1px solid #ccc;
+  border-collapse: collapse;
 }
 
 .mwiki table.filehistory th,
 .mwiki table.filehistory td {
-	padding: 0 0.2em 0 0.2em;
-	vertical-align:top;
-	border:1px solid #ccc;
+  padding: 0 0.2em 0 0.2em;
+  vertical-align: top;
+  border: 1px solid #ccc;
 }
 .mwiki table.filehistory th {
-	text-align: left;
+  text-align: left;
 }
 .mwiki table.filehistory td.mw-imagepage-filesize,
 .mwiki table.filehistory th.mw-imagepage-filesize {
-	white-space:nowrap;
+  white-space: nowrap;
 }
 
 .mwiki table.filehistory td.filehistory-selected {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 /*
  * rev_deleted stuff
  */
-.mwiki li span.deleted, .mwiki span.history-deleted {
-	text-decoration: line-through;
-	color: #888;
-	font-style: italic;
+.mwiki li span.deleted,
+.mwiki span.history-deleted {
+  text-decoration: line-through;
+  color: #888;
+  font-style: italic;
 }
 
-.mwiki td.mw-label { vertical-align: top; }
-.mwiki td.mw-submit { white-space: nowrap; }
+.mwiki td.mw-label {
+  vertical-align: top;
+}
+.mwiki td.mw-submit {
+  white-space: nowrap;
+}
 /**
  * Forms
  */
-.mwiki body.ltr td.mw-label { text-align: right; }
-.mwiki body.ltr td.mw-input { text-align: left; }
-.mwiki body.ltr td.mw-submit { text-align: left; }
-.mwiki body.rtl td.mw-label { text-align: left; }
-.mwiki body.rtl td.mw-input { text-align: right; }
-.mwiki body.rtl td.mw-submit { text-align: right; }
+.mwiki body.ltr td.mw-label {
+  text-align: right;
+}
+.mwiki body.ltr td.mw-input {
+  text-align: left;
+}
+.mwiki body.ltr td.mw-submit {
+  text-align: left;
+}
+.mwiki body.rtl td.mw-label {
+  text-align: left;
+}
+.mwiki body.rtl td.mw-input {
+  text-align: right;
+}
+.mwiki body.rtl td.mw-submit {
+  text-align: right;
+}
 
 /**
  * Image captions
  */
-.mwiki body.rtl .thumbcaption { text-align:right; }
-.mwiki body.rtl .magnify { float:left; }
+.mwiki body.rtl .thumbcaption {
+  text-align: right;
+}
+.mwiki body.rtl .magnify {
+  float: left;
+}
 
-.mwiki body.ltr .thumbcaption { text-align:left; }
-.mwiki body.ltr .magnify { float:right; }
+.mwiki body.ltr .thumbcaption {
+  text-align: left;
+}
+.mwiki body.ltr .magnify {
+  float: right;
+}
 
 /**
  * Hidden categories
  */
-.mwiki .mw-hidden-cats-hidden { display: none; }
-.mwiki .catlinks-allhidden { display: none; }
+.mwiki .mw-hidden-cats-hidden {
+  display: none;
+}
+.mwiki .catlinks-allhidden {
+  display: none;
+}
 
 /* Convenience links to edit block, delete and protect reasons */
-.mwiki p.mw-ipb-conveniencelinks, .mwiki p.mw-protect-editreasons,
-.mwiki p.mw-filedelete-editreasons, .mwiki p.mw-delete-editreasons {
-	font-size: 90%;
-	float: right;
+.mwiki p.mw-ipb-conveniencelinks,
+.mwiki p.mw-protect-editreasons,
+.mwiki p.mw-filedelete-editreasons,
+.mwiki p.mw-delete-editreasons {
+  font-size: 90%;
+  float: right;
 }
 
 /* Search results */
 .mwiki div.searchresult {
-	font-size: 95%;
-	width:38em;
+  font-size: 95%;
+  width: 38em;
 }
 .mwiki .mw-search-results li {
-	padding-bottom: 1em;
-	list-style:none;
+  padding-bottom: 1em;
+  list-style: none;
 }
 .mwiki .mw-search-result-data {
-	color: green;
-	font-size: 97%;
+  color: green;
+  font-size: 97%;
 }
 
 .mwiki td#mw-search-menu {
-	padding-left:6em;
-	font-size:85%;
+  padding-left: 6em;
+  font-size: 85%;
 }
 
 .mwiki div#mw-search-interwiki {
-	float: right;
-	width: 18em;
-	border-style: solid;
-	border-color: #AAAAAA;
-	border-width: 1px;
-	margin-top: 2ex;
+  float: right;
+  width: 18em;
+  border-style: solid;
+  border-color: #aaaaaa;
+  border-width: 1px;
+  margin-top: 2ex;
 }
 
 .mwiki div#mw-search-interwiki li {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki .mw-search-interwiki-more {
-	float: right;
-	font-size: 90%;
+  float: right;
+  font-size: 90%;
 }
 
 .mwiki span.searchalttitle {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki div.searchdidyoumean {
-	font-size: 127%;
-	margin-bottom: 1ex;
-	margin-top: 1ex;
-	/* Note that this color won't affect the link, as desired. */
-	color: #c00;
+  font-size: 127%;
+  margin-bottom: 1ex;
+  margin-top: 1ex;
+  /* Note that this color won't affect the link, as desired. */
+  color: #c00;
 }
 
 .mwiki div.searchdidyoumean em {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki .searchmatch {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki div.searchresults {
-	border:1px solid darkblue;
-	padding-top: 10px;
-	padding-bottom: 10px;
-	padding-left: 20px;
-	padding-right: 20px;
+  border: 1px solid darkblue;
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 20px;
+  padding-right: 20px;
 }
 
 /*
  * UserRights stuff
  */
 .mwiki .mw-userrights-disabled {
-	color: #888;
+  color: #888;
 }
 
-.mwiki table.mw-userrights-groups * td,.mwiki table.mw-userrights-groups * th {
-	padding-right: 1.5em;
+.mwiki table.mw-userrights-groups * td,
+.mwiki table.mw-userrights-groups * th {
+  padding-right: 1.5em;
 }
 
 /*
  * OpenSearch ajax suggestions
  */
 .mwiki .os-suggest {
-	overflow: auto;
-	overflow-x: hidden;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	width: 0px;
-	background-color: white;
-	border-style: solid;
-	border-color: #AAAAAA;
-	border-width: 1px;
-	z-index:99;
-	visibility:hidden;
-	font-size:95%;
+  overflow: auto;
+  overflow-x: hidden;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  width: 0px;
+  background-color: white;
+  border-style: solid;
+  border-color: #aaaaaa;
+  border-width: 1px;
+  z-index: 99;
+  visibility: hidden;
+  font-size: 95%;
 }
 
 .mwiki table.os-suggest-results {
-	font-size: 95%;
-	cursor: pointer;
-	border: 0;
-	border-collapse: collapse;
-	width: 100%;
+  font-size: 95%;
+  cursor: pointer;
+  border: 0;
+  border-collapse: collapse;
+  width: 100%;
 }
 
-.mwiki td.os-suggest-result, .mwiki td.os-suggest-result-hl {
-	white-space: nowrap;
-	background-color: white;
-	color: black;
-	padding: 2px;
+.mwiki td.os-suggest-result,
+.mwiki td.os-suggest-result-hl {
+  white-space: nowrap;
+  background-color: white;
+  color: black;
+  padding: 2px;
 }
 .mwiki td.os-suggest-result-hl,
 .mwiki td.os-suggest-result-hl-webkit {
-	background-color: #4C59A6;
-	color: white;
+  background-color: #4c59a6;
+  color: white;
 }
 
 .mwiki .os-suggest-toggle {
-	position: relative;
-	left: 1ex;
-	font-size: 65%;
+  position: relative;
+  left: 1ex;
+  font-size: 65%;
 }
 .mwiki .os-suggest-toggle-def {
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	font-size: 65%;
-	visibility: hidden;
+  position: absolute;
+  top: 0px;
+  left: 0px;
+  font-size: 65%;
+  visibility: hidden;
 }
 
 /* Page history styling */
 /* the auto-generated edit comments */
-.mwiki .autocomment { color: gray; }
-.mwiki #pagehistory .history-user {
-    margin-left: 0.4em;
-    margin-right: 0.2em;
+.mwiki .autocomment {
+  color: gray;
+}
+.mwiki #pagehistory .history-user {
+  margin-left: 0.4em;
+  margin-right: 0.2em;
+}
+.mwiki #pagehistory span.minor {
+  font-weight: bold;
+}
+.mwiki #pagehistory li {
+  border: 1px solid white;
 }
-.mwiki #pagehistory span.minor { font-weight: bold; }
-.mwiki #pagehistory li { border: 1px solid white; }
 .mwiki #pagehistory li.selected {
-    background-color: #f9f9f9;
-    border: 1px dashed #aaa;
+  background-color: #f9f9f9;
+  border: 1px dashed #aaa;
 }
 
 /*
@@ -1015,57 +993,61 @@ div.xdxf
 
 .mwiki table.mw-listgrouprights-table,
 .mwiki table.mw-statistics-table {
-	border: 1px solid #ccc;
-	border-collapse: collapse;
+  border: 1px solid #ccc;
+  border-collapse: collapse;
 }
 
-.mwiki table.mw-listgrouprights-table tr  {
-	vertical-align: top;
+.mwiki table.mw-listgrouprights-table tr {
+  vertical-align: top;
 }
 
-.mwiki table.mw-listgrouprights-table td, .mwiki table.mw-listgrouprights-table th,
-.mwiki table.mw-statistics-table td, .mwiki table.mw-statistics-table th {
-	padding: 0.5em 0.2em 0.5em 0.2em;
-	border: 1px solid #ccc;
+.mwiki table.mw-listgrouprights-table td,
+.mwiki table.mw-listgrouprights-table th,
+.mwiki table.mw-statistics-table td,
+.mwiki table.mw-statistics-table th {
+  padding: 0.5em 0.2em 0.5em 0.2em;
+  border: 1px solid #ccc;
 }
 
 .mwiki td.mw-statistics-numbers {
-	text-align: right;
+  text-align: right;
 }
 
 /* Special:SpecialPages styling */
 .mwiki h4.mw-specialpagesgroup {
-	background-color: #dcdcdc;
-	padding: 2px;
-	margin: .3em 0em 0em 0em;
+  background-color: #dcdcdc;
+  padding: 2px;
+  margin: 0.3em 0em 0em 0em;
 }
 .mwiki .mw-specialpagerestricted {
-	font-weight: bold;
+  font-weight: bold;
 }
 
-.mwiki #shared-image-dup, .mwiki #shared-image-conflict {
-	font-style: italic;
+.mwiki #shared-image-dup,
+.mwiki #shared-image-conflict {
+  font-style: italic;
 }
 
 /* Special:EmailUser styling */
 .mwiki table.mw-emailuser-table {
-	width: 98%;
+  width: 98%;
 }
-.mwiki td#mw-emailuser-sender, .mwiki td#mw-emailuser-recipient {
-	font-weight: bold;
+.mwiki td#mw-emailuser-sender,
+.mwiki td#mw-emailuser-recipient {
+  font-weight: bold;
 }
 
 /* Special:Prefixindex styling */
 .mwiki table#mw-prefixindex-list-table,
 .mwiki table#mw-prefixindex-nav-table {
-	width: 98%;
-	background-color: transparent;
+  width: 98%;
+  background-color: transparent;
 }
-.mwiki td#mw-prefixindex-nav-form  {
-	font-size: smaller;
-	margin-bottom: 1em;
-	text-align: right;
-	vertical-align: top;
+.mwiki td#mw-prefixindex-nav-form {
+  font-size: smaller;
+  margin-bottom: 1em;
+  text-align: right;
+  vertical-align: top;
 }
 
 /*
@@ -1075,25 +1057,25 @@ div.xdxf
  * incl. log entries for these warnings
  */
 .mwiki div.mw-warning-with-logexcerpt {
-	padding: 3px;
-	margin-bottom: 3px;
-	border: 2px solid #2F6FAB;
+  padding: 3px;
+  margin-bottom: 3px;
+  border: 2px solid #2f6fab;
 }
 .mwiki div.mw-warning-with-logexcerpt ul li {
-	font-size: 90%;
+  font-size: 90%;
 }
 
 /* (show/hide) revision deletion links */
 .mwiki span.mw-revdelundel-link,
 .mwiki strong.mw-revdelundel-link {
-	font-family: monospace;
-	font-size: smaller
+  font-family: monospace;
+  font-size: smaller;
 }
 
 /* feed links */
 .mwiki a.feedlink {
-	background: url("images/feed-icon.png") center left no-repeat;
-	padding-left: 16px;
+  background: url("images/feed-icon.png") center left no-repeat;
+  padding-left: 16px;
 }
 
 /************ monobook/main.css **************/
@@ -1110,26 +1092,26 @@ div.xdxf
 */
 
 .mwiki #column-content {
-	width: 100%;
-	float: right;
-	margin: 0 0 .6em -12.2em;
-	padding: 0;
+  width: 100%;
+  float: right;
+  margin: 0 0 0.6em -12.2em;
+  padding: 0;
 }
 .mwiki #content {
-	margin: 2.8em 0 0 12.2em;
-	padding: 0 1em 1em 1em;
-	position: relative;
-	z-index: 2;
+  margin: 2.8em 0 0 12.2em;
+  padding: 0 1em 1em 1em;
+  position: relative;
+  z-index: 2;
 }
 .mwiki #column-one {
-	padding-top: 160px;
+  padding-top: 160px;
 }
 .mwiki #content {
-	background: white;
-	color: black;
-	border: 1px solid #aaa;
-	border-right: none;
-	line-height: 1.5em;
+  background: white;
+  color: black;
+  border: 1px solid #aaa;
+  border-right: none;
+  line-height: 1.5em;
 }
 /* the left column width is specified in class .portlet */
 
@@ -1151,171 +1133,210 @@ body {
 
 /* scale back up to a sane default */
 .mwiki #globalWrapper {
-	font-size: 127%;
-	width: 100%;
-	margin: 0;
-	padding: 0;
+  font-size: 127%;
+  width: 100%;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .visualClear {
-	clear: both;
+  clear: both;
 }
 
 /* general styles */
 
 .mwiki table {
-	font-size: 100%;
-	color: black;
-	/* we don't want the bottom borders of <h2>s to be visible through
+  font-size: 100%;
+  color: black;
+  /* we don't want the bottom borders of <h2>s to be visible through
 	   floated tables */
-	background-color: white;
+  background-color: white;
 }
 .mwiki fieldset table {
-	/* but keep table layouts in forms clean... */
-	background: none;
+  /* but keep table layouts in forms clean... */
+  background: none;
 }
 .mwiki a {
-	text-decoration: none;
-	color: #002bb8;
-	background: none;
+  text-decoration: none;
+  color: #002bb8;
+  background: none;
 }
 .mwiki a:visited {
-	color: #5a3696;
+  color: #5a3696;
 }
 .mwiki a:active {
-	color: #faa700;
+  color: #faa700;
 }
 .mwiki a:hover {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 .mwiki a.stub {
-	color: #772233;
+  color: #772233;
 }
-.mwiki a.new, .mwiki #p-personal a.new {
-	color: #ba0000;
+.mwiki a.new,
+.mwiki #p-personal a.new {
+  color: #ba0000;
 }
-.mwiki a.new:visited, .mwiki #p-personal a.new:visited {
-	color: #a55858;
+.mwiki a.new:visited,
+.mwiki #p-personal a.new:visited {
+  color: #a55858;
 }
 
 .mwiki img {
-	border: none;
-	vertical-align: middle;
+  border: none;
+  vertical-align: middle;
 }
 .mwiki p {
-	margin: .4em 0 .5em 0;
-	line-height: 1.5em;
+  margin: 0.4em 0 0.5em 0;
+  line-height: 1.5em;
 }
 .mwiki p img {
-	margin: 0;
+  margin: 0;
 }
 
 .mwiki hr {
-	height: 1px;
-	color: #aaa;
-	background-color: #aaa;
-	border: 0;
-	margin: .2em 0 .2em 0;
+  height: 1px;
+  color: #aaa;
+  background-color: #aaa;
+  border: 0;
+  margin: 0.2em 0 0.2em 0;
 }
 
-.mwiki h1, .mwiki h2, .mwiki h3, .mwiki h4, .mwiki h5, .mwiki h6 {
-	color: black;
-	background: none;
-	font-weight: normal;
-	margin: 0;
-	padding-top: .5em;
-	padding-bottom: .17em;
-	border-bottom: 1px solid #aaa;
+.mwiki h1,
+.mwiki h2,
+.mwiki h3,
+.mwiki h4,
+.mwiki h5,
+.mwiki h6 {
+  color: black;
+  background: none;
+  font-weight: normal;
+  margin: 0;
+  padding-top: 0.5em;
+  padding-bottom: 0.17em;
+  border-bottom: 1px solid #aaa;
 }
-.mwiki h1 { font-size: 188%; }
-.mwiki h1 .editsection { font-size: 53%; }
-.mwiki h2 { font-size: 150%; }
-.mwiki h2 .editsection { font-size: 67%; }
-.mwiki h3, .mwiki h4, .mwiki h5, .mwiki h6 {
-	border-bottom: none;
-	font-weight: bold;
+.mwiki h1 {
+  font-size: 188%;
+}
+.mwiki h1 .editsection {
+  font-size: 53%;
+}
+.mwiki h2 {
+  font-size: 150%;
+}
+.mwiki h2 .editsection {
+  font-size: 67%;
+}
+.mwiki h3,
+.mwiki h4,
+.mwiki h5,
+.mwiki h6 {
+  border-bottom: none;
+  font-weight: bold;
+}
+.mwiki h3 {
+  font-size: 132%;
+}
+.mwiki h3 .editsection {
+  font-size: 76%;
+  font-weight: normal;
+}
+.mwiki h4 {
+  font-size: 116%;
+}
+.mwiki h4 .editsection {
+  font-size: 86%;
+  font-weight: normal;
+}
+.mwiki h5 {
+  font-size: 100%;
+}
+.mwiki h5 .editsection {
+  font-weight: normal;
+}
+.mwiki h6 {
+  font-size: 80%;
+}
+.mwiki h6 .editsection {
+  font-size: 125%;
+  font-weight: normal;
 }
-.mwiki h3 { font-size: 132%; }
-.mwiki h3 .editsection { font-size: 76%; font-weight: normal; }
-.mwiki h4 { font-size: 116%; }
-.mwiki h4 .editsection { font-size: 86%; font-weight: normal; }
-.mwiki h5 { font-size: 100%; }
-.mwiki h5 .editsection { font-weight: normal; }
-.mwiki h6 { font-size: 80%;  }
-.mwiki h6 .editsection { font-size: 125%; font-weight: normal; }
 
 .mwiki ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	margin: .3em 0 0 1.5em;
-	padding: 0;
-	list-style-image: url(bullet.gif);
+  line-height: 1.5em;
+  list-style-type: square;
+  margin: 0.3em 0 0 1.5em;
+  padding: 0;
+  list-style-image: url(bullet.gif);
 }
 .mwiki ol {
-	line-height: 1.5em;
-	margin: .3em 0 0 3.2em;
-	padding: 0;
-	list-style-image: none;
+  line-height: 1.5em;
+  margin: 0.3em 0 0 3.2em;
+  padding: 0;
+  list-style-image: none;
 }
 .mwiki li {
-	margin-bottom: .1em;
+  margin-bottom: 0.1em;
 }
 .mwiki dt {
-	font-weight: bold;
-	margin-bottom: .1em;
+  font-weight: bold;
+  margin-bottom: 0.1em;
 }
 .mwiki dl {
-	margin-top: .2em;
-	margin-bottom: .5em;
+  margin-top: 0.2em;
+  margin-bottom: 0.5em;
 }
 .mwiki dd {
-	line-height: 1.5em;
-	margin-left: 2em;
-	margin-bottom: .1em;
+  line-height: 1.5em;
+  margin-left: 2em;
+  margin-bottom: 0.1em;
 }
 
 .mwiki fieldset {
-	border: 1px solid #2f6fab;
-	margin: 1em 0 1em 0;
-	padding: 0 1em 1em;
-	line-height: 1.5em;
+  border: 1px solid #2f6fab;
+  margin: 1em 0 1em 0;
+  padding: 0 1em 1em;
+  line-height: 1.5em;
 }
 .mwiki fieldset.nested {
-	margin: 0 0 0.5em 0;
-	padding: 0 0.5em 0.5em;
+  margin: 0 0 0.5em 0;
+  padding: 0 0.5em 0.5em;
 }
 .mwiki legend {
-	padding: .5em;
-	font-size: 95%;
+  padding: 0.5em;
+  font-size: 95%;
 }
 .mwiki form {
-	border: none;
-	margin: 0;
+  border: none;
+  margin: 0;
 }
 
 .mwiki textarea {
-	width: 100%;
-	padding: .1em;
+  width: 100%;
+  padding: 0.1em;
 }
 
 .mwiki input.historysubmit {
-	padding: 0 .3em .3em .3em !important;
-	font-size: 94%;
-	cursor: pointer;
-	height: 1.7em !important;
-	margin-left: 1.6em;
+  padding: 0 0.3em 0.3em 0.3em !important;
+  font-size: 94%;
+  cursor: pointer;
+  height: 1.7em !important;
+  margin-left: 1.6em;
 }
 .mwiki select {
-	vertical-align: top;
+  vertical-align: top;
 }
-.mwiki abbr, .mwiki acronym, .mwiki .explain {
-	border-bottom: 1px dotted black;
-	color: black;
-	background: none;
-	cursor: help;
+.mwiki abbr,
+.mwiki acronym,
+.mwiki .explain {
+  border-bottom: 1px dotted black;
+  color: black;
+  background: none;
+  cursor: help;
 }
 .mwiki q {
-	font-family: Times, "Times New Roman", serif;
-	font-style: italic;
+  font-family: Times, "Times New Roman", serif;
+  font-style: italic;
 }
 /* disabled for now
 .mwiki blockquote {
@@ -1323,14 +1344,14 @@ body {
 	font-style: italic;
 }*/
 .mwiki code {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 .mwiki pre {
-	padding: 1em;
-	border: 1px dashed #2f6fab;
-	color: black;
-	background-color: #f9f9f9;
-	line-height: 1.1em;
+  padding: 1em;
+  border: 1px dashed #2f6fab;
+  color: black;
+  background-color: #f9f9f9;
+  line-height: 1.1em;
 }
 
 /*
@@ -1338,128 +1359,135 @@ body {
 */
 
 .mwiki #siteSub {
-	display: none;
+  display: none;
 }
 .mwiki #jump-to-nav {
-	display: none;
+  display: none;
 }
 
-.mwiki #contentSub, .mwiki #contentSub2 {
-	font-size: 84%;
-	line-height: 1.2em;
-	margin: 0 0 1.4em 1em;
-	color: #7d7d7d;
-	width: auto;
+.mwiki #contentSub,
+.mwiki #contentSub2 {
+  font-size: 84%;
+  line-height: 1.2em;
+  margin: 0 0 1.4em 1em;
+  color: #7d7d7d;
+  width: auto;
 }
 .mwiki span.subpages {
-	display: block;
+  display: block;
 }
 
 /* Some space under the headers in the content area */
-.mwiki #bodyContent h1, .mwiki #bodyContent h2 {
-	margin-bottom: .6em;
+.mwiki #bodyContent h1,
+.mwiki #bodyContent h2 {
+  margin-bottom: 0.6em;
 }
-.mwiki #bodyContent h3, .mwiki #bodyContent h4, .mwiki #bodyContent h5 {
-	margin-bottom: .3em;
+.mwiki #bodyContent h3,
+.mwiki #bodyContent h4,
+.mwiki #bodyContent h5 {
+  margin-bottom: 0.3em;
 }
 .mwiki #firstHeading {
-	margin-bottom: .1em;
-	/* These two rules hack around bug 2013 (fix for more limited bug 11325).
+  margin-bottom: 0.1em;
+  /* These two rules hack around bug 2013 (fix for more limited bug 11325).
 	   When bug 2013 is fixed properly, they should be removed. */
-	line-height: 1.2em;
-	padding-bottom: 0;
+  line-height: 1.2em;
+  padding-bottom: 0;
 }
 
 /* user notification thing */
 .mwiki .usermessage {
-	background-color: #ffce7b;
-	border: 1px solid #ffa500;
-	color: black;
-	font-weight: bold;
-	margin: 2em 0 1em;
-	padding: .5em 1em;
-	vertical-align: middle;
+  background-color: #ffce7b;
+  border: 1px solid #ffa500;
+  color: black;
+  font-weight: bold;
+  margin: 2em 0 1em;
+  padding: 0.5em 1em;
+  vertical-align: middle;
 }
 .mwiki #siteNotice {
-	text-align: center;
-	font-size: 95%;
-	padding: 0 .9em;
+  text-align: center;
+  font-size: 95%;
+  padding: 0 0.9em;
 }
 .mwiki #siteNotice p {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .success {
-	color: green;
-	font-size: larger;
+  color: green;
+  font-size: larger;
 }
 .mwiki .error {
-	color: red;
-	font-size: larger;
+  color: red;
+  font-size: larger;
 }
-.mwiki .errorbox, .mwiki .successbox {
-	font-size: larger;
-	border: 2px solid;
-	padding: .5em 1em;
-	float: left;
-	margin-bottom: 2em;
-	color: #000;
+.mwiki .errorbox,
+.mwiki .successbox {
+  font-size: larger;
+  border: 2px solid;
+  padding: 0.5em 1em;
+  float: left;
+  margin-bottom: 2em;
+  color: #000;
 }
 .mwiki .errorbox {
-	border-color: red;
-	background-color: #fff2f2;
+  border-color: red;
+  background-color: #fff2f2;
 }
 .mwiki .successbox {
-	border-color: green;
-	background-color: #dfd;
+  border-color: green;
+  background-color: #dfd;
 }
-.mwiki .errorbox h2, .mwiki .successbox h2 {
-	font-size: 1em;
-	font-weight: bold;
-	display: inline;
-	margin: 0 .5em 0 0;
-	border: none;
+.mwiki .errorbox h2,
+.mwiki .successbox h2 {
+  font-size: 1em;
+  font-weight: bold;
+  display: inline;
+  margin: 0 0.5em 0 0;
+  border: none;
 }
 
 .mwiki .catlinks {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	margin-top: 1em;
-	clear: both;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  margin-top: 1em;
+  clear: both;
 }
 /* currently unused, intended to be used by a metadata box
 in the bottom-right corner of the content area */
 .mwiki .documentDescription {
-	/* The summary text describing the document */
-	font-weight: bold;
-	display: block;
-	margin: 1em 0;
-	line-height: 1.5em;
+  /* The summary text describing the document */
+  font-weight: bold;
+  display: block;
+  margin: 1em 0;
+  line-height: 1.5em;
 }
 .mwiki .documentByLine {
-	text-align: right;
-	font-size: 90%;
-	clear: both;
-	font-weight: normal;
-	color: #76797c;
+  text-align: right;
+  font-size: 90%;
+  clear: both;
+  font-weight: normal;
+  color: #76797c;
 }
 
 /* emulate center */
 .mwiki .center {
-	width: 100%;
-	text-align: center;
+  width: 100%;
+  text-align: center;
 }
 .mwiki *.center * {
-	margin-left: auto;
-	margin-right: auto;
+  margin-left: auto;
+  margin-right: auto;
 }
 /* small for tables and similar */
-.mwiki .small, .mwiki .small * {
-	font-size: 94%;
+.mwiki .small,
+.mwiki .small * {
+  font-size: 94%;
 }
 .mwiki table.small {
-	font-size: 100%;
+  font-size: 100%;
 }
 
 /*
@@ -1469,125 +1497,132 @@ in the bottom-right corner of the content area */
 .mwiki #toc,
 .mwiki .toc,
 .mwiki .mw-warning {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
 }
 .mwiki #toc h2,
 .mwiki .toc h2 {
-	display: inline;
-	border: none;
-	padding: 0;
-	font-size: 100%;
-	font-weight: bold;
+  display: inline;
+  border: none;
+  padding: 0;
+  font-size: 100%;
+  font-weight: bold;
 }
 .mwiki #toc #toctitle,
 .mwiki .toc #toctitle,
 .mwiki #toc .toctitle,
 .mwiki .toc .toctitle {
-	text-align: center;
+  text-align: center;
 }
 .mwiki #toc ul,
 .mwiki .toc ul {
-	list-style-type: none;
-	list-style-image: none;
-	margin-left: 0;
-	padding-left: 0;
-	text-align: left;
+  list-style-type: none;
+  list-style-image: none;
+  margin-left: 0;
+  padding-left: 0;
+  text-align: left;
 }
 .mwiki #toc ul ul,
 .mwiki .toc ul ul {
-	margin: 0 0 0 2em;
+  margin: 0 0 0 2em;
 }
 .mwiki #toc .toctoggle,
 .mwiki .toc .toctoggle {
-	font-size: 94%;
+  font-size: 94%;
 }
 
 .mwiki .mw-warning {
-	margin-left: 50px;
-	margin-right: 50px;
-	text-align: center;
+  margin-left: 50px;
+  margin-right: 50px;
+  text-align: center;
 }
 
 /* images */
-.mwiki div.floatright, .mwiki table.floatright {
-	clear: right;
-	float: right;
-	position: relative;
-	margin: 0 0 .5em .5em;
-	border: 0;
-/*
+.mwiki div.floatright,
+.mwiki table.floatright {
+  clear: right;
+  float: right;
+  position: relative;
+  margin: 0 0 0.5em 0.5em;
+  border: 0;
+  /*
 	border: .5em solid white;
 	border-width: .5em 0 .8em 1.4em;
 */
 }
-.mwiki div.floatright p { font-style: italic; }
-.mwiki div.floatleft, .mwiki table.floatleft {
-	float: left;
-	clear: left;
-	position: relative;
-	margin: 0 .5em .5em 0;
-	border: 0;
-/*
+.mwiki div.floatright p {
+  font-style: italic;
+}
+.mwiki div.floatleft,
+.mwiki table.floatleft {
+  float: left;
+  clear: left;
+  position: relative;
+  margin: 0 0.5em 0.5em 0;
+  border: 0;
+  /*
 	margin: .3em .5em .5em 0;
 	border: .5em solid white;
 	border-width: .5em 1.4em .8em 0;
 */
 }
-.mwiki div.floatleft p { font-style: italic; }
+.mwiki div.floatleft p {
+  font-style: italic;
+}
 /* thumbnails */
 .mwiki div.thumb {
-	margin-bottom: .5em;
-	border-style: solid;
-	border-color: white;
-	width: auto;
+  margin-bottom: 0.5em;
+  border-style: solid;
+  border-color: white;
+  width: auto;
 }
 .mwiki div.thumbinner {
-	border: 1px solid #ccc;
-	padding: 3px !important;
-	background-color: #f9f9f9;
-	font-size: 94%;
-	text-align: center;
-	overflow: hidden;
+  border: 1px solid #ccc;
+  padding: 3px !important;
+  background-color: #f9f9f9;
+  font-size: 94%;
+  text-align: center;
+  overflow: hidden;
 }
 .mwiki html .thumbimage {
-	border: 1px solid #ccc;
+  border: 1px solid #ccc;
 }
 .mwiki html .thumbcaption {
-	border: none;
-	text-align: left;
-	line-height: 1.4em;
-	padding: 3px !important;
-	font-size: 94%;
+  border: none;
+  text-align: left;
+  line-height: 1.4em;
+  padding: 3px !important;
+  font-size: 94%;
 }
 .mwiki div.magnify {
-	float: right;
-	border: none !important;
-	background: none !important;
+  float: right;
+  border: none !important;
+  background: none !important;
 }
-.mwiki div.magnify a, .mwiki div.magnify img {
-	display: block;
-	border: none !important;
-	background: none !important;
+.mwiki div.magnify a,
+.mwiki div.magnify img {
+  display: block;
+  border: none !important;
+  background: none !important;
 }
 .mwiki div.tright {
-	clear: right;
-	float: right;
-	border-width: .5em 0 .8em 1.4em;
+  clear: right;
+  float: right;
+  border-width: 0.5em 0 0.8em 1.4em;
 }
 .mwiki div.tleft {
-	float: left;
-	clear: left;
-	margin-right: .5em;
-	border-width: .5em 1.4em .8em 0;
+  float: left;
+  clear: left;
+  margin-right: 0.5em;
+  border-width: 0.5em 1.4em 0.8em 0;
 }
 .mwiki img.thumbborder {
-	border: 1px solid #dddddd;
+  border: 1px solid #dddddd;
 }
 .mwiki .hiddenStructure {
-	display: none;
+  display: none;
 }
 
 /*
@@ -1600,26 +1635,26 @@ in the bottom-right corner of the content area */
 */
 /* table standards */
 .mwiki table.rimage {
-	float: right;
-	position: relative;
-	margin-left: 1em;
-	margin-bottom: 1em;
-	text-align: center;
+  float: right;
+  position: relative;
+  margin-left: 1em;
+  margin-bottom: 1em;
+  text-align: center;
 }
 .mwiki .toccolours {
-	border: 1px solid #aaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
 }
 
 /*
 ** edit views etc
 */
 .mwiki .special li {
-	line-height: 1.4em;
-	margin: 0;
-	padding: 0;
+  line-height: 1.4em;
+  margin: 0;
+  padding: 0;
 }
 
 /*
@@ -1627,77 +1662,93 @@ in the bottom-right corner of the content area */
 ** this is css3, the validator doesn't like it when validating as css2
 */
 .mwiki #bodyContent a.external,
-.mwiki #bodyContent a[href ^="gopher://"] {
-	background: url(external.png) center right no-repeat;
-        padding-right: 1em;
+.mwiki #bodyContent a[href ^="gopher://"]
+{
+  background: url(external.png) center right no-repeat;
+  padding-right: 1em;
 }
 .mwiki #bodyContent a[href ^="https://"],
 .mwiki .link-https {
-	background: url(lock_icon.gif) center right no-repeat;
-	padding-right: 16px;
+  background: url(lock_icon.gif) center right no-repeat;
+  padding-right: 16px;
 }
-.mwiki #bodyContent a[href ^="mailto:"],
+.mwiki #bodyContent a[href^="mailto:"],
 .mwiki .link-mailto {
-	background: url(mail_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(mail_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
-.mwiki #bodyContent a[href ^="news://"] {
-	background: url(news_icon.png) center right no-repeat;
-	padding-right: 18px;
+.mwiki #bodyContent a[href ^="news://"]
+{
+  background: url(news_icon.png) center right no-repeat;
+  padding-right: 18px;
 }
 .mwiki #bodyContent a[href ^="ftp://"],
 .mwiki .link-ftp {
-	background: url(file_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(file_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
 .mwiki #bodyContent a[href ^="irc://"],
 .mwiki #bodyContent a.extiw[href ^="irc://"],
 .mwiki .link-irc {
-	background: url(discussionitem_icon.gif) center right no-repeat;
-	padding-right: 18px;
+  background: url(discussionitem_icon.gif) center right no-repeat;
+  padding-right: 18px;
 }
-.mwiki #bodyContent a.external[href $=".ogg"], .mwiki #bodyContent a.external[href $=".OGG"],
-.mwiki #bodyContent a.external[href $=".oga"], .mwiki #bodyContent a.external[href $=".OGA"],
-.mwiki #bodyContent a.external[href $=".mid"], .mwiki #bodyContent a.external[href $=".MID"],
-.mwiki #bodyContent a.external[href $=".midi"], .mwiki #bodyContent a.external[href $=".MIDI"],
-.mwiki #bodyContent a.external[href $=".mp3"], .mwiki #bodyContent a.external[href $=".MP3"],
-.mwiki #bodyContent a.external[href $=".wav"], .mwiki #bodyContent a.external[href $=".WAV"],
-.mwiki #bodyContent a.external[href $=".wma"], .mwiki #bodyContent a.external[href $=".WMA"],
+.mwiki #bodyContent a.external[href$=".ogg"],
+.mwiki #bodyContent a.external[href$=".OGG"],
+.mwiki #bodyContent a.external[href$=".oga"],
+.mwiki #bodyContent a.external[href$=".OGA"],
+.mwiki #bodyContent a.external[href$=".mid"],
+.mwiki #bodyContent a.external[href$=".MID"],
+.mwiki #bodyContent a.external[href$=".midi"],
+.mwiki #bodyContent a.external[href$=".MIDI"],
+.mwiki #bodyContent a.external[href$=".mp3"],
+.mwiki #bodyContent a.external[href$=".MP3"],
+.mwiki #bodyContent a.external[href$=".wav"],
+.mwiki #bodyContent a.external[href$=".WAV"],
+.mwiki #bodyContent a.external[href$=".wma"],
+.mwiki #bodyContent a.external[href$=".WMA"],
 .mwiki .link-audio {
-	background: url("audio.png") center right no-repeat;
-        padding-right: 1em;
+  background: url("audio.png") center right no-repeat;
+  padding-right: 1em;
 }
-.mwiki #bodyContent a.external[href $=".ogm"], .mwiki #bodyContent a.external[href $=".OGM"],
-.mwiki #bodyContent a.external[href $=".avi"], .mwiki #bodyContent a.external[href $=".AVI"],
-.mwiki #bodyContent a.external[href $=".mpeg"], .mwiki #bodyContent a.external[href $=".MPEG"],
-.mwiki #bodyContent a.external[href $=".mpg"], .mwiki #bodyContent a.external[href $=".MPG"],
+.mwiki #bodyContent a.external[href$=".ogm"],
+.mwiki #bodyContent a.external[href$=".OGM"],
+.mwiki #bodyContent a.external[href$=".avi"],
+.mwiki #bodyContent a.external[href$=".AVI"],
+.mwiki #bodyContent a.external[href$=".mpeg"],
+.mwiki #bodyContent a.external[href$=".MPEG"],
+.mwiki #bodyContent a.external[href$=".mpg"],
+.mwiki #bodyContent a.external[href$=".MPG"],
 .mwiki .link-video {
-	background: url("video.png") center right no-repeat;
-        padding-right: 1em;
+  background: url("video.png") center right no-repeat;
+  padding-right: 1em;
 }
-.mwiki #bodyContent a.external[href $=".pdf"], .mwiki #bodyContent a.external[href $=".PDF"],
-.mwiki #bodyContent a.external[href *=".pdf#"], .mwiki #bodyContent a.external[href *=".PDF#"],
-.mwiki #bodyContent a.external[href *=".pdf?"], .mwiki #bodyContent a.external[href *=".PDF?"],
+.mwiki #bodyContent a.external[href$=".pdf"],
+.mwiki #bodyContent a.external[href$=".PDF"],
+.mwiki #bodyContent a.external[href*=".pdf#"],
+.mwiki #bodyContent a.external[href*=".PDF#"],
+.mwiki #bodyContent a.external[href*=".pdf?"],
+.mwiki #bodyContent a.external[href*=".PDF?"],
 .mwiki .link-document {
-	background: url("document.png") center right no-repeat;
-	padding-right: 12px;
+  background: url("document.png") center right no-repeat;
+  padding-right: 12px;
 }
 
 /* disable interwiki styling */
 .mwiki #bodyContent a.extiw,
 .mwiki #bodyContent a.extiw:active {
-	color: #36b;
-	background: none;
-	padding: 0;
+  color: #36b;
+  background: none;
+  padding: 0;
 }
 .mwiki #bodyContent a.external {
-	color: #36b;
+  color: #36b;
 }
 /* this can be used in the content area to switch off
 special external link styling */
 .mwiki #bodyContent .plainlinks a {
-	background: none !important;
-	padding: 0 !important;
+  background: none !important;
+  padding: 0 !important;
 }
 /*
 ** Structural Elements
@@ -1707,64 +1758,64 @@ special external link styling */
 ** general portlet styles (elements in the quickbar)
 */
 .mwiki .portlet {
-	border: none;
-	margin: 0 0 .5em;
-	padding: 0;
-	float: none;
-	width: 11.6em;
-	overflow: hidden;
+  border: none;
+  margin: 0 0 0.5em;
+  padding: 0;
+  float: none;
+  width: 11.6em;
+  overflow: hidden;
 }
 .mwiki .portlet h4 {
-	font-size: 95%;
-	font-weight: normal;
-	white-space: nowrap;
+  font-size: 95%;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .portlet h5 {
-	background: transparent;
-	padding: 0 1em 0 .5em;
-	display: inline;
-	height: 1em;
-	text-transform: lowercase;
-	font-size: 91%;
-	font-weight: normal;
-	white-space: nowrap;
+  background: transparent;
+  padding: 0 1em 0 0.5em;
+  display: inline;
+  height: 1em;
+  text-transform: lowercase;
+  font-size: 91%;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .portlet h6 {
-	background: #ffae2e;
-	border: 1px solid #2f6fab;
-	border-style: solid solid none solid;
-	padding: 0 1em 0 1em;
-	text-transform: lowercase;
-	display: block;
-	font-size: 1em;
-	height: 1.2em;
-	font-weight: normal;
-	white-space: nowrap;
+  background: #ffae2e;
+  border: 1px solid #2f6fab;
+  border-style: solid solid none solid;
+  padding: 0 1em 0 1em;
+  text-transform: lowercase;
+  display: block;
+  font-size: 1em;
+  height: 1.2em;
+  font-weight: normal;
+  white-space: nowrap;
 }
 .mwiki .pBody {
-	font-size: 95%;
-	background-color: white;
-	color: black;
-	border-collapse: collapse;
-	border: 1px solid #aaa;
-	padding: 0 .8em .3em .5em;
+  font-size: 95%;
+  background-color: white;
+  color: black;
+  border-collapse: collapse;
+  border: 1px solid #aaa;
+  padding: 0 0.8em 0.3em 0.5em;
 }
 .mwiki .portlet h1,
 .mwiki .portlet h2,
 .mwiki .portlet h3,
 .mwiki .portlet h4 {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 .mwiki .portlet ul {
-	line-height: 1.5em;
-	list-style-type: square;
-	list-style-image: url(bullet.gif);
-	font-size: 95%;
+  line-height: 1.5em;
+  list-style-type: square;
+  list-style-image: url(bullet.gif);
+  font-size: 95%;
 }
 .mwiki .portlet li {
-	padding: 0;
-	margin: 0;
+  padding: 0;
+  margin: 0;
 }
 
 /*
@@ -1772,755 +1823,776 @@ special external link styling */
 */
 
 .mwiki #p-logo {
-	top: 0;
-	left: 0;
-	position: absolute; /*needed to use z-index */
-	z-index: 3;
-	height: 155px;
-	width: 12em;
-	overflow: visible;
+  top: 0;
+  left: 0;
+  position: absolute; /*needed to use z-index */
+  z-index: 3;
+  height: 155px;
+  width: 12em;
+  overflow: visible;
 }
 .mwiki #p-logo h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-logo a,
 .mwiki #p-logo a:hover {
-	display: block;
-	height: 155px;
-	width: 12.2em;
-	background-repeat: no-repeat;
-	background-position: 35% 50% !important;
-	text-decoration: none;
+  display: block;
+  height: 155px;
+  width: 12.2em;
+  background-repeat: no-repeat;
+  background-position: 35% 50% !important;
+  text-decoration: none;
 }
 
 /*
 ** Search portlet
 */
 .mwiki #p-search {
-	position: relative;
-	z-index: 3;
+  position: relative;
+  z-index: 3;
 }
 .mwiki input.searchButton {
-	margin-top: 1px;
-	font-size: 95%;
+  margin-top: 1px;
+  font-size: 95%;
 }
 .mwiki #searchGoButton {
-	padding-left: .5em;
-	padding-right: .5em;
-	font-weight: bold;
+  padding-left: 0.5em;
+  padding-right: 0.5em;
+  font-weight: bold;
 }
 .mwiki #searchInput {
-	width: 10.9em;
-	margin: 0;
-	font-size: 95%;
+  width: 10.9em;
+  margin: 0;
+  font-size: 95%;
 }
 .mwiki #p-search .pBody {
-	padding: .5em .4em .4em .4em;
-	text-align: center;
+  padding: 0.5em 0.4em 0.4em 0.4em;
+  text-align: center;
 }
 .mwiki #p-search #searchform div div {
-	margin-top: .4em;
-	font-size: 95%;
+  margin-top: 0.4em;
+  font-size: 95%;
 }
 /*
 ** the personal toolbar
 */
 .mwiki #p-personal {
-	position: absolute;
-	left: 0;
-	top: 0;
-	z-index: 0;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 0;
 }
 .mwiki #p-personal {
-	width: 100%;
-	white-space: nowrap;
-	padding: 0;
-	margin: 0;
-	border: none;
-	background: none;
-	overflow: visible;
-	line-height: 1.2em;
+  width: 100%;
+  white-space: nowrap;
+  padding: 0;
+  margin: 0;
+  border: none;
+  background: none;
+  overflow: visible;
+  line-height: 1.2em;
 }
 .mwiki #p-personal h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-personal .portlet,
 .mwiki #p-personal .pBody {
-	z-index: 0;
-	padding: 0;
-	margin: 0;
-	border: none;
-	overflow: visible;
-	background: none;
+  z-index: 0;
+  padding: 0;
+  margin: 0;
+  border: none;
+  overflow: visible;
+  background: none;
 }
 /* this is the ul contained in the portlet */
 .mwiki #p-personal ul {
-	border: none;
-	line-height: 1.4em;
-	color: #2f6fab;
-	padding: 0 2em 0 3em;
-	margin: 0;
-	text-align: right;
-	list-style: none;
-	z-index: 0;
-	background: none;
-	cursor: default;
+  border: none;
+  line-height: 1.4em;
+  color: #2f6fab;
+  padding: 0 2em 0 3em;
+  margin: 0;
+  text-align: right;
+  list-style: none;
+  z-index: 0;
+  background: none;
+  cursor: default;
 }
 .mwiki #p-personal li {
-	z-index: 0;
-	border: none;
-	padding: 0;
-	display: inline;
-	color: #2f6fab;
-	margin-left: 1em;
-	line-height: 1.2em;
-	background: none;
+  z-index: 0;
+  border: none;
+  padding: 0;
+  display: inline;
+  color: #2f6fab;
+  margin-left: 1em;
+  line-height: 1.2em;
+  background: none;
 }
 .mwiki #p-personal li a {
-	text-decoration: none;
-	color: #005896;
-	padding-bottom: .2em;
-	background: none;
+  text-decoration: none;
+  color: #005896;
+  padding-bottom: 0.2em;
+  background: none;
 }
 .mwiki #p-personal li a:hover {
-	background-color: white;
-	padding-bottom: .2em;
-	text-decoration: none;
+  background-color: white;
+  padding-bottom: 0.2em;
+  text-decoration: none;
 }
 .mwiki #p-personal li.active a:hover {
-	background-color: transparent;
+  background-color: transparent;
 }
 /* the icon in front of the user name, single quotes
 in bg url to hide it from iemac */
 .mwiki li#pt-userpage,
 .mwiki li#pt-anonuserpage,
 .mwiki li#pt-login {
-	background: url(user.gif) top left no-repeat;
-	padding-left: 20px;
-	text-transform: none;
+  background: url(user.gif) top left no-repeat;
+  padding-left: 20px;
+  text-transform: none;
 }
 .mwiki #p-personal ul {
-	text-transform: lowercase;
+  text-transform: lowercase;
 }
 .mwiki #p-personal li.active {
-	font-weight: bold;
+  font-weight: bold;
 }
 /*
 ** the page-related actions- page/talk, edit etc
 */
 .mwiki #p-cactions {
-	position: absolute;
-	top: 1.3em;
-	left: 11.5em;
-	margin: 0;
-	white-space: nowrap;
-	width: 76%;
-	line-height: 1.1em;
-	overflow: visible;
-	background: none;
-	border-collapse: collapse;
-	padding-left: 1em;
-	list-style: none;
-	font-size: 95%;
+  position: absolute;
+  top: 1.3em;
+  left: 11.5em;
+  margin: 0;
+  white-space: nowrap;
+  width: 76%;
+  line-height: 1.1em;
+  overflow: visible;
+  background: none;
+  border-collapse: collapse;
+  padding-left: 1em;
+  list-style: none;
+  font-size: 95%;
 }
 .mwiki #p-cactions ul {
-	list-style: none;
+  list-style: none;
 }
 .mwiki #p-cactions li {
-	display: inline;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	padding: 0 0 .1em 0;
-	margin: 0 .3em 0 0;
-	overflow: visible;
-	background: white;
+  display: inline;
+  border: 1px solid #aaa;
+  border-bottom: none;
+  padding: 0 0 0.1em 0;
+  margin: 0 0.3em 0 0;
+  overflow: visible;
+  background: white;
 }
 .mwiki #p-cactions li.selected {
-	border-color: #fabd23;
-	padding: 0 0 .2em 0;
-	font-weight: bold;
+  border-color: #fabd23;
+  padding: 0 0 0.2em 0;
+  font-weight: bold;
 }
 .mwiki #p-cactions li a {
-	background-color: #fbfbfb;
-	color: #002bb8;
-	border: none;
-	padding: 0 .8em .3em;
-	position: relative;
-	z-index: 0;
-	margin: 0;
-	text-decoration: none;
+  background-color: #fbfbfb;
+  color: #002bb8;
+  border: none;
+  padding: 0 0.8em 0.3em;
+  position: relative;
+  z-index: 0;
+  margin: 0;
+  text-decoration: none;
 }
 .mwiki #p-cactions li.selected a {
-	z-index: 3;
-	padding: 0 1em .2em!important;
-	background-color: white;
+  z-index: 3;
+  padding: 0 1em 0.2em !important;
+  background-color: white;
 }
 .mwiki #p-cactions .new a {
-	color: #ba0000;
+  color: #ba0000;
 }
 .mwiki #p-cactions li a:hover {
-	z-index: 3;
-	text-decoration: none;
-	background-color: white;
+  z-index: 3;
+  text-decoration: none;
+  background-color: white;
 }
 .mwiki #p-cactions h5 {
-	display: none;
+  display: none;
 }
 .mwiki #p-cactions li.istalk {
-	margin-right: 0;
+  margin-right: 0;
 }
 .mwiki #p-cactions li.istalk a {
-	padding-right: .5em;
+  padding-right: 0.5em;
 }
 .mwiki #p-cactions #ca-addsection a {
-	padding-left: .4em;
-	padding-right: .4em;
+  padding-left: 0.4em;
+  padding-right: 0.4em;
 }
 /* offsets to distinguish the tab groups */
 .mwiki li#ca-talk {
-	margin-right: 1.6em;
+  margin-right: 1.6em;
 }
-.mwiki li#ca-watch, .mwiki li#ca-unwatch, .mwiki li#ca-varlang-0, .mwiki li#ca-print {
-	margin-left: 1.6em;
+.mwiki li#ca-watch,
+.mwiki li#ca-unwatch,
+.mwiki li#ca-varlang-0,
+.mwiki li#ca-print {
+  margin-left: 1.6em;
 }
 .mwiki #p-cactions .pBody {
-	font-size: 1em;
-	background-color: transparent;
-	color: inherit;
-	border-collapse: inherit;
-	border: 0;
-	padding: 0;
+  font-size: 1em;
+  background-color: transparent;
+  color: inherit;
+  border-collapse: inherit;
+  border: 0;
+  padding: 0;
 }
 .mwiki #p-cactions .hiddenStructure {
-	display: none;
+  display: none;
 }
 .mwiki #p-cactions li a {
-	text-transform: lowercase;
+  text-transform: lowercase;
 }
 
 .mwiki #p-lang {
-	position: relative;
-	z-index: 3;
+  position: relative;
+  z-index: 3;
 }
 
 /* TODO: #t-iscite is only used by the Cite extension, come up with some
  * system which allows extensions to add to this file on the fly
  */
-.mwiki #t-ispermalink, .mwiki #t-iscite {
-	color: #999;
+.mwiki #t-ispermalink,
+.mwiki #t-iscite {
+  color: #999;
 }
 /*
 ** footer
 */
 .mwiki #footer {
-	background-color: white;
-	border-top: 1px solid #fabd23;
-	border-bottom: 1px solid #fabd23;
-	margin: .6em 0 1em 0;
-	padding: .4em 0 1.2em 0;
-	text-align: center;
-	font-size: 90%;
+  background-color: white;
+  border-top: 1px solid #fabd23;
+  border-bottom: 1px solid #fabd23;
+  margin: 0.6em 0 1em 0;
+  padding: 0.4em 0 1.2em 0;
+  text-align: center;
+  font-size: 90%;
 }
 .mwiki #footer li {
-	display: inline;
-	margin: 0 1.3em;
+  display: inline;
+  margin: 0 1.3em;
 }
-.mwiki #f-poweredbyico, .mwiki #f-copyrightico {
-	margin: 0 8px;
-	position: relative;
-	top: -2px; /* Bump it up just a tad */
+.mwiki #f-poweredbyico,
+.mwiki #f-copyrightico {
+  margin: 0 8px;
+  position: relative;
+  top: -2px; /* Bump it up just a tad */
 }
 .mwiki #f-poweredbyico {
-	float: right;
-	height: 1%;
+  float: right;
+  height: 1%;
 }
 .mwiki #f-copyrightico {
-	float: left;
-	height: 1%;
+  float: left;
+  height: 1%;
 }
 
 /* js pref toc */
 .mwiki #preftoc {
-	margin: 0;
-	padding: 0;
-	width: 100%;
-	clear: both;
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  clear: both;
 }
 .mwiki #preftoc li {
-	background-color: #f0f0f0;
-	color: #000;
+  background-color: #f0f0f0;
+  color: #000;
 }
 .mwiki #preftoc li {
-	margin: 1px -2px 1px 2px;
-	float: left;
-	padding: 2px 0 3px 0;
-	border: 1px solid #fff;
-	border-right-color: #716f64;
-	border-bottom: 0;
-	position: relative;
-	white-space: nowrap;
-	list-style-type: none;
-	list-style-image: none;
-	z-index: 3;
+  margin: 1px -2px 1px 2px;
+  float: left;
+  padding: 2px 0 3px 0;
+  border: 1px solid #fff;
+  border-right-color: #716f64;
+  border-bottom: 0;
+  position: relative;
+  white-space: nowrap;
+  list-style-type: none;
+  list-style-image: none;
+  z-index: 3;
 }
 .mwiki #preftoc li.selected {
-	font-weight: bold;
-	background-color: #f9f9f9;
-	border: 1px solid #aaa;
-	border-bottom: none;
-	cursor: default;
-	top: 1px;
-	padding-top: 2px;
-	margin-right: -3px;
+  font-weight: bold;
+  background-color: #f9f9f9;
+  border: 1px solid #aaa;
+  border-bottom: none;
+  cursor: default;
+  top: 1px;
+  padding-top: 2px;
+  margin-right: -3px;
 }
 .mwiki #preftoc > li.selected {
-	top: 2px;
+  top: 2px;
 }
 .mwiki #preftoc a,
 .mwiki #preftoc a:active {
-	display: block;
-	color: #000;
-	padding: 0 .7em;
-	position: relative;
-	text-decoration: none;
+  display: block;
+  color: #000;
+  padding: 0 0.7em;
+  position: relative;
+  text-decoration: none;
 }
 .mwiki #preftoc li.selected a {
-	cursor: default;
-	text-decoration: none;
+  cursor: default;
+  text-decoration: none;
 }
 .mwiki #prefcontrol {
-	padding-top: 2em;
-	clear: both;
+  padding-top: 2em;
+  clear: both;
 }
 .mwiki #preferences {
-	margin: 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em;
-	background-color: #F9F9F9;
+  margin: 0;
+  border: 1px solid #aaa;
+  clear: both;
+  padding: 1.5em;
+  background-color: #f9f9f9;
 }
 .mwiki .prefsection {
-	border: none;
-	padding: 0;
-	margin: 0;
+  border: none;
+  padding: 0;
+  margin: 0;
 }
 .mwiki .prefsection fieldset {
-	border: 1px solid #aaa;
-	float: left;
-	margin-right: 2em;
+  border: 1px solid #aaa;
+  float: left;
+  margin-right: 2em;
 }
 .mwiki .prefsection legend {
-	font-weight: bold;
+  font-weight: bold;
 }
-.mwiki .prefsection table, .mwiki .prefsection legend {
-	background-color: #F9F9F9;
+.mwiki .prefsection table,
+.mwiki .prefsection legend {
+  background-color: #f9f9f9;
 }
 .mwiki .mainLegend {
-	display: none;
+  display: none;
 }
 .mwiki div.prefsectiontip {
-	font-size: x-small;
-	padding: .2em 2em;
-	color: #666;
+  font-size: x-small;
+  padding: 0.2em 2em;
+  color: #666;
 }
 .mwiki .btnSavePrefs {
-	font-weight: bold;
-	padding-left: .3em;
-	padding-right: .3em;
+  font-weight: bold;
+  padding-left: 0.3em;
+  padding-right: 0.3em;
 }
 
 .mwiki .preferences-login {
-	clear: both;
-	margin-bottom: 1.5em;
+  clear: both;
+  margin-bottom: 1.5em;
 }
 
 .mwiki .prefcache {
-	font-size: 90%;
-	margin-top: 2em;
+  font-size: 90%;
+  margin-top: 2em;
 }
 
 .mwiki div#userloginForm form,
 .mwiki div#userlogin form#userlogin2 {
-	margin: 0 3em 1em 0;
-	border: 1px solid #aaa;
-	clear: both;
-	padding: 1.5em 2em;
-	background-color: #f9f9f9;
-	float: left;
+  margin: 0 3em 1em 0;
+  border: 1px solid #aaa;
+  clear: both;
+  padding: 1.5em 2em;
+  background-color: #f9f9f9;
+  float: left;
 }
 .mwiki .rtl div#userloginForm form,
 .mwiki .rtl div#userlogin form#userlogin2 {
-	float: right;
+  float: right;
 }
 
 .mwiki div#userloginForm table,
 .mwiki div#userlogin form#userlogin2 table {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 
 .mwiki div#userloginForm h2,
 .mwiki div#userlogin form#userlogin2 h2 {
-	padding-top: 0;
+  padding-top: 0;
 }
 
 .mwiki div#userlogin .captcha,
 .mwiki div#userloginForm .captcha {
-	border: 1px solid #bbb;
-	padding: 1.5em 2em;
-	background-color: white;
+  border: 1px solid #bbb;
+  padding: 1.5em 2em;
+  background-color: white;
 }
 
-.mwiki #loginend, .mwiki #signupend {
-	clear: both;
+.mwiki #loginend,
+.mwiki #signupend {
+  clear: both;
 }
 
-.mwiki #userloginprompt, .mwiki #languagelinks {
-	font-size: 85%;
+.mwiki #userloginprompt,
+.mwiki #languagelinks {
+  font-size: 85%;
 }
 
 .mwiki #login-sectiontip {
-	font-size: 85%;
-	line-height: 1.2;
-	padding-top: 2em;
+  font-size: 85%;
+  line-height: 1.2;
+  padding-top: 2em;
 }
 
-.mwiki #userlogin .loginText, .mwiki #userlogin .loginPassword {
-	width: 12em;
+.mwiki #userlogin .loginText,
+.mwiki #userlogin .loginPassword {
+  width: 12em;
 }
 
-.mwiki #userloginlink a, .mwiki #wpLoginattempt, .mwiki #wpCreateaccount {
-	font-weight: bold;
+.mwiki #userloginlink a,
+.mwiki #wpLoginattempt,
+.mwiki #wpCreateaccount {
+  font-weight: bold;
 }
 
-
 /* IE/Mac fixes were cut out */
 
 .mwiki .redirectText {
-	font-size: 150%;
-	margin: 5px;
+  font-size: 150%;
+  margin: 5px;
 }
 
 .mwiki .printfooter {
-	display: none;
+  display: none;
 }
 
 .mwiki .not-patrolled {
-	background-color: #ffa;
+  background-color: #ffa;
 }
 .mwiki div.patrollink {
-	clear: both;
-	font-size: 75%;
-	text-align: right;
+  clear: both;
+  font-size: 75%;
+  text-align: right;
 }
-.mwiki span.newpage, .mwiki span.minor, .mwiki span.bot {
-	font-weight: bold;
+.mwiki span.newpage,
+.mwiki span.minor,
+.mwiki span.bot {
+  font-weight: bold;
 }
 .mwiki span.unpatrolled {
-	font-weight: bold;
-	color: red;
+  font-weight: bold;
+  color: red;
 }
 
 .mwiki .sharedUploadNotice {
-	font-style: italic;
+  font-style: italic;
 }
 
 .mwiki span.updatedmarker {
-	color: black;
-	background-color: #0f0;
+  color: black;
+  background-color: #0f0;
 }
 
 .mwiki table.gallery {
-	border: 1px solid #ccc;
-	margin: 2px;
-	padding: 2px;
-	background-color: white;
+  border: 1px solid #ccc;
+  margin: 2px;
+  padding: 2px;
+  background-color: white;
 }
 
 .mwiki table.gallery tr {
-	vertical-align: top;
+  vertical-align: top;
 }
 
 .mwiki table.gallery td {
-	vertical-align: top;
-	background-color: #f9f9f9;
-	border: solid 2px white;
+  vertical-align: top;
+  background-color: #f9f9f9;
+  border: solid 2px white;
 }
 /* Keep this temporarily so that cached pages will display right */
 .mwiki table.gallery td.galleryheader {
-    text-align: center;
-	font-weight: bold;
+  text-align: center;
+  font-weight: bold;
 }
 .mwiki table.gallery caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki div.gallerybox {
-	margin: 2px;
+  margin: 2px;
 }
 
 .mwiki div.gallerybox div.thumb {
-	text-align: center;
-	border: 1px solid #ccc;
-	margin: 2px;
+  text-align: center;
+  border: 1px solid #ccc;
+  margin: 2px;
 }
 
 .mwiki div.gallerytext {
-	overflow: hidden;
-	font-size: 94%;
-	padding: 2px 4px;
+  overflow: hidden;
+  font-size: 94%;
+  padding: 2px 4px;
 }
 
 .mwiki span.comment {
-	font-style: italic;
+  font-style: italic;
 }
 
 .mwiki span.changedby {
-	font-size: 95%;
+  font-size: 95%;
 }
 
 .mwiki .previewnote {
-	text-indent: 3em;
-	color: #c00;
-	border-bottom: 1px solid #aaa;
-	padding-bottom: 1em;
-	margin-bottom: 1em;
+  text-indent: 3em;
+  color: #c00;
+  border-bottom: 1px solid #aaa;
+  padding-bottom: 1em;
+  margin-bottom: 1em;
 }
 
 .mwiki .previewnote p {
-	margin: 0;
-	padding: 0;
+  margin: 0;
+  padding: 0;
 }
 
 .mwiki .editExternally {
-	border: 1px solid gray;
-	background-color: #ffffff;
-	padding: 3px;
-	margin-top: 0.5em;
-	float: left;
-	font-size: small;
-	text-align: center;
+  border: 1px solid gray;
+  background-color: #ffffff;
+  padding: 3px;
+  margin-top: 0.5em;
+  float: left;
+  font-size: small;
+  text-align: center;
 }
 .mwiki .editExternallyHelp {
-	font-style: italic;
-	color: gray;
+  font-style: italic;
+  color: gray;
 }
 
 .mwiki .toggle {
-	margin-left: 2em;
-	text-indent: -2em;
+  margin-left: 2em;
+  text-indent: -2em;
 }
 
 /* Classes for EXIF data display */
 .mwiki table.mw_metadata {
-	font-size: 0.8em;
-	margin-left: 0.5em;
-	margin-bottom: 0.5em;
-	width: 300px;
+  font-size: 0.8em;
+  margin-left: 0.5em;
+  margin-bottom: 0.5em;
+  width: 300px;
 }
 
 .mwiki table.mw_metadata caption {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .mwiki table.mw_metadata th {
-	font-weight: normal;
+  font-weight: normal;
 }
 
 .mwiki table.mw_metadata td {
-	padding: 0.1em;
+  padding: 0.1em;
 }
 
 .mwiki table.mw_metadata {
-	border: none;
-	border-collapse: collapse;
+  border: none;
+  border-collapse: collapse;
 }
 
-.mwiki table.mw_metadata td, .mwiki table.mw_metadata th {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	padding-left: 0.1em;
-	padding-right: 0.1em;
+.mwiki table.mw_metadata td,
+.mwiki table.mw_metadata th {
+  text-align: center;
+  border: 1px solid #aaaaaa;
+  padding-left: 0.1em;
+  padding-right: 0.1em;
 }
 
 .mwiki table.mw_metadata th {
-	background-color: #f9f9f9;
+  background-color: #f9f9f9;
 }
 
 .mwiki table.mw_metadata td {
-	background-color: #fcfcfc;
+  background-color: #fcfcfc;
 }
 
 .mwiki table.collapsed tr.collapsable {
-	display: none;
+  display: none;
 }
 
-
 /* filetoc */
 .mwiki ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
+  text-align: center;
+  border: 1px solid #aaaaaa;
+  background-color: #f9f9f9;
+  padding: 5px;
+  font-size: 95%;
+  margin-bottom: 0.5em;
+  margin-left: 0;
+  margin-right: 0;
 }
 
 .mwiki #filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
+  display: inline;
+  list-style-type: none;
+  padding-right: 2em;
 }
 
 .mwiki input#wpSummary {
-	width: 80%;
+  width: 80%;
 }
 
 /* @bug 1714 */
-.mwiki input#wpSave, .mwiki input#wpDiff {
-	margin-right: 0.33em;
+.mwiki input#wpSave,
+.mwiki input#wpDiff {
+  margin-right: 0.33em;
 }
 
 .mwiki #wpSave {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 /* Classes for article validation */
 
 .mwiki table.revisionform_default {
-	border: 1px solid #000000;
+  border: 1px solid #000000;
 }
 
 .mwiki table.revisionform_focus {
-	border: 1px solid #000000;
-	background-color:#00BBFF;
+  border: 1px solid #000000;
+  background-color: #00bbff;
 }
 
 .mwiki tr.revision_tr_default {
-	background-color:#EEEEEE;
+  background-color: #eeeeee;
 }
 
 .mwiki tr.revision_tr_first {
-	background-color:#DDDDDD;
+  background-color: #dddddd;
 }
 
 .mwiki p.revision_saved {
-	color: green;
-	font-weight:bold;
+  color: green;
+  font-weight: bold;
 }
 
 .mwiki #mw_trackbacks {
-	border: solid 1px #bbbbff;
-	background-color: #eeeeff;
-	padding: 0.2em;
+  border: solid 1px #bbbbff;
+  background-color: #eeeeff;
+  padding: 0.2em;
 }
 
-
 /* Allmessages table */
 
 .mwiki #allmessagestable th {
-	background-color: #b2b2ff;
+  background-color: #b2b2ff;
 }
 
 .mwiki #allmessagestable tr.orig {
-	background-color: #ffe2e2;
+  background-color: #ffe2e2;
 }
 
 .mwiki #allmessagestable tr.new {
-	background-color: #e2ffe2;
+  background-color: #e2ffe2;
 }
 
 .mwiki #allmessagestable tr.def {
-	background-color: #f0f0ff;
+  background-color: #f0f0ff;
 }
 
-
 /* noarticletext */
 .mwiki div.noarticletext {
-	border: 1px solid #ccc;
-	background: #fff;
-	padding: .2em 1em;
-	color: #000;
+  border: 1px solid #ccc;
+  background: #fff;
+  padding: 0.2em 1em;
+  color: #000;
 }
 
 .mwiki div#searchTargetContainer {
-	left:       10px;
-	top:        10px;
-	width:      90%;
-	background: white;
+  left: 10px;
+  top: 10px;
+  width: 90%;
+  background: white;
 }
 
 .mwiki div#searchTarget {
-	padding:    3px;
-	margin:     5px;
-	background: #F0F0F0;
-	border:     solid 1px blue;
+  padding: 3px;
+  margin: 5px;
+  background: #f0f0f0;
+  border: solid 1px blue;
 }
 
 .mwiki div#searchTarget ul li {
-	list-style: none;
+  list-style: none;
 }
 
 .mwiki div#searchTarget ul li:before {
-	color: orange;
-	content: "\00BB \0020";
+  color: orange;
+  content: "\00BB \0020";
 }
 
 .mwiki div#searchTargetHide {
-	float:right;
-	border:solid 1px black;
-	background:#DCDCDC;
-	padding:2px;
+  float: right;
+  border: solid 1px black;
+  background: #dcdcdc;
+  padding: 2px;
 }
 
 .mwiki #powersearch p {
-	margin-top:0px;
+  margin-top: 0px;
 }
 
 .mwiki div.multipageimagenavbox {
-   border: solid 1px silver;
-   padding: 4px;
-   margin: 1em;
-   background: #f0f0f0;
+  border: solid 1px silver;
+  padding: 4px;
+  margin: 1em;
+  background: #f0f0f0;
 }
 
 .mwiki div.multipageimagenavbox div.thumb {
-   border: none;
-   margin-left: 2em;
-   margin-right: 2em;
+  border: none;
+  margin-left: 2em;
+  margin-right: 2em;
 }
 
 .mwiki div.multipageimagenavbox hr {
-   margin: 6px;
+  margin: 6px;
 }
 
 .mwiki table.multipageimage td {
-   text-align: center;
+  text-align: center;
 }
 
 /** Special:Version */
 
-.mwiki table#sv-ext, table#sv-hooks, .mwiki table#sv-software {
-	margin: 1em;
-	padding:0em;
+.mwiki table#sv-ext,
+table#sv-hooks,
+.mwiki table#sv-software {
+  margin: 1em;
+  padding: 0em;
 }
 
-.mwiki #sv-ext td, .mwiki #sv-hooks td, .mwiki #sv-software td,
-.mwiki #sv-ext th, .mwiki #sv-hooks th, .mwiki #sv-software th {
-	border: 1px solid #A0A0A0;
-	padding: 0 0.15em 0 0.15em;
+.mwiki #sv-ext td,
+.mwiki #sv-hooks td,
+.mwiki #sv-software td,
+.mwiki #sv-ext th,
+.mwiki #sv-hooks th,
+.mwiki #sv-software th {
+  border: 1px solid #a0a0a0;
+  padding: 0 0.15em 0 0.15em;
 }
-.mwiki #sv-ext th, .mwiki #sv-hooks th, .mwiki #sv-software th {
-	background-color: #F0F0F0;
-	color: black;
-	padding: 0 0.15em 0 0.15em;
+.mwiki #sv-ext th,
+.mwiki #sv-hooks th,
+.mwiki #sv-software th {
+  background-color: #f0f0f0;
+  color: black;
+  padding: 0 0.15em 0 0.15em;
 }
-.mwiki tr.sv-space{
-	height: 0.8em;
-	border:none;
+.mwiki tr.sv-space {
+  height: 0.8em;
+  border: none;
+}
+.mwiki tr.sv-space td {
+  display: none;
 }
-.mwiki tr.sv-space td { display: none; }
 
 /*
   Table pager (e.g. Special:Imagelist)
@@ -2530,90 +2602,113 @@ in bg url to hide it from iemac */
   - remove line wrapping for all td and th, set background color
   - restore line wrapping for the last two table cells (description and size)
 */
-.mwiki .TablePager { min-width: 80%; }
-.mwiki .TablePager_nav a { text-decoration: none; }
-.mwiki .TablePager { border-collapse: collapse; }
-.mwiki .TablePager, .mwiki .TablePager td, .mwiki .TablePager th {
-	border: 1px solid #aaaaaa;
-	padding: 0 0.15em 0 0.15em;
+.mwiki .TablePager {
+  min-width: 80%;
+}
+.mwiki .TablePager_nav a {
+  text-decoration: none;
+}
+.mwiki .TablePager {
+  border-collapse: collapse;
+}
+.mwiki .TablePager,
+.mwiki .TablePager td,
+.mwiki .TablePager th {
+  border: 1px solid #aaaaaa;
+  padding: 0 0.15em 0 0.15em;
+}
+.mwiki .TablePager th {
+  background-color: #eeeeff;
+}
+.mwiki .TablePager td {
+  background-color: #ffffff;
+}
+.mwiki .TablePager tr:hover td {
+  background-color: #eeeeff;
 }
-.mwiki .TablePager th { background-color: #eeeeff }
-.mwiki .TablePager td { background-color: #ffffff }
-.mwiki .TablePager tr:hover td { background-color: #eeeeff }
 
-.mwiki .imagelist td, .mwiki .imagelist th { white-space: nowrap }
-.mwiki .imagelist .TablePager_col_links { background-color: #eeeeff }
-.mwiki .imagelist .TablePager_col_img_description { white-space: normal }
-.mwiki .imagelist th.TablePager_sort { background-color: #ccccff }
+.mwiki .imagelist td,
+.mwiki .imagelist th {
+  white-space: nowrap;
+}
+.mwiki .imagelist .TablePager_col_links {
+  background-color: #eeeeff;
+}
+.mwiki .imagelist .TablePager_col_img_description {
+  white-space: normal;
+}
+.mwiki .imagelist th.TablePager_sort {
+  background-color: #ccccff;
+}
 
-.mwiki .templatesUsed { margin-top: 1.5em; }
+.mwiki .templatesUsed {
+  margin-top: 1.5em;
+}
 
 .mwiki .mw-summary-preview {
-	margin: 0.1em 0;
+  margin: 0.1em 0;
 }
 
 /* Friendlier slave lag warnings */
 .mwiki div.mw-lag-warn-normal,
 .mwiki div.mw-lag-warn-high {
-	padding: 3px;
-	text-align: center;
-	margin: 3px auto;
+  padding: 3px;
+  text-align: center;
+  margin: 3px auto;
 }
 .mwiki div.mw-lag-warn-normal {
-	border: 1px solid #FFCC66;
-	background-color: #FFFFCC;
+  border: 1px solid #ffcc66;
+  background-color: #ffffcc;
 }
 .mwiki div.mw-lag-warn-high {
-	font-weight: bold;
-	border: 2px solid #FF0033;
-	background-color: #FFCCCC;
+  font-weight: bold;
+  border: 2px solid #ff0033;
+  background-color: #ffcccc;
 }
 
 .mwiki .MediaTransformError {
-	background-color: #ccc;
-	padding: 0.1em;
+  background-color: #ccc;
+  padding: 0.1em;
 }
 .mwiki .MediaTransformError td {
-	text-align: center;
-	vertical-align: middle;
-	font-size: 90%;
+  text-align: center;
+  vertical-align: middle;
+  font-size: 90%;
 }
 
 /** Special:Search stuff */
 .mwiki div#mw-search-interwiki-caption {
-	text-align: center;
-	font-weight: bold;
-	font-size: 95%;
+  text-align: center;
+  font-weight: bold;
+  font-size: 95%;
 }
 
 .mwiki .mw-search-interwiki-project {
-	font-size: 97%;
-	text-align: left;
-	padding-left: 0.2em;
-	padding-right: 0.15em;
-	padding-bottom: 0.2em;
-	padding-top: 0.15em;
-	background: #cae8ff;
+  font-size: 97%;
+  text-align: left;
+  padding-left: 0.2em;
+  padding-right: 0.15em;
+  padding-bottom: 0.2em;
+  padding-top: 0.15em;
+  background: #cae8ff;
 }
 
 /* God-damned hack for the crappy layout */
 .mwiki .os-suggest {
-	font-size: 127%;
+  font-size: 127%;
 }
 
-
 /**** Excerpts from http://en.wikipedia.org/wiki/MediaWiki:Common.css ******/
 /* Since GoldenDict support is not Wikipedia-specific, we don't include all
  * of it, and besides, it's large and volatile anyway. */
 /* It was also edited for the usually narrow article view */
 
-
 /* Make the list of references smaller */
 .mwiki ol.references {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki .references-small {
-    font-size: 90%;
+  font-size: 90%;
 }
 
 /* VALIDATOR NOTICE: the following is correct, but the W3C validator doesn't accept it */
@@ -2621,355 +2716,374 @@ in bg url to hide it from iemac */
 /* column-count is from the CSS3 module "CSS Multi-column Layout" */
 /* Please ignore any validator errors caused by these two lines */
 .mwiki .references-2column {
-    font-size: 90%;
-    -moz-column-count: 2;
-    -webkit-column-count: 2;
-    column-count: 2;
+  font-size: 90%;
+  -moz-column-count: 2;
+  -webkit-column-count: 2;
+  column-count: 2;
 }
 
 /* Highlight clicked reference in blue to help navigation */
 .mwiki ol.references > li:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 .mwiki sup.reference:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 /* Styling for citations */
 .mwiki cite {
-    font-style: normal;
-    word-wrap: break-word;
+  font-style: normal;
+  word-wrap: break-word;
 }
 
 /* If there is an inline link to a full citation, the full citation will turn blue when the inline link is clicked */
 .mwiki cite:target {
-    background-color: #DEF;
+  background-color: #def;
 }
 
 /* wikitable/prettytable class for skinning normal tables */
 .mwiki table.wikitable,
 .mwiki table.prettytable {
-    margin: 1em 1em 1em 0;
-    background: #f9f9f9;
-    border: 1px #aaa solid;
-    border-collapse: collapse;
+  margin: 1em 1em 1em 0;
+  background: #f9f9f9;
+  border: 1px #aaa solid;
+  border-collapse: collapse;
 }
-.mwiki .wikitable th, .mwiki .wikitable td,
-.mwiki .prettytable th, .mwiki .prettytable td {
-    border: 1px #aaa solid;
-    padding: 0.2em;
+.mwiki .wikitable th,
+.mwiki .wikitable td,
+.mwiki .prettytable th,
+.mwiki .prettytable td {
+  border: 1px #aaa solid;
+  padding: 0.2em;
 }
 .mwiki .wikitable th,
 .mwiki .prettytable th {
-    background: #f2f2f2;
-    text-align: center;
+  background: #f2f2f2;
+  text-align: center;
 }
 .mwiki .wikitable caption,
 .mwiki .prettytable caption {
-    font-weight: bold;
+  font-weight: bold;
 }
 
 /* default skin for navigation boxes */
-.mwiki table.navbox {            /* navbox container style */
-  border:1px solid #aaa;
-  width:100%;
-  margin:auto;
-  clear:both;
-  font-size:88%;
-  text-align:center;
-  padding:1px;
+.mwiki table.navbox {
+  /* navbox container style */
+  border: 1px solid #aaa;
+  width: 100%;
+  margin: auto;
+  clear: both;
+  font-size: 88%;
+  text-align: center;
+  padding: 1px;
 }
 .mwiki table.navbox + table.navbox {
-  margin-top:-1px;        /* single pixel border between adjacent navboxes (doesn't work for IE6, but that's okay) */
+  margin-top: -1px; /* single pixel border between adjacent navboxes (doesn't work for IE6, but that's okay) */
 }
-.mwiki .navbox-title, .mwiki .navbox-abovebelow, .mwiki table.navbox th {
-  text-align:center;      /* title and above/below styles */
-  padding-left:1em;
-  padding-right:1em;
+.mwiki .navbox-title,
+.mwiki .navbox-abovebelow,
+.mwiki table.navbox th {
+  text-align: center; /* title and above/below styles */
+  padding-left: 1em;
+  padding-right: 1em;
 }
-.mwiki .navbox-group {           /* group style */
-  white-space:nowrap;
-  text-align:right;
-  font-weight:bold;
-  padding-left:1em;
-  padding-right:1em;
+.mwiki .navbox-group {
+  /* group style */
+  white-space: nowrap;
+  text-align: right;
+  font-weight: bold;
+  padding-left: 1em;
+  padding-right: 1em;
 }
-.mwiki .navbox, .mwiki .navbox-subgroup {
-  background:#fdfdfd;     /* Background color */
+.mwiki .navbox,
+.mwiki .navbox-subgroup {
+  background: #fdfdfd; /* Background color */
 }
 .mwiki .navbox-list {
-  border-color:#fdfdfd;   /* Must match background color */
+  border-color: #fdfdfd; /* Must match background color */
 }
-.mwiki .navbox-title, .mwiki table.navbox th {
-  background:#ccccff;     /* Level 1 color */
+.mwiki .navbox-title,
+.mwiki table.navbox th {
+  background: #ccccff; /* Level 1 color */
 }
-.mwiki .navbox-abovebelow, .mwiki .navbox-group, .mwiki .navbox-subgroup .navbox-title {
-  background:#ddddff;     /* Level 2 color */
+.mwiki .navbox-abovebelow,
+.mwiki .navbox-group,
+.mwiki .navbox-subgroup .navbox-title {
+  background: #ddddff; /* Level 2 color */
 }
-.mwiki .navbox-subgroup .navbox-group, .mwiki .navbox-subgroup .navbox-abovebelow {
-  background:#e6e6ff;     /* Level 3 color */
+.mwiki .navbox-subgroup .navbox-group,
+.mwiki .navbox-subgroup .navbox-abovebelow {
+  background: #e6e6ff; /* Level 3 color */
 }
 .mwiki .navbox-even {
-  background:#f7f7f7;     /* Even row striping */
+  background: #f7f7f7; /* Even row striping */
 }
 .mwiki .navbox-odd {
-  background:transparent; /* Odd row striping */
+  background: transparent; /* Odd row striping */
 }
 
-.mwiki .collapseButton {         /* 'show'/'hide' buttons created dynamically by the        */
-    float: right;         /* CollapsibleTables javascript in [[MediaWiki:Common.js]] */
-    font-weight: normal;  /* are styled here so they can be customised.              */
-    text-align: right;
-    width: auto;
+.mwiki .collapseButton {
+  /* 'show'/'hide' buttons created dynamically by the        */
+  float: right; /* CollapsibleTables javascript in [[MediaWiki:Common.js]] */
+  font-weight: normal; /* are styled here so they can be customised.              */
+  text-align: right;
+  width: auto;
 }
-.mwiki .navbox .collapseButton { /* In navboxes, the show/hide button balances the vde links from */
-    width: 6em;           /* [[Template:Tnavbar]], so they need to be the same width.      */
+.mwiki .navbox .collapseButton {
+  /* In navboxes, the show/hide button balances the vde links from */
+  width: 6em; /* [[Template:Tnavbar]], so they need to be the same width.      */
 }
 
-
-
 /* Infobox template style */
 .mwiki .infobox {
-    border: 1px solid #aaa;
-    background-color: #f9f9f9;
-    color: black;
-/*    margin: 0.5em 0 0.5em 1em;*/
-    margin: 10px auto 0;
-    padding: 0.2em;
-/*
+  border: 1px solid #aaa;
+  background-color: #f9f9f9;
+  color: black;
+  /*    margin: 0.5em 0 0.5em 1em;*/
+  margin: 10px auto 0;
+  padding: 0.2em;
+  /*
     float: right;
     clear: right;*/
 }
 
 .mwiki .infobox td,
 .mwiki .infobox th {
-    vertical-align: top;
+  vertical-align: top;
 }
 .mwiki .infobox caption {
-    font-size: larger;
+  font-size: larger;
 }
 .mwiki .infobox.bordered {
-    border-collapse: collapse;
+  border-collapse: collapse;
 }
 .mwiki .infobox.bordered td,
 .mwiki .infobox.bordered th {
-    border: 1px solid #aaa;
+  border: 1px solid #aaa;
 }
 .mwiki .infobox.bordered .borderless td,
 .mwiki .infobox.bordered .borderless th {
-    border: 0;
+  border: 0;
 }
 
 .mwiki .infobox.sisterproject {
-    width: 20em;
-    font-size: 90%;
+  width: 20em;
+  font-size: 90%;
 }
 
 .mwiki .infobox.standard-talk {
-    border: 1px solid #c0c090;
-    background-color: #f8eaba;
+  border: 1px solid #c0c090;
+  background-color: #f8eaba;
 }
 .mwiki .infobox.standard-talk.bordered td,
 .mwiki .infobox.standard-talk.bordered th {
-    border: 1px solid #c0c090;
+  border: 1px solid #c0c090;
 }
 
 /* styles for bordered infobox with merged rows */
 .mwiki .infobox.bordered .mergedtoprow td,
 .mwiki .infobox.bordered .mergedtoprow th {
-    border: 0;
-    border-top: 1px solid #aaa;
-    border-right: 1px solid #aaa;
+  border: 0;
+  border-top: 1px solid #aaa;
+  border-right: 1px solid #aaa;
 }
 
 .mwiki .infobox.bordered .mergedrow td,
 .mwiki .infobox.bordered .mergedrow th {
-    border: 0;
-    border-right: 1px solid #aaa;
+  border: 0;
+  border-right: 1px solid #aaa;
 }
 
 /* Styles for geography infoboxes, e.g. countries, country subdivisions, cities, etc. */
 .mwiki .infobox.geography {
-    text-align: left;
-    border-collapse: collapse;
-    line-height: 1.2em;
-    font-size: 90%;
+  text-align: left;
+  border-collapse: collapse;
+  line-height: 1.2em;
+  font-size: 90%;
 }
 
-.mwiki .infobox.geography  td,
-.mwiki .infobox.geography  th {
-    border-top: solid 1px #aaa;
-    padding: 0.4em 0.6em 0.4em 0.6em;
+.mwiki .infobox.geography td,
+.mwiki .infobox.geography th {
+  border-top: solid 1px #aaa;
+  padding: 0.4em 0.6em 0.4em 0.6em;
 }
 .mwiki .infobox.geography .mergedtoprow td,
 .mwiki .infobox.geography .mergedtoprow th {
-    border-top: solid 1px #aaa;
-    padding: 0.4em 0.6em 0.2em 0.6em;
+  border-top: solid 1px #aaa;
+  padding: 0.4em 0.6em 0.2em 0.6em;
 }
 
 .mwiki .infobox.geography .mergedrow td,
 .mwiki .infobox.geography .mergedrow th {
-    border: 0;
-    padding: 0 0.6em 0.2em 0.6em;
+  border: 0;
+  padding: 0 0.6em 0.2em 0.6em;
 }
 
 .mwiki .infobox.geography .mergedbottomrow td,
 .mwiki .infobox.geography .mergedbottomrow th {
-    border-top: 0;
-    border-bottom: solid 1px #aaa;
-    padding: 0 0.6em 0.4em 0.6em;
+  border-top: 0;
+  border-bottom: solid 1px #aaa;
+  padding: 0 0.6em 0.4em 0.6em;
 }
 
 .mwiki .infobox.geography .maptable td,
 .mwiki .infobox.geography .maptable th {
-    border: 0;
-    padding: 0;
+  border: 0;
+  padding: 0;
 }
 
 /* Style for "notices" */
 .mwiki .notice {
-    margin: 1em;
-    padding: 0.2em;
+  margin: 1em;
+  padding: 0.2em;
 }
 
 .mwiki #disambig {
-    border-top: 1px solid #ccc;
-    border-bottom: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
 }
 
 .mwiki .rellink,
 .mwiki .dablink {
-    font-style: italic;
-    padding-left: 2em;
+  font-style: italic;
+  padding-left: 2em;
 }
 .mwiki .rellink i,
 .mwiki .dablink i {
-    font-style: normal;
+  font-style: normal;
 }
 
 /* Article message box styles */
-.mwiki table.ambox {            /* 10% = Will not overlap with other elements */
-    margin: -1px 10% 0px;    /* -1px = Single border between stacked boxes in all browsers */
-    border: 1px solid #aaa;
-    border-left: 10px solid #1e90ff;    /* Default "notice" blue */
-    background: #fbfbfb;
+.mwiki table.ambox {
+  /* 10% = Will not overlap with other elements */
+  margin: -1px 10% 0px; /* -1px = Single border between stacked boxes in all browsers */
+  border: 1px solid #aaa;
+  border-left: 10px solid #1e90ff; /* Default "notice" blue */
+  background: #fbfbfb;
 }
 .mwiki .ambox th.mbox-text,
-.mwiki .ambox td.mbox-text {            /* The message body cell(s) */
-    padding: 0.25em 0.5em;       /* 0.5em left/right */
+.mwiki .ambox td.mbox-text {
+  /* The message body cell(s) */
+  padding: 0.25em 0.5em; /* 0.5em left/right */
 }
-.mwiki .ambox td.mbox-image {           /* The left image cell */
-    padding: 2px 0 2px 0.5em;    /* 0.5em left, 0px right */
+.mwiki .ambox td.mbox-image {
+  /* The left image cell */
+  padding: 2px 0 2px 0.5em; /* 0.5em left, 0px right */
 }
-.mwiki .ambox td.mbox-imageright {      /* The right image cell */
-    padding: 2px 0.5em 2px 0;    /* 0px left, 0.5em right */
+.mwiki .ambox td.mbox-imageright {
+  /* The right image cell */
+  padding: 2px 0.5em 2px 0; /* 0px left, 0.5em right */
 }
 
 /* Standard Navigationsleisten, aka box hiding thingy from .de.  Documentation at [[Wikipedia:NavFrame]]. */
 .mwiki div.NavFrame {
-    margin: 0;
-    padding: 4px;
-    border: 1px solid #aaa;
-    text-align: center;
-    border-collapse: collapse;
-    font-size: 95%;
+  margin: 0;
+  padding: 4px;
+  border: 1px solid #aaa;
+  text-align: center;
+  border-collapse: collapse;
+  font-size: 95%;
 }
 .mwiki div.NavFrame + div.NavFrame {
-    border-top-style: none;
-    border-top-style: hidden;
+  border-top-style: none;
+  border-top-style: hidden;
 }
 .mwiki div.NavPic {
-    background-color: #fff;
-    margin: 0;
-    padding: 2px;
-    float: left;
+  background-color: #fff;
+  margin: 0;
+  padding: 2px;
+  float: left;
 }
 .mwiki div.NavFrame div.NavHead {
-    height: 1.6em;
-    font-weight: bold;
-    background-color: #ccf;
-    position:relative;
+  height: 1.6em;
+  font-weight: bold;
+  background-color: #ccf;
+  position: relative;
 }
 .mwiki div.NavFrame p {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavFrame div.NavContent {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavFrame div.NavContent p {
-    font-size: 100%;
+  font-size: 100%;
 }
 .mwiki div.NavEnd {
-    margin: 0;
-    padding: 0;
-    line-height: 1px;
-    clear: both;
+  margin: 0;
+  padding: 0;
+  line-height: 1px;
+  clear: both;
 }
 .mwiki a.NavToggle {
-    position: absolute;
-    top: 0;
-    right: 3px;
-    font-weight: normal;
-    font-size: 90%;
+  position: absolute;
+  top: 0;
+  right: 3px;
+  font-weight: normal;
+  font-size: 90%;
 }
 
-
 /****** Wiktionary-specific excerpts *********/
 
 .mwiki .audiolink a {
-    background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png") center left no-repeat !important;
-    padding-left: 20px !important;
-    padding-right: 0 !important;
+  background: url("https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Loudspeaker.svg/16px-Loudspeaker.svg.png")
+    center left no-repeat !important;
+  padding-left: 20px !important;
+  padding-right: 0 !important;
 }
 
 /* default setting for [[:Category:Inflection templates]] */
 
-.mwiki .infl-inline { display: inline }
-.mwiki .infl-table { display: none }
+.mwiki .infl-inline {
+  display: inline;
+}
+.mwiki .infl-table {
+  display: none;
+}
 /****default hide dict icon ***/
-.gddicticon{display:none;}
+.gddicticon {
+  display: none;
+}
 
 .gdexpandicon {
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    vertical-align: text-bottom;
-    background-size: contain;
-    content:url('qrc://localhost/icons/arrow.png');
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-bottom;
+  background-size: contain;
+  content: url("qrc://localhost/icons/arrow.png");
 }
 
 .gdcollapseicon {
-    cursor:pointer;
-    width:16px;
-    height:16px;
-    vertical-align: text-bottom;
-    background-size: contain;
-    content:url('qrc://localhost/icons/downarrow.png');
+  cursor: pointer;
+  width: 16px;
+  height: 16px;
+  vertical-align: text-bottom;
+  background-size: contain;
+  content: url("qrc://localhost/icons/downarrow.png");
 }
 
 /********** Slob dictionaries ***********/
 
-.slobdict_headword{
-	display:none;
+.slobdict_headword {
+  display: none;
 }
 
 .slobdict img.imgtex {
-	vertical-align: baseline !important;
+  vertical-align: baseline !important;
 }
 
 /************* GLS dictionaries **************/
 
-.glsdict_headwords
-{
+.glsdict_headwords {
   font-weight: bold;
   margin-top: 15px;
   margin-bottom: 10px;
   font-size: 116%;
 }
 
-.gls_wav img
-{
+.gls_wav img {
   /* Ugly hack since "vertical-align: middle;" looks _terrible_ in Qt4's webkit: */
   vertical-align: -30%;
 }
diff --git a/src/stylesheets/css.qrc b/src/stylesheets/css.qrc
index 705f950e..4b7307e0 100644
--- a/src/stylesheets/css.qrc
+++ b/src/stylesheets/css.qrc
@@ -14,7 +14,6 @@
         <file>qt-lingoes.css</file>
         <file>qt-lingvo.css</file>
         <file>qt-modern.css</file>
-        <file>qt-style-macos.css</file>
         <file>qt-style-win.css</file>
         <file>qt-style.css</file>
         <file>article-style-darkmode.css</file>
diff --git a/src/stylesheets/qt-classic.css b/src/stylesheets/qt-classic.css
index 1d09be6c..6aeeb106 100644
--- a/src/stylesheets/qt-classic.css
+++ b/src/stylesheets/qt-classic.css
@@ -14,14 +14,13 @@
 }
 
 QTabBar::close-button {
-  image: url(:/icons/closetab.svg)
+  image: url(:/icons/closetab.svg);
 }
 QTabBar::close-button:hover {
-  image: url(:/icons/closetab-hover.png)
+  image: url(:/icons/closetab-hover.png);
 }
 
-MainStatusBar #text
-{
+MainStatusBar #text {
   border-top-right-radius: 3px;
   border-top: 1px solid palette(dark);
   border-right: 1px solid palette(dark);
@@ -29,8 +28,7 @@ MainStatusBar #text
   padding: 2px;
 }
 
-MainStatusBar #icon
-{
+MainStatusBar #icon {
   border-top: 1px solid palette(dark);
   background: palette(window);
   padding: 2px;
@@ -38,8 +36,7 @@ MainStatusBar #icon
   padding-right: 0px;
 }
 
-ScanPopup #translateLine
-{
+ScanPopup #translateLine {
   margin: 0px;
   padding: 1px 3px 1px 3px;
   border: 1px solid gray;
@@ -48,8 +45,7 @@ ScanPopup #translateLine
   border-bottom-left-radius: 0px;
 }
 
-ScanPopup GroupComboBox
-{
+ScanPopup GroupComboBox {
   margin: 0px 0px 0px 1px;
   padding: 1px 4px 1px 4px;
   border: 1px solid gray;
@@ -64,35 +60,31 @@ ScanPopup GroupComboBox:on {
 }
 
 ScanPopup GroupComboBox::drop-down {
-   subcontrol-origin: padding;
-   subcontrol-position: top right;
-   width: 15px;
-   border-left: 1px solid darkgray;
-   border-right: 1px transparent;
+  subcontrol-origin: padding;
+  subcontrol-position: top right;
+  width: 15px;
+  border-left: 1px solid darkgray;
+  border-right: 1px transparent;
 }
 
 ScanPopup GroupComboBox::down-arrow {
-   image: url(:/icons/1downarrow.svg);
+  image: url(:/icons/1downarrow.svg);
   max-height: 100%;
 }
 
-.ScanPopup #outerFrame
-{
+.ScanPopup #outerFrame {
   border: 1px solid palette(dark);
 }
 
-.ScanPopup MainStatusBar #text
-{
+.ScanPopup MainStatusBar #text {
   border-bottom: 1px solid palette(dark);
 }
 
-.ScanPopup MainStatusBar[hasImage="false"] #text
-{
+.ScanPopup MainStatusBar[hasImage="false"] #text {
   border-left: 1px solid palette(dark);
 }
 
-.ScanPopup MainStatusBar #icon
-{
+.ScanPopup MainStatusBar #icon {
   border-left: 1px solid palette(dark);
   border-bottom: 1px solid palette(dark);
 }
diff --git a/src/stylesheets/qt-lingoes-blue.css b/src/stylesheets/qt-lingoes-blue.css
index f22cfdea..39a2e2c8 100644
--- a/src/stylesheets/qt-lingoes-blue.css
+++ b/src/stylesheets/qt-lingoes-blue.css
@@ -1,5 +1,5 @@
 MainWindow {
-    background-color: #CFDDF0;
+  background-color: #cfddf0;
 }
 
 #wordList,
@@ -9,71 +9,81 @@ MainWindow {
 #historyList,
 #favoritesPane,
 #favoritesTree {
-    background: #EAF0F8;
-    color: darkblue;
+  background: #eaf0f8;
+  color: darkblue;
 }
 
 MainWindow #menubar {
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-                      stop:0 #F0F6FF, stop:0.5 #D2E0F5, stop:0.9 #DCEBFF, stop:1 #F0F6FF);
+  background-color: qlineargradient(
+    x1: 0,
+    y1: 0,
+    x2: 0,
+    y2: 1,
+    stop: 0 #f0f6ff,
+    stop: 0.5 #d2e0f5,
+    stop: 0.9 #dcebff,
+    stop: 1 #f0f6ff
+  );
 }
 
 MainWindow #menubar::item {
-    padding: 2px 8px;
-    background: transparent;
+  padding: 2px 8px;
+  background: transparent;
 }
 
-MainWindow #menubar::item:selected { /* when selected using mouse or keyboard */
-    background: #839EC7;
+MainWindow #menubar::item:selected {
+  /* when selected using mouse or keyboard */
+  background: #839ec7;
 }
 
 MainWindow #menubar::item:pressed {
-    background: #728AAD;
+  background: #728aad;
 }
 
 MainWindow #centralWidget QTabBar::tab {
-    border: 1px solid #667B9B;
-    border-bottom-color: #667B9B;
-    border-top-left-radius: 4px;
-    border-top-right-radius: 4px;
-    padding: 1px 3px;
-    margin-left: 1px;
-    margin-top: 2px;
-    margin-bottom: 2px;
-    background-color: #CFDDF0;
-    color: darkslategray;
+  border: 1px solid #667b9b;
+  border-bottom-color: #667b9b;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  padding: 1px 3px;
+  margin-left: 1px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  background-color: #cfddf0;
+  color: darkslategray;
 }
 
 MainWindow #centralWidget QTabBar::tab:selected {
-    background-color: #839EC7;
-    color: #fff;
-    border-bottom-style: none;
+  background-color: #839ec7;
+  color: #fff;
+  border-bottom-style: none;
 }
 
-
-ArticleView #searchFrame QMenu {background-color: none}
-ArticleView QMenu {background-color: none} 
+ArticleView #searchFrame QMenu {
+  background-color: none;
+}
+ArticleView QMenu {
+  background-color: none;
+}
 
 QMainWindow::separator {
-     width:  1px; /* when vertical */
-     height: 1px; /* when horizontal */
-} 
+  width: 1px; /* when vertical */
+  height: 1px; /* when horizontal */
+}
 
 #dictsPaneTitleBar {
   margin: 2px;
-} 
+}
 
 /* Colored header for the History Pane */
 #historyPaneTitleBar {
   margin: 2px;
-} 
-
-ScanPopup #outerFrame
-{
-   background-color: #CEDDEF;
 }
 
-ScanPopup #dictionaryBar
-{
-   background: #CEDDEF;
+ScanPopup #outerFrame {
+  background-color: #ceddef;
+}
+
+ScanPopup #dictionaryBar {
+  background: #ceddef;
 }
diff --git a/src/stylesheets/qt-modern.css b/src/stylesheets/qt-modern.css
index 04a3b82c..8e5355a2 100644
--- a/src/stylesheets/qt-modern.css
+++ b/src/stylesheets/qt-modern.css
@@ -4,21 +4,34 @@
 }
 
 /* Another way to hide specific separators */
-#navToolbar #beforeOptionsSeparator, #navToolbar #beforeScanPopupSeparator, #navToolbar #afterScanPopupSeparator, #navToolbar #separatorBeforeZoom, #navToolbar #separatorBeforeSave {
-  background: rgba(0,0,0,0%);
+#navToolbar #beforeOptionsSeparator,
+#navToolbar #beforeScanPopupSeparator,
+#navToolbar #afterScanPopupSeparator,
+#navToolbar #separatorBeforeZoom,
+#navToolbar #separatorBeforeSave {
+  background: rgba(0, 0, 0, 0%);
   width: 0px;
   margin: -3px;
 }
 
 /* Hide various buttons in the toolbar: */
-#navToolbar #menuButtonXX, #navToolbar #soundButtonXX, #navToolbar #backButtonXX, #navToolbar #forwardButtonXX, #navToolbar #zoomInButtonXX, #navToolbar #zoomOutButtonXX, #navToolbar #zoomBaseButtonXX, #navToolbar #saveArticleButton, #navToolbar #printButton {
-  width:   0px;
-  height:  0px;
-  margin:  -3px;
+#navToolbar #menuButtonXX,
+#navToolbar #soundButtonXX,
+#navToolbar #backButtonXX,
+#navToolbar #forwardButtonXX,
+#navToolbar #zoomInButtonXX,
+#navToolbar #zoomOutButtonXX,
+#navToolbar #zoomBaseButtonXX,
+#navToolbar #saveArticleButton,
+#navToolbar #printButton {
+  width: 0px;
+  height: 0px;
+  margin: -3px;
 }
 
 /* remove the main toolbar handle */
-#navToolbar::handle, #dictionaryBar::handle {
+#navToolbar::handle,
+#dictionaryBar::handle {
   image: none;
 }
 
@@ -38,8 +51,8 @@
 
 /* Thin separators between the main UI and sidebars */
 QMainWindow::separator {
-     width:  1px; /* when vertical */
-     height: 1px; /* when horizontal */
+  width: 1px; /* when vertical */
+  height: 1px; /* when horizontal */
 }
 
 ScanPopup #goBackButtonAA,
@@ -49,8 +62,7 @@ ScanPopup #wordListButtonXX,
 ScanPopup #pronounceButtonAA,
 ScanPopup #sendWordButtonXX
 /* ScanPopup #showDictionaryBar, */
-/* ScanPopup #pinButton */
-{
+/* ScanPopup #pinButton */ {
   width: 0px;
   height: 0px;
   margin: -4px;
diff --git a/src/stylesheets/qt-style-macos.css b/src/stylesheets/qt-style-macos.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/stylesheets/qt-style-win.css b/src/stylesheets/qt-style-win.css
index a1acc05a..57354329 100644
--- a/src/stylesheets/qt-style-win.css
+++ b/src/stylesheets/qt-style-win.css
@@ -1,6 +1,6 @@
 QTabBar::close-button {
-    image: url(:/icons/closetab.svg)
+  image: url(:/icons/closetab.svg);
 }
 QTabBar::close-button:hover {
-    image: url(:/icons/closetab-hover.png)
-}
\ No newline at end of file
+  image: url(:/icons/closetab-hover.png);
+}
diff --git a/src/termination.cc b/src/termination.cc
index ee165e2c..87d35833 100644
--- a/src/termination.cc
+++ b/src/termination.cc
@@ -9,28 +9,9 @@
 
 static void termHandler()
 {
+  qDebug() << "GoldenDict has crashed unexpectedly.\n\n";
 
-  // Trick: In c++17, there is no standardized way to know the exception name/type inside terminate_handler
-  // So, we just get the exception and throw it again, so that we can call the std::exception::what :)
-
-  // This trick can be removed/improved if something similar to
-  // boost::current_exception_diagnostic_information got standardized,
-
-  std::exception_ptr curException = std::current_exception();
-
-  try {
-    if ( curException != nullptr ) {
-      std::rethrow_exception( curException );
-    }
-    else {
-      qDebug() << "GoldenDict has crashed unexpectedly.\n\n";
-    }
-  }
-  catch ( const std::exception & e ) {
-    qDebug() << "GoldenDict has crashed with exception: " << e.what() ;
-  }
-
-  if( logFilePtr && logFilePtr->isOpen() )
+  if ( logFilePtr && logFilePtr->isOpen() )
     logFilePtr->close();
 
   abort();
diff --git a/src/texttospeechsource.cc b/src/texttospeechsource.cc
index 329dfca3..e23f4a67 100644
--- a/src/texttospeechsource.cc
+++ b/src/texttospeechsource.cc
@@ -6,8 +6,7 @@
 #include <QMessageBox>
 #include <memory>
 
-TextToSpeechSource::TextToSpeechSource( QWidget * parent,
-                                        Config::VoiceEngines voiceEngines ):
+TextToSpeechSource::TextToSpeechSource( QWidget * parent, Config::VoiceEngines voiceEngines ):
   QWidget( parent ),
   voiceEnginesModel( this, voiceEngines )
 {
@@ -22,15 +21,18 @@ TextToSpeechSource::TextToSpeechSource( QWidget * parent,
   ui.selectedVoiceEngines->setItemDelegateForColumn( VoiceEnginesModel::kColumnEngineDName,
                                                      new VoiceEngineItemDelegate( engines, this ) );
 
-  foreach( Config::VoiceEngine ve, voiceEngines ) { occupiedEngines.insert( ve.name ); }
-
-  foreach ( SpeechClient::Engine engine, engines )
+  foreach( Config::VoiceEngine ve, voiceEngines )
   {
-    QMap<QString,QVariant> map;
+    occupiedEngines.insert( ve.name );
+  }
+
+  foreach( SpeechClient::Engine engine, engines )
+  {
+    QMap< QString, QVariant > map;
     map[ "engine_name" ] = engine.engine_name;
     map[ "locale" ]      = engine.locale;
-    map["voice_name"] = engine.voice_name;
-    ui.availableVoiceEngines->addItem( engine.name, QVariant(map) );
+    map[ "voice_name" ]  = engine.voice_name;
+    ui.availableVoiceEngines->addItem( engine.name, QVariant( map ) );
   }
 
   //disable the already added engines.
@@ -45,52 +47,56 @@ TextToSpeechSource::TextToSpeechSource( QWidget * parent,
     }
   }
 
-  if( voiceEngines.count() > 0 )
-  {
-    QModelIndex const &idx = ui.selectedVoiceEngines->model()->index( 0, 0 );
-    if( idx.isValid() )
+  if ( voiceEngines.count() > 0 ) {
+    QModelIndex const & idx = ui.selectedVoiceEngines->model()->index( 0, 0 );
+    if ( idx.isValid() )
       ui.selectedVoiceEngines->setCurrentIndex( idx );
   }
 
   adjustSliders();
 
-  connect( ui.volumeSlider, SIGNAL( valueChanged( int ) ),
-           this, SLOT( slidersChanged() ) );
-  connect( ui.rateSlider, SIGNAL( valueChanged( int ) ),
-           this, SLOT( slidersChanged() ) );
-  connect( ui.selectedVoiceEngines->selectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
-           this, SLOT( selectionChanged() ) );
+  connect( ui.volumeSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
+  connect( ui.rateSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
+  connect( ui.selectedVoiceEngines->selectionModel(),
+           SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
+           this,
+           SLOT( selectionChanged() ) );
 
   ui.availableVoiceEngines->view()->setVerticalScrollBarPolicy( Qt::ScrollBarAsNeeded );
 }
 
 void TextToSpeechSource::slidersChanged()
 {
-  if( ui.selectedVoiceEngines->selectionModel()->hasSelection() )
+  if ( ui.selectedVoiceEngines->selectionModel()->hasSelection() )
     voiceEnginesModel.setEngineParams( ui.selectedVoiceEngines->currentIndex(),
                                        ui.volumeSlider->value(),
-                                       ui.rateSlider->value()) ;
+                                       ui.rateSlider->value() );
 }
 
 void TextToSpeechSource::on_addVoiceEngine_clicked()
 {
-  if ( ui.availableVoiceEngines->count() == 0 )
-  {
-    QMessageBox::information( this, tr( "No TTS voice available" ),
-                              tr( "Cannot find available TTS voice.<br>"
-                                  "Please make sure that at least one TTS engine installed on your computer already." ) );
+  if ( ui.availableVoiceEngines->count() == 0 ) {
+    QMessageBox::information(
+      this,
+      tr( "No TTS voice available" ),
+      tr( "Cannot find available TTS voice.<br>"
+          "Please make sure that at least one TTS engine installed on your computer already." ) );
     return;
   }
 
   int idx = ui.availableVoiceEngines->currentIndex();
-  if( idx >= 0 )
-  {
-    QString name = ui.availableVoiceEngines->itemText( idx );
-    auto map = ui.availableVoiceEngines->itemData( idx ).toMap();
-    QString engine_name = map["engine_name"].toString();
-    QString locale = map["locale"].toString();
-    QString voice_name = map["voice_name"].toString();
-    voiceEnginesModel.addNewVoiceEngine( engine_name, QLocale(locale), name, voice_name, ui.volumeSlider->value(), ui.rateSlider->value() );
+  if ( idx >= 0 ) {
+    QString name        = ui.availableVoiceEngines->itemText( idx );
+    auto map            = ui.availableVoiceEngines->itemData( idx ).toMap();
+    QString engine_name = map[ "engine_name" ].toString();
+    QString locale      = map[ "locale" ].toString();
+    QString voice_name  = map[ "voice_name" ].toString();
+    voiceEnginesModel.addNewVoiceEngine( engine_name,
+                                         QLocale( locale ),
+                                         name,
+                                         voice_name,
+                                         ui.volumeSlider->value(),
+                                         ui.rateSlider->value() );
     fitSelectedVoiceEnginesColumns();
 
     occupiedEngines.insert( name );
@@ -104,15 +110,15 @@ void TextToSpeechSource::on_addVoiceEngine_clicked()
 void TextToSpeechSource::on_removeVoiceEngine_clicked()
 {
   QModelIndex current = ui.selectedVoiceEngines->currentIndex();
-  auto selected_name = voiceEnginesModel.getCurrentVoiceEngines()[ current.row() ].name;
+  auto selected_name  = voiceEnginesModel.getCurrentVoiceEngines()[ current.row() ].name;
 
-  if ( current.isValid() &&
-       QMessageBox::question( this, tr( "Confirm removal" ),
-                              tr( "Remove voice engine <b>%1</b> from the list?" ).arg(
-                              selected_name ),
-                              QMessageBox::Ok,
-                              QMessageBox::Cancel ) == QMessageBox::Ok )
-  {
+  if ( current.isValid()
+       && QMessageBox::question( this,
+                                 tr( "Confirm removal" ),
+                                 tr( "Remove voice engine <b>%1</b> from the list?" ).arg( selected_name ),
+                                 QMessageBox::Ok,
+                                 QMessageBox::Cancel )
+         == QMessageBox::Ok ) {
     voiceEnginesModel.removeVoiceEngine( current.row() );
 
     occupiedEngines.remove( selected_name );
@@ -137,13 +143,13 @@ void TextToSpeechSource::on_previewVoice_clicked()
   if ( idx < 0 )
     return;
 
-  auto map = ui.availableVoiceEngines->itemData( idx ).toMap();
-  QString engineId = map["engine_name"].toString();
-  QString locale = map["locale"].toString();
-  QString name = ui.availableVoiceEngines->itemText( idx );
-  QString text = ui.previewText->text();
-  int volume = ui.volumeSlider->value();
-  int rate = ui.rateSlider->value();
+  auto map         = ui.availableVoiceEngines->itemData( idx ).toMap();
+  QString engineId = map[ "engine_name" ].toString();
+  QString locale   = map[ "locale" ].toString();
+  QString name     = ui.availableVoiceEngines->itemText( idx );
+  QString text     = ui.previewText->text();
+  int volume       = ui.volumeSlider->value();
+  int rate         = ui.rateSlider->value();
 
   speechClient = std::make_unique< SpeechClient >(
     Config::VoiceEngine( engineId, name, map[ "voice_name" ].toString(), QLocale( locale ), volume, rate ),
@@ -166,9 +172,8 @@ void TextToSpeechSource::fitSelectedVoiceEnginesColumns()
 void TextToSpeechSource::adjustSliders()
 {
   QModelIndex const & index = ui.selectedVoiceEngines->currentIndex();
-  if ( index.isValid() )
-  {
-    Config::VoiceEngines const &engines = voiceEnginesModel.getCurrentVoiceEngines();
+  if ( index.isValid() ) {
+    Config::VoiceEngines const & engines = voiceEnginesModel.getCurrentVoiceEngines();
     ui.volumeSlider->setValue( engines[ index.row() ].volume );
     ui.rateSlider->setValue( engines[ index.row() ].rate );
     return;
@@ -179,22 +184,18 @@ void TextToSpeechSource::adjustSliders()
 
 void TextToSpeechSource::selectionChanged()
 {
-  disconnect( ui.volumeSlider, SIGNAL( valueChanged( int ) ),
-              this, SLOT( slidersChanged() ) );
-  disconnect( ui.rateSlider, SIGNAL( valueChanged( int ) ),
-              this, SLOT( slidersChanged() ) );
+  disconnect( ui.volumeSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
+  disconnect( ui.rateSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
 
   adjustSliders();
 
-  connect( ui.volumeSlider, SIGNAL( valueChanged( int ) ),
-           this, SLOT( slidersChanged() ) );
-  connect( ui.rateSlider, SIGNAL( valueChanged( int ) ),
-           this, SLOT( slidersChanged() ) );
+  connect( ui.volumeSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
+  connect( ui.rateSlider, SIGNAL( valueChanged( int ) ), this, SLOT( slidersChanged() ) );
 }
 
-VoiceEnginesModel::VoiceEnginesModel( QWidget * parent,
-                                      Config::VoiceEngines const & voiceEngines ):
-  QAbstractItemModel( parent ), voiceEngines( voiceEngines )
+VoiceEnginesModel::VoiceEnginesModel( QWidget * parent, Config::VoiceEngines const & voiceEngines ):
+  QAbstractItemModel( parent ),
+  voiceEngines( voiceEngines )
 {
 }
 
@@ -208,7 +209,7 @@ void VoiceEnginesModel::removeVoiceEngine( int index )
 void VoiceEnginesModel::addNewVoiceEngine(
   QString const & engine_name, QLocale locale, QString const & name, QString const & voice_name, int volume, int rate )
 {
-  if( engine_name.isEmpty() || name.isEmpty() )
+  if ( engine_name.isEmpty() || name.isEmpty() )
     return;
 
   Config::VoiceEngine v;
@@ -216,9 +217,9 @@ void VoiceEnginesModel::addNewVoiceEngine(
   v.engine_name = engine_name;
   v.locale      = locale;
   v.name        = name;
-  v.volume = volume;
-  v.rate = rate;
-  v.voice_name = voice_name;
+  v.volume      = volume;
+  v.rate        = rate;
+  v.voice_name  = voice_name;
 
   beginInsertRows( QModelIndex(), voiceEngines.size(), voiceEngines.size() );
   voiceEngines.push_back( v );
@@ -239,10 +240,8 @@ Qt::ItemFlags VoiceEnginesModel::flags( QModelIndex const & index ) const
 {
   Qt::ItemFlags result = QAbstractItemModel::flags( index );
 
-  if ( index.isValid() )
-  {
-    switch ( index.column() )
-    {
+  if ( index.isValid() ) {
+    switch ( index.column() ) {
       case kColumnEnabled:
         result |= Qt::ItemIsUserCheckable;
         break;
@@ -272,10 +271,8 @@ int VoiceEnginesModel::columnCount( QModelIndex const & parent ) const
 
 QVariant VoiceEnginesModel::headerData( int section, Qt::Orientation /*orientation*/, int role ) const
 {
-  if ( role == Qt::DisplayRole )
-  {
-    switch ( section )
-    {
+  if ( role == Qt::DisplayRole ) {
+    switch ( section ) {
       case kColumnEnabled:
         return tr( "Enabled" );
       case kColumnEngineDName:
@@ -295,8 +292,7 @@ QVariant VoiceEnginesModel::data( QModelIndex const & index, int role ) const
   if ( index.row() >= voiceEngines.size() )
     return QVariant();
 
-  if ( role == Qt::DisplayRole || role == Qt::EditRole )
-  {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
     switch ( index.column() ) {
       case kColumnEngineName:
         return voiceEngines[ index.row() ].engine_name;
@@ -315,21 +311,18 @@ QVariant VoiceEnginesModel::data( QModelIndex const & index, int role ) const
   return QVariant();
 }
 
-bool VoiceEnginesModel::setData( QModelIndex const & index, const QVariant & value,
-                                 int role )
+bool VoiceEnginesModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
   if ( index.row() >= voiceEngines.size() )
     return false;
 
-  if ( role == Qt::CheckStateRole && index.column() == kColumnEnabled )
-  {
+  if ( role == Qt::CheckStateRole && index.column() == kColumnEnabled ) {
     voiceEngines[ index.row() ].enabled = !voiceEngines[ index.row() ].enabled;
     dataChanged( index, index );
     return true;
   }
 
-  if ( role == Qt::DisplayRole || role == Qt::EditRole )
-  {
+  if ( role == Qt::DisplayRole || role == Qt::EditRole ) {
     switch ( index.column() ) {
       case kColumnEngineName:
         voiceEngines[ index.row() ].engine_name = value.toString();
@@ -353,17 +346,16 @@ bool VoiceEnginesModel::setData( QModelIndex const & index, const QVariant & val
 
 void VoiceEnginesModel::setEngineParams( QModelIndex idx, int volume, int rate )
 {
-  if ( idx.isValid() )
-  {
+  if ( idx.isValid() ) {
     voiceEngines[ idx.row() ].volume = volume;
-    voiceEngines[ idx.row() ].rate = rate;
+    voiceEngines[ idx.row() ].rate   = rate;
   }
 }
 
 VoiceEngineEditor::VoiceEngineEditor( SpeechClient::Engines const & engines, QWidget * parent ):
   QComboBox( parent )
 {
-  foreach ( SpeechClient::Engine engine, engines )
+  foreach( SpeechClient::Engine engine, engines )
   {
     addItem( engine.name, engine.engine_name );
   }
@@ -389,10 +381,8 @@ void VoiceEngineEditor::setEngineId( QString const & engineId )
 {
   // Find index for the id
   int idx = -1;
-  for ( int i = 0; i < count(); ++i )
-  {
-    if ( engineId == itemData( i ).toString() )
-    {
+  for ( int i = 0; i < count(); ++i ) {
+    if ( engineId == itemData( i ).toString() ) {
       idx = i;
       break;
     }
@@ -400,7 +390,7 @@ void VoiceEngineEditor::setEngineId( QString const & engineId )
   setCurrentIndex( idx );
 }
 
-VoiceEngineItemDelegate::VoiceEngineItemDelegate( SpeechClient::Engines const & engines, QObject * parent ) :
+VoiceEngineItemDelegate::VoiceEngineItemDelegate( SpeechClient::Engines const & engines, QObject * parent ):
   QStyledItemDelegate( parent ),
   engines( engines )
 {
@@ -410,7 +400,7 @@ QWidget * VoiceEngineItemDelegate::createEditor( QWidget * parent,
                                                  QStyleOptionViewItem const & option,
                                                  QModelIndex const & index ) const
 {
-  if( index.column() != VoiceEnginesModel::kColumnEngineDName )
+  if ( index.column() != VoiceEnginesModel::kColumnEngineDName )
     return QStyledItemDelegate::createEditor( parent, option, index );
   return new VoiceEngineEditor( engines, parent );
 }
@@ -427,11 +417,12 @@ void VoiceEngineItemDelegate::setEditorData( QWidget * uncastedEditor, const QMo
   editor->setEngineId( engineId );
 }
 
-void VoiceEngineItemDelegate::setModelData( QWidget * uncastedEditor, QAbstractItemModel * model,
+void VoiceEngineItemDelegate::setModelData( QWidget * uncastedEditor,
+                                            QAbstractItemModel * model,
                                             const QModelIndex & index ) const
 {
   VoiceEngineEditor * editor = qobject_cast< VoiceEngineEditor * >( uncastedEditor );
-  if( !editor )
+  if ( !editor )
     return;
 
   int currentRow              = index.row();
diff --git a/src/texttospeechsource.hh b/src/texttospeechsource.hh
index 94838229..d3be3594 100644
--- a/src/texttospeechsource.hh
+++ b/src/texttospeechsource.hh
@@ -17,33 +17,41 @@ class VoiceEnginesModel: public QAbstractItemModel
   Q_OBJECT
 
 public:
- enum {
-   kColumnEnabled = 0,
-   kColumnEngineName,
-   kColumnEngineDName,
-   kColumnIcon,
-   kColumnCount
- };
+  enum {
+    kColumnEnabled = 0,
+    kColumnEngineName,
+    kColumnEngineDName,
+    kColumnIcon,
+    kColumnCount
+  };
 
- VoiceEnginesModel( QWidget * parent, Config::VoiceEngines const & voiceEngines );
+  VoiceEnginesModel( QWidget * parent, Config::VoiceEngines const & voiceEngines );
 
- void removeVoiceEngine( int index );
- void addNewVoiceEngine( QString const & engine_name, QLocale locale, QString const & name, QString const & voice_name, int volume, int rate );
+  void removeVoiceEngine( int index );
+  void addNewVoiceEngine( QString const & engine_name,
+                          QLocale locale,
+                          QString const & name,
+                          QString const & voice_name,
+                          int volume,
+                          int rate );
 
- Config::VoiceEngines const & getCurrentVoiceEngines() const { return voiceEngines; }
- void setEngineParams( QModelIndex idx, int volume, int rate );
+  Config::VoiceEngines const & getCurrentVoiceEngines() const
+  {
+    return voiceEngines;
+  }
+  void setEngineParams( QModelIndex idx, int volume, int rate );
 
- QModelIndex index( int row, int column, QModelIndex const & parent ) const override;
- QModelIndex parent( QModelIndex const & parent ) const override;
- Qt::ItemFlags flags( QModelIndex const & index ) const override;
- int rowCount( QModelIndex const & parent ) const override;
- int columnCount( QModelIndex const & parent ) const override;
- QVariant headerData( int section, Qt::Orientation orientation, int role ) const override;
- QVariant data( QModelIndex const & index, int role ) const override;
- bool setData( QModelIndex const & index, const QVariant & value, int role ) override;
+  QModelIndex index( int row, int column, QModelIndex const & parent ) const override;
+  QModelIndex parent( QModelIndex const & parent ) const override;
+  Qt::ItemFlags flags( QModelIndex const & index ) const override;
+  int rowCount( QModelIndex const & parent ) const override;
+  int columnCount( QModelIndex const & parent ) const override;
+  QVariant headerData( int section, Qt::Orientation orientation, int role ) const override;
+  QVariant data( QModelIndex const & index, int role ) const override;
+  bool setData( QModelIndex const & index, const QVariant & value, int role ) override;
 
 private:
- Config::VoiceEngines voiceEngines;
+  Config::VoiceEngines voiceEngines;
 };
 
 class VoiceEngineEditor: public QComboBox
@@ -51,10 +59,10 @@ class VoiceEngineEditor: public QComboBox
   Q_OBJECT
 
 public:
- VoiceEngineEditor( SpeechClient::Engines const & engines, QWidget * parent = nullptr );
+  VoiceEngineEditor( SpeechClient::Engines const & engines, QWidget * parent = nullptr );
 
 
- QString engineName() const;
+  QString engineName() const;
   QString engineId() const;
   void setEngineId( QString const & engineId );
 };
@@ -63,7 +71,7 @@ class VoiceEngineItemDelegate: public QStyledItemDelegate
 {
   Q_OBJECT
 
- public:
+public:
   VoiceEngineItemDelegate( SpeechClient::Engines const & engines, QObject * parent = nullptr );
 
   QWidget *
@@ -72,7 +80,7 @@ class VoiceEngineItemDelegate: public QStyledItemDelegate
   virtual void
   setModelData( QWidget * uncastedEditor, QAbstractItemModel * model, const QModelIndex & index ) const override;
 
- private:
+private:
   SpeechClient::Engines engines;
 };
 
@@ -84,7 +92,9 @@ public:
   TextToSpeechSource( QWidget * parent, Config::VoiceEngines voiceEngines );
 
   const VoiceEnginesModel & getVoiceEnginesModel() const
-  { return voiceEnginesModel; }
+  {
+    return voiceEnginesModel;
+  }
 
 private slots:
   void on_addVoiceEngine_clicked();
@@ -100,7 +110,7 @@ private:
 
   std::unique_ptr< SpeechClient > speechClient;
 
-  QSet<QString>  occupiedEngines;
+  QSet< QString > occupiedEngines;
 
   void fitSelectedVoiceEnginesColumns();
   void adjustSliders();
diff --git a/src/ui/about.cc b/src/ui/about.cc
index 0d3ce876..e6750b3b 100644
--- a/src/ui/about.cc
+++ b/src/ui/about.cc
@@ -3,92 +3,44 @@
 
 #include "about.hh"
 #include "utils.hh"
+#include "version.hh"
 
 #include <QClipboard>
 #include <QFile>
 #include <QPushButton>
 #include <QSysInfo>
 
-About::About( QWidget * parent, std::vector< sptr< Dictionary::Class > > * dictonaries ): QDialog( parent )
+About::About( QWidget * parent, std::vector< sptr< Dictionary::Class > > * dictonaries ):
+  QDialog( parent )
 {
   ui.setupUi( this );
 
-  QFile versionFile( ":/version.txt" );
+  ui.version->setText( Version::version() );
 
-  QString version;
+  ui.qtVersion->setText( tr( "Based on Qt %1 (%2, %3)" )
+                           .arg( QLatin1String( qVersion() ), Version::compiler, QSysInfo::currentCpuArchitecture() )
+                         + " (Xapian inside)" );
 
-  if ( !versionFile.open( QFile::ReadOnly ) )
-    version = tr( "[Unknown]" );
-  else
-    version = QString::fromLatin1( versionFile.readAll() ).trimmed();
+  connect( ui.copyInfoBtn, &QPushButton::clicked, [] {
+    QGuiApplication::clipboard()->setText( Version::everything() );
+  } );
 
-  ui.version->setText( version );
-
-#if defined (_MSC_VER)
-  QString compilerVersion = QString( "Visual C++ Compiler: %1" )
-                               .arg( _MSC_FULL_VER );
-#elif defined (__clang__) && defined (__clang_version__)
-  QString compilerVersion = QLatin1String( "Clang " ) + QLatin1String( __clang_version__ );
-#else
-  QString compilerVersion = QLatin1String( "GCC " ) + QLatin1String( __VERSION__ );
-#endif
-
-  ui.qtVersion->setText( tr( "Based on Qt %1 (%2, %3 bit)" ).arg(
-                           QLatin1String( qVersion() ),
-                           compilerVersion,
-                           QString::number( QSysInfo::WordSize ) )
-  +" (Xapian inside)"
-                         );
-
-  // copy basic debug info to clipboard
-  connect(ui.copyInfoBtn, &QPushButton::clicked, [=]{
-      QGuiApplication::clipboard()->setText(
-          "Goldendict " + version + "\n" +
-          QSysInfo::productType() + " " + QSysInfo::kernelType() + " " + QSysInfo::kernelVersion() + " " +
-          "Qt " + QLatin1String(qVersion()) + " " +
-          QSysInfo::buildAbi() + "\n" +
-          compilerVersion + "\n"
-    + "Flags:"
-         +" USE_XAPIAN "
-
-#ifdef MAKE_ZIM_SUPPORT
-         +" MAKE_ZIM_SUPPORT"
-#endif
-
-#ifdef NO_EPWING_SUPPORT
-         +" NO_EPWING_SUPPORT"
-#endif
-
-#ifdef USE_ICONV
-        +" USE_ICONV"
-#endif
-
-#ifdef MAKE_CHINESE_CONVERSION_SUPPORT
-         +" MAKE_CHINESE_CONVERSION_SUPPORT"
-#endif
-      );
-  });
-
-  connect(ui.copyDictListBtn, &QPushButton::clicked, [=]{
-      QString tempDictList{};
-      for (auto dict : *dictonaries) {
-        tempDictList.append(QString::fromStdString(dict->getName() + "\n"));
-      }
-      QGuiApplication::clipboard()->setText(tempDictList);
-  });
+  connect( ui.copyDictListBtn, &QPushButton::clicked, [ = ] {
+    QString tempDictList{};
+    for ( auto dict : *dictonaries ) {
+      tempDictList.append( QString::fromStdString( dict->getName() + "\n" ) );
+    }
+    QGuiApplication::clipboard()->setText( tempDictList );
+  } );
 
   QFile creditsFile( ":/CREDITS.txt" );
 
-  if ( creditsFile.open( QFile::ReadOnly ) )
-  {
-    QStringList creditsList =
-      QString::fromUtf8(
-        creditsFile.readAll() ).split( '\n', Qt::SkipEmptyParts );
+  if ( creditsFile.open( QFile::ReadOnly ) ) {
+    QStringList creditsList = QString::fromUtf8( creditsFile.readAll() ).split( '\n', Qt::SkipEmptyParts );
 
     QString html = "<html><body>";
 
-    for( int x = 0; x < creditsList.size(); ++x )
-    {
+    for ( int x = 0; x < creditsList.size(); ++x ) {
       QString str = creditsList[ x ];
 
       str.replace( "\\", "@" );
@@ -97,14 +49,12 @@ About::About( QWidget * parent, std::vector< sptr< Dictionary::Class > > * dicto
 
       int colon = str.indexOf( ":" );
 
-      if ( colon != -1 )
-      {
+      if ( colon != -1 ) {
         QString name( str.left( colon ) );
 
         name.replace( ", ", "<br>" );
 
-        str = "<font color='blue'>" + name + "</font><br>&nbsp;&nbsp;&nbsp;&nbsp;"
-              + str.mid( colon + 1 );
+        str = "<font color='blue'>" + name + "</font><br>&nbsp;&nbsp;&nbsp;&nbsp;" + str.mid( colon + 1 );
       }
 
       html += str;
diff --git a/src/ui/about.hh b/src/ui/about.hh
index d041a0cb..955c080e 100644
--- a/src/ui/about.hh
+++ b/src/ui/about.hh
@@ -13,8 +13,9 @@
 class About: public QDialog
 {
   Q_OBJECT
+
 public:
-  About( QWidget * parent, std::vector< sptr< Dictionary::Class > > * dictonaries);
+  About( QWidget * parent, std::vector< sptr< Dictionary::Class > > * dictonaries );
 
 private:
 
diff --git a/src/ui/article_inspect.cc b/src/ui/article_inspect.cc
index b1d08863..e2943516 100644
--- a/src/ui/article_inspect.cc
+++ b/src/ui/article_inspect.cc
@@ -1,11 +1,12 @@
 #include "article_inspect.hh"
 #include <QCloseEvent>
-#if (QT_VERSION > QT_VERSION_CHECK(6,0,0))
-#include <QWebEngineContextMenuRequest>
+#if ( QT_VERSION > QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QWebEngineContextMenuRequest>
 #endif
-ArticleInspector::ArticleInspector( QWidget * parent ) : QWidget( parent, Qt::WindowType::Window )
+ArticleInspector::ArticleInspector( QWidget * parent ):
+  QWidget( parent, Qt::WindowType::Window )
 {
-  setWindowTitle(tr("Inspect"));
+  setWindowTitle( tr( "Inspect" ) );
   setAttribute( Qt::WidgetAttribute::WA_DeleteOnClose, false );
   QVBoxLayout * v = new QVBoxLayout( this );
   v->setSpacing( 0 );
@@ -14,7 +15,7 @@ ArticleInspector::ArticleInspector( QWidget * parent ) : QWidget( parent, Qt::Wi
   v->addWidget( viewContainer );
 
   setInspectPage( nullptr );
-  resize(800,600);
+  resize( 800, 600 );
 }
 
 void ArticleInspector::setInspectPage( QWebEnginePage * page )
@@ -38,13 +39,12 @@ void ArticleInspector::triggerAction( QWebEnginePage * page )
     return;
   }
 
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) || QT_VERSION > QT_VERSION_CHECK(6,3,0) )
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) || QT_VERSION > QT_VERSION_CHECK( 6, 3, 0 ) )
   page->triggerAction( QWebEnginePage::InspectElement );
 #endif
-
 }
 
 void ArticleInspector::closeEvent( QCloseEvent * )
 {
-  viewContainer->page()->setInspectedPage(nullptr);
+  viewContainer->page()->setInspectedPage( nullptr );
 }
diff --git a/src/ui/article_inspect.hh b/src/ui/article_inspect.hh
index 2a16473b..29fc523a 100644
--- a/src/ui/article_inspect.hh
+++ b/src/ui/article_inspect.hh
@@ -6,15 +6,17 @@
 #include <QWebEnginePage>
 #include <QVBoxLayout>
 
-class ArticleInspector : public QWidget
+class ArticleInspector: public QWidget
 {
   Q_OBJECT
-  QWebEngineView * viewContainer   = nullptr;
+  QWebEngineView * viewContainer = nullptr;
+
 public:
   ArticleInspector( QWidget * parent = nullptr );
 
-  void setInspectPage( QWebEnginePage * page);
+  void setInspectPage( QWebEnginePage * page );
   void triggerAction( QWebEnginePage * page );
+
 private:
 
   virtual void closeEvent( QCloseEvent * );
diff --git a/src/ui/articleview.cc b/src/ui/articleview.cc
index 371ac233..2172444f 100644
--- a/src/ui/articleview.cc
+++ b/src/ui/articleview.cc
@@ -4,7 +4,6 @@
 #include "articleview.hh"
 #include "dict/programs.hh"
 #include "folding.hh"
-#include "fulltextsearch.hh"
 #include "gddebug.hh"
 #include "gestures.hh"
 #include "globalbroadcaster.hh"
@@ -30,139 +29,25 @@
 #include <QWebEngineScriptCollection>
 #include <QWebEngineSettings>
 #include <map>
+#include <QApplication>
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5,0,0) && QT_VERSION < QT_VERSION_CHECK(6,0,0))
-#include <QWebEngineContextMenuData>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) && QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QWebEngineContextMenuData>
 #endif
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat/QRegExp>
-#include <QWebEngineContextMenuRequest>
-#include <QWebEngineFindTextResult>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat/QRegExp>
+  #include <QWebEngineContextMenuRequest>
+  #include <QWebEngineFindTextResult>
+  #include <utility>
 #endif
 #ifdef Q_OS_WIN32
-#include <windows.h>
-#include <QPainter>
+  #include <windows.h>
+  #include <QPainter>
 #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
-{
-protected:
-  QString normalizedString;
-  QVector< int > accentMarkPos;
-public:
-  AccentMarkHandler()          = default;
-  virtual ~AccentMarkHandler() = default;
-  static QChar accentMark()
-  { return QChar( 0x301 ); }
-
-  /// Create text without accent marks
-  /// and store mark positions
-  virtual void setText( QString const & baseString )
-  {
-    accentMarkPos.clear();
-    normalizedString.clear();
-    int pos = 0;
-    QChar mark = accentMark();
-
-    for ( auto const & str : baseString ) {
-      if ( str == mark ) {
-        accentMarkPos.append( pos );
-        continue;
-      }
-      normalizedString.append( str );
-      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( auto const accentPos: accentMarkPos)
-    {
-      if ( accentPos < pos )
-        newPos++;
-      else
-        break;
-    }
-    return newPos;
-  }
-};
-
-/// End of DslAccentMark class
-
-/// DiacriticsHandler class
-///
-/// Remove diacritics from text
-/// and mirror position in normalized text to original text
-
-class DiacriticsHandler : public AccentMarkHandler
-{
-public:
-  DiacriticsHandler() = default;
-  ~DiacriticsHandler() = default;
-
-  /// Create text without diacriticss
-  /// and store diacritic marks positions
-  void setText( QString const & baseString ) override
-  {
-    accentMarkPos.clear();
-    normalizedString.clear();
-
-    gd::wstring baseText = gd::toWString( baseString );
-    gd::wstring normText;
-
-    int pos = 0;
-    normText.reserve( baseText.size() );
-
-    gd::wchar const * nextChar = baseText.data();
-    size_t consumed;
-
-    for( size_t left = baseText.size(); left; )
-    {
-      if( *nextChar >= 0x10000U )
-      {
-        // Will be translated into surrogate pair
-        normText.push_back( *nextChar );
-        pos += 2;
-        nextChar++; left--;
-        continue;
-      }
-
-      gd::wchar ch = *nextChar;
-
-      if( Folding::isCombiningMark( ch ) )
-      {
-        accentMarkPos.append( pos );
-        nextChar++; left--;
-        continue;
-      }
-
-      normText.push_back( ch );
-      pos += 1;
-      nextChar += 1;
-      left -= 1;
-    }
-    normalizedString = QString::fromStdU32String( normText );
-  }
-};
-/// End of DiacriticsHandler class
-
-void ArticleView::emitJavascriptFinished(){
-    emit notifyJavascriptFinished();
-}
 
 namespace {
 
@@ -176,7 +61,7 @@ bool isScrollTo( QString const & id )
 QString dictionaryIdFromScrollTo( QString const & scrollTo )
 {
   Q_ASSERT( isScrollTo( scrollTo ) );
-  const int scrollToPrefixLength = 7;
+  constexpr int scrollToPrefixLength = 7;
   return scrollTo.mid( scrollToPrefixLength );
 }
 
@@ -201,14 +86,17 @@ QString ArticleView::scrollToFromDictionaryId( QString const & dictionaryId )
   return scrollToPrefix + dictionaryId;
 }
 
-ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, AudioPlayerPtr const & audioPlayer_,
+ArticleView::ArticleView( QWidget * parent,
+                          ArticleNetworkAccessManager & nm,
+                          AudioPlayerPtr const & audioPlayer_,
                           std::vector< sptr< Dictionary::Class > > const & allDictionaries_,
-                          Instances::Groups const & groups_, bool popupView_, Config::Class const & cfg_,
+                          Instances::Groups const & groups_,
+                          bool popupView_,
+                          Config::Class const & cfg_,
                           QAction & openSearchAction_,
                           QLineEdit const * translateLine_,
                           QAction * dictionaryBarToggled_,
-                          GroupComboBox const * groupComboBox_
-                        ):
+                          GroupComboBox const * groupComboBox_ ):
   QWidget( parent ),
   articleNetMgr( nm ),
   audioPlayer( audioPlayer_ ),
@@ -230,6 +118,9 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
   groupComboBox( groupComboBox_ ),
   translateLine( translateLine_ )
 {
+  if ( groupComboBox_ )
+    currentGroupId = groupComboBox_->getCurrentGroup();
+
   // setup GUI
   webview        = new ArticleWebView( this );
   ftsSearchPanel = new FtsSearchPanel( this );
@@ -291,7 +182,7 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
 
   connect( webview, &QWidget::customContextMenuRequested, this, &ArticleView::contextMenuRequested );
 
-  connect( webview->page(), SIGNAL( linkHovered( const QString & ) ), this, SLOT( linkHovered( const QString & ) ) );
+  connect( webview->page(), &QWebEnginePage::linkHovered, this, &ArticleView::linkHovered );
 
   connect( webview, &ArticleWebView::doubleClicked, this, &ArticleView::doubleClicked );
 
@@ -333,7 +224,7 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
 
   QWebEngineSettings * settings = webview->settings();
   settings->setUnknownUrlSchemePolicy( QWebEngineSettings::UnknownUrlSchemePolicy::DisallowUnknownUrlSchemes );
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
   settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessRemoteUrls, true );
   settings->defaultSettings()->setAttribute( QWebEngineSettings::LocalContentCanAccessFileUrls, true );
   settings->defaultSettings()->setAttribute( QWebEngineSettings::ErrorPageEnabled, false );
@@ -361,24 +252,19 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
   // Variable name for store current selection range
   rangeVarName = QString( "sr_%1" ).arg( QString::number( (quint64)this, 16 ) );
 
-  const bool fromMainWindow = parent && parent->objectName() == "MainWindow";
-  if ( fromMainWindow ) {
-    connect( GlobalBroadcaster::instance(),
-             &GlobalBroadcaster::dictionaryChanges,
-             this,
-             &ArticleView::setActiveDictIds );
 
-    connect( GlobalBroadcaster::instance(), &GlobalBroadcaster::dictionaryClear, this, &ArticleView::dictionaryClear );
-  }
+  connect( GlobalBroadcaster::instance(), &GlobalBroadcaster::dictionaryChanges, this, &ArticleView::setActiveDictIds );
+
+  connect( GlobalBroadcaster::instance(), &GlobalBroadcaster::dictionaryClear, this, &ArticleView::dictionaryClear );
+
 
   channel = new QWebChannel( webview->page() );
-  agent = new ArticleViewAgent(this);
+  agent   = new ArticleViewAgent( this );
   attachWebChannelToHtml();
   ankiConnector = new AnkiConnector( this, cfg );
-  connect( ankiConnector,
-           &AnkiConnector::errorText,
-           this,
-           [ this ]( QString const & errorText ) { emit statusBarMessage( errorText ); } );
+  connect( ankiConnector, &AnkiConnector::errorText, this, [ this ]( QString const & errorText ) {
+    emit statusBarMessage( errorText );
+  } );
 
   // Set up an Anki action if Anki integration is enabled in settings.
   if ( cfg.preferences.ankiConnectServer.enabled ) {
@@ -390,11 +276,18 @@ ArticleView::ArticleView( QWidget * parent, ArticleNetworkAccessManager & nm, Au
 
 // explicitly report the minimum size, to avoid
 // sidebar widgets' improper resize during restore
-QSize ArticleView::minimumSizeHint() const { return searchPanel->minimumSizeHint(); }
-
-void ArticleView::setGroupComboBox( GroupComboBox const * g )
+QSize ArticleView::minimumSizeHint() const
 {
-  groupComboBox = g;
+  return searchPanel->minimumSizeHint();
+}
+
+void ArticleView::setCurrentGroupId( unsigned currentGrgId )
+{
+  currentGroupId = currentGrgId;
+}
+unsigned ArticleView::getCurrentGroupId()
+{
+  return currentGroupId;
 }
 
 ArticleView::~ArticleView()
@@ -406,12 +299,14 @@ ArticleView::~ArticleView()
   webview->ungrabGesture( Gestures::GDSwipeGestureType );
 }
 
-void ArticleView::showDefinition( QString const & word, unsigned group,
+void ArticleView::showDefinition( QString const & word,
+                                  unsigned group,
                                   QString const & scrollTo,
                                   Contexts const & contexts_ )
 {
+  GlobalBroadcaster::instance()->pronounce_engine.reset();
   currentWord = word.trimmed();
-  if( currentWord.isEmpty() )
+  if ( currentWord.isEmpty() )
     return;
   historyMode = false;
   currentActiveDictIds.clear();
@@ -425,27 +320,23 @@ void ArticleView::showDefinition( QString const & word, unsigned group,
   req.setHost( "localhost" );
   Utils::Url::addQueryItem( req, "word", word );
   Utils::Url::addQueryItem( req, "group", QString::number( group ) );
-  if( cfg.preferences.ignoreDiacritics )
+  if ( cfg.preferences.ignoreDiacritics )
     Utils::Url::addQueryItem( req, "ignore_diacritics", "1" );
 
   if ( scrollTo.size() )
     Utils::Url::addQueryItem( req, "scrollto", scrollTo );
 
-  if( delayedHighlightText.size() )
-  {
+  if ( delayedHighlightText.size() ) {
     Utils::Url::addQueryItem( req, "regexp", delayedHighlightText );
     delayedHighlightText.clear();
   }
 
-  Contexts::Iterator pos = contexts.find( "gdanchor" );
-  if( pos != contexts.end() )
-  {
+  if ( Contexts::Iterator pos = contexts.find( "gdanchor" ); pos != contexts.end() ) {
     Utils::Url::addQueryItem( req, "gdanchor", contexts[ "gdanchor" ] );
     contexts.erase( pos );
   }
 
-  if ( contexts.size() )
-  {
+  if ( contexts.size() ) {
     QBuffer buf;
 
     buf.open( QIODevice::WriteOnly );
@@ -456,13 +347,13 @@ void ArticleView::showDefinition( QString const & word, unsigned group,
 
     buf.close();
 
-    Utils::Url::addQueryItem( req,  "contexts", QString::fromLatin1( buf.buffer().toBase64() ) );
+    Utils::Url::addQueryItem( req, "contexts", QString::fromLatin1( buf.buffer().toBase64() ) );
   }
 
   QString mutedDicts = getMutedForGroup( group );
 
   if ( mutedDicts.size() )
-    Utils::Url::addQueryItem( req,  "muted", mutedDicts );
+    Utils::Url::addQueryItem( req, "muted", mutedDicts );
 
   // Update headwords history
   emit sendWordToHistory( word );
@@ -476,14 +367,16 @@ void ArticleView::showDefinition( QString const & word, unsigned group,
   webview->setCursor( Qt::WaitCursor );
 }
 
-void ArticleView::showDefinition( QString const & word, QStringList const & dictIDs,
-                                  QRegExp const & searchRegExp, unsigned group,
+void ArticleView::showDefinition( QString const & word,
+                                  QStringList const & dictIDs,
+                                  QRegExp const & searchRegExp,
+                                  unsigned group,
                                   bool ignoreDiacritics )
 {
-  if( dictIDs.isEmpty() )
+  if ( dictIDs.isEmpty() )
     return;
   currentWord = word.trimmed();
-  if( currentWord.isEmpty() )
+  if ( currentWord.isEmpty() )
     return;
   historyMode = false;
   // first, let's stop the player
@@ -494,14 +387,14 @@ void ArticleView::showDefinition( QString const & word, QStringList const & dict
   req.setScheme( "gdlookup" );
   req.setHost( "localhost" );
   Utils::Url::addQueryItem( req, "word", word );
-  Utils::Url::addQueryItem( req, "dictionaries", dictIDs.join( ",") );
+  Utils::Url::addQueryItem( req, "dictionaries", dictIDs.join( "," ) );
   Utils::Url::addQueryItem( req, "regexp", searchRegExp.pattern() );
-  if( searchRegExp.caseSensitivity() == Qt::CaseSensitive )
+  if ( searchRegExp.caseSensitivity() == Qt::CaseSensitive )
     Utils::Url::addQueryItem( req, "matchcase", "1" );
-  if( searchRegExp.patternSyntax() == QRegExp::WildcardUnix )
+  if ( searchRegExp.patternSyntax() == QRegExp::WildcardUnix )
     Utils::Url::addQueryItem( req, "wildcards", "1" );
   Utils::Url::addQueryItem( req, "group", QString::number( group ) );
-  if( ignoreDiacritics )
+  if ( ignoreDiacritics )
     Utils::Url::addQueryItem( req, "ignore_diacritics", "1" );
 
   // Update headwords history
@@ -529,30 +422,29 @@ void ArticleView::showAnticipation()
   webview->setCursor( Qt::WaitCursor );
 }
 
-void ArticleView::inspectElement() { emit inspectSignal( webview->page() ); }
+void ArticleView::inspectElement()
+{
+  emit inspectSignal( webview->page() );
+}
 
 void ArticleView::loadFinished( bool result )
 {
   setZoomFactor( cfg.preferences.zoomFactor );
   QUrl url = webview->url();
   qDebug() << "article view loaded url:" << url.url().left( 200 ) << result;
-  
-  if( url.url() == "about:blank" )
-  {
+
+  if ( url.url() == "about:blank" ) {
     return;
   }
 
-  if( !result )
-  {
-    qWarning() << "article loaded unsuccessful"; 
+  if ( !result ) {
+    qWarning() << "article loaded unsuccessful";
     return;
   }
 
-  if( cfg.preferences.autoScrollToTargetArticle )
-  {
+  if ( cfg.preferences.autoScrollToTargetArticle ) {
     QString const scrollTo = Utils::Url::queryItemValue( url, "scrollto" );
-    if( isScrollTo( scrollTo ) )
-    {
+    if ( isScrollTo( scrollTo ) ) {
       setCurrentArticle( scrollTo, true );
     }
   }
@@ -562,7 +454,7 @@ void ArticleView::loadFinished( bool result )
   // Expand collapsed article if only one loaded
   webview->page()->runJavaScript( QString( "gdCheckArticlesNumber();" ) );
 
-  if( !Utils::Url::queryItemValue( url, "gdanchor" ).isEmpty() ) {
+  if ( !Utils::Url::queryItemValue( url, "gdanchor" ).isEmpty() ) {
     const QString anchor = QUrl::fromPercentEncoding( Utils::Url::encodedQueryItemValue( url, "gdanchor" ) );
 
     // Find GD anchor on page
@@ -574,16 +466,16 @@ void ArticleView::loadFinished( bool result )
 
   //the click audio url such as gdau://xxxx ,webview also emit a pageLoaded signal but with the result is false.need future investigation.
   //the audio link click ,no need to emit pageLoaded signal
-  if(result){
+  if ( result ) {
     emit pageLoaded( this );
   }
-  if( Utils::Url::hasQueryItem( webview->url(), "regexp" ) )
+  if ( Utils::Url::hasQueryItem( webview->url(), "regexp" ) )
     highlightFTSResults();
 }
 
 void ArticleView::handleTitleChanged( QString const & title )
 {
-  if( !title.isEmpty() ) // Qt 5.x WebKit raise signal titleChanges(QString()) while navigation within page
+  if ( !title.isEmpty() ) // Qt 5.x WebKit raise signal titleChanges(QString()) while navigation within page
     emit titleChanged( this, title );
 }
 
@@ -591,10 +483,7 @@ void ArticleView::handleUrlChanged( QUrl const & url )
 {
   QIcon icon;
 
-  unsigned group = getGroup( url );
-
-  if ( group )
-  {
+  if ( unsigned group = getGroup( url ) ) {
     // Find the group's instance corresponding to the fragment value
     for ( auto const & g : groups ) {
       if ( g.id == group ) {
@@ -623,26 +512,25 @@ QStringList ArticleView::getArticlesList()
 
 QString ArticleView::getActiveArticleId()
 {
-    return activeDictId;
+  return activeDictId;
 }
 
-void ArticleView::setActiveArticleId(QString const & dictId){
-    this->activeDictId=dictId;
+void ArticleView::setActiveArticleId( QString const & dictId )
+{
+  this->activeDictId = dictId;
 }
 
 QString ArticleView::getCurrentArticle()
 {
-  QString dictId=getActiveArticleId();
+  const QString dictId = getActiveArticleId();
   return scrollToFromDictionaryId( dictId );
 }
 
 void ArticleView::jumpToDictionary( QString const & id, bool force )
 {
-  QString targetArticle = scrollToFromDictionaryId( id );
 
   // jump only if neceessary, or when forced
-  if ( force || targetArticle != getCurrentArticle() )
-  {
+  if ( const QString targetArticle = scrollToFromDictionaryId( id ); force || targetArticle != getCurrentArticle() ) {
     setCurrentArticle( targetArticle, true );
   }
 }
@@ -652,15 +540,16 @@ bool ArticleView::setCurrentArticle( QString const & id, bool moveToIt )
   if ( !isScrollTo( id ) )
     return false; // Incorrect id
 
-  if( !webview->isVisible() )
+  if ( !webview->isVisible() )
     return false; // No action on background page, scrollIntoView there don't work
 
-  if(moveToIt){
+  if ( moveToIt ) {
     QString dictId = id.mid( 7 );
-    if( dictId.isEmpty() )
+    if ( dictId.isEmpty() )
       return false;
-    QString script = QString( "var elem=document.getElementById('%1'); "
-                              "if(elem!=undefined){elem.scrollIntoView(true);} gdMakeArticleActive('%2',true);" )
+    QString script = QString(
+                       "var elem=document.getElementById('%1'); "
+                       "if(elem!=undefined){elem.scrollIntoView(true);} gdMakeArticleActive('%2',true);" )
                        .arg( id, dictId );
     onJsActiveArticleChanged( id );
     webview->page()->runJavaScript( script );
@@ -679,7 +568,7 @@ void ArticleView::selectCurrentArticle()
 
 void ArticleView::isFramedArticle( QString const & ca, const std::function< void( bool ) > & callback )
 {
-  if( ca.isEmpty() )
+  if ( ca.isEmpty() )
     callback( false );
 
   webview->page()->runJavaScript( QString( "!!document.getElementById('gdexpandframe-%1');" ).arg( ca.mid( 7 ) ),
@@ -690,30 +579,32 @@ void ArticleView::isFramedArticle( QString const & ca, const std::function< void
 
 bool ArticleView::isExternalLink( QUrl const & url )
 {
-  return Utils::isExternalLink(url);
+  return Utils::isExternalLink( url );
 }
 
 void ArticleView::tryMangleWebsiteClickedUrl( QUrl & url, Contexts & contexts )
 {
   // Don't try mangling audio urls, even if they are from the framed websites
 
-  if( ( url.scheme() == "http" || url.scheme() == "https" ) && !Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
-  {
+  if ( ( url.scheme() == "http" || url.scheme() == "https" )
+       && !Dictionary::WebMultimediaDownload::isAudioUrl( url ) ) {
     // Maybe a link inside a website was clicked?
 
     QString ca = getCurrentArticle();
-    isFramedArticle( ca, []( bool framed ){} );
+    isFramedArticle( ca, []( bool framed ) {} );
   }
 }
 
-void ArticleView::load( QUrl const & url ) { webview->load( url ); }
+void ArticleView::load( QUrl const & url )
+{
+  webview->load( url );
+}
 
 void ArticleView::cleanupTemp()
 {
   auto it = desktopOpenedTempFiles.begin();
-  while( it != desktopOpenedTempFiles.end() )
-  {
-    if( QFile::remove( *it ) )
+  while ( it != desktopOpenedTempFiles.end() ) {
+    if ( QFile::remove( *it ) )
       it = desktopOpenedTempFiles.erase( it );
     else
       ++it;
@@ -722,43 +613,36 @@ void ArticleView::cleanupTemp()
 
 bool ArticleView::handleF3( QObject * /*obj*/, QEvent * ev )
 {
-  if ( ev->type() == QEvent::ShortcutOverride
-       || ev->type() == QEvent::KeyPress )
-  {
-    QKeyEvent * ke = static_cast<QKeyEvent *>( ev );
+  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() )
-      {
-        if( ev->type() == QEvent::KeyPress )
+      if ( !ke->modifiers() ) {
+        if ( ev->type() == QEvent::KeyPress )
           on_searchNext_clicked();
 
         ev->accept();
         return true;
       }
 
-      if ( ke->modifiers() == Qt::ShiftModifier )
-      {
-        if( ev->type() == QEvent::KeyPress )
+      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 )
+    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 )
-      {
-        if( ev->type() == QEvent::KeyPress )
+      if ( ke->modifiers() == Qt::ShiftModifier ) {
+        if ( ev->type() == QEvent::KeyPress )
           on_ftsSearchPrevious_clicked();
 
         ev->accept();
@@ -774,8 +658,7 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
 {
 #ifdef Q_OS_MAC
 
-  if( ev->type() == QEvent::NativeGesture )
-  {
+  if ( ev->type() == QEvent::NativeGesture ) {
     qDebug() << "it's a Native Gesture!";
     // handle Qt::ZoomNativeGesture Qt::SmartZoomNativeGesture here
     // ignore swipe left/right.
@@ -783,43 +666,48 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
   }
 
 #else
-  if( ev->type() == QEvent::Gesture )
-  {
+  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 )
+    if ( handled ) {
+      if ( result == Gestures::ZOOM_IN )
         emit zoomIn();
-      else
-      if( result == Gestures::ZOOM_OUT )
+      else if ( result == Gestures::ZOOM_OUT )
         emit zoomOut();
-      else
-      if( result == Gestures::SWIPE_LEFT )
+      else if ( result == Gestures::SWIPE_LEFT )
         back();
-      else
-      if( result == Gestures::SWIPE_RIGHT )
+      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 );
+      else if ( result == Gestures::SWIPE_UP || result == Gestures::SWIPE_DOWN ) {
+        int delta        = result == Gestures::SWIPE_UP ? -120 : 120;
+        QWidget * widget = static_cast< QWidget * >( obj );
 
-        QPoint angleDelta(0, delta);
+        QPoint angleDelta( 0, delta );
         QPoint pixelDetal;
-        QWidget *child = widget->childAt( widget->mapFromGlobal( pt ) );
-        if( child )
-        {
-          QWheelEvent whev( child->mapFromGlobal( pt ), pt,  pixelDetal,angleDelta, Qt::NoButton, Qt::NoModifier,Qt::NoScrollPhase,false);
+        QWidget * child = widget->childAt( widget->mapFromGlobal( pt ) );
+        if ( child ) {
+          QWheelEvent whev( child->mapFromGlobal( pt ),
+                            pt,
+                            pixelDetal,
+                            angleDelta,
+                            Qt::NoButton,
+                            Qt::NoModifier,
+                            Qt::NoScrollPhase,
+                            false );
           qApp->sendEvent( child, &whev );
         }
-        else
-        {
-          QWheelEvent whev( widget->mapFromGlobal( pt ), pt,pixelDetal, angleDelta,Qt::NoButton, Qt::NoModifier,Qt::NoScrollPhase,false );
+        else {
+          QWheelEvent whev( widget->mapFromGlobal( pt ),
+                            pt,
+                            pixelDetal,
+                            angleDelta,
+                            Qt::NoButton,
+                            Qt::NoModifier,
+                            Qt::NoScrollPhase,
+                            false );
           qApp->sendEvent( widget, &whev );
         }
       }
@@ -829,23 +717,20 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
   }
 #endif
 
-  if( ev->type() == QEvent::MouseMove )
-  {
-    if( Gestures::isFewTouchPointsPresented() )
-    {
+  if ( ev->type() == QEvent::MouseMove ) {
+    if ( Gestures::isFewTouchPointsPresented() ) {
       ev->accept();
       return true;
     }
   }
 
-  if ( handleF3( obj, ev ) )
-  {
+  if ( handleF3( obj, ev ) ) {
     return true;
   }
 
-  if( obj == webview ) {
-    if( ev->type() == QEvent::MouseButtonPress ) {
-      QMouseEvent * event = static_cast< QMouseEvent * >( ev );
+  if ( obj == webview ) {
+    if ( ev->type() == QEvent::MouseButtonPress ) {
+      auto event = static_cast< QMouseEvent * >( ev );
       if ( event->button() == Qt::XButton1 ) {
         back();
         return true;
@@ -855,39 +740,29 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
         return true;
       }
     }
-    else
-    if ( ev->type() == QEvent::KeyPress )
-    {
-      QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
+    else if ( ev->type() == QEvent::KeyPress ) {
+      auto keyEvent = static_cast< QKeyEvent * >( ev );
 
-      if ( keyEvent->modifiers() &
-           ( Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier ) )
+      if ( keyEvent->modifiers() & ( Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier ) )
         return false; // A non-typing modifier is pressed
 
-      if ( Utils::ignoreKeyEvent(keyEvent)||
-           keyEvent->key() == Qt::Key_Return ||
-           keyEvent->key() == Qt::Key_Enter )
+      if ( Utils::ignoreKeyEvent( keyEvent ) || 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();
 
-      if ( text.size() )
-      {
+      if ( text.size() ) {
         emit typingEvent( text );
         return true;
       }
     }
-    else if( ev->type() == QEvent::Wheel )
-    {
+    else if ( ev->type() == QEvent::Wheel ) {
       QWheelEvent * pe = static_cast< QWheelEvent * >( ev );
-      if( pe->modifiers().testFlag( Qt::ControlModifier ) )
-      {
-        if( pe->angleDelta().y() > 0 )
-        {
+      if ( pe->modifiers().testFlag( Qt::ControlModifier ) ) {
+        if ( pe->angleDelta().y() > 0 ) {
           zoomIn();
         }
-        else
-        {
+        else {
           zoomOut();
         }
       }
@@ -901,65 +776,62 @@ bool ArticleView::eventFilter( QObject * obj, QEvent * ev )
 
 QString ArticleView::getMutedForGroup( unsigned group )
 {
-  if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() )
-  {
+  if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() ) {
     // Dictionary bar is active -- mute the muted dictionaries
     Instances::Group const * groupInstance = groups.findGroup( group );
 
     // Find muted dictionaries for current group
     Config::Group const * grp = cfg.getGroup( group );
     Config::MutedDictionaries const * mutedDictionaries;
-    if( group == Instances::Group::AllGroupId )
+    if ( group == Instances::Group::AllGroupId )
       mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
     else
-        mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
-    if( !mutedDictionaries )
+      mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
+    if ( !mutedDictionaries )
       return QString();
 
     QStringList mutedDicts;
 
-    if ( groupInstance )
-    {
-      for( unsigned x = 0; x < groupInstance->dictionaries.size(); ++x )
-      {
-        QString id = QString::fromStdString(
-                       groupInstance->dictionaries[ x ]->getId() );
+    if ( groupInstance ) {
+      for ( const auto & dictionarie : groupInstance->dictionaries ) {
+        QString id = QString::fromStdString( dictionarie->getId() );
 
         if ( mutedDictionaries->contains( id ) )
           mutedDicts.append( id );
       }
     }
 
-    if ( mutedDicts.size() )
+    if ( !mutedDicts.empty() )
       return mutedDicts.join( "," );
   }
 
   return QString();
 }
 
-QStringList ArticleView::getMutedDictionaries(unsigned group) {
-  if (dictionaryBarToggled && dictionaryBarToggled->isChecked()) {
+QStringList ArticleView::getMutedDictionaries( unsigned group )
+{
+  if ( dictionaryBarToggled && dictionaryBarToggled->isChecked() ) {
     // Dictionary bar is active -- mute the muted dictionaries
-    Instances::Group const *groupInstance = groups.findGroup(group);
+    Instances::Group const * groupInstance = groups.findGroup( group );
 
     // Find muted dictionaries for current group
-    Config::Group const *grp = cfg.getGroup(group);
-    Config::MutedDictionaries const *mutedDictionaries;
-    if (group == Instances::Group::AllGroupId)
+    Config::Group const * grp = cfg.getGroup( group );
+    Config::MutedDictionaries const * mutedDictionaries;
+    if ( group == Instances::Group::AllGroupId )
       mutedDictionaries = popupView ? &cfg.popupMutedDictionaries : &cfg.mutedDictionaries;
     else
-      mutedDictionaries = grp ? (popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries) : nullptr;
-    if (!mutedDictionaries)
+      mutedDictionaries = grp ? ( popupView ? &grp->popupMutedDictionaries : &grp->mutedDictionaries ) : nullptr;
+    if ( !mutedDictionaries )
       return QStringList();
 
     QStringList mutedDicts;
 
-    if (groupInstance) {
-      for (unsigned x = 0; x < groupInstance->dictionaries.size(); ++x) {
-        QString id = QString::fromStdString(groupInstance->dictionaries[x]->getId());
+    if ( groupInstance ) {
+      for ( const auto & dictionarie : groupInstance->dictionaries ) {
+        QString id = QString::fromStdString( dictionarie->getId() );
 
-        if (mutedDictionaries->contains(id))
-          mutedDicts.append(id);
+        if ( mutedDictionaries->contains( id ) )
+          mutedDicts.append( id );
       }
     }
 
@@ -969,87 +841,70 @@ QStringList ArticleView::getMutedDictionaries(unsigned group) {
   return QStringList();
 }
 
-void ArticleView::linkHovered ( const QString & link )
+void ArticleView::linkHovered( const QString & link )
 {
   QString msg;
-  QUrl url(link);
+  QUrl url( link );
 
-  if ( url.scheme() == "bres" )
-  {
+  if ( url.scheme() == "bres" ) {
     msg = tr( "Resource" );
   }
-  else
-  if ( url.scheme() == "gdau" || Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
-  {
+  else if ( url.scheme() == "gdau" || Dictionary::WebMultimediaDownload::isAudioUrl( url ) ) {
     msg = tr( "Audio" );
   }
-  else
-  if ( url.scheme() == "gdtts" )
-  {
+  else if ( url.scheme() == "gdtts" ) {
     msg = tr( "TTS Voice" );
   }
-  else
-  if ( url.scheme() == "gdpicture" )
-  {
+  else if ( url.scheme() == "gdpicture" ) {
     msg = tr( "Picture" );
   }
-  else
-  if ( url.scheme() == "gdvideo" )
-  {
-    if ( url.path().isEmpty() )
-    {
+  else if ( url.scheme() == "gdvideo" ) {
+    if ( url.path().isEmpty() ) {
       msg = tr( "Video" );
     }
-    else
-    {
+    else {
       QString path = url.path();
-      if ( path.startsWith( '/' ) )
-      {
+      if ( path.startsWith( '/' ) ) {
         path = path.mid( 1 );
       }
       msg = tr( "Video: %1" ).arg( path );
     }
   }
-  else
-  if (url.scheme() == "gdlookup" || url.scheme().compare( "bword" ) == 0)
-  {
+  else if ( url.scheme() == "gdlookup" || url.scheme().compare( "bword" ) == 0 ) {
     QString def = url.path();
-    if (def.startsWith("/"))
-    {
+    if ( def.startsWith( "/" ) ) {
       def = def.mid( 1 );
     }
 
-    if( Utils::Url::hasQueryItem( url, "dict" ) )
-    {
+    if ( Utils::Url::hasQueryItem( url, "dict" ) ) {
       // Link to other dictionary
       QString dictName( Utils::Url::queryItemValue( url, "dict" ) );
-      if( !dictName.isEmpty() )
-        msg = tr( "Definition from dictionary \"%1\": %2" ).arg( dictName , def );
+      if ( !dictName.isEmpty() )
+        msg = tr( "Definition from dictionary \"%1\": %2" ).arg( dictName, def );
     }
 
-    if( msg.isEmpty() )
-    {
-      if( def.isEmpty() && url.hasFragment() )
+    if ( msg.isEmpty() ) {
+      if ( def.isEmpty() && url.hasFragment() )
         msg = '#' + url.fragment(); // this must be a citation, footnote or backlink
       else
-        msg = tr( "Definition: %1").arg( def );
+        msg = tr( "Definition: %1" ).arg( def );
     }
   }
-  else
-  {
+  else {
     msg = link;
   }
 
   emit statusBarMessage( msg );
 }
 
-void ArticleView::attachWebChannelToHtml() {
+void ArticleView::attachWebChannelToHtml()
+{
   // set the web channel to be used by the page
   // see http://doc.qt.io/qt-5/qwebenginepage.html#setWebChannel
-  webview->page()->setWebChannel(channel, QWebEngineScript::MainWorld);
+  webview->page()->setWebChannel( channel, QWebEngineScript::MainWorld );
 
   // register QObjects to be exposed to JavaScript
-  channel->registerObject(QStringLiteral("articleview"), agent);
+  channel->registerObject( QStringLiteral( "articleview" ), agent );
 }
 
 void ArticleView::linkClicked( QUrl const & url_ )
@@ -1057,7 +912,7 @@ void ArticleView::linkClicked( QUrl const & url_ )
   Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
 
   // Lock jump on links while Alt key is pressed
-  if( kmod & Qt::AltModifier )
+  if ( kmod & Qt::AltModifier )
     return;
 
   QUrl url( url_ );
@@ -1065,8 +920,8 @@ void ArticleView::linkClicked( QUrl const & url_ )
 
   tryMangleWebsiteClickedUrl( url, contexts );
 
-  if( !popupView && ( webview->isMidButtonPressed() || ( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) )
-      && !isAudioLink( url ) ) {
+  if ( !popupView && ( webview->isMidButtonPressed() || ( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) )
+       && !isAudioLink( url ) ) {
     // Mid button or Control/Shift is currently pressed - open the link in new tab
     webview->resetMidButtonPressed();
     emit openLinkInNewTab( url, webview->url(), getCurrentArticle(), contexts );
@@ -1078,7 +933,7 @@ void ArticleView::linkClicked( QUrl const & url_ )
 void ArticleView::linkClickedInHtml( QUrl const & url_ )
 {
   emit webview->linkClickedInHtml( url_ );
-  if( !url_.isEmpty() ) {
+  if ( !url_.isEmpty() ) {
     linkClicked( url_ );
   }
 }
@@ -1096,9 +951,8 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
   audioPlayer->stop();
   qDebug() << "open link url:" << url;
 
-  auto [valid, word] = Utils::Url::getQueryWord( url );
-  if( valid && word.isEmpty() )
-  {
+  auto [ valid, word ] = Utils::Url::getQueryWord( url );
+  if ( valid && word.isEmpty() ) {
     //if valid=true and word is empty,the url must be a invalid gdlookup url.
     //else if valid=false,the url should be external urls.
     return;
@@ -1106,9 +960,9 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
 
   Contexts contexts( contexts_ );
 
-  if( url.scheme().compare( "gdpicture" ) == 0 )
+  if ( url.scheme().compare( "gdpicture" ) == 0 )
     load( url );
-  else if( url.scheme().compare( "ankisearch" ) == 0 ) {
+  else if ( url.scheme().compare( "ankisearch" ) == 0 ) {
     ankiConnector->ankiSearch( url.path() );
     return;
   }
@@ -1124,64 +978,50 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
     qDebug() << "requested to make Anki card.";
     return;
   }
-  else if( url.scheme().compare( "bword" ) == 0 || url.scheme().compare( "entry" ) == 0 ) {
-    if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
-    {
-      QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" )
-                                          .split( ",", Qt::SkipEmptyParts );
+  else if ( url.scheme().compare( "bword" ) == 0 || url.scheme().compare( "entry" ) == 0 ) {
+    if ( Utils::Url::hasQueryItem( ref, "dictionaries" ) ) {
+      QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" ).split( ",", Qt::SkipEmptyParts );
 
       showDefinition( word, dictsList, QRegExp(), getGroup( ref ), false );
     }
     else
-      showDefinition( word,
-                      getGroup( ref ), scrollTo, contexts );
+      showDefinition( word, getGroup( ref ), scrollTo, contexts );
   }
-  else
-  if ( url.scheme() == "gdlookup" ) // Plain html links inherit gdlookup scheme
+  else if ( url.scheme() == "gdlookup" ) // Plain html links inherit gdlookup scheme
   {
-    if ( url.hasFragment() )
-    {
+    if ( url.hasFragment() ) {
       webview->page()->runJavaScript(
         QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
     }
-    else
-    {
-      if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
-      {
+    else {
+      if ( Utils::Url::hasQueryItem( ref, "dictionaries" ) ) {
         // Specific dictionary group from full-text search
-        QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" )
-                                            .split( ",", Qt::SkipEmptyParts );
+        QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" ).split( ",", Qt::SkipEmptyParts );
 
         showDefinition( url.path().mid( 1 ), dictsList, QRegExp(), getGroup( ref ), false );
         return;
       }
 
       QString newScrollTo( scrollTo );
-      if( Utils::Url::hasQueryItem( url, "dict" ) )
-      {
+      if ( Utils::Url::hasQueryItem( url, "dict" ) ) {
         // Link to other dictionary
         QString dictName( Utils::Url::queryItemValue( url, "dict" ) );
-        for( unsigned i = 0; i < allDictionaries.size(); i++ )
-        {
-          if( dictName.compare( QString::fromUtf8( allDictionaries[ i ]->getName().c_str() ) ) == 0 )
-          {
-            newScrollTo = scrollToFromDictionaryId( QString::fromUtf8( allDictionaries[ i ]->getId().c_str() ) );
+        for ( const auto & allDictionarie : allDictionaries ) {
+          if ( dictName.compare( QString::fromUtf8( allDictionarie->getName().c_str() ) ) == 0 ) {
+            newScrollTo = scrollToFromDictionaryId( QString::fromUtf8( allDictionarie->getId().c_str() ) );
             break;
           }
         }
       }
 
-      if( Utils::Url::hasQueryItem( url, "gdanchor" ) )
+      if ( Utils::Url::hasQueryItem( url, "gdanchor" ) )
         contexts[ "gdanchor" ] = Utils::Url::queryItemValue( url, "gdanchor" );
 
-      showDefinition( word,
-                      getGroup( ref ), newScrollTo, contexts );
+      showDefinition( word, getGroup( ref ), newScrollTo, contexts );
     }
   }
-  else
-  if ( url.scheme() == "bres" || url.scheme() == "gdau" || url.scheme() == "gdvideo" ||
-       Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
-  {
+  else if ( url.scheme() == "bres" || url.scheme() == "gdau" || url.scheme() == "gdvideo"
+            || Dictionary::WebMultimediaDownload::isAudioUrl( url ) ) {
     // Download it
 
     // Clear any pending ones
@@ -1190,68 +1030,53 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
 
     resourceDownloadUrl = url;
 
-    if ( Dictionary::WebMultimediaDownload::isAudioUrl( url ) )
-    {
-      sptr< Dictionary::DataRequest > req =
-        std::make_shared<Dictionary::WebMultimediaDownload>( url, articleNetMgr );
+    if ( Dictionary::WebMultimediaDownload::isAudioUrl( url ) ) {
+      sptr< Dictionary::DataRequest > req = std::make_shared< Dictionary::WebMultimediaDownload >( url, articleNetMgr );
 
       resourceDownloadRequests.push_back( req );
 
       connect( req.get(), &Dictionary::Request::finished, this, &ArticleView::resourceDownloadFinished );
     }
-    else
-    if ( url.scheme() == "gdau" && url.host() == "search" )
-    {
+    else if ( url.scheme() == "gdau" && url.host() == "search" ) {
       // Since searches should be limited to current group, we just do them
       // here ourselves since otherwise we'd need to pass group id to netmgr
       // and it should've been having knowledge of the current groups, too.
 
       unsigned currentGroup = getGroup( ref );
 
-      std::vector< sptr< Dictionary::Class > > const * activeDicts = 0;
+      std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
 
-      if ( groups.size() )
-      {
-        for( unsigned x = 0; x < groups.size(); ++x )
-          if ( groups[ x ].id == currentGroup )
-          {
-            activeDicts = &( groups[ x ].dictionaries );
+      if ( groups.size() ) {
+        for ( const auto & group : groups )
+          if ( group.id == currentGroup ) {
+            activeDicts = &( group.dictionaries );
             break;
           }
       }
       else
         activeDicts = &allDictionaries;
 
-      if ( activeDicts )
-      {
+      if ( activeDicts ) {
         unsigned preferred = UINT_MAX;
-        if( url.hasFragment() )
-        {
+        if ( url.hasFragment() ) {
           // Find sound in the preferred dictionary
           QString preferredName = Utils::Url::fragment( url );
-          try
-          {
-            for( unsigned x = 0; x < activeDicts->size(); ++x )
-            {
-              if( preferredName.compare( QString::fromUtf8( (*activeDicts)[ x ]->getName().c_str() ) ) == 0 )
-              {
+          try {
+            for ( unsigned x = 0; x < activeDicts->size(); ++x ) {
+              if ( preferredName.compare( QString::fromUtf8( ( *activeDicts )[ x ]->getName().c_str() ) ) == 0 ) {
                 preferred = x;
                 sptr< Dictionary::DataRequest > req =
-                  (*activeDicts)[ x ]->getResource(
-                    url.path().mid( 1 ).toUtf8().data() );
+                  ( *activeDicts )[ x ]->getResource( url.path().mid( 1 ).toUtf8().data() );
 
                 resourceDownloadRequests.push_back( req );
 
-                if ( !req->isFinished() )
-                {
+                if ( !req->isFinished() ) {
                   // Queued loading
                   connect( req.get(), &Dictionary::Request::finished, this, &ArticleView::resourceDownloadFinished );
                 }
-                else
-                {
+                else {
                   // Immediate loading
-                  if( req->dataSize() > 0 )
-                  {
+                  if ( req->dataSize() > 0 ) {
                     // Resource already found, stop next search
                     resourceDownloadFinished();
                     return;
@@ -1261,74 +1086,55 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
               }
             }
           }
-          catch( std::exception & e )
-          {
-            emit statusBarMessage(
-                tr("ERROR: %1").arg(e.what()),
-                10000, QPixmap(":/icons/error.svg"));
+          catch ( std::exception & e ) {
+            emit statusBarMessage( tr( "ERROR: %1" ).arg( e.what() ), 10000, QPixmap( ":/icons/error.svg" ) );
           }
         }
-        for( unsigned x = 0; x < activeDicts->size(); ++x )
-        {
-          try
-          {
-            if( x == preferred )
+        for ( unsigned x = 0; x < activeDicts->size(); ++x ) {
+          try {
+            if ( x == preferred )
               continue;
 
             sptr< Dictionary::DataRequest > req =
-              (*activeDicts)[ x ]->getResource(
-                url.path().mid( 1 ).toUtf8().data() );
+              ( *activeDicts )[ x ]->getResource( url.path().mid( 1 ).toUtf8().data() );
 
             resourceDownloadRequests.push_back( req );
 
-            if ( !req->isFinished() )
-            {
+            if ( !req->isFinished() ) {
               // Queued loading
               connect( req.get(), &Dictionary::Request::finished, this, &ArticleView::resourceDownloadFinished );
             }
-            else
-            {
+            else {
               // Immediate loading
-              if( req->dataSize() > 0 )
-              {
+              if ( req->dataSize() > 0 ) {
                 // Resource already found, stop next search
                 break;
               }
             }
           }
-          catch( std::exception & e )
-          {
-            emit statusBarMessage(
-                tr("ERROR: %1").arg(e.what()),
-                10000, QPixmap(":/icons/error.svg"));
+          catch ( std::exception & e ) {
+            emit statusBarMessage( tr( "ERROR: %1" ).arg( e.what() ), 10000, QPixmap( ":/icons/error.svg" ) );
           }
         }
       }
     }
-    else
-    {
+    else {
       // Normal resource download
       QString contentType;
 
-      sptr< Dictionary::DataRequest > req =
-        articleNetMgr.getResource( url, contentType );
+      sptr< Dictionary::DataRequest > req = articleNetMgr.getResource( url, contentType );
 
-      if ( !req.get() )
-      {
+      if ( !req.get() ) {
         // Request failed, fail
       }
-      else
-      if ( req->isFinished() && req->dataSize() >= 0 )
-      {
+      else if ( req->isFinished() && req->dataSize() >= 0 ) {
         // Have data ready, handle it
         resourceDownloadRequests.push_back( req );
         resourceDownloadFinished();
 
         return;
       }
-      else
-      if ( !req->isFinished() )
-      {
+      else if ( !req->isFinished() ) {
         // Queue to be handled when done
 
         resourceDownloadRequests.push_back( req );
@@ -1345,17 +1151,12 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
     else
       resourceDownloadFinished(); // Check any requests finished already
   }
-  else
-  if ( url.scheme() == "gdprg" )
-  {
+  else if ( url.scheme() == "gdprg" ) {
     // Program. Run it.
     QString id( url.host() );
 
-    for( Config::Programs::const_iterator i = cfg.programs.begin();
-         i != cfg.programs.end(); ++i )
-    {
-      if ( i->id == id )
-      {
+    for ( const auto & program : cfg.programs ) {
+      if ( program.id == id ) {
         // Found the corresponding program.
         Programs::RunInstance * req = new Programs::RunInstance;
 
@@ -1364,12 +1165,10 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
         QString error;
 
         // Delete the request if it fails to start
-        if ( !req->start( *i, url.path().mid( 1 ), error ) )
-        {
+        if ( !req->start( program, url.path().mid( 1 ), error ) ) {
           delete req;
 
-          QMessageBox::critical( this, "GoldenDict",
-                                 error );
+          QMessageBox::critical( this, "GoldenDict", error );
         }
 
         return;
@@ -1377,20 +1176,18 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
     }
 
     // Still here? No such program exists.
-    QMessageBox::critical( this, "GoldenDict",
-                           tr( "The referenced audio program doesn't exist." ) );
+    QMessageBox::critical( this, "GoldenDict", tr( "The referenced audio program doesn't exist." ) );
   }
-  else
-  if ( url.scheme() == "gdtts" ) {
+  else if ( url.scheme() == "gdtts" ) {
     // Text to speech
     QString md5Id = Utils::Url::queryItemValue( url, "engine" );
     QString text( url.path().mid( 1 ) );
 
-    for( const auto & voiceEngine : cfg.voiceEngines ) {
+    for ( const auto & voiceEngine : cfg.voiceEngines ) {
       QString itemMd5Id =
         QString( QCryptographicHash::hash( voiceEngine.name.toUtf8(), QCryptographicHash::Md5 ).toHex() );
 
-      if( itemMd5Id == md5Id ) {
+      if ( itemMd5Id == md5Id ) {
         SpeechClient * speechClient = new SpeechClient( voiceEngine, this );
         connect( speechClient, SIGNAL( finished() ), speechClient, SLOT( deleteLater() ) );
         speechClient->tell( text );
@@ -1398,9 +1195,7 @@ void ArticleView::openLink( QUrl const & url, QUrl const & ref, QString const &
       }
     }
   }
-  else
-  if ( isExternalLink( url ) )
-  {
+  else if ( isExternalLink( url ) ) {
     // Use the system handler for the conventional external links
     QDesktopServices::openUrl( url );
   }
@@ -1416,115 +1211,97 @@ ResourceToSaveHandler * ArticleView::saveResource( const QUrl & url, const QUrl
   ResourceToSaveHandler * handler = new ResourceToSaveHandler( this, fileName );
   sptr< Dictionary::DataRequest > req;
 
-  if( url.scheme() == "bres" || url.scheme() == "gico" || url.scheme() == "gdau" || url.scheme() == "gdvideo" )
-  {
-    if ( url.host() == "search" )
-    {
+  if ( url.scheme() == "bres" || url.scheme() == "gico" || url.scheme() == "gdau" || url.scheme() == "gdvideo" ) {
+    if ( url.host() == "search" ) {
       // Since searches should be limited to current group, we just do them
       // here ourselves since otherwise we'd need to pass group id to netmgr
       // and it should've been having knowledge of the current groups, too.
 
       unsigned currentGroup = getGroup( ref );
 
-      std::vector< sptr< Dictionary::Class > > const * activeDicts = 0;
+      std::vector< sptr< Dictionary::Class > > const * activeDicts = nullptr;
 
-      if ( groups.size() )
-      {
-        for( unsigned x = 0; x < groups.size(); ++x )
-          if ( groups[ x ].id == currentGroup )
-          {
-            activeDicts = &( groups[ x ].dictionaries );
+      if ( groups.size() ) {
+        for ( const auto & group : groups )
+          if ( group.id == currentGroup ) {
+            activeDicts = &( group.dictionaries );
             break;
           }
       }
       else
         activeDicts = &allDictionaries;
 
-      if ( activeDicts )
-      {
+      if ( activeDicts ) {
         unsigned preferred = UINT_MAX;
-        if( url.hasFragment() && url.scheme() == "gdau" )
-        {
+        if ( url.hasFragment() && url.scheme() == "gdau" ) {
           // Find sound in the preferred dictionary
           QString preferredName = Utils::Url::fragment( url );
-          for( unsigned x = 0; x < activeDicts->size(); ++x )
-          {
-            try
-            {
-              if( preferredName.compare( QString::fromUtf8( (*activeDicts)[ x ]->getName().c_str() ) ) == 0 )
-              {
+          for ( unsigned x = 0; x < activeDicts->size(); ++x ) {
+            try {
+              if ( preferredName.compare( QString::fromUtf8( ( *activeDicts )[ x ]->getName().c_str() ) ) == 0 ) {
                 preferred = x;
-                sptr< Dictionary::DataRequest > req =
-                  (*activeDicts)[ x ]->getResource(
-                    url.path().mid( 1 ).toUtf8().data() );
+                sptr< Dictionary::DataRequest > data_request =
+                  ( *activeDicts )[ x ]->getResource( url.path().mid( 1 ).toUtf8().data() );
 
-                handler->addRequest( req );
+                handler->addRequest( data_request );
 
-                if( req->isFinished() && req->dataSize() > 0 )
-                {
+                if ( data_request->isFinished() && data_request->dataSize() > 0 ) {
                   handler->downloadFinished();
                   return handler;
                 }
                 break;
               }
             }
-            catch( std::exception & e )
-            {
-              gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
-                         (*activeDicts)[ x ]->getName().c_str() );
+            catch ( std::exception & e ) {
+              gdWarning( "getResource request error (%s) in \"%s\"\n",
+                         e.what(),
+                         ( *activeDicts )[ x ]->getName().c_str() );
             }
           }
         }
-        for( unsigned x = 0; x < activeDicts->size(); ++x )
-        {
-          try
-          {
-            if( x == preferred )
+        for ( unsigned x = 0; x < activeDicts->size(); ++x ) {
+          try {
+            if ( x == preferred )
               continue;
 
-            req = (*activeDicts)[ x ]->getResource(
-                    Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
+            req = ( *activeDicts )[ x ]->getResource( Utils::Url::path( url ).mid( 1 ).toUtf8().data() );
 
             handler->addRequest( req );
 
-            if( req->isFinished() && req->dataSize() > 0 )
-            {
+            if ( req->isFinished() && req->dataSize() > 0 ) {
               // Resource already found, stop next search
               break;
             }
           }
-          catch( std::exception & e )
-          {
-            gdWarning( "getResource request error (%s) in \"%s\"\n", e.what(),
-                       (*activeDicts)[ x ]->getName().c_str() );
+          catch ( std::exception & e ) {
+            gdWarning( "getResource request error (%s) in \"%s\"\n",
+                       e.what(),
+                       ( *activeDicts )[ x ]->getName().c_str() );
           }
         }
       }
     }
-    else
-    {
+    else {
       // Normal resource download
       QString contentType;
       req = articleNetMgr.getResource( url, contentType );
 
-      if( req.get() )
-      {
+      if ( req.get() ) {
         handler->addRequest( req );
       }
     }
   }
-  else
-  {
-    req = std::make_shared<Dictionary::WebMultimediaDownload>( url, articleNetMgr );
+  else {
+    req = std::make_shared< Dictionary::WebMultimediaDownload >( url, articleNetMgr );
 
     handler->addRequest( req );
   }
 
   if ( handler->isEmpty() ) // No requests were queued
   {
-    emit statusBarMessage(
-        tr("ERROR: %1").arg(tr("The referenced resource doesn't exist.")),
-        10000, QPixmap(":/icons/error.svg"));
+    emit statusBarMessage( tr( "ERROR: %1" ).arg( tr( "The referenced resource doesn't exist." ) ),
+                           10000,
+                           QPixmap( ":/icons/error.svg" ) );
   }
 
   // Check already finished downloads
@@ -1547,14 +1324,13 @@ void ArticleView::updateMutedContents()
 
   QString mutedDicts = getMutedForGroup( group );
 
-  if ( Utils::Url::queryItemValue( currentUrl, "muted" ) != mutedDicts )
-  {
+  if ( Utils::Url::queryItemValue( currentUrl, "muted" ) != mutedDicts ) {
     // The list has changed -- update the url
 
     Utils::Url::removeQueryItem( currentUrl, "muted" );
 
     if ( mutedDicts.size() )
-    Utils::Url::addQueryItem( currentUrl, "muted", mutedDicts );
+      Utils::Url::addQueryItem( currentUrl, "muted", mutedDicts );
 
     load( currentUrl );
 
@@ -1570,11 +1346,17 @@ bool ArticleView::canGoBack()
   return webview->history()->currentItemIndex() > 1;
 }
 
-bool ArticleView::canGoForward() { return webview->history()->canGoForward(); }
+bool ArticleView::canGoForward()
+{
+  return webview->history()->canGoForward();
+}
 
-void ArticleView::setSelectionBySingleClick( bool set ) { webview->setSelectionBySingleClick( set ); }
+void ArticleView::setSelectionBySingleClick( bool set )
+{
+  webview->setSelectionBySingleClick( set );
+}
 
-void ArticleView::setDelayedHighlightText(QString const & text)
+void ArticleView::setDelayedHighlightText( QString const & text )
 {
   delayedHighlightText = text;
 }
@@ -1583,8 +1365,7 @@ void ArticleView::back()
 {
   // Don't allow navigating back to page 0, which is usually the initial
   // empty page
-  if ( canGoBack() )
-  {
+  if ( canGoBack() ) {
     currentActiveDictIds.clear();
     historyMode = true;
     webview->back();
@@ -1610,14 +1391,17 @@ void ArticleView::handleAnkiAction()
   }
 }
 
-void ArticleView::reload() { webview->reload(); }
+void ArticleView::reload()
+{
+  webview->reload();
+}
 
 void ArticleView::hasSound( const std::function< void( bool ) > & callback )
 {
-  webview->page()->runJavaScript( "if(typeof(gdAudioLinks)!=\"undefined\") gdAudioLinks.first",
+  webview->page()->runJavaScript( R"(if(typeof(gdAudioLinks)!="undefined") gdAudioLinks.first)",
                                   [ callback ]( const QVariant & v ) {
                                     bool has = false;
-                                    if( v.type() == QVariant::String )
+                                    if ( v.type() == QVariant::String )
                                       has = !v.toString().isEmpty();
                                     callback( has );
                                   } );
@@ -1626,16 +1410,16 @@ void ArticleView::hasSound( const std::function< void( bool ) > & callback )
 //use webengine javascript to playsound
 void ArticleView::playSound()
 {
-  QString variable = " (function(){  var link=gdAudioLinks[gdAudioLinks.current];           "
-    "   if(link==undefined){           "
-    "       link=gdAudioLinks.first;           "
-    "   }          "
-    "    return link;})();         ";
+  QString variable = R"( (function(){  var link=gdAudioMap.get(gdAudioLinks.current);           
+       if(link==undefined){           
+           link=gdAudioLinks.first;           
+       }          
+        return link;})();         )";
 
   webview->page()->runJavaScript( variable, [ this ]( const QVariant & result ) {
-    if( result.type() == QVariant::String ) {
+    if ( result.type() == QVariant::String ) {
       QString soundScript = result.toString();
-      if( !soundScript.isEmpty() )
+      if ( !soundScript.isEmpty() )
         openLink( QUrl::fromEncoded( soundScript.toUtf8() ), webview->url() );
     }
   } );
@@ -1659,7 +1443,10 @@ void ArticleView::setContent( const QByteArray & data, const QString & mimeType,
   webview->page()->setContent( data, mimeType, baseUrl );
 }
 
-QString ArticleView::getTitle() { return webview->page()->title(); }
+QString ArticleView::getTitle()
+{
+  return webview->page()->title();
+}
 
 QString ArticleView::getWord() const
 {
@@ -1670,20 +1457,18 @@ void ArticleView::print( QPrinter * printer ) const
 {
   QEventLoop loop;
   bool result;
-  auto printPreview = [ & ]( bool success )
-  {
+  auto printPreview = [ & ]( bool success ) {
     result = success;
     loop.quit();
   };
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
   webview->page()->print( printer, std::move( printPreview ) );
 #else
   connect( webview, &QWebEngineView::printFinished, &loop, std::move( printPreview ) );
   webview->print( printer );
 #endif
   loop.exec();
-  if( !result )
-  {
+  if ( !result ) {
     qDebug() << "print failed";
   }
 }
@@ -1694,48 +1479,43 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
   QWebEnginePage * r = webview->page();
   QMenu menu( this );
 
-  QAction * followLink = 0;
-  QAction * followLinkExternal = 0;
-  QAction * followLinkNewTab = 0;
-  QAction * lookupSelection           = 0;
-  QAction * lookupSelectionGr = 0;
-  QAction * lookupSelectionNewTab = 0;
-  QAction * lookupSelectionNewTabGr = 0;
-  QAction * maxDictionaryRefsAction = 0;
-  QAction * addWordToHistoryAction = 0;
-  QAction * addHeaderToHistoryAction = 0;
-  QAction * sendWordToInputLineAction = 0;
-  QAction * saveImageAction = 0;
-  QAction * saveSoundAction           = 0;
-  QAction * saveBookmark = 0;
+  QAction * followLink                = nullptr;
+  QAction * followLinkExternal        = nullptr;
+  QAction * followLinkNewTab          = nullptr;
+  QAction * lookupSelection           = nullptr;
+  QAction * lookupSelectionGr         = nullptr;
+  QAction * lookupSelectionNewTab     = nullptr;
+  QAction * lookupSelectionNewTabGr   = nullptr;
+  QAction * maxDictionaryRefsAction   = nullptr;
+  QAction * addWordToHistoryAction    = nullptr;
+  QAction * addHeaderToHistoryAction  = nullptr;
+  QAction * sendWordToInputLineAction = nullptr;
+  QAction * saveImageAction           = nullptr;
+  QAction * saveSoundAction           = nullptr;
+  QAction * saveBookmark              = nullptr;
 
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-  const QWebEngineContextMenuData * menuData = &(r->contextMenuData());
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  const QWebEngineContextMenuData * menuData = &( r->contextMenuData() );
 #else
   QWebEngineContextMenuRequest * menuData = webview->lastContextMenuRequest();
 #endif
-  QUrl targetUrl(menuData->linkUrl());
+  QUrl targetUrl( menuData->linkUrl() );
   Contexts contexts;
 
   tryMangleWebsiteClickedUrl( targetUrl, contexts );
 
-  if ( !targetUrl.isEmpty() )
-  {
-    if ( !isExternalLink( targetUrl ) )
-    {
+  if ( !targetUrl.isEmpty() ) {
+    if ( !isExternalLink( targetUrl ) ) {
       followLink = new QAction( tr( "Op&en Link" ), &menu );
       menu.addAction( followLink );
 
-      if( !popupView && !isAudioLink( targetUrl ) )
-      {
-        followLinkNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
-                                        tr( "Open Link in New &Tab" ), &menu );
+      if ( !popupView && !isAudioLink( targetUrl ) ) {
+        followLinkNewTab = new QAction( QIcon( ":/icons/addtab.svg" ), tr( "Open Link in New &Tab" ), &menu );
         menu.addAction( followLinkNewTab );
       }
     }
 
-    if ( isExternalLink( targetUrl ) )
-    {
+    if ( isExternalLink( targetUrl ) ) {
       followLinkExternal = new QAction( tr( "Open Link in &External Browser" ), &menu );
       menu.addAction( followLinkExternal );
       menu.addAction( webview->pageAction( QWebEnginePage::CopyLinkToClipboard ) );
@@ -1743,86 +1523,67 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
   }
 
   QUrl imageUrl;
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-  if( !popupView && menuData->mediaType ()==QWebEngineContextMenuData::MediaTypeImage)
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  if ( !popupView && menuData->mediaType() == QWebEngineContextMenuData::MediaTypeImage )
 #else
-  if( !popupView && menuData->mediaType ()==QWebEngineContextMenuRequest::MediaType::MediaTypeImage)
+  if ( !popupView && menuData->mediaType() == QWebEngineContextMenuRequest::MediaType::MediaTypeImage )
 #endif
   {
     imageUrl = menuData->mediaUrl();
-    if( !imageUrl.isEmpty() ) {
+    if ( !imageUrl.isEmpty() ) {
       menu.addAction( webview->pageAction( QWebEnginePage::CopyImageToClipboard ) );
       saveImageAction = new QAction( tr( "Save &image..." ), &menu );
       menu.addAction( saveImageAction );
     }
   }
 
-  if( !popupView && isAudioLink( targetUrl ) )
-  {
-      saveSoundAction = new QAction( tr( "Save s&ound..." ), &menu );
-      menu.addAction( saveSoundAction );
+  if ( !popupView && isAudioLink( targetUrl ) ) {
+    saveSoundAction = new QAction( tr( "Save s&ound..." ), &menu );
+    menu.addAction( saveSoundAction );
   }
 
   QString const selectedText = webview->selectedText();
-  QString text         = Utils::trimNonChar( selectedText );
+  QString text               = Utils::trimNonChar( selectedText );
 
-  if ( text.size() && text.size() < 60 )
-  {
+  if ( text.size() && text.size() < 60 ) {
     // We don't prompt for selections larger or equal to 60 chars, since
     // it ruins the menu and it's hardly a single word anyway.
 
-    lookupSelection = new QAction( tr( "&Look up \"%1\"" ).
-                                   arg( text ),
-                                   &menu );
+    lookupSelection = new QAction( tr( "&Look up \"%1\"" ).arg( text ), &menu );
     menu.addAction( lookupSelection );
 
-    if ( !popupView )
-    {
-      lookupSelectionNewTab = new QAction( QIcon( ":/icons/addtab.svg" ),
-                                           tr( "Look up \"%1\" in &New Tab" ).
-                                           arg( text ),
-                                           &menu );
+    if ( !popupView ) {
+      lookupSelectionNewTab =
+        new QAction( QIcon( ":/icons/addtab.svg" ), tr( "Look up \"%1\" in &New Tab" ).arg( text ), &menu );
       menu.addAction( lookupSelectionNewTab );
 
-      sendWordToInputLineAction = new QAction( tr( "Send \"%1\" to input line" ).
-                                               arg( text ),
-                                               &menu );
+      sendWordToInputLineAction = new QAction( tr( "Send \"%1\" to input line" ).arg( text ), &menu );
       menu.addAction( sendWordToInputLineAction );
     }
 
-    addWordToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).
-                                          arg( text ),
-                                          &menu );
+    addWordToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).arg( text ), &menu );
     menu.addAction( addWordToHistoryAction );
 
     Instances::Group const * altGroup =
-      ( groupComboBox && groupComboBox->getCurrentGroup() != getGroup( webview->url() ) ) ?
-      groups.findGroup( groupComboBox->getCurrentGroup() ) :
-      0;
+      ( currentGroupId != getGroup( webview->url() ) ) ? groups.findGroup( currentGroupId ) : nullptr;
 
-    if ( altGroup )
-    {
-      QIcon icon = altGroup->icon.size() ? QIcon( ":/flags/" + altGroup->icon ) :
-                   QIcon();
+    if ( altGroup ) {
+      QIcon icon = altGroup->icon.size() ? QIcon( ":/flags/" + altGroup->icon ) : QIcon();
 
-      lookupSelectionGr = new QAction( icon, tr( "Look up \"%1\" in %2" ).
-                                       arg( text ).
-                                       arg( altGroup->name ), &menu );
+      lookupSelectionGr = new QAction( icon, tr( "Look up \"%1\" in %2" ).arg( text ).arg( altGroup->name ), &menu );
       menu.addAction( lookupSelectionGr );
 
-      if ( !popupView )
-      {
-        lookupSelectionNewTabGr = new QAction( QIcon( ":/icons/addtab.svg" ),
-                                               tr( "Look up \"%1\" in %2 in &New Tab" ).
-                                               arg( text ).
-                                               arg( altGroup->name ), &menu );
+      if ( !popupView ) {
+        lookupSelectionNewTabGr =
+          new QAction( QIcon( ":/icons/addtab.svg" ),
+                       tr( "Look up \"%1\" in %2 in &New Tab" ).arg( text ).arg( altGroup->name ),
+                       &menu );
         menu.addAction( lookupSelectionNewTabGr );
       }
     }
   }
 
-  if(text.size())
-  {
+  if ( text.size() ) {
     // avoid too long in the menu ,use left 30 characters.
     saveBookmark = new QAction( tr( "Save &Bookmark \"%1...\"" ).arg( text.left( 30 ) ), &menu );
     menu.addAction( saveBookmark );
@@ -1836,25 +1597,20 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
                                                                   tr( "&Send selected text to Anki" ) );
   }
 
-  if( text.isEmpty() && !cfg.preferences.storeHistory)
-  {
+  if ( text.isEmpty() && !cfg.preferences.storeHistory ) {
     QString txt = webview->title();
-    if( txt.size() > 60 )
+    if ( txt.size() > 60 )
       txt = txt.left( 60 ) + "...";
 
-    addHeaderToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).
-                                            arg( txt ),
-                                            &menu );
+    addHeaderToHistoryAction = new QAction( tr( "&Add \"%1\" to history" ).arg( txt ), &menu );
     menu.addAction( addHeaderToHistoryAction );
   }
 
-  if ( selectedText.size() )
-  {
+  if ( selectedText.size() ) {
     menu.addAction( webview->pageAction( QWebEnginePage::Copy ) );
     menu.addAction( &copyAsTextAction );
   }
-  else
-  {
+  else {
     menu.addAction( &selectCurrentArticleAction );
     menu.addAction( webview->pageAction( QWebEnginePage::SelectAll ) );
   }
@@ -1867,32 +1623,25 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
   if ( !menu.isEmpty() && ids.size() )
     menu.addSeparator();
 
-  unsigned refsAdded = 0;
+  unsigned refsAdded            = 0;
   bool maxDictionaryRefsReached = false;
 
-  for( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd();
-       ++i, ++refsAdded )
-  {
+  for ( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd(); ++i, ++refsAdded ) {
     // Find this dictionary
 
-    for( unsigned x = allDictionaries.size(); x--; )
-    {
-      if ( allDictionaries[ x ]->getId() == i->toUtf8().data() )
-      {
-        QAction * action = 0;
-        if ( refsAdded == cfg.preferences.maxDictionaryRefsInContextMenu )
-        {
+    for ( unsigned x = allDictionaries.size(); x--; ) {
+      if ( allDictionaries[ x ]->getId() == i->toUtf8().data() ) {
+        QAction * action = nullptr;
+        if ( refsAdded == cfg.preferences.maxDictionaryRefsInContextMenu ) {
           // Enough! Or the menu would become too large.
-          maxDictionaryRefsAction = new QAction( ".........", &menu );
-          action = maxDictionaryRefsAction;
+          maxDictionaryRefsAction  = new QAction( ".........", &menu );
+          action                   = maxDictionaryRefsAction;
           maxDictionaryRefsReached = true;
         }
-        else
-        {
-          action = new QAction(
-                  allDictionaries[ x ]->getIcon(),
-                  QString::fromUtf8( allDictionaries[ x ]->getName().c_str() ),
-                  &menu );
+        else {
+          action = new QAction( allDictionaries[ x ]->getIcon(),
+                                QString::fromUtf8( allDictionaries[ x ]->getName().c_str() ),
+                                &menu );
           // Force icons in menu on all platforms,
           // since without them it will be much harder
           // to find things.
@@ -1905,60 +1654,56 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
         break;
       }
     }
-    if( maxDictionaryRefsReached )
+    if ( maxDictionaryRefsReached )
       break;
   }
 
   menu.addSeparator();
-  if(!popupView||cfg.pinPopupWindow)
+  if ( !popupView || cfg.pinPopupWindow )
     menu.addAction( &inspectAction );
 
-  if ( !menu.isEmpty() )
-  {
+  if ( !menu.isEmpty() ) {
     connect( this, &ArticleView::closePopupMenu, &menu, &QWidget::close );
     QAction * result = menu.exec( webview->mapToGlobal( pos ) );
 
     if ( !result )
       return;
 
-    if( result == followLink )
+    if ( result == followLink )
       openLink( targetUrl, webview->url(), getCurrentArticle(), contexts );
-    else if( result == followLinkExternal )
+    else if ( result == followLinkExternal )
       QDesktopServices::openUrl( targetUrl );
-    else if( result == lookupSelection )
+    else if ( result == lookupSelection )
       showDefinition( text, getGroup( webview->url() ), getCurrentArticle() );
-    else if( result == saveBookmark ) {
+    else if ( result == saveBookmark ) {
       emit saveBookmarkSignal( text.left( 60 ) );
     }
-    else if( result == &sendToAnkiAction ) {
+    else if ( result == &sendToAnkiAction ) {
       // This action is handled by a slot.
       return;
     }
-    else
-    if ( result == lookupSelectionGr && groupComboBox )
-      showDefinition( selectedText, groupComboBox->getCurrentGroup(), QString() );
-    else
-    if ( result == addWordToHistoryAction )
+    else if ( result == lookupSelectionGr && currentGroupId )
+      showDefinition( selectedText, currentGroupId, QString() );
+    else if ( result == addWordToHistoryAction )
       emit forceAddWordToHistory( selectedText );
-    if( result == addHeaderToHistoryAction )
+    if ( result == addHeaderToHistoryAction )
       emit forceAddWordToHistory( webview->title() );
-    else if( result == sendWordToInputLineAction )
+    else if ( result == sendWordToInputLineAction )
       emit sendWordToInputLine( selectedText );
-    else if( !popupView && result == followLinkNewTab )
+    else if ( !popupView && result == followLinkNewTab )
       emit openLinkInNewTab( targetUrl, webview->url(), getCurrentArticle(), contexts );
-    else if( !popupView && result == lookupSelectionNewTab )
+    else if ( !popupView && result == lookupSelectionNewTab )
       emit showDefinitionInNewTab( selectedText, getGroup( webview->url() ), getCurrentArticle(), Contexts() );
-    else if( !popupView && result == lookupSelectionNewTabGr && groupComboBox )
-      emit showDefinitionInNewTab( selectedText, groupComboBox->getCurrentGroup(), QString(), Contexts() );
-    else if( result == saveImageAction || result == saveSoundAction ) {
+    else if ( !popupView && result == lookupSelectionNewTabGr && currentGroupId )
+      emit showDefinitionInNewTab( selectedText, currentGroupId, QString(), Contexts() );
+    else if ( result == saveImageAction || result == saveSoundAction ) {
       QUrl url = ( result == saveImageAction ) ? imageUrl : targetUrl;
       QString savePath;
       QString fileName;
 
       if ( cfg.resourceSavePath.isEmpty() )
         savePath = QDir::homePath();
-      else
-      {
+      else {
         savePath = QDir::fromNativeSeparators( cfg.resourceSavePath );
         if ( !QDir( savePath ).exists() )
           savePath = QDir::homePath();
@@ -1966,19 +1711,20 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
 
       QString name = Utils::Url::path( url ).section( '/', -1 );
 
-      if ( result == saveSoundAction )
-      {
+      if ( result == saveSoundAction ) {
         // Audio data
-//        if ( name.indexOf( '.' ) < 0 )
-//          name += ".wav";
+        //        if ( name.indexOf( '.' ) < 0 )
+        //          name += ".wav";
 
         fileName = savePath + "/" + name;
-        fileName = QFileDialog::getSaveFileName( parentWidget(), tr( "Save sound" ),
-                                                 fileName,
-                                                 tr( "Sound files (*.wav *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)" ) );
+        fileName = QFileDialog::getSaveFileName(
+          parentWidget(),
+          tr( "Save sound" ),
+          fileName,
+          tr(
+            "Sound files (*.wav *.opus *.ogg *.oga *.mp3 *.mp4 *.aac *.flac *.mid *.wv *.ape *.spx);;All files (*.*)" ) );
       }
-      else
-      {
+      else {
         // Image data
 
         // Check for babylon image name
@@ -1988,20 +1734,19 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
           name.chop( 1 );
 
         fileName = savePath + "/" + name;
-        fileName = QFileDialog::getSaveFileName( parentWidget(), tr( "Save image" ),
+        fileName = QFileDialog::getSaveFileName( parentWidget(),
+                                                 tr( "Save image" ),
                                                  fileName,
                                                  tr( "Image files (*.bmp *.jpg *.png *.tif);;All files (*.*)" ) );
       }
 
-      if ( !fileName.isEmpty() )
-      {
+      if ( !fileName.isEmpty() ) {
         QFileInfo fileInfo( fileName );
         emit storeResourceSavePath( QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() ) );
         saveResource( url, webview->url(), fileName );
       }
     }
-    else
-    {
+    else {
       if ( !popupView && result == maxDictionaryRefsAction )
         emit showDictsPane();
 
@@ -2013,8 +1758,7 @@ void ArticleView::contextMenuRequested( QPoint const & pos )
     }
   }
 
-  qDebug()<< "title = "<< r->title();
-
+  qDebug() << "title = " << r->title();
 }
 
 void ArticleView::resourceDownloadFinished()
@@ -2023,43 +1767,37 @@ void ArticleView::resourceDownloadFinished()
     return; // Stray signal
 
   // Find any finished resources
-  for( list< sptr< Dictionary::DataRequest > >::iterator i =
-       resourceDownloadRequests.begin(); i != resourceDownloadRequests.end(); )
-  {
-    if ( (*i)->isFinished() )
-    {
-      if ( (*i)->dataSize() >= 0 )
-      {
+  for ( list< sptr< Dictionary::DataRequest > >::iterator i = resourceDownloadRequests.begin();
+        i != resourceDownloadRequests.end(); ) {
+    if ( ( *i )->isFinished() ) {
+      if ( ( *i )->dataSize() >= 0 ) {
         // Ok, got one finished, all others are irrelevant now
 
-        vector< char > const & data = (*i)->getFullData();
+        vector< char > const & data = ( *i )->getFullData();
 
-        if ( resourceDownloadUrl.scheme() == "gdau" ||
-             Dictionary::WebMultimediaDownload::isAudioUrl( resourceDownloadUrl ) )
-        {
+        if ( resourceDownloadUrl.scheme() == "gdau"
+             || Dictionary::WebMultimediaDownload::isAudioUrl( resourceDownloadUrl ) ) {
           // Audio data
           connect( audioPlayer.data(),
-            &AudioPlayerInterface::error,
-            this,
-            &ArticleView::audioPlayerError,
-            Qt::UniqueConnection );
+                   &AudioPlayerInterface::error,
+                   this,
+                   &ArticleView::audioPlayerError,
+                   Qt::UniqueConnection );
           QString errorMessage = audioPlayer->play( data.data(), data.size() );
-          if( !errorMessage.isEmpty() )
+          if ( !errorMessage.isEmpty() )
             QMessageBox::critical( this, "GoldenDict", tr( "Failed to play sound file: %1" ).arg( errorMessage ) );
         }
-        else
-        {
+        else {
           // Create a temporary file
           // Remove the ones previously used, if any
           cleanupTemp();
           QString fileName;
 
           {
-            QTemporaryFile tmp(
-              QDir::temp().filePath( "XXXXXX-" + resourceDownloadUrl.path().section( '/', -1 ) ), this );
+            QTemporaryFile tmp( QDir::temp().filePath( "XXXXXX-" + resourceDownloadUrl.path().section( '/', -1 ) ),
+                                this );
 
-            if ( !tmp.open() || (size_t) tmp.write( &data.front(), data.size() ) != data.size() )
-            {
+            if ( !tmp.open() || (size_t)tmp.write( &data.front(), data.size() ) != data.size() ) {
               QMessageBox::critical( this, "GoldenDict", tr( "Failed to create temporary file." ) );
               return;
             }
@@ -2070,8 +1808,10 @@ void ArticleView::resourceDownloadFinished()
           }
 
           if ( !QDesktopServices::openUrl( QUrl::fromLocalFile( fileName ) ) )
-            QMessageBox::critical( this, "GoldenDict",
-                                   tr( "Failed to auto-open resource file, try opening manually: %1." ).arg( fileName ) );
+            QMessageBox::critical(
+              this,
+              "GoldenDict",
+              tr( "Failed to auto-open resource file, try opening manually: %1." ).arg( fileName ) );
         }
 
         // Ok, whatever it was, it's finished. Remove this and any other
@@ -2081,8 +1821,7 @@ void ArticleView::resourceDownloadFinished()
 
         return;
       }
-      else
-      {
+      else {
         // This one had no data. Erase it.
         resourceDownloadRequests.erase( i++ );
       }
@@ -2091,8 +1830,7 @@ void ArticleView::resourceDownloadFinished()
       break;
   }
 
-  if ( resourceDownloadRequests.empty() )
-  {
+  if ( resourceDownloadRequests.empty() ) {
     // emit statusBarMessage(
     //     tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
     //     10000, QPixmap(":/icons/error.svg"));
@@ -2101,20 +1839,19 @@ void ArticleView::resourceDownloadFinished()
 
 void ArticleView::audioPlayerError( QString const & message )
 {
-  emit statusBarMessage(tr("WARNING: Audio Player: %1").arg(message),
-                        10000, QPixmap(":/icons/error.svg"));
+  emit statusBarMessage( tr( "WARNING: Audio Player: %1" ).arg( message ), 10000, QPixmap( ":/icons/error.svg" ) );
 }
 
 void ArticleView::pasteTriggered()
 {
   QString word = cfg.preferences.sanitizeInputPhrase( QApplication::clipboard()->text() );
 
-  if( !word.isEmpty() ) {
+  if ( !word.isEmpty() ) {
     unsigned groupId = getGroup( webview->url() );
-    if( groupId == 0 ) {
+    if ( groupId == 0 ) {
       // We couldn't figure out the group out of the URL,
       // so let's try the currently selected group.
-      groupId = groupComboBox->getCurrentGroup();
+      groupId = currentGroupId;
     }
     showDefinition( word, groupId, getCurrentArticle() );
   }
@@ -2122,6 +1859,8 @@ void ArticleView::pasteTriggered()
 
 unsigned ArticleView::getCurrentGroup()
 {
+  if ( !groupComboBox )
+    return currentGroupId;
   return groupComboBox->getCurrentGroup();
 }
 
@@ -2129,14 +1868,12 @@ void ArticleView::moveOneArticleUp()
 {
   QString current = getCurrentArticle();
 
-  if ( current.size() )
-  {
+  if ( current.size() ) {
     QStringList lst = getArticlesList();
 
     int idx = lst.indexOf( dictionaryIdFromScrollTo( current ) );
 
-    if ( idx != -1 )
-    {
+    if ( idx != -1 ) {
       --idx;
 
       if ( idx < 0 )
@@ -2149,19 +1886,17 @@ void ArticleView::moveOneArticleUp()
 
 void ArticleView::moveOneArticleDown()
 {
-  QString current = getCurrentArticle();
+  QString current       = getCurrentArticle();
   QString currentDictId = dictionaryIdFromScrollTo( current );
   QStringList lst       = getArticlesList();
   // if current article is empty .use the first as default.
-  if( currentDictId.isEmpty() && !lst.isEmpty() )
-  {
+  if ( currentDictId.isEmpty() && !lst.isEmpty() ) {
     currentDictId = lst[ 0 ];
   }
 
   int idx = lst.indexOf( currentDictId );
 
-  if( idx != -1 )
-  {
+  if ( idx != -1 ) {
     idx = ( idx + 1 ) % lst.size();
 
     setCurrentArticle( scrollToFromDictionaryId( lst[ idx ] ), true );
@@ -2170,14 +1905,13 @@ void ArticleView::moveOneArticleDown()
 
 void ArticleView::openSearch()
 {
-  if( !isVisible() )
+  if ( !isVisible() )
     return;
 
-  if( ftsSearchIsOpened )
+  if ( ftsSearchIsOpened )
     closeSearch();
 
-  if ( !searchIsOpened )
-  {
+  if ( !searchIsOpened ) {
     searchPanel->show();
     searchPanel->lineEdit->setText( getTitle() );
     searchIsOpened = true;
@@ -2187,11 +1921,11 @@ void ArticleView::openSearch()
   searchPanel->lineEdit->selectAll();
 
   // Clear any current selection
-  if( webview->selectedText().size() ) {
+  if ( webview->selectedText().size() ) {
     webview->page()->runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
   }
 
-  if( searchPanel->lineEdit->property( "noResults" ).toBool() ) {
+  if ( searchPanel->lineEdit->property( "noResults" ).toBool() ) {
     searchPanel->lineEdit->setProperty( "noResults", false );
 
     Utils::Widget::setNoResultColor( searchPanel->lineEdit, false );
@@ -2200,13 +1934,13 @@ void ArticleView::openSearch()
 
 void ArticleView::on_searchPrevious_clicked()
 {
-  if( searchIsOpened )
+  if ( searchIsOpened )
     performFindOperation( false, true );
 }
 
 void ArticleView::on_searchNext_clicked()
 {
-  if( searchIsOpened )
+  if ( searchIsOpened )
     performFindOperation( false, false );
 }
 
@@ -2236,7 +1970,7 @@ void ArticleView::on_highlightAllButton_clicked()
 }
 
 //the id start with "gdform-"
-void ArticleView::onJsActiveArticleChanged(QString const & id)
+void ArticleView::onJsActiveArticleChanged( QString const & id )
 {
   if ( !isScrollTo( id ) )
     return; // Incorrect id
@@ -2250,30 +1984,26 @@ void ArticleView::doubleClicked( QPoint pos )
 {
   // We might want to initiate translation of the selected word
   audioPlayer->stop();
-  if( cfg.preferences.doubleClickTranslates ) {
+  if ( cfg.preferences.doubleClickTranslates ) {
     QString selectedText = webview->selectedText();
 
     // ignore empty word;
-    if( selectedText.isEmpty() )
+    if ( selectedText.isEmpty() )
       return;
 
     emit sendWordToInputLine( selectedText );
     // Do some checks to make sure there's a sensible selection indeed
-    if ( Folding::applyWhitespaceOnly( gd::toWString( selectedText ) ).size() &&
-         selectedText.size() < 60 )
-    {
+    if ( Folding::applyWhitespaceOnly( gd::toWString( selectedText ) ).size() && selectedText.size() < 60 ) {
       // Initiate translation
       Qt::KeyboardModifiers kmod = QApplication::keyboardModifiers();
-      if( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) { // open in new tab
+      if ( kmod & ( Qt::ControlModifier | Qt::ShiftModifier ) ) { // open in new tab
         emit showDefinitionInNewTab( selectedText, getGroup( webview->url() ), getCurrentArticle(), Contexts() );
       }
       else {
         QUrl const & ref = webview->url();
 
-        if( Utils::Url::hasQueryItem( ref, "dictionaries" ) )
-        {
-          QStringList dictsList = Utils::Url::queryItemValue(ref, "dictionaries" )
-                                              .split( ",", Qt::SkipEmptyParts );
+        if ( Utils::Url::hasQueryItem( ref, "dictionaries" ) ) {
+          QStringList dictsList = Utils::Url::queryItemValue( ref, "dictionaries" ).split( ",", Qt::SkipEmptyParts );
           showDefinition( selectedText, dictsList, QRegExp(), getGroup( ref ), false );
         }
         else
@@ -2288,65 +2018,61 @@ void ArticleView::performFindOperation( bool restart, bool backwards, bool check
 {
   QString text = searchPanel->lineEdit->text();
 
-  if ( restart || checkHighlight )
-  {
-    if( restart ) {
+  if ( restart || checkHighlight ) {
+    if ( restart ) {
       // Anyone knows how we reset the search position?
       // For now we resort to this hack:
-      if( webview->selectedText().size() ) {
+      if ( webview->selectedText().size() ) {
         webview->page()->runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
       }
     }
 
     QWebEnginePage::FindFlags f( 0 );
 
-    if( searchPanel->caseSensitive->isChecked() )
+    if ( searchPanel->caseSensitive->isChecked() )
       f |= QWebEnginePage::FindCaseSensitively;
 
     webview->findText( "", f );
 
-    if( searchPanel->highlightAll->isChecked() )
+    if ( searchPanel->highlightAll->isChecked() )
       webview->findText( text, f );
 
-    if( checkHighlight )
+    if ( checkHighlight )
       return;
   }
 
   QWebEnginePage::FindFlags f( 0 );
 
-  if( searchPanel->caseSensitive->isChecked() )
+  if ( searchPanel->caseSensitive->isChecked() )
     f |= QWebEnginePage::FindCaseSensitively;
 
-  if( backwards )
+  if ( backwards )
     f |= QWebEnginePage::FindBackward;
 
-  findText( text,
-            f,
-            [ text, this ]( bool match )
-            {
-              bool setMark = !text.isEmpty() && !match;
+  findText( text, f, [ text, this ]( bool match ) {
+    bool setMark = !text.isEmpty() && !match;
 
-              if( searchPanel->lineEdit->property( "noResults" ).toBool() != setMark ) {
-                searchPanel->lineEdit->setProperty( "noResults", setMark );
+    if ( searchPanel->lineEdit->property( "noResults" ).toBool() != setMark ) {
+      searchPanel->lineEdit->setProperty( "noResults", setMark );
 
-                Utils::Widget::setNoResultColor( searchPanel->lineEdit, setMark );
-              }
-            } );
+      Utils::Widget::setNoResultColor( searchPanel->lineEdit, setMark );
+    }
+  } );
 }
 
 void ArticleView::findText( QString & text,
                             const QWebEnginePage::FindFlags & f,
                             const std::function< void( bool match ) > & callback )
 {
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
   webview->findText( text, f, [ callback ]( const QWebEngineFindTextResult & result ) {
     auto r = result.numberOfMatches() > 0;
-    if( callback )
+    if ( callback )
       callback( r );
   } );
 #else
   webview->findText( text, f, [ callback ]( bool result ) {
-    if( callback )
+    if ( callback )
       callback( result );
   } );
 #endif
@@ -2354,25 +2080,23 @@ void ArticleView::findText( QString & text,
 
 bool ArticleView::closeSearch()
 {
-  if( searchIsOpened ) {
+  if ( searchIsOpened ) {
     searchPanel->hide();
     webview->setFocus();
     searchIsOpened = false;
 
     return true;
   }
-  else
-  if( ftsSearchIsOpened )
-  {
-    allMatches.clear();
+  else if ( ftsSearchIsOpened ) {
+    firstAvailableText.clear();
     uniqueMatches.clear();
-    ftsPosition = 0;
+    ftsPosition       = 0;
     ftsSearchIsOpened = false;
 
     ftsSearchPanel->hide();
     webview->setFocus();
 
-    QWebEnginePage::FindFlags flags ( 0 );
+    QWebEnginePage::FindFlags flags( 0 );
 
     webview->findText( "", flags );
 
@@ -2382,176 +2106,114 @@ bool ArticleView::closeSearch()
     return false;
 }
 
-bool ArticleView::isSearchOpened() { return searchIsOpened; }
+bool ArticleView::isSearchOpened()
+{
+  return searchIsOpened;
+}
 
 void ArticleView::showEvent( QShowEvent * ev )
 {
   QWidget::showEvent( ev );
 
-  if( !searchIsOpened )
+  if ( !searchIsOpened )
     searchPanel->hide();
 
-  if( !ftsSearchIsOpened )
+  if ( !ftsSearchIsOpened )
     ftsSearchPanel->hide();
 }
 
 void ArticleView::copyAsText()
 {
   QString text = webview->selectedText();
-  if( !text.isEmpty() )
+  if ( !text.isEmpty() )
     QApplication::clipboard()->setText( text );
 }
 
 void ArticleView::highlightFTSResults()
 {
   closeSearch();
-
   // Clear any current selection
-  if( webview->selectedText().size() ) {
-    webview->page()->runJavaScript( "window.getSelection().removeAllRanges();_=0;" );
+  webview->findText( "" );
+  QString regString = Utils::Url::queryItemValue( webview->url(), "regexp" );
+  if ( regString.isEmpty() )
+    return;
+
+  //<div><i>watch</i>out</div>  to plainText will return "watchout".
+  //if application goes here,that means the article text must contains the search text.
+  //whole word match regString will contain \b . can not match the above senario.
+  //workaround ,remove \b from the regstring="(\bwatch\b)"
+  regString.remove( QRegularExpression( R"(\b)" ) );
+
+  //make it simple ,and do not support too much complex cases. such as wildcard etc.
+  firstAvailableText = regString;
+
+  if ( firstAvailableText.isEmpty() ) {
+    return;
   }
 
-  webview->page()->toPlainText(
-    [ & ]( const QString pageText ) {
-      const QUrl & url = webview->url();
+  //remove possible wildcard character.
+  auto cleaned =
+    firstAvailableText.split( QRegularExpression( "\\p{P}", QRegularExpression::UseUnicodePropertiesOption ) );
 
-      QString regString = Utils::Url::queryItemValue( url, "regexp" );
-	  if( regString.isEmpty() )
-	    return;
-      
-      bool ignoreDiacritics = Utils::Url::hasQueryItem( url, "ignore_diacritics" );
+  if ( cleaned.empty() )
+    return;
 
-      if( ignoreDiacritics )
-        regString = QString::fromStdU32String( Folding::applyDiacriticsOnly( gd::toWString( regString ) ) );
-      else
-        regString = regString.remove( AccentMarkHandler::accentMark() );
+  firstAvailableText = cleaned.at( 0 );
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  webview->findText( firstAvailableText,
+                     QWebEnginePage::FindBackward,
+                     [ & ]( const QWebEngineFindTextResult & result ) {
+                       qInfo() << result.activeMatch() << "of" << result.numberOfMatches() << "matches";
 
-      //<div><i>watch</i>out</div>  to plainText will return "watchout".
-      //if application goes here,that means the article text must contains the search text.
-      //whole word match regString will contain \b . can not match the above senario.
-      //workaround ,remove \b from the regstring="(\bwatch\b)"
-      regString.remove( QRegularExpression( "\\\\b" ) );
+                       if ( result.numberOfMatches() == 0 ) {
+                         ftsSearchPanel->statusLabel->setText( searchStatusMessageNoMatches() );
+                       }
+                       else {
+                         ftsSearchPanel->statusLabel->setText(
+                           searchStatusMessage( result.activeMatch(), result.numberOfMatches() ) );
+                       }
 
-      QRegularExpression regexp;
-      if( Utils::Url::hasQueryItem( url, "wildcards" ) )
-        regexp.setPattern( wildcardsToRegexp( regString ) );
-      else
-        regexp.setPattern( regString );
+                       ftsSearchPanel->show();
+                       ftsSearchPanel->previous->setEnabled( result.numberOfMatches() > 1 );
+                       ftsSearchPanel->next->setEnabled( result.numberOfMatches() > 1 );
 
-      QRegularExpression::PatternOptions patternOptions =
-        QRegularExpression::DotMatchesEverythingOption | QRegularExpression::UseUnicodePropertiesOption |
-        QRegularExpression::MultilineOption | QRegularExpression::InvertedGreedinessOption;
-      if( !Utils::Url::hasQueryItem( url, "matchcase" ) )
-        patternOptions |= QRegularExpression::CaseInsensitiveOption;
-      regexp.setPatternOptions( patternOptions );
-
-      if( regexp.pattern().isEmpty() || !regexp.isValid() )
-        return;
-      sptr< AccentMarkHandler > marksHandler = ignoreDiacritics ? std::make_shared<DiacriticsHandler>() : std::make_shared<AccentMarkHandler>();
-
-      marksHandler->setText( pageText );
-
-      QRegularExpressionMatchIterator it = regexp.globalMatch( marksHandler->normalizedText() );
-      while( it.hasNext() )
-      {
-        QRegularExpressionMatch match = it.next();
-
-        // Mirror pos and matched length to original string
-        int pos     = match.capturedStart();
-        int spos    = marksHandler->mirrorPosition( pos );
-        int matched = marksHandler->mirrorPosition( pos + match.capturedLength() ) - spos;
-
-        // Add mark pos (if presented)
-        while( spos + matched < pageText.length() && pageText[ spos + matched ].category() == QChar::Mark_NonSpacing )
-          matched++;
-
-        if( matched > FTS::MaxMatchLengthForHighlightResults )
-        {
-          gdWarning( "ArticleView::highlightFTSResults(): Too long match - skipped (matched length %i, allowed %i)",
-                     match.capturedLength(),
-                     FTS::MaxMatchLengthForHighlightResults );
-        }
-        else
-          allMatches.append( pageText.mid( spos, matched ) );
-      }
-
-      ftsSearchMatchCase = Utils::Url::hasQueryItem( url, "matchcase" );
-
-      QWebEnginePage::FindFlags flags( QWebEnginePage::FindBackward );
-
-      if( ftsSearchMatchCase )
-        flags |= QWebEnginePage::FindCaseSensitively;
-
-      if( allMatches.isEmpty() )
-        ftsSearchPanel->statusLabel->setText( searchStatusMessageNoMatches() );
-      else {
-        //        highlightAllFtsOccurences( flags );
-        webview->findText( allMatches.at( 0 ), flags );
-        // if( webview->findText( allMatches.at( 0 ), flags ) )
-        // {
-        //   webview->page()->runJavaScript(
-        //     QString( "%1=window.getSelection().getRangeAt(0);_=0;" ).arg( rangeVarName ) );
-        // }
-		Q_ASSERT( ftsPosition == 0 );
-                ftsSearchPanel->statusLabel->setText( searchStatusMessage( 1, allMatches.size() ) );
-      }
-
-
-      ftsSearchPanel->show();
-      ftsSearchPanel->previous->setEnabled( false );
-      ftsSearchPanel->next->setEnabled( allMatches.size() > 1 );
-
-      ftsSearchIsOpened = true;
-    } );
+                       ftsSearchIsOpened = true;
+                     } );
+#else
+  webview->findText( firstAvailableText, QWebEnginePage::FindBackward, [ this ]( bool res ) {
+    ftsSearchPanel->previous->setEnabled( res );
+    if ( !ftsSearchPanel->next->isEnabled() )
+      ftsSearchPanel->next->setEnabled( res );
+  } );
+#endif
 }
 
-void ArticleView::highlightAllFtsOccurences( QWebEnginePage::FindFlags flags )
+void ArticleView::setActiveDictIds( const ActiveDictIds & ad )
 {
-  // Usually allMatches contains mostly duplicates. Thus searching for each element of
-  // allMatches to highlight them takes a long time => collect unique elements into a
-  // set and search for them instead.
-  // Don't use QList::toSet() or QSet's range constructor because they reserve space
-  // for QList::size() elements, whereas the final QSet size is likely 1 or 2.
-  QSet< QString > uniqueMatches;
-  for( int x = 0; x < allMatches.size(); ++x )
-  {
-    QString const & match = allMatches.at( x );
-    // Consider words that differ only in case equal if the search is case-insensitive.
-    uniqueMatches.insert( ftsSearchMatchCase ? match : match.toLower() );
+  if ( ( ad.word == currentWord && ad.groupId == getCurrentGroup() ) || historyMode ) {
+    // ignore all other signals.
+    qDebug() << "receive dicts, current word:" << currentWord << ad.word << ":" << ad.dictIds;
+    currentActiveDictIds << ad.dictIds;
+    currentActiveDictIds.removeDuplicates();
+    emit updateFoundInDictsList();
   }
-
-  for( QSet< QString >::const_iterator it = uniqueMatches.constBegin(); it != uniqueMatches.constEnd(); ++it )
-    webview->findText( *it, flags );
 }
 
-void ArticleView::setActiveDictIds(ActiveDictIds ad) {
-  if ( ( ad.word == currentWord  &&  ad.groupId == getCurrentGroup() ) || historyMode)
-    {
-      // ignore all other signals.
-      qDebug() << "receive dicts, current word:" << currentWord << ad.word << ":" << ad.dictIds;
-      currentActiveDictIds << ad.dictIds;
-      currentActiveDictIds.removeDuplicates();
-      emit updateFoundInDictsList();
-    }
-}
-
-void ArticleView::dictionaryClear( ActiveDictIds ad )
+void ArticleView::dictionaryClear( const ActiveDictIds & ad )
 {
   // ignore all other signals.
-  if( ad.word == currentWord && ad.groupId==getCurrentGroup() )
-  {
+  if ( ad.word == currentWord && ad.groupId == getCurrentGroup() ) {
     qDebug() << "clear current dictionaries:" << currentWord;
     currentActiveDictIds.clear();
   }
 }
 
-//todo ,futher refinement?
 void ArticleView::performFtsFindOperation( bool backwards )
 {
-  if( !ftsSearchIsOpened )
+  if ( !ftsSearchIsOpened )
     return;
 
-  if( allMatches.isEmpty() ) {
+  if ( firstAvailableText.isEmpty() ) {
     ftsSearchPanel->statusLabel->setText( searchStatusMessageNoMatches() );
     ftsSearchPanel->next->setEnabled( false );
     ftsSearchPanel->previous->setEnabled( false );
@@ -2560,7 +2222,7 @@ void ArticleView::performFtsFindOperation( bool backwards )
 
   QWebEnginePage::FindFlags flags( 0 );
 
-  if( ftsSearchMatchCase )
+  if ( ftsSearchMatchCase )
     flags |= QWebEnginePage::FindCaseSensitively;
 
 
@@ -2568,53 +2230,49 @@ void ArticleView::performFtsFindOperation( bool backwards )
   webview->page()->runJavaScript(
     QString( "var sel=window.getSelection();sel.removeAllRanges();sel.addRange(%1);_=0;" ).arg( rangeVarName ) );
 
-  if( backwards ) {
-    if( ftsPosition > 0 ) {
-      ftsPosition -= 1;
-    }
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
-    webview->findText( allMatches.at( ftsPosition ),
+  if ( backwards ) {
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    webview->findText( firstAvailableText,
                        flags | QWebEnginePage::FindBackward,
                        [ this ]( const QWebEngineFindTextResult & result ) {
-                         if( result.numberOfMatches() == 0 )
+                         if ( result.numberOfMatches() == 0 )
                            return;
                          ftsSearchPanel->previous->setEnabled( true );
-                         if( !ftsSearchPanel->next->isEnabled() )
+                         if ( !ftsSearchPanel->next->isEnabled() )
                            ftsSearchPanel->next->setEnabled( true );
+
+                         ftsSearchPanel->statusLabel->setText(
+                           searchStatusMessage( result.activeMatch(), result.numberOfMatches() ) );
                        } );
 #else
-    webview->findText( allMatches.at( ftsPosition ), flags | QWebEnginePage::FindBackward, [ this ]( bool res ) {
+    webview->findText( firstAvailableText, flags | QWebEnginePage::FindBackward, [ this ]( bool res ) {
       ftsSearchPanel->previous->setEnabled( res );
-      if( !ftsSearchPanel->next->isEnabled() )
+      if ( !ftsSearchPanel->next->isEnabled() )
         ftsSearchPanel->next->setEnabled( res );
     } );
 #endif
   }
   else {
-    if( ftsPosition < allMatches.size() - 1 ) {
-      ftsPosition += 1;
-    }
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
-    webview->findText( allMatches.at( ftsPosition ), flags, [ this ]( const QWebEngineFindTextResult & result ) {
-      if( result.numberOfMatches() == 0 )
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    webview->findText( firstAvailableText, flags, [ this ]( const QWebEngineFindTextResult & result ) {
+      if ( result.numberOfMatches() == 0 )
         return;
       ftsSearchPanel->next->setEnabled( true );
-      if( !ftsSearchPanel->previous->isEnabled() )
+      if ( !ftsSearchPanel->previous->isEnabled() )
         ftsSearchPanel->previous->setEnabled( true );
+
+      ftsSearchPanel->statusLabel->setText( searchStatusMessage( result.activeMatch(), result.numberOfMatches() ) );
     } );
-  }
 #else
 
-    webview->findText( allMatches.at( ftsPosition ), flags, [ this ]( bool res ) {
+    webview->findText( firstAvailableText, flags, [ this ]( bool res ) {
       ftsSearchPanel->next->setEnabled( res );
-      if( !ftsSearchPanel->previous->isEnabled() )
+      if ( !ftsSearchPanel->previous->isEnabled() )
         ftsSearchPanel->previous->setEnabled( res );
     } );
-  }
 
 #endif
-
-  ftsSearchPanel->statusLabel->setText( searchStatusMessage( ftsPosition + 1, allMatches.size() ) );
+  }
 }
 
 void ArticleView::on_ftsSearchPrevious_clicked()
@@ -2627,18 +2285,17 @@ void ArticleView::on_ftsSearchNext_clicked()
   performFtsFindOperation( false );
 }
 
-ResourceToSaveHandler::ResourceToSaveHandler(ArticleView * view, QString const & fileName ) :
+ResourceToSaveHandler::ResourceToSaveHandler( ArticleView * view, QString fileName ):
   QObject( view ),
-  fileName( fileName ),
+  fileName( std::move( fileName ) ),
   alreadyDone( false )
 {
   connect( this, &ResourceToSaveHandler::statusBarMessage, view, &ArticleView::statusBarMessage );
 }
 
-void ResourceToSaveHandler::addRequest( sptr< Dictionary::DataRequest > req )
+void ResourceToSaveHandler::addRequest( const sptr< Dictionary::DataRequest > & req )
 {
-  if( !alreadyDone )
-  {
+  if ( !alreadyDone ) {
     downloadRequests.push_back( req );
 
     connect( req.get(), &Dictionary::Request::finished, this, &ResourceToSaveHandler::downloadFinished );
@@ -2651,36 +2308,29 @@ void ResourceToSaveHandler::downloadFinished()
     return; // Stray signal
 
   // Find any finished resources
-  for( list< sptr< Dictionary::DataRequest > >::iterator i =
-       downloadRequests.begin(); i != downloadRequests.end(); )
-  {
-    if ( (*i)->isFinished() )
-    {
-      if ( (*i)->dataSize() >= 0 && !alreadyDone )
-      {
+  for ( auto i = downloadRequests.begin(); i != downloadRequests.end(); ) {
+    if ( ( *i )->isFinished() ) {
+      if ( ( *i )->dataSize() >= 0 && !alreadyDone ) {
         QByteArray resourceData;
-        vector< char > const & data = (*i)->getFullData();
-        resourceData = QByteArray( data.data(), data.size() );
+        vector< char > const & data = ( *i )->getFullData();
+        resourceData                = QByteArray( data.data(), data.size() );
 
         // Write data to file
 
-        if ( !fileName.isEmpty() )
-        {
-          QFileInfo fileInfo( fileName );
+        if ( !fileName.isEmpty() ) {
+          const QFileInfo fileInfo( fileName );
           QDir().mkpath( fileInfo.absoluteDir().absolutePath() );
 
           QFile file( fileName );
-          if ( file.open( QFile::WriteOnly ) )
-          {
+          if ( file.open( QFile::WriteOnly ) ) {
             file.write( resourceData.data(), resourceData.size() );
             file.close();
           }
 
-          if ( file.error() )
-          {
-            emit statusBarMessage(
-                tr("ERROR: %1").arg(tr("Resource saving error: ") + file.errorString()),
-                10000, QPixmap(":/icons/error.svg"));
+          if ( file.error() ) {
+            emit statusBarMessage( tr( "ERROR: %1" ).arg( tr( "Resource saving error: " ) + file.errorString() ),
+                                   10000,
+                                   QPixmap( ":/icons/error.svg" ) );
           }
         }
         alreadyDone = true;
@@ -2690,8 +2340,7 @@ void ResourceToSaveHandler::downloadFinished()
         downloadRequests.clear();
         break;
       }
-      else
-      {
+      else {
         // This one had no data. Erase it.
         downloadRequests.erase( i++ );
       }
@@ -2700,20 +2349,20 @@ void ResourceToSaveHandler::downloadFinished()
       break;
   }
 
-  if ( downloadRequests.empty() )
-  {
-    if( !alreadyDone )
-    {
-      emit statusBarMessage(
-          tr("WARNING: %1").arg(tr("The referenced resource failed to download.")),
-          10000, QPixmap(":/icons/error.svg"));
+  if ( downloadRequests.empty() ) {
+    if ( !alreadyDone ) {
+      emit statusBarMessage( tr( "WARNING: %1" ).arg( tr( "The referenced resource failed to download." ) ),
+                             10000,
+                             QPixmap( ":/icons/error.svg" ) );
     }
     emit done();
     deleteLater();
   }
 }
 
-ArticleViewAgent::ArticleViewAgent( ArticleView * articleView ) : QObject( articleView ), articleView( articleView )
+ArticleViewAgent::ArticleViewAgent( ArticleView * articleView ):
+  QObject( articleView ),
+  articleView( articleView )
 {
 }
 
@@ -2738,4 +2387,3 @@ void ArticleViewAgent::collapseInHtml( QString const & dictId, bool on ) const
     }
   }
 }
-
diff --git a/src/ui/articleview.hh b/src/ui/articleview.hh
index dc693a62..708a6715 100644
--- a/src/ui/articleview.hh
+++ b/src/ui/articleview.hh
@@ -16,7 +16,7 @@
 #include "groupcombobox.hh"
 #include "globalbroadcaster.hh"
 #include "article_inspect.hh"
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
   #include <QtCore5Compat/QRegExp>
 
 #endif
@@ -28,7 +28,7 @@
 #include "ui/ftssearchpanel.hh"
 
 class ResourceToSaveHandler;
-class ArticleViewAgent ;
+class ArticleViewAgent;
 
 /// A widget with the web view tailored to view and handle articles -- it
 /// uses the appropriate netmgr, handles link clicks, rmb clicks etc
@@ -45,11 +45,10 @@ class ArticleView: public QWidget
   QWebChannel * channel;
   ArticleViewAgent * agent;
 
-  AnkiConnector  * ankiConnector;
+  AnkiConnector * ankiConnector;
 
-  QAction pasteAction, articleUpAction, articleDownAction,
-          goBackAction, goForwardAction, selectCurrentArticleAction,
-          copyAsTextAction, inspectAction;
+  QAction pasteAction, articleUpAction, articleDownAction, goBackAction, goForwardAction, selectCurrentArticleAction,
+    copyAsTextAction, inspectAction;
   QAction & openSearchAction;
   bool searchIsOpened;
   bool expandOptionalParts;
@@ -69,7 +68,8 @@ class ArticleView: public QWidget
   QSet< QString > desktopOpenedTempFiles;
 
   QAction * dictionaryBarToggled;
-  GroupComboBox const *groupComboBox;
+  GroupComboBox const * groupComboBox;
+  unsigned currentGroupId;
   QLineEdit const * translateLine;
 
   /// current searching word.
@@ -78,22 +78,21 @@ class ArticleView: public QWidget
   /// current active dict id list;
   QStringList currentActiveDictIds;
 
-  bool historyMode=false;
+  bool historyMode = false;
 
   //current active dictionary id;
   QString activeDictId;
 
   /// Search in results of full-text search
-  QStringList allMatches;
+  QString firstAvailableText;
   QStringList uniqueMatches;
-  bool ftsSearchIsOpened = false;
+  bool ftsSearchIsOpened  = false;
   bool ftsSearchMatchCase = false;
-  int ftsPosition=0;
+  int ftsPosition         = 0;
 
   QString delayedHighlightText;
 
   void highlightFTSResults();
-  void highlightAllFtsOccurences( QWebEnginePage::FindFlags flags );
   void performFtsFindOperation( bool backwards );
 
 public:
@@ -109,41 +108,39 @@ public:
                Config::Class const & cfg,
                QAction & openSearchAction_,
                QLineEdit const * translateLine,
-               QAction * dictionaryBarToggled = nullptr,
-               GroupComboBox const * groupComboBox = nullptr
-              );
+               QAction * dictionaryBarToggled      = nullptr,
+               GroupComboBox const * groupComboBox = nullptr );
 
-  /// Sets the currently active group combo box. When looking up selections,
-  /// this allows presenting a choice of looking up in the currently chosen
-  /// group. Setting this to 0 disables this. It is 0 by default.
-  void setGroupComboBox( GroupComboBox const * );
+
+  void setCurrentGroupId( unsigned currengGrgId );
+  unsigned getCurrentGroupId();
 
   virtual QSize minimumSizeHint() const;
 
   ~ArticleView();
 
 
-
   /// Returns "gdfrom-" + dictionaryId.
   static QString scrollToFromDictionaryId( QString const & dictionaryId );
 
-  void emitJavascriptFinished();
-
   /// Shows the definition of the given word with the given group.
   /// scrollTo can be optionally set to a "gdfrom-xxxx" identifier to position
   /// the page to that article on load.
   /// contexts is an optional map of context values to be passed for dictionaries.
   /// The only values to pass here are ones obtained from showDefinitionInNewTab()
   /// signal or none at all.
-  void showDefinition( QString const & word, unsigned group,
-                       QString const & scrollTo = QString(),
+  void showDefinition( QString const & word,
+                       unsigned group,
+                       QString const & scrollTo  = QString(),
                        Contexts const & contexts = Contexts() );
 
-  void showDefinition( QString const & word, QStringList const & dictIDs,
-                       QRegExp const & searchRegExp, unsigned group,
+  void showDefinition( QString const & word,
+                       QStringList const & dictIDs,
+                       QRegExp const & searchRegExp,
+                       unsigned group,
                        bool ignoreDiacritics );
 
-  void sendToAnki(QString const & word, QString const & text, QString const & sentence );
+  void sendToAnki( QString const & word, QString const & text, QString const & sentence );
   /// Clears the view and sets the application-global waiting cursor,
   /// which will be restored when some article loads eventually.
   void showAnticipation();
@@ -158,8 +155,9 @@ public:
   /// contexts is an optional map of context values to be passed for dictionaries.
   /// The only values to pass here are ones obtained from showDefinitionInNewTab()
   /// signal or none at all.
-  void openLink( QUrl const & url, QUrl const & referrer,
-                 QString const & scrollTo = QString(),
+  void openLink( QUrl const & url,
+                 QUrl const & referrer,
+                 QString const & scrollTo  = QString(),
                  Contexts const & contexts = Contexts() );
 
   /// Called when the state of dictionary bar changes and the view is active.
@@ -172,15 +170,15 @@ public:
   /// Called when preference changes
   void setSelectionBySingleClick( bool set );
 
-  void setDelayedHighlightText(QString const & text);
+  void setDelayedHighlightText( QString const & text );
 
- private:
+private:
   // widgets
   ArticleWebView * webview;
   SearchPanel * searchPanel;
   FtsSearchPanel * ftsSearchPanel;
 
- public slots:
+public slots:
 
   /// Goes back in history
   void back();
@@ -211,7 +209,7 @@ public:
   void setZoomFactor( qreal factor )
   {
     qreal existedFactor = webview->zoomFactor();
-    if( !qFuzzyCompare( existedFactor, factor ) ) {
+    if ( !qFuzzyCompare( existedFactor, factor ) ) {
       qDebug() << "zoom factor ,existed:" << existedFactor << "set:" << factor;
       webview->setZoomFactor( factor );
       //webview->page()->setZoomFactor(factor);
@@ -221,14 +219,14 @@ public:
   /// Returns current article's text in .html format
   void toHtml( const std::function< void( QString & ) > & callback );
 
-  void setHtml(const QString& content, const QUrl& baseUrl);
-  void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
+  void setHtml( const QString & content, const QUrl & baseUrl );
+  void setContent( const QByteArray & data, const QString & mimeType = QString(), const QUrl & baseUrl = QUrl() );
 
   /// Returns current article's title
   QString getTitle();
 
   /// Returns the phrase translated by the current article.
- QString getWord() const;
+  QString getWord() const;
 
   /// Prints current article
   void print( QPrinter * ) const;
@@ -249,7 +247,7 @@ public:
 
   /// Returns the dictionary id of the currently active article in the view.
   QString getActiveArticleId();
-   void setActiveArticleId(QString const&);
+  void setActiveArticleId( QString const & );
 
   ResourceToSaveHandler * saveResource( const QUrl & url, const QString & fileName );
   ResourceToSaveHandler * saveResource( const QUrl & url, const QUrl & ref, const QString & fileName );
@@ -267,11 +265,10 @@ signals:
   void pageLoaded( ArticleView * );
 
   /// Signals that the following link was requested to be opened in new tab
-  void openLinkInNewTab( QUrl const &, QUrl const & referrer,
-                         QString const & fromArticle,
-                         Contexts const & contexts );
+  void openLinkInNewTab( QUrl const &, QUrl const & referrer, QString const & fromArticle, Contexts const & contexts );
   /// Signals that the following definition was requested to be showed in new tab
-  void showDefinitionInNewTab( QString const & word, unsigned group,
+  void showDefinitionInNewTab( QString const & word,
+                               unsigned group,
                                QString const & fromArticle,
                                Contexts const & contexts );
 
@@ -282,12 +279,12 @@ signals:
   /// switch focus to word input.
   void typingEvent( QString const & text );
 
-  void statusBarMessage( QString const & message, int timeout = 0, QPixmap const & pixmap = QPixmap());
+  void statusBarMessage( QString const & message, int timeout = 0, QPixmap const & pixmap = QPixmap() );
 
   /// Signals that the dictionaries pane was requested to be showed
-  void showDictsPane( );
+  void showDictsPane();
   /// Signals that the founded dictionaries ready to be showed
-  void updateFoundInDictsList( );
+  void updateFoundInDictsList();
 
   /// Emitted when an article becomes active,
   /// typically in response to user actions
@@ -296,14 +293,14 @@ signals:
   void activeArticleChanged( ArticleView const *, QString const & id );
 
   /// Signal to add word to history even if history is disabled
-  void forceAddWordToHistory( const QString & word);
+  void forceAddWordToHistory( const QString & word );
 
   /// Signal to close popup menu
   void closePopupMenu();
 
   void sendWordToInputLine( QString const & word );
 
-  void storeResourceSavePath(QString const & );
+  void storeResourceSavePath( QString const & );
 
   void zoomIn();
   void zoomOut();
@@ -311,7 +308,7 @@ signals:
   ///  signal finished javascript;
   void notifyJavascriptFinished();
 
-  void inspectSignal(QWebEnginePage * page);
+  void inspectSignal( QWebEnginePage * page );
 
   void saveBookmarkSignal( const QString & bookmark );
 
@@ -320,7 +317,7 @@ public slots:
   void on_searchPrevious_clicked();
   void on_searchNext_clicked();
 
-  void onJsActiveArticleChanged(QString const & id);
+  void onJsActiveArticleChanged( QString const & id );
 
   /// Handles F3 and Shift+F3 for search navigation
   bool handleF3( QObject * obj, QEvent * ev );
@@ -338,7 +335,7 @@ private slots:
   void handleUrlChanged( QUrl const & url );
   void attachWebChannelToHtml();
 
-  void linkHovered( const QString & link);
+  void linkHovered( const QString & link );
   void contextMenuRequested( QPoint const & );
 
   bool isAudioLink( QUrl & targetUrl )
@@ -380,9 +377,9 @@ private slots:
   /// Copy current selection as plain text
   void copyAsText();
 
-  void setActiveDictIds(ActiveDictIds);
+  void setActiveDictIds( const ActiveDictIds & ad );
 
-  void dictionaryClear( ActiveDictIds ad );
+  void dictionaryClear( const ActiveDictIds & ad );
 
 private:
 
@@ -417,7 +414,7 @@ private:
   /// Attempts removing last temporary file created.
   void cleanupTemp();
 
-  bool eventFilter( QObject * obj, QEvent * ev );
+  bool eventFilter( QObject * obj, QEvent * ev ) override;
 
   void performFindOperation( bool restart, bool backwards, bool checkHighlight = false );
 
@@ -425,12 +422,11 @@ private:
   /// for the given group. If there are none, returns empty string.
   QString getMutedForGroup( unsigned group );
 
-  QStringList getMutedDictionaries(unsigned group);
+  QStringList getMutedDictionaries( unsigned group );
 
-  protected:
+protected:
   // We need this to hide the search bar when we're showed
-  void showEvent( QShowEvent * );
-
+  void showEvent( QShowEvent * ) override;
 };
 
 class ResourceToSaveHandler: public QObject
@@ -438,10 +434,12 @@ class ResourceToSaveHandler: public QObject
   Q_OBJECT
 
 public:
-  explicit ResourceToSaveHandler( ArticleView * view, QString const & fileName );
-  void addRequest( sptr< Dictionary::DataRequest > req );
+  explicit ResourceToSaveHandler( ArticleView * view, QString fileName );
+  void addRequest( const sptr< Dictionary::DataRequest > & req );
   bool isEmpty()
-  { return downloadRequests.empty(); }
+  {
+    return downloadRequests.empty();
+  }
 
 signals:
   void done();
@@ -456,13 +454,13 @@ private:
   bool alreadyDone;
 };
 
-class ArticleViewAgent : public QObject
+class ArticleViewAgent: public QObject
 {
   Q_OBJECT
   ArticleView * articleView;
 
 public:
-  ArticleViewAgent( ArticleView * articleView );
+  explicit ArticleViewAgent( ArticleView * articleView );
 
 
 public slots:
diff --git a/src/ui/articlewebpage.cc b/src/ui/articlewebpage.cc
index 39aa6227..810b8153 100644
--- a/src/ui/articlewebpage.cc
+++ b/src/ui/articlewebpage.cc
@@ -1,15 +1,14 @@
 #include "articlewebpage.hh"
 #include "utils.hh"
 
-ArticleWebPage::ArticleWebPage(QObject *parent)
-  : QWebEnginePage{parent}
+ArticleWebPage::ArticleWebPage( QObject * parent ):
+  QWebEnginePage{ parent }
 {
 }
 bool ArticleWebPage::acceptNavigationRequest( const QUrl & resUrl, NavigationType type, bool isMainFrame )
 {
   QUrl url = resUrl;
-  if( url.scheme() == "bword" || url.scheme() == "entry" )
-  {
+  if ( url.scheme() == "bword" || url.scheme() == "entry" ) {
     url.setScheme( "gdlookup" );
     url.setHost( "localhost" );
     url.setPath( "" );
@@ -22,14 +21,12 @@ bool ArticleWebPage::acceptNavigationRequest( const QUrl & resUrl, NavigationTyp
   }
 
   //save current gdlookup's values.
-  if( url.scheme() == "gdlookup" )
-  {
+  if ( url.scheme() == "gdlookup" ) {
     lastReq.group      = Utils::Url::queryItemValue( url, "group" );
     lastReq.mutedDicts = Utils::Url::queryItemValue( url, "muted" );
   }
 
-  if( type == QWebEnginePage::NavigationTypeLinkClicked )
-  {
+  if ( type == QWebEnginePage::NavigationTypeLinkClicked ) {
     emit linkClicked( url );
     return false;
   }
diff --git a/src/ui/articlewebpage.hh b/src/ui/articlewebpage.hh
index 19027148..603b45e6 100644
--- a/src/ui/articlewebpage.hh
+++ b/src/ui/articlewebpage.hh
@@ -3,20 +3,24 @@
 
 #include <QWebEnginePage>
 
-struct LastReqInfo{
+struct LastReqInfo
+{
   QString group;
   QString mutedDicts;
 };
 
-class ArticleWebPage : public QWebEnginePage
+class ArticleWebPage: public QWebEnginePage
 {
   Q_OBJECT
+
 public:
   explicit ArticleWebPage( QObject * parent = nullptr );
 signals:
-    void linkClicked( const QUrl & url );
+  void linkClicked( const QUrl & url );
+
 protected:
   virtual bool acceptNavigationRequest( const QUrl & url, NavigationType type, bool isMainFrame );
+
 private:
   LastReqInfo lastReq;
 };
diff --git a/src/ui/articlewebview.cc b/src/ui/articlewebview.cc
index 3a5f6182..038be525 100644
--- a/src/ui/articlewebview.cc
+++ b/src/ui/articlewebview.cc
@@ -10,10 +10,10 @@
 #include <QDialog>
 #include <QMainWindow>
 #ifdef Q_OS_WIN32
-#include <qt_windows.h>
+  #include <qt_windows.h>
 #endif
 
-ArticleWebView::ArticleWebView( QWidget *parent ):
+ArticleWebView::ArticleWebView( QWidget * parent ):
   QWebEngineView( parent ),
   midButtonPressed( false ),
   selectionBySingleClick( false )
@@ -23,157 +23,159 @@ ArticleWebView::ArticleWebView( QWidget *parent ):
   this->setPage( page );
 }
 
-void ArticleWebView::setUp( Config::Class * cfg )
+void ArticleWebView::setUp( Config::Class * _cfg )
 {
-  this->cfg = cfg;
-  setZoomFactor(cfg->preferences.zoomFactor);
+  this->cfg = _cfg;
+  setZoomFactor( _cfg->preferences.zoomFactor );
 }
 
 QWebEngineView * ArticleWebView::createWindow( QWebEnginePage::WebWindowType type )
 {
-  if(type==QWebEnginePage::WebWindowType::WebDialog)
-  {
-    QMainWindow * dlg = new QMainWindow( this );
-    QWebEngineView * view = new QWebEngineView( dlg );
-    dlg->setCentralWidget(view);
-    dlg->resize(400,400);
+  if ( type == QWebEnginePage::WebWindowType::WebDialog ) {
+    auto dlg  = new QMainWindow( this );
+    auto view = new QWebEngineView( dlg );
+    dlg->setCentralWidget( view );
+    dlg->resize( 400, 400 );
     dlg->show();
 
     return view;
   }
-  return QWebEngineView::createWindow(type);
+  return QWebEngineView::createWindow( type );
 }
 
 bool ArticleWebView::event( QEvent * event )
 {
-  if( event->type() == QEvent::ChildAdded )
-  {
-    QChildEvent * child_ev = static_cast< QChildEvent * >( event );
+  if ( event->type() == QEvent::ChildAdded ) {
+    auto child_ev = dynamic_cast< QChildEvent * >( event );
     child_ev->child()->installEventFilter( this );
   }
 
   return QWebEngineView::event( event );
 }
 
-void ArticleWebView::linkClickedInHtml(QUrl const& ){
-  //disable single click to simulate dbclick action on the new loaded pages.
-  singleClickToDbClick=false;
-}
-
-bool ArticleWebView::eventFilter(QObject *obj, QEvent *ev) {
-    if (ev->type() == QEvent::MouseButtonDblClick) {
-      QMouseEvent *pe = static_cast<QMouseEvent *>(ev);
-      if (Qt::MouseEventSynthesizedByApplication != pe->source()) {
-        singleClickToDbClick = false;
-        dbClicked = true;
-      }
-    }
-    if (ev->type()==QEvent::MouseMove) {
-      singleClickToDbClick=false;
-    }
-    if (ev->type() == QEvent::MouseButtonPress) {
-        QMouseEvent *pe = static_cast<QMouseEvent *>(ev);
-        if(pe->button() == Qt::LeftButton)
-        {
-          singleClickToDbClick = true;
-          dbClicked = false;
-          QTimer::singleShot(QApplication::doubleClickInterval(),this,[=](){
-            singleClickAction(pe);
-          });
-        }
-        mousePressEvent(pe);
-    }
-    if (ev->type() == QEvent::MouseButtonRelease) {
-        QMouseEvent *pe = static_cast<QMouseEvent *>(ev);
-        mouseReleaseEvent(pe);
-        if (dbClicked) {
-          //emit the signal after button release.emit earlier(in MouseButtonDblClick event) can not get selected text;
-            doubleClickAction(pe);
-        }
-    }
-    if (ev->type() == QEvent::Wheel) {
-        QWheelEvent *pe = static_cast<QWheelEvent *>(ev);
-        wheelEvent(pe);
-
-        if ( pe->modifiers().testFlag( Qt::ControlModifier ) )
-        {
-          return true;
-        }
-    }
-
-    return QWebEngineView::eventFilter(obj, ev);
-}
-
-void ArticleWebView::mousePressEvent(QMouseEvent *event)
+void ArticleWebView::linkClickedInHtml( QUrl const & )
 {
-  if( event->buttons() & Qt::MiddleButton )
+  //disable single click to simulate dbclick action on the new loaded pages.
+  singleClickToDbClick = false;
+}
+
+bool ArticleWebView::eventFilter( QObject * obj, QEvent * ev )
+{
+  if ( ev->type() == QEvent::MouseButtonDblClick ) {
+    auto pe = dynamic_cast< QMouseEvent * >( ev );
+    if ( Qt::MouseEventSynthesizedByApplication != pe->source() ) {
+      singleClickToDbClick = false;
+      dbClicked            = true;
+    }
+  }
+  if ( ev->type() == QEvent::MouseMove ) {
+    singleClickToDbClick = false;
+  }
+  if ( ev->type() == QEvent::MouseButtonPress ) {
+    auto pe = dynamic_cast< QMouseEvent * >( ev );
+    if ( pe->button() == Qt::LeftButton ) {
+      singleClickToDbClick = true;
+      dbClicked            = false;
+      QTimer::singleShot( QApplication::doubleClickInterval(), this, [ = ]() {
+        singleClickAction( pe );
+      } );
+    }
+    mousePressEvent( pe );
+  }
+  if ( ev->type() == QEvent::MouseButtonRelease ) {
+    auto pe = dynamic_cast< QMouseEvent * >( ev );
+    mouseReleaseEvent( pe );
+    if ( dbClicked ) {
+      //emit the signal after button release.emit earlier(in MouseButtonDblClick event) can not get selected text;
+      doubleClickAction( pe );
+    }
+  }
+  if ( ev->type() == QEvent::Wheel ) {
+    auto pe = dynamic_cast< QWheelEvent * >( ev );
+    wheelEvent( pe );
+
+    if ( pe->modifiers().testFlag( Qt::ControlModifier ) ) {
+      return true;
+    }
+  }
+
+  return QWebEngineView::eventFilter( obj, ev );
+}
+
+void ArticleWebView::mousePressEvent( QMouseEvent * event )
+{
+  if ( event->buttons() & Qt::MiddleButton )
     midButtonPressed = true;
 
-  if( event->buttons() & Qt::XButton1 )
-  {
+  if ( event->buttons() & Qt::XButton1 ) {
     back();
   }
-  if( event->buttons() & Qt::XButton2 )
-  {
+  if ( event->buttons() & Qt::XButton2 ) {
     forward();
   }
 }
 
-void ArticleWebView::singleClickAction(QMouseEvent *event )
+void ArticleWebView::singleClickAction( QMouseEvent * event )
 {
-  if(!singleClickToDbClick)
+  if ( !singleClickToDbClick )
     return;
 
-  if (selectionBySingleClick) {
-      findText(""); // clear the selection first, if any
-      //send dbl click event twice? send one time seems not work .weird really.  need further investigate.
-      sendCustomMouseEvent( QEvent::MouseButtonDblClick);
-      sendCustomMouseEvent( QEvent::MouseButtonDblClick);
+  if ( selectionBySingleClick ) {
+    findText( "" ); // clear the selection first, if any
+    //send dbl click event twice? send one time seems not work .weird really.  need further investigate.
+    sendCustomMouseEvent( QEvent::MouseButtonDblClick );
+    sendCustomMouseEvent( QEvent::MouseButtonDblClick );
   }
 }
 
-void ArticleWebView::sendCustomMouseEvent( QEvent::Type type) {
-  QPoint pt = mapFromGlobal(QCursor::pos());
-  QMouseEvent ev(type, pt, pt, QCursor::pos(), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier,
-                 Qt::MouseEventSynthesizedByApplication);
+void ArticleWebView::sendCustomMouseEvent( QEvent::Type type )
+{
+  QPoint pt = mapFromGlobal( QCursor::pos() );
+  QMouseEvent ev( type,
+                  pt,
+                  pt,
+                  QCursor::pos(),
+                  Qt::LeftButton,
+                  Qt::LeftButton,
+                  Qt::NoModifier,
+                  Qt::MouseEventSynthesizedByApplication );
 
   auto childrens = this->children();
-  for (auto child:childrens) {
-    QApplication::sendEvent(child, &ev);
+  for ( auto child : childrens ) {
+    QApplication::sendEvent( child, &ev );
   }
 }
 
-void ArticleWebView::mouseReleaseEvent(QMouseEvent *event) {
+void ArticleWebView::mouseReleaseEvent( QMouseEvent * event )
+{
   bool noMidButton = !( event->buttons() & Qt::MiddleButton );
 
-//  if ( midButtonPressed & noMidButton )
-//    midButtonPressed = false;
+  //  if ( midButtonPressed & noMidButton )
+  //    midButtonPressed = false;
 }
 
-void ArticleWebView::doubleClickAction(QMouseEvent *event) {
-  if (Qt::MouseEventSynthesizedByApplication != event->source()) {
-    emit doubleClicked(event->pos());
+void ArticleWebView::doubleClickAction( QMouseEvent * event )
+{
+  if ( Qt::MouseEventSynthesizedByApplication != event->source() ) {
+    emit doubleClicked( event->pos() );
   }
 }
 
-void ArticleWebView::wheelEvent( QWheelEvent *ev )
+void ArticleWebView::wheelEvent( QWheelEvent * ev )
 {
 #ifdef Q_OS_WIN32
 
   // Avoid wrong mouse wheel handling in QWebEngineView
   // if system preferences is set to "scroll by page"
 
-  if( ev->modifiers() == Qt::NoModifier )
-  {
+  if ( ev->modifiers() == Qt::NoModifier ) {
     unsigned nLines;
     SystemParametersInfo( SPI_GETWHEELSCROLLLINES, 0, &nLines, 0 );
-    if( nLines == WHEEL_PAGESCROLL )
-    {
-      QKeyEvent kev( QEvent::KeyPress, ev->angleDelta ().y () > 0 ? Qt::Key_PageUp : Qt::Key_PageDown,
-                     Qt::NoModifier );
+    if ( nLines == WHEEL_PAGESCROLL ) {
+      QKeyEvent kev( QEvent::KeyPress, ev->angleDelta().y() > 0 ? Qt::Key_PageUp : Qt::Key_PageDown, Qt::NoModifier );
       auto childrens = this->children();
-      for (auto child : childrens) {
-        QApplication::sendEvent(child, &kev);
+      for ( auto child : childrens ) {
+        QApplication::sendEvent( child, &kev );
       }
 
       ev->accept();
@@ -182,13 +184,10 @@ void ArticleWebView::wheelEvent( QWheelEvent *ev )
   }
 #endif
 
-  if ( ev->modifiers().testFlag( Qt::ControlModifier ) )
-  {
-     ev->ignore();
+  if ( ev->modifiers().testFlag( Qt::ControlModifier ) ) {
+    ev->ignore();
   }
-  else
-  {
-     QWebEngineView::wheelEvent( ev );
+  else {
+    QWebEngineView::wheelEvent( ev );
   }
-
 }
diff --git a/src/ui/articlewebview.hh b/src/ui/articlewebview.hh
index a90bb1bd..f65ebf83 100644
--- a/src/ui/articlewebview.hh
+++ b/src/ui/articlewebview.hh
@@ -22,21 +22,25 @@ class ArticleWebView: public QWebEngineView
 
 public:
 
-  ArticleWebView( QWidget * parent );
-  void setUp( Config::Class * cfg );
+  explicit ArticleWebView( QWidget * parent );
+  void setUp( Config::Class * _cfg );
 
   bool isMidButtonPressed() const
-  { return midButtonPressed; }
+  {
+    return midButtonPressed;
+  }
   void resetMidButtonPressed()
   {
     midButtonPressed = false;
   }
   void setSelectionBySingleClick( bool set )
-  { selectionBySingleClick = set; }
+  {
+    selectionBySingleClick = set;
+  }
 
-  bool eventFilter(QObject *obj, QEvent *ev);
+  bool eventFilter( QObject * obj, QEvent * ev ) override;
 
-  signals:
+signals:
 
   /// Signals that the user has just double-clicked. The signal is delivered
   /// after the event was processed by the view -- that's the difference from
@@ -47,18 +51,16 @@ public:
   void linkClicked( const QUrl & url );
 
 protected:
-  QWebEngineView *createWindow(QWebEnginePage::WebWindowType type);
-  bool event( QEvent * event );
-  void singleClickAction(QMouseEvent *event);
-  void sendCustomMouseEvent(QEvent::Type type);
-  void mousePressEvent(QMouseEvent *event);
-  void mouseReleaseEvent( QMouseEvent * event );
+  QWebEngineView * createWindow( QWebEnginePage::WebWindowType type ) override;
+  bool event( QEvent * event ) override;
+  void singleClickAction( QMouseEvent * event );
+  void sendCustomMouseEvent( QEvent::Type type );
+  void mousePressEvent( QMouseEvent * event ) override;
+  void mouseReleaseEvent( QMouseEvent * event ) override;
   void doubleClickAction( QMouseEvent * event );
-  void wheelEvent( QWheelEvent * event );
-
+  void wheelEvent( QWheelEvent * event ) override;
 
 private:
-
   Config::Class * cfg;
   //QPointer<QOpenGLWidget> child_;
 
diff --git a/src/ui/chineseconversion.cc b/src/ui/chineseconversion.cc
index 7fa6bc9d..421e8a18 100644
--- a/src/ui/chineseconversion.cc
+++ b/src/ui/chineseconversion.cc
@@ -4,9 +4,9 @@
 #include "chineseconversion.hh"
 #include "ui_chineseconversion.h"
 
-ChineseConversion::ChineseConversion(QWidget * parent, Config::Chinese const & cfg) :
-  QGroupBox(parent),
-  ui(new Ui::ChineseConversion)
+ChineseConversion::ChineseConversion( QWidget * parent, Config::Chinese const & cfg ):
+  QGroupBox( parent ),
+  ui( new Ui::ChineseConversion )
 {
   ui->setupUi( this );
 
@@ -23,7 +23,7 @@ ChineseConversion::~ChineseConversion()
 
 void ChineseConversion::getConfig( Config::Chinese & cfg ) const
 {
-  cfg.enable = isChecked();
+  cfg.enable                 = isChecked();
   cfg.enableSCToTWConversion = ui->enableSCToTWConversion->isChecked();
   cfg.enableSCToHKConversion = ui->enableSCToHKConversion->isChecked();
   cfg.enableTCToSCConversion = ui->enableTCToSCConversion->isChecked();
diff --git a/src/ui/chineseconversion.hh b/src/ui/chineseconversion.hh
index 9bc7cba5..00541067 100644
--- a/src/ui/chineseconversion.hh
+++ b/src/ui/chineseconversion.hh
@@ -11,7 +11,7 @@ namespace Ui {
 class ChineseConversion;
 }
 
-class ChineseConversion : public QGroupBox
+class ChineseConversion: public QGroupBox
 {
   Q_OBJECT
 
@@ -22,7 +22,7 @@ public:
   void getConfig( Config::Chinese & ) const;
 
 private:
-  Ui::ChineseConversion *ui;
+  Ui::ChineseConversion * ui;
 };
 
 #endif // __CHINESE_CONVERSION_HH_INCLUDED__
diff --git a/src/ui/dictheadwords.cc b/src/ui/dictheadwords.cc
index 1f7faea1..646fae0b 100644
--- a/src/ui/dictheadwords.cc
+++ b/src/ui/dictheadwords.cc
@@ -6,8 +6,8 @@
 #include "headwordsmodel.hh"
 
 #include <QRegExp>
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QtCore5Compat>
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QtCore5Compat>
 #endif
 #include <QDir>
 #include <QFileDialog>
@@ -33,12 +33,12 @@ DictHeadwords::DictHeadwords( QWidget * parent, Config::Class & cfg_, Dictionary
 
   const bool fromMainWindow = parent->objectName() == "MainWindow";
 
-  if( fromMainWindow )
+  if ( fromMainWindow )
     setAttribute( Qt::WA_DeleteOnClose, false );
 
   setWindowFlags( windowFlags() & ~Qt::WindowContextHelpButtonHint );
 
-  if( cfg.headwordsDialog.headwordsDialogGeometry.size() > 0 )
+  if ( cfg.headwordsDialog.headwordsDialogGeometry.size() > 0 )
     restoreGeometry( cfg.headwordsDialog.headwordsDialogGeometry );
 
   ui.searchModeCombo->addItem( tr( "Text" ), QRegExp::FixedString );
@@ -47,7 +47,7 @@ DictHeadwords::DictHeadwords( QWidget * parent, Config::Class & cfg_, Dictionary
   ui.searchModeCombo->setCurrentIndex( cfg.headwordsDialog.searchMode );
 
   ui.exportButton->setAutoDefault( false );
-  ui.OKButton->setAutoDefault( false);
+  ui.OKButton->setAutoDefault( false );
   ui.applyButton->setAutoDefault( true );
   ui.applyButton->setDefault( true );
 
@@ -69,20 +69,18 @@ DictHeadwords::DictHeadwords( QWidget * parent, Config::Class & cfg_, Dictionary
   ui.headersListView->setUniformItemSizes( true );
 
   delegate = new WordListItemDelegate( ui.headersListView->itemDelegate() );
-  if( delegate )
+  if ( delegate )
     ui.headersListView->setItemDelegate( delegate );
 
   ui.autoApply->setChecked( cfg.headwordsDialog.autoApply );
 
   connect( this, &QDialog::finished, this, &DictHeadwords::savePos );
 
-  if( !fromMainWindow )
-  {
+  if ( !fromMainWindow ) {
     ui.helpButton->hide();
     connect( this, &DictHeadwords::closeDialog, this, &QDialog::accept );
   }
-  else
-  {
+  else {
 
     helpAction.setShortcut( QKeySequence( "F1" ) );
     helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
@@ -116,11 +114,11 @@ DictHeadwords::DictHeadwords( QWidget * parent, Config::Class & cfg_, Dictionary
 
 DictHeadwords::~DictHeadwords()
 {
-  if( delegate )
+  if ( delegate )
     delegate->deleteLater();
 }
 
-void DictHeadwords::setup( Dictionary::Class *dict_ )
+void DictHeadwords::setup( Dictionary::Class * dict_ )
 {
   QApplication::setOverrideCursor( Qt::WaitCursor );
 
@@ -141,8 +139,7 @@ void DictHeadwords::setup( Dictionary::Class *dict_ )
     ui.autoApply->setChecked( false );
     ui.autoApply->setEnabled( false );
   }
-  else
-  {
+  else {
     ui.autoApply->setEnabled( true );
     ui.autoApply->setChecked( cfg.headwordsDialog.autoApply );
   }
@@ -159,9 +156,9 @@ void DictHeadwords::setup( Dictionary::Class *dict_ )
 void DictHeadwords::savePos()
 {
   cfg.headwordsDialog.searchMode = ui.searchModeCombo->currentIndex();
-  cfg.headwordsDialog.matchCase = ui.matchCase->isChecked();
+  cfg.headwordsDialog.matchCase  = ui.matchCase->isChecked();
 
-  if( model->totalCount() <= AUTO_APPLY_LIMIT )
+  if ( model->totalCount() <= AUTO_APPLY_LIMIT )
     cfg.headwordsDialog.autoApply = ui.autoApply->isChecked();
 
   cfg.headwordsDialog.headwordsDialogGeometry = saveGeometry();
@@ -169,11 +166,9 @@ void DictHeadwords::savePos()
 
 bool DictHeadwords::eventFilter( QObject * obj, QEvent * ev )
 {
-  if( obj == ui.headersListView && ev->type() == QEvent::KeyPress )
-  {
+  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 )
-    {
+    if ( kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter ) {
       itemClicked( ui.headersListView->currentIndex() );
       return true;
     }
@@ -201,23 +196,21 @@ void DictHeadwords::exportButtonClicked()
 void DictHeadwords::filterChangedInternal()
 {
   // emit signal in async manner, to avoid UI slowdown
-  if( ui.autoApply->isChecked() )
+  if ( ui.autoApply->isChecked() )
     QTimer::singleShot( 100, this, &DictHeadwords::filterChanged );
 }
 
-QRegularExpression DictHeadwords::getFilterRegex(  ) const
+QRegularExpression DictHeadwords::getFilterRegex() const
 {
   const QRegExp::PatternSyntax syntax =
-    static_cast< QRegExp::PatternSyntax >(ui.searchModeCombo->itemData(
-      ui.searchModeCombo->currentIndex() ).toInt());
+    static_cast< QRegExp::PatternSyntax >( ui.searchModeCombo->itemData( ui.searchModeCombo->currentIndex() ).toInt() );
 
   QRegularExpression::PatternOptions options = QRegularExpression::UseUnicodePropertiesOption;
-  if( !ui.matchCase->isChecked() )
+  if ( !ui.matchCase->isChecked() )
     options |= QRegularExpression::CaseInsensitiveOption;
 
   QString pattern;
-  switch( syntax )
-  {
+  switch ( syntax ) {
     case QRegExp::FixedString:
       pattern = QRegularExpression::escape( ui.filterLine->text() );
       break;
@@ -231,8 +224,7 @@ QRegularExpression DictHeadwords::getFilterRegex(  ) const
 
   QRegularExpression regExp = QRegularExpression( pattern, options );
 
-  if( !regExp.isValid() )
-  {
+  if ( !regExp.isValid() ) {
     gdWarning( "Invalid regexp pattern: %s\n", pattern.toUtf8().data() );
   }
   return regExp;
@@ -268,8 +260,7 @@ void DictHeadwords::filterChanged()
 void DictHeadwords::itemClicked( const QModelIndex & index )
 {
   QVariant value = proxy->data( index, Qt::DisplayRole );
-  if ( value.canConvert< QString >() )
-  {
+  if ( value.canConvert< QString >() ) {
     QString headword = value.toString();
     emit headwordSelected( headword, dictId );
   }
@@ -283,11 +274,11 @@ void DictHeadwords::autoApplyStateChanged( int state )
 void DictHeadwords::showHeadwordsNumber()
 {
   ui.headersNumber->setText( tr( "Unique headwords total: %1, filtered: %2" )
-                             .arg( QString::number( model->totalCount() ), QString::number( proxy->rowCount() ) ) );
+                               .arg( QString::number( model->totalCount() ), QString::number( proxy->rowCount() ) ) );
 }
 
 // TODO , the ui and the code mixed together , this is not the right way to do this. need future refactor
-void  DictHeadwords::loadAllSortedWords( QProgressDialog & progress )
+void DictHeadwords::loadAllSortedWords( QProgressDialog & progress )
 {
   const int headwordsNumber = model->totalCount();
 
@@ -330,35 +321,34 @@ void  DictHeadwords::loadAllSortedWords( QProgressDialog & progress )
 void DictHeadwords::saveHeadersToFile()
 {
   QString exportPath;
-  if( cfg.headwordsDialog.headwordsExportPath.isEmpty() )
+  if ( cfg.headwordsDialog.headwordsExportPath.isEmpty() )
     exportPath = QDir::homePath();
-  else
-  {
+  else {
     exportPath = QDir::fromNativeSeparators( cfg.headwordsDialog.headwordsExportPath );
-    if( !QDir( exportPath ).exists() )
+    if ( !QDir( exportPath ).exists() )
       exportPath = QDir::homePath();
   }
 
-  QString fileName = QFileDialog::getSaveFileName( this, tr( "Save headwords to file" ),
+  QString fileName = QFileDialog::getSaveFileName( this,
+                                                   tr( "Save headwords to file" ),
                                                    exportPath,
                                                    tr( "Text files (*.txt);;All files (*.*)" ) );
-  if( fileName.size() == 0)
-      return;
+  if ( fileName.size() == 0 )
+    return;
 
   QFile file( fileName );
 
-  if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
-  {
+  if ( !file.open( QFile::WriteOnly | QIODevice::Text ) ) {
     QMessageBox::critical( this, "GoldenDict", tr( "Can not open exported file" ) );
     return;
   }
 
-  cfg.headwordsDialog.headwordsExportPath = QDir::toNativeSeparators(
-                                              QFileInfo( fileName ).absoluteDir().absolutePath() );
+  cfg.headwordsDialog.headwordsExportPath =
+    QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
 
   const int headwordsNumber = model->totalCount();
 
-  QProgressDialog progress( tr( "Export headwords..." ), tr( "Cancel" ), 0, headwordsNumber*2, this );
+  QProgressDialog progress( tr( "Export headwords..." ), tr( "Cancel" ), 0, headwordsNumber * 2, this );
   progress.setWindowModality( Qt::WindowModal );
 
   loadAllSortedWords( progress );
@@ -368,7 +358,7 @@ void DictHeadwords::saveHeadersToFile()
   out.setGenerateByteOrderMark( true );
 //qt 6 will use utf-8 default.
 #if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
-  out.setCodec("UTF-8");
+  out.setCodec( "UTF-8" );
 #endif
 
   QStringList filtered;
@@ -376,14 +366,13 @@ void DictHeadwords::saveHeadersToFile()
   if ( const QRegularExpression regExp = getFilterRegex(); regExp.isValid() && !regExp.pattern().isEmpty() ) {
     filtered = sortedWords.filter( regExp );
   }
-  else{
+  else {
     filtered = sortedWords;
   }
   auto currentValue = progress.value();
   // Write headwords
-  for ( auto const & word : filtered )
-  {
-    if( progress.wasCanceled() )
+  for ( auto const & word : filtered ) {
+    if ( progress.wasCanceled() )
       break;
     progress.setValue( currentValue++ );
     QByteArray line = word.toUtf8();
@@ -399,15 +388,13 @@ void DictHeadwords::saveHeadersToFile()
   file.close();
 
   progress.setValue( progress.maximum() );
-  if( progress.wasCanceled() )
-  {
+  if ( progress.wasCanceled() ) {
     QMessageBox::warning( this, "GoldenDict", tr( "Export process is interrupted" ) );
     gdWarning( "Headers export error: %s", file.errorString().toUtf8().data() );
   }
-  else
-  {
+  else {
     //completed.
-    progress.setValue(headwordsNumber*2);
+    progress.setValue( headwordsNumber * 2 );
     progress.close();
     QMessageBox::information( this, "GoldenDict", tr( "Export finished" ) );
   }
diff --git a/src/ui/dictheadwords.hh b/src/ui/dictheadwords.hh
index 9c7d57cd..a4b56c94 100644
--- a/src/ui/dictheadwords.hh
+++ b/src/ui/dictheadwords.hh
@@ -16,13 +16,12 @@
 #include "delegate.hh"
 #include "headwordsmodel.hh"
 
-class DictHeadwords : public QDialog
+class DictHeadwords: public QDialog
 {
   Q_OBJECT
 
 public:
-  explicit DictHeadwords( QWidget * parent, Config::Class & cfg_,
-                          Dictionary::Class * dict_ );
+  explicit DictHeadwords( QWidget * parent, Config::Class & cfg_, Dictionary::Class * dict_ );
   virtual ~DictHeadwords();
 
   void setup( Dictionary::Class * dict_ );
diff --git a/src/ui/dictinfo.cc b/src/ui/dictinfo.cc
index c19f931c..cdfac39c 100644
--- a/src/ui/dictinfo.cc
+++ b/src/ui/dictinfo.cc
@@ -1,35 +1,36 @@
 #include "dictinfo.hh"
-#include "langcoder.hh"
 #include "language.hh"
+#include <QDesktopServices>
+#include "config.hh"
 
 #include <QString>
 
-DictInfo::DictInfo( Config::Class &cfg_, QWidget *parent ) :
-  QDialog( parent),
-  cfg( cfg_)
+DictInfo::DictInfo( Config::Class & cfg_, QWidget * parent ):
+  QDialog( parent ),
+  cfg( cfg_ )
 {
   ui.setupUi( this );
-  if( cfg.dictInfoGeometry.size() > 0 )
+  if ( cfg.dictInfoGeometry.size() > 0 )
     restoreGeometry( cfg.dictInfoGeometry );
   connect( this, &QDialog::finished, this, &DictInfo::savePos );
 }
 
-void DictInfo::showInfo( sptr<Dictionary::Class> dict )
+void DictInfo::showInfo( sptr< Dictionary::Class > dict )
 {
   setWindowTitle( QString::fromUtf8( dict->getName().data(), dict->getName().size() ) );
 
-  ui.dictionaryId->setText( QString::fromStdString( dict->getId() ));
+  ui.dictionaryId->setText( QString::fromStdString( dict->getId() ) );
   ui.dictionaryTotalArticles->setText( QString::number( dict->getArticleCount() ) );
   ui.dictionaryTotalWords->setText( QString::number( dict->getWordCount() ) );
   ui.dictionaryTranslatesFrom->setText( Language::localizedStringForId( dict->getLangFrom() ) );
   ui.dictionaryTranslatesTo->setText( Language::localizedStringForId( dict->getLangTo() ) );
 
   ui.openFolder->setVisible( dict->isLocalDictionary() );
-  ui.editDictionary->setVisible( dict->isLocalDictionary() && !dict->getMainFilename().isEmpty() && !cfg.editDictionaryCommandLine.isEmpty());
-  ui.editDictionary->setToolTip(
-        tr( "Edit the dictionary via command:\n%1" ).arg( cfg.editDictionaryCommandLine ) );
+  ui.editDictionary->setVisible( dict->isLocalDictionary() && !dict->getMainFilename().isEmpty()
+                                 && !cfg.editDictionaryCommandLine.isEmpty() );
+  ui.editDictionary->setToolTip( tr( "Edit the dictionary via command:\n%1" ).arg( cfg.editDictionaryCommandLine ) );
 
-  if( dict->getWordCount() == 0 )
+  if ( dict->getWordCount() == 0 )
     ui.headwordsButton->setVisible( false );
   else
     ui.buttonsLayout->insertSpacerItem( 0, new QSpacerItem( 40, 20, QSizePolicy::Expanding ) );
@@ -38,17 +39,14 @@ void DictInfo::showInfo( sptr<Dictionary::Class> dict )
 
   QString filenamesText;
 
-  for( unsigned x = 0; x < filenames.size(); x++ )
-  {
-    filenamesText += QString::fromStdString( filenames[ x ] );
+  for ( const auto & filename : filenames ) {
+    filenamesText += QString::fromStdString( filename );
     filenamesText += '\n';
   }
 
   ui.dictionaryFileList->setPlainText( filenamesText );
 
-  QString info = dict->getDescription();
-
-  if( !info.isEmpty() && info.compare( "NONE" ) != 0 ) {
+  if ( QString info = dict->getDescription(); !info.isEmpty() && info.compare( "NONE" ) != 0 ) {
     //qtbug QTBUG-112020
     info.remove( QRegularExpression( R"(<link[^>]*>)", QRegularExpression::CaseInsensitiveOption ) );
     ui.infoLabel->setHtml( info );
@@ -83,3 +81,8 @@ void DictInfo::on_headwordsButton_clicked()
 {
   done( SHOW_HEADWORDS );
 }
+
+void DictInfo::on_openIndexFolder_clicked()
+{
+  QDesktopServices::openUrl( QUrl::fromLocalFile( Config::getIndexDir() ) );
+}
diff --git a/src/ui/dictinfo.hh b/src/ui/dictinfo.hh
index 35c07822..74a15b6a 100644
--- a/src/ui/dictinfo.hh
+++ b/src/ui/dictinfo.hh
@@ -9,10 +9,10 @@
 class DictInfo: public QDialog
 {
   Q_OBJECT
+
 public:
 
-  enum Actions
-  {
+  enum Actions {
     REJECTED,
     ACCEPTED,
     OPEN_FOLDER,
@@ -20,18 +20,19 @@ public:
     SHOW_HEADWORDS
   };
 
-  DictInfo( Config::Class &cfg_, QWidget * parent = 0 );
+  DictInfo( Config::Class & cfg_, QWidget * parent = nullptr );
   void showInfo( sptr< Dictionary::Class > dict );
 
 private:
   Ui::DictInfo ui;
-  Config::Class &cfg;
+  Config::Class & cfg;
 private slots:
   void savePos( int );
   void on_editDictionary_clicked();
   void on_openFolder_clicked();
   void on_OKButton_clicked();
   void on_headwordsButton_clicked();
+  void on_openIndexFolder_clicked();
 };
 
 #endif // DICTINFO_HH
diff --git a/src/ui/dictinfo.ui b/src/ui/dictinfo.ui
index 006e82dc..bb01984b 100644
--- a/src/ui/dictinfo.ui
+++ b/src/ui/dictinfo.ui
@@ -23,67 +23,6 @@
       <string/>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="1" column="3">
-       <widget class="QLabel" name="dictionaryTranslatesTo">
-        <property name="text">
-         <string notr="true"/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="4">
-       <widget class="QPushButton" name="openFolder">
-        <property name="text">
-         <string>Open folder</string>
-        </property>
-        <property name="autoDefault">
-         <bool>false</bool>
-        </property>
-        <property name="default">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLabel" name="label_4">
-        <property name="text">
-         <string>Translates from:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="label_6">
-        <property name="text">
-         <string>Total words:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="label_8">
-        <property name="text">
-         <string>Translates to:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="4">
-       <widget class="QPushButton" name="editDictionary">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="text">
-         <string>Edit dictionary</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Total articles:</string>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
        <widget class="QLabel" name="dictionaryTotalArticles">
         <property name="text">
@@ -94,8 +33,22 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="3">
-       <widget class="QLabel" name="dictionaryTranslatesFrom">
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>Total words:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Translates from:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLabel" name="dictionaryTranslatesTo">
         <property name="text">
          <string notr="true"/>
         </property>
@@ -111,7 +64,52 @@
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="3">
+      <item row="0" column="3">
+       <widget class="QLabel" name="dictionaryTranslatesFrom">
+        <property name="text">
+         <string notr="true"/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Total articles:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QPushButton" name="openFolder">
+        <property name="text">
+         <string>Open folder</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QPushButton" name="editDictionary">
+        <property name="enabled">
+         <bool>true</bool>
+        </property>
+        <property name="text">
+         <string>Edit dictionary</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Translates to:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Index filename:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
        <widget class="QLabel" name="dictionaryId">
         <property name="text">
          <string/>
@@ -121,6 +119,13 @@
         </property>
        </widget>
       </item>
+      <item row="2" column="4">
+       <widget class="QPushButton" name="openIndexFolder">
+        <property name="text">
+         <string>Open index folder</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -198,9 +203,6 @@
        <property name="text">
         <string>Headwords</string>
        </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
       </widget>
      </item>
      <item>
diff --git a/src/ui/dictionarybar.cc b/src/ui/dictionarybar.cc
index 4a9569d0..9ab4c1a4 100644
--- a/src/ui/dictionarybar.cc
+++ b/src/ui/dictionarybar.cc
@@ -9,16 +9,19 @@
 using std::vector;
 
 DictionaryBar::DictionaryBar( QWidget * parent,
-                              Config::Events & events, QString const & _editDictionaryCommand, unsigned short const & maxDictionaryRefsInContextMenu_ ):
+                              Config::Events & events,
+                              QString const & _editDictionaryCommand,
+                              unsigned short const & maxDictionaryRefsInContextMenu_ ):
   QToolBar( tr( "&Dictionary Bar" ), parent ),
   mutedDictionaries( 0 ),
   configEvents( events ),
   editDictionaryCommand( _editDictionaryCommand ),
-  maxDictionaryRefsInContextMenu(maxDictionaryRefsInContextMenu_)
+  maxDictionaryRefsInContextMenu( maxDictionaryRefsInContextMenu_ )
 {
   setObjectName( "dictionaryBar" );
 
-  maxDictionaryRefsAction = new QAction(  QIcon(":/icons/expand_opt.png"), tr( "Extended menu with all dictionaries..." ), this );
+  maxDictionaryRefsAction =
+    new QAction( QIcon( ":/icons/expand_opt.png" ), tr( "Extended menu with all dictionaries..." ), this );
 
   connect( &events, &Config::Events::mutedDictionariesChanged, this, &DictionaryBar::mutedDictionariesChanged );
 
@@ -39,8 +42,7 @@ static QString elideDictName( QString const & name )
   return name.left( pieceSize ) + QChar( 0x2026 ) + name.right( pieceSize );
 }
 
-void DictionaryBar::setDictionaries( vector< sptr< Dictionary::Class > >
-                                     const & dictionaries )
+void DictionaryBar::setDictionaries( vector< sptr< Dictionary::Class > > const & dictionaries )
 {
   setUpdatesEnabled( false );
 
@@ -50,12 +52,10 @@ void DictionaryBar::setDictionaries( vector< sptr< Dictionary::Class > >
   clear();
   dictActions.clear();
 
-  for( unsigned x = 0; x < dictionaries.size(); ++x )
-  {
-    QIcon icon = dictionaries[ x ]->getNativeIcon();
+  for ( unsigned x = 0; x < dictionaries.size(); ++x ) {
+    QIcon icon = dictionaries[ x ]->getIcon();
 
-    QString dictName = QString::fromUtf8( dictionaries[ x ]->
-                                            getName().c_str() );
+    QString dictName = QString::fromUtf8( dictionaries[ x ]->getName().c_str() );
 
     QAction * action = addAction( icon, elideDictName( dictName ) );
 
@@ -79,7 +79,7 @@ void DictionaryBar::setDictionaries( vector< sptr< Dictionary::Class > >
 
 void DictionaryBar::setDictionaryIconSize( int extent )
 {
-  setIconSize( QSize(  extent, extent  ) );
+  setIconSize( QSize( extent, extent ) );
 }
 
 void DictionaryBar::contextMenuEvent( QContextMenuEvent * event )
@@ -91,45 +91,37 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
 {
   QMenu menu( this );
 
-  QAction * editAction =
-      menu.addAction( QIcon( ":/icons/bookcase.svg" ), tr( "Edit this group" ) );
+  QAction * editAction = menu.addAction( QIcon( ":/icons/bookcase.svg" ), tr( "Edit this group" ) );
 
-  QAction * infoAction = NULL;
-  QAction * headwordsAction = NULL;
-  QAction * editDictAction = NULL;
+  QAction * infoAction           = NULL;
+  QAction * headwordsAction      = NULL;
+  QAction * editDictAction       = NULL;
   QAction * openDictFolderAction = NULL;
   QString dictFilename;
 
   QAction * dictAction = actionAt( event->x(), event->y() );
-  if( dictAction )
-  {
-    Dictionary::Class *pDict = NULL;
-    QString id = dictAction->data().toString();
-    for( unsigned i = 0; i < allDictionaries.size(); i++ )
-    {
-      if( id.compare( allDictionaries[ i ]->getId().c_str() ) == 0 )
-      {
+  if ( dictAction ) {
+    Dictionary::Class * pDict = NULL;
+    QString id                = dictAction->data().toString();
+    for ( unsigned i = 0; i < allDictionaries.size(); i++ ) {
+      if ( id.compare( allDictionaries[ i ]->getId().c_str() ) == 0 ) {
         pDict = allDictionaries[ i ].get();
         break;
       }
     }
 
-    if( pDict )
-    {
-      infoAction =  menu.addAction( tr( "Dictionary info" ) );
+    if ( pDict ) {
+      infoAction = menu.addAction( tr( "Dictionary info" ) );
 
-      if( pDict->isLocalDictionary() )
-      {
-        if( pDict->getWordCount() > 0 )
+      if ( pDict->isLocalDictionary() ) {
+        if ( pDict->getWordCount() > 0 )
           headwordsAction = menu.addAction( tr( "Dictionary headwords" ) );
 
         openDictFolderAction = menu.addAction( tr( "Open dictionary folder" ) );
 
-        if( !editDictionaryCommand.isEmpty() )
-        {
-          if( !pDict->getMainFilename().isEmpty() )
-          {
-            dictFilename = pDict->getMainFilename();
+        if ( !editDictionaryCommand.isEmpty() ) {
+          if ( !pDict->getMainFilename().isEmpty() ) {
+            dictFilename   = pDict->getMainFilename();
             editDictAction = menu.addAction( tr( "Edit dictionary" ) );
           }
         }
@@ -142,23 +134,20 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
 
   unsigned refsAdded = 0;
 
-  for( QList< QAction * >::iterator i = dictActions.begin();
-       i != dictActions.end(); ++i )
-  {
+  for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i ) {
 
     // Enough! Or the menu would become too large.
-    if ( refsAdded++ >= maxDictionaryRefsInContextMenu && !extended )
-    {
+    if ( refsAdded++ >= maxDictionaryRefsInContextMenu && !extended ) {
       menu.addSeparator();
       menu.addAction( maxDictionaryRefsAction );
       break;
     }
 
     // We need new action, since the one we have has text elided
-    QAction * action = menu.addAction( (*i)->icon(), (*i)->toolTip() );
+    QAction * action = menu.addAction( ( *i )->icon(), ( *i )->toolTip() );
 
     action->setCheckable( true );
-    action->setChecked( (*i)->isChecked() );
+    action->setChecked( ( *i )->isChecked() );
     action->setData( QVariant::fromValue( (void *)*i ) );
     // Force "icon in menu" on all platforms, for
     // usability reasons.
@@ -169,8 +158,7 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
 
   QAction * result = menu.exec( event->globalPos() );
 
-  if( result && result == infoAction )
-  {
+  if ( result && result == infoAction ) {
     QString id = dictAction->data().toString();
     emit showDictionaryInfo( id );
     return;
@@ -188,31 +176,27 @@ void DictionaryBar::showContextMenu( QContextMenuEvent * event, bool extended )
     return;
   }
 
-  if( result && result == openDictFolderAction )
-  {
+  if ( result && result == openDictFolderAction ) {
     QString id = dictAction->data().toString();
     emit openDictionaryFolder( id );
     return;
   }
 
-  if( result && result == editDictAction )
-  {
+  if ( result && result == editDictAction ) {
     QString command( editDictionaryCommand );
     command.replace( "%GDDICT%", "\"" + dictFilename + "\"" );
-    if( !QProcess::startDetached( command ,QStringList()) )
+    if ( !QProcess::startDetached( command, QStringList() ) )
       QApplication::beep();
   }
 
-  if( result && result == maxDictionaryRefsAction )
-  {
+  if ( result && result == maxDictionaryRefsAction ) {
     showContextMenu( event, true );
   }
 
   if ( result == editAction )
     emit editGroupRequested();
-  else
-  if ( result && result->data().value< void * >() )
-    ( ( QAction * )( result->data().value< void * >() ) )->trigger();
+  else if ( result && result->data().value< void * >() )
+    ( (QAction *)( result->data().value< void * >() ) )->trigger();
 
   event->accept();
 }
@@ -221,20 +205,18 @@ void DictionaryBar::mutedDictionariesChanged()
 {
   //GD_DPRINTF( "Muted dictionaries changed\n" );
 
-  if( !mutedDictionaries )
+  if ( !mutedDictionaries )
     return;
 
   // Update actions
 
   setUpdatesEnabled( false );
 
-  for( QList< QAction * >::iterator i = dictActions.begin();
-       i != dictActions.end(); ++i )
-  {
-    bool isUnmuted = !mutedDictionaries->contains( (*i)->data().toString() );
+  for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i ) {
+    bool isUnmuted = !mutedDictionaries->contains( ( *i )->data().toString() );
 
-    if ( isUnmuted != (*i)->isChecked() )
-      (*i)->setChecked( isUnmuted );
+    if ( isUnmuted != ( *i )->isChecked() )
+      ( *i )->setChecked( isUnmuted );
   }
 
   setUpdatesEnabled( true );
@@ -242,7 +224,7 @@ void DictionaryBar::mutedDictionariesChanged()
 
 void DictionaryBar::actionWasTriggered( QAction * action )
 {
-  if( !mutedDictionaries )
+  if ( !mutedDictionaries )
     return;
 
   QString id = action->data().toString();
@@ -250,9 +232,7 @@ void DictionaryBar::actionWasTriggered( QAction * action )
   if ( id.isEmpty() )
     return; // Some weird action, not our button
 
-  if ( QApplication::keyboardModifiers() &
-         ( Qt::ControlModifier | Qt::ShiftModifier ) )
-  {
+  if ( QApplication::keyboardModifiers() & ( Qt::ControlModifier | Qt::ShiftModifier ) ) {
     // Solo mode -- either use the dictionary exclusively, or toggle
     // back all dictionaries if we do that already.
 
@@ -263,70 +243,56 @@ void DictionaryBar::actionWasTriggered( QAction * action )
     // For solo, all dictionaries must be unchecked, since we're handling
     // the result of the dictionary being (un)checked, and in case we were
     // in solo, now we would end up with no dictionaries being checked at all.
-    for( QList< QAction * >::iterator i = dictActions.begin();
-         i != dictActions.end(); ++i )
-    {
-      if ( (*i)->isChecked() )
-      {
+    for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i ) {
+      if ( ( *i )->isChecked() ) {
         isSolo = false;
         break;
       }
     }
 
-    if ( isSolo )
-    {
+    if ( isSolo ) {
       // Restore or clear all the dictionaries
       if ( QApplication::keyboardModifiers() & Qt::ShiftModifier )
         *mutedDictionaries = storedMutedSet;
-      else
-      {
-        for( QList< QAction * >::iterator i = dictActions.begin();
-             i != dictActions.end(); ++i )
-          mutedDictionaries->remove( (*i)->data().toString() );
+      else {
+        for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i )
+          mutedDictionaries->remove( ( *i )->data().toString() );
       }
       storedMutedSet.clear();
     }
-    else
-    {
+    else {
       // Save dictionaries state
       storedMutedSet = *mutedDictionaries;
 
       // Make dictionary solo
-      for( QList< QAction * >::iterator i = dictActions.begin();
-           i != dictActions.end(); ++i )
-      {
-        QString dictId = (*i)->data().toString();
+      for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i ) {
+        QString dictId = ( *i )->data().toString();
 
         if ( dictId == id )
           mutedDictionaries->remove( dictId );
         else
           mutedDictionaries->insert( dictId );
       }
-    }  
+    }
     configEvents.signalMutedDictionariesChanged();
   }
-  else
-  {
+  else {
     // Normal mode
 
     storedMutedSet.clear();
 
-    if ( action->isChecked() )
-    {
+    if ( action->isChecked() ) {
       // Unmute the dictionary
 
-      if ( mutedDictionaries->contains( id ) )
-      {
+      if ( mutedDictionaries->contains( id ) ) {
         mutedDictionaries->remove( id );
         configEvents.signalMutedDictionariesChanged();
       }
     }
-    else
-    {
+    else {
       // Mute the dictionary
 
-      if ( !mutedDictionaries->contains( id ) )
-      {
+      if ( !mutedDictionaries->contains( id ) ) {
         mutedDictionaries->insert( id );
         configEvents.signalMutedDictionariesChanged();
       }
@@ -339,13 +305,10 @@ void DictionaryBar::dictsPaneClicked( const QString & id )
   if ( !isVisible() )
     return;
 
-  for( QList< QAction * >::iterator i = dictActions.begin();
-       i != dictActions.end(); ++i )
-  {
-    QString dictId = (*i)->data().toString();
-    if ( dictId == id )
-    {
-      (*i)->activate( QAction::Trigger );
+  for ( QList< QAction * >::iterator i = dictActions.begin(); i != dictActions.end(); ++i ) {
+    QString dictId = ( *i )->data().toString();
+    if ( dictId == id ) {
+      ( *i )->activate( QAction::Trigger );
       break;
     }
   }
diff --git a/src/ui/dictionarybar.hh b/src/ui/dictionarybar.hh
index 64090ca2..5e6c2576 100644
--- a/src/ui/dictionarybar.hh
+++ b/src/ui/dictionarybar.hh
@@ -19,15 +19,21 @@ public:
 
   /// Constructs an empty dictionary bar
   DictionaryBar( QWidget * parent,
-                 Config::Events &, QString const & _editDictionaryCommand, unsigned short const & maxDictionaryRefsInContextMenu_ );
+                 Config::Events &,
+                 QString const & _editDictionaryCommand,
+                 unsigned short const & maxDictionaryRefsInContextMenu_ );
 
   /// Sets dictionaries to be displayed in the bar. Their statuses (enabled/
   /// disabled) are taken from the configuration data.
   void setDictionaries( std::vector< sptr< Dictionary::Class > > const & );
   void setMutedDictionaries( Config::MutedDictionaries * mutedDictionaries_ )
-  { mutedDictionaries = mutedDictionaries_; }
+  {
+    mutedDictionaries = mutedDictionaries_;
+  }
   Config::MutedDictionaries const * getMutedDictionaries() const
-  { return mutedDictionaries; }
+  {
+    return mutedDictionaries;
+  }
   void setDictionaryIconSize( int extent );
 
 signals:
diff --git a/src/ui/dictspanewidget.hh b/src/ui/dictspanewidget.hh
index 1ed01898..bebde145 100644
--- a/src/ui/dictspanewidget.hh
+++ b/src/ui/dictspanewidget.hh
@@ -11,14 +11,18 @@
 class DictsPaneWidget: public QWidget
 {
   Q_OBJECT
+
 public:
 
-  DictsPaneWidget( QWidget * parent = 0 ): QWidget( parent )
-  {}
+  DictsPaneWidget( QWidget * parent = 0 ):
+    QWidget( parent )
+  {
+  }
 
   virtual QSize sizeHint() const
-  { return QSize( 204, 204 ); }
-
+  {
+    return QSize( 204, 204 );
+  }
 };
 
 #endif
diff --git a/src/ui/editdictionaries.cc b/src/ui/editdictionaries.cc
index a0b02e9f..3d314739 100644
--- a/src/ui/editdictionaries.cc
+++ b/src/ui/editdictionaries.cc
@@ -4,11 +4,13 @@
 #include "editdictionaries.hh"
 #include "dict/loaddictionaries.hh"
 #include "help.hh"
+#include <QTabWidget>
 #include <QMessageBox>
 
 using std::vector;
 
-EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_,
+EditDictionaries::EditDictionaries( QWidget * parent,
+                                    Config::Class & cfg_,
                                     vector< sptr< Dictionary::Class > > & dictionaries_,
                                     Instances::Groups & groupInstances_,
                                     QNetworkAccessManager & dictNetMgr_ ):
@@ -19,48 +21,43 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_,
   dictNetMgr( dictNetMgr_ ),
   origCfg( cfg ),
   sources( this, cfg ),
-  orderAndProps( new OrderAndProps( this, cfg.dictionaryOrder, cfg.inactiveDictionaries,
-                                    dictionaries ) ),
+  orderAndProps( new OrderAndProps( this, cfg.dictionaryOrder, cfg.inactiveDictionaries, dictionaries ) ),
   groups( new Groups( this, dictionaries, cfg.groups, orderAndProps->getCurrentDictionaryOrder() ) ),
   dictionariesChanged( false ),
   groupsChanged( false ),
-  lastCurrentTab( 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
   // the initial group readings so that if no edits were really done, we won't
   // be changing groups.
-  origCfg.groups = groups->getGroups();
-  origCfg.dictionaryOrder = orderAndProps->getCurrentDictionaryOrder();
+  origCfg.groups               = groups->getGroups();
+  origCfg.dictionaryOrder      = orderAndProps->getCurrentDictionaryOrder();
   origCfg.inactiveDictionaries = orderAndProps->getCurrentInactiveDictionaries();
 
   ui.setupUi( this );
 
-  setWindowIcon( QIcon(":/icons/dictionary.svg") );
+  setWindowIcon( QIcon( ":/icons/dictionary.svg" ) );
 
   ui.tabs->clear();
 
-  ui.tabs->addTab( &sources, QIcon(":/icons/sources.png"), tr( "&Sources" ) );
-  ui.tabs->addTab( orderAndProps, QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) );
-  ui.tabs->addTab( groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) );
+  ui.tabs->addTab( &sources, QIcon( ":/icons/sources.png" ), tr( "&Sources" ) );
+  ui.tabs->addTab( orderAndProps, QIcon( ":/icons/book.svg" ), tr( "&Dictionaries" ) );
+  ui.tabs->addTab( groups, QIcon( ":/icons/bookcase.svg" ), tr( "&Groups" ) );
 
   connect( ui.buttons, &QDialogButtonBox::clicked, this, &EditDictionaries::buttonBoxClicked );
 
   connect( &sources, &Sources::rescan, this, &EditDictionaries::rescanSources );
 
-  connect( groups.get(), &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
+  connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
 
-  connect( orderAndProps.data(),
-    &OrderAndProps::showDictionaryHeadwords,
-    this,
-    &EditDictionaries::showDictionaryHeadwords );
+  connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords );
 
   helpAction.setShortcut( QKeySequence( "F1" ) );
   helpAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
 
   connect( &helpAction, &QAction::triggered, [ this ]() {
-    if ( ui.tabs->currentWidget() == this->groups.get() ) {
+    if ( ui.tabs->currentWidget() == this->groups ) {
       Help::openHelpWebpage( Help::section::manage_groups );
     }
     else {
@@ -71,18 +68,17 @@ EditDictionaries::EditDictionaries( QWidget * parent, Config::Class & cfg_,
 
   addAction( &helpAction );
 
+  connect( ui.tabs, &QTabWidget::currentChanged, this, &EditDictionaries::currentChanged );
 }
 
 void EditDictionaries::editGroup( unsigned id )
 {
   ui.tabs->setTabVisible( 0, false );
 
-  if ( id == Instances::Group::AllGroupId )
-  {
+  if ( id == Instances::Group::AllGroupId ) {
     ui.tabs->setCurrentIndex( 1 );
   }
-  else
-  {
+  else {
     ui.tabs->setCurrentIndex( 2 );
     groups->editGroup( id );
   }
@@ -90,19 +86,18 @@ void EditDictionaries::editGroup( unsigned id )
 
 void EditDictionaries::save( bool rebuildGroups )
 {
-  Config::Groups newGroups = groups->getGroups();
-  Config::Group newOrder = orderAndProps->getCurrentDictionaryOrder();
-  Config::Group newInactive = orderAndProps->getCurrentInactiveDictionaries();
+  const Config::Groups newGroups  = groups->getGroups();
+  const Config::Group newOrder    = orderAndProps->getCurrentDictionaryOrder();
+  const Config::Group newInactive = orderAndProps->getCurrentInactiveDictionaries();
 
-  if( isSourcesChanged() )
+  if ( isSourcesChanged() )
     acceptChangedSources( rebuildGroups );
 
-  if ( origCfg.groups != newGroups || origCfg.dictionaryOrder != newOrder ||
-       origCfg.inactiveDictionaries != newInactive )
-  {
-    groupsChanged = true;
-    cfg.groups = newGroups;
-    cfg.dictionaryOrder = newOrder;
+  if ( origCfg.groups != newGroups || origCfg.dictionaryOrder != newOrder
+       || origCfg.inactiveDictionaries != newInactive ) {
+    groupsChanged            = true;
+    cfg.groups               = newGroups;
+    cfg.dictionaryOrder      = newOrder;
     cfg.inactiveDictionaries = newInactive;
   }
 }
@@ -113,54 +108,49 @@ void EditDictionaries::accept()
   QDialog::accept();
 }
 
-void EditDictionaries::on_tabs_currentChanged( int index )
+void EditDictionaries::currentChanged( int index )
 {
   if ( index == -1 || !isVisible() )
     return; // Sent upon the construction/destruction
-
-  if ( !lastCurrentTab && index )
-  {
+  qDebug() << ui.tabs->currentWidget()->objectName();
+  if ( lastTabName.isEmpty() || lastTabName == "Sources" ) {
     // We're switching away from the Sources tab -- if its contents were
     // changed, we need to either apply or reject now.
 
-    if ( isSourcesChanged() )
-    {
-      ui.tabs->setCurrentIndex( 0 );
-
-      QMessageBox question( QMessageBox::Question, tr( "Sources changed" ),
+    if ( isSourcesChanged() ) {
+      QMessageBox question( QMessageBox::Question,
+                            tr( "Sources changed" ),
                             tr( "Some sources were changed. Would you like to accept the changes?" ),
-                            QMessageBox::NoButton, this );
+                            QMessageBox::NoButton,
+                            this );
 
-      QPushButton * accept = question.addButton( tr( "Accept" ), QMessageBox::AcceptRole );
+      const QPushButton * accept = question.addButton( tr( "Accept" ), QMessageBox::AcceptRole );
 
       question.addButton( tr( "Cancel" ), QMessageBox::RejectRole );
 
       question.exec();
 
-      if ( question.clickedButton() == accept )
-      {
+      //When accept the changes ,the second and third tab will be recreated. which means the current Index tab will be changed.
+      if ( question.clickedButton() == accept ) {
+        disconnect( ui.tabs, &QTabWidget::currentChanged, this, &EditDictionaries::currentChanged );
+
         acceptChangedSources( true );
-        
-        lastCurrentTab = index;
         ui.tabs->setCurrentIndex( index );
+        connect( ui.tabs, &QTabWidget::currentChanged, this, &EditDictionaries::currentChanged );
       }
-      else
-      {
+      else {
         // Prevent tab from switching
-        lastCurrentTab = 0;
-        return;
+        //        return;
       }
     }
   }
-  else
-  if ( lastCurrentTab == 1 && index != 1 )
-  {
+  else if ( lastTabName == "OrderAndProps" ) {
     // When switching from the dictionary order, we need to propagate any
     // changes to the groups.
     groups->updateDictionaryOrder( orderAndProps->getCurrentDictionaryOrder() );
   }
 
-  lastCurrentTab = index;
+  lastTabName = ui.tabs->currentWidget()->objectName();
 }
 
 void EditDictionaries::rescanSources()
@@ -170,88 +160,82 @@ void EditDictionaries::rescanSources()
 
 void EditDictionaries::buttonBoxClicked( QAbstractButton * button )
 {
-  if (ui.buttons->buttonRole(button) == QDialogButtonBox::ApplyRole) {
+  if ( ui.buttons->buttonRole( button ) == QDialogButtonBox::ApplyRole ) {
     save( true );
   }
 }
 
 bool EditDictionaries::isSourcesChanged() const
 {
-  return sources.getPaths() != cfg.paths ||
-         sources.getSoundDirs() != cfg.soundDirs ||
-         sources.getHunspell() != cfg.hunspell ||
-         sources.getTransliteration() != cfg.transliteration ||
-         sources.getLingua() != cfg.lingua ||
-         sources.getForvo() != cfg.forvo ||
-         sources.getMediaWikis() != cfg.mediawikis ||
-         sources.getWebSites() != cfg.webSites ||
-         sources.getDictServers() != cfg.dictServers ||
-         sources.getPrograms() != cfg.programs ||
-         sources.getVoiceEngines() != cfg.voiceEngines;
+  return sources.getPaths() != cfg.paths || sources.getSoundDirs() != cfg.soundDirs
+    || sources.getHunspell() != cfg.hunspell || sources.getTransliteration() != cfg.transliteration
+    || sources.getLingua() != cfg.lingua || sources.getForvo() != cfg.forvo || sources.getMediaWikis() != cfg.mediawikis
+    || sources.getWebSites() != cfg.webSites || sources.getDictServers() != cfg.dictServers
+    || sources.getPrograms() != cfg.programs || sources.getVoiceEngines() != cfg.voiceEngines;
 }
 
 void EditDictionaries::acceptChangedSources( bool rebuildGroups )
 {
   dictionariesChanged = true;
 
-  Config::Groups savedGroups = groups->getGroups();
-  Config::Group savedOrder = orderAndProps->getCurrentDictionaryOrder();
+  Config::Groups savedGroups  = groups->getGroups();
+  Config::Group savedOrder    = orderAndProps->getCurrentDictionaryOrder();
   Config::Group savedInactive = orderAndProps->getCurrentInactiveDictionaries();
 
-  cfg.paths = sources.getPaths();
-  cfg.soundDirs = sources.getSoundDirs();
-  cfg.hunspell = sources.getHunspell();
+  cfg.paths           = sources.getPaths();
+  cfg.soundDirs       = sources.getSoundDirs();
+  cfg.hunspell        = sources.getHunspell();
   cfg.transliteration = sources.getTransliteration();
-  cfg.lingua = sources.getLingua();
-  cfg.forvo = sources.getForvo();
-  cfg.mediawikis = sources.getMediaWikis();
-  cfg.webSites = sources.getWebSites();
-  cfg.dictServers = sources.getDictServers();
-  cfg.programs = sources.getPrograms();
-  cfg.voiceEngines = sources.getVoiceEngines();
+  cfg.lingua          = sources.getLingua();
+  cfg.forvo           = sources.getForvo();
+  cfg.mediawikis      = sources.getMediaWikis();
+  cfg.webSites        = sources.getWebSites();
+  cfg.dictServers     = sources.getDictServers();
+  cfg.programs        = sources.getPrograms();
+  cfg.voiceEngines    = sources.getVoiceEngines();
 
-  groupInstances.clear(); // Those hold pointers to dictionaries, we need to
-                          // free them.
   ui.tabs->setUpdatesEnabled( false );
+  // Those hold pointers to dictionaries, we need to free them.
+  groupInstances.clear();
 
-  groups.reset();
+  groups.clear();
   orderAndProps.clear();
 
   loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
 
   // If no changes to groups were made, update the original data
-  bool noGroupEdits = ( origCfg.groups == savedGroups );
+  const bool noGroupEdits = ( origCfg.groups == savedGroups );
 
   if ( noGroupEdits )
     savedGroups = cfg.groups;
 
   Instances::updateNames( savedGroups, dictionaries );
 
-  bool noOrderEdits = ( origCfg.dictionaryOrder == savedOrder );
+  const bool noOrderEdits = ( origCfg.dictionaryOrder == savedOrder );
 
   if ( noOrderEdits )
     savedOrder = cfg.dictionaryOrder;
 
   Instances::updateNames( savedOrder, dictionaries );
 
-  bool noInactiveEdits = ( origCfg.inactiveDictionaries == savedInactive );
+  const bool noInactiveEdits = ( origCfg.inactiveDictionaries == savedInactive );
 
   if ( noInactiveEdits )
-    savedInactive  = cfg.inactiveDictionaries;
+    savedInactive = cfg.inactiveDictionaries;
 
   Instances::updateNames( savedInactive, dictionaries );
 
-  if ( rebuildGroups )
-  {
+  if ( rebuildGroups ) {
+    ui.tabs->removeTab( 1 );
+    ui.tabs->removeTab( 1 );
+
     orderAndProps = new OrderAndProps( this, savedOrder, savedInactive, dictionaries );
-    groups =  std::make_shared<Groups>( this, dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
-
-    ui.tabs->removeTab( 1 );
-    ui.tabs->removeTab( 1 );
-    ui.tabs->insertTab( 1, orderAndProps, QIcon(":/icons/book.svg"), tr( "&Dictionaries" ) );
-
-    ui.tabs->insertTab( 2, groups.get(), QIcon(":/icons/bookcase.svg"), tr( "&Groups" ) );
+    groups        = new Groups( this, dictionaries, savedGroups, orderAndProps->getCurrentDictionaryOrder() );
 
+    ui.tabs->insertTab( 1, orderAndProps, QIcon( ":/icons/book.svg" ), tr( "&Dictionaries" ) );
+    ui.tabs->insertTab( 2, groups, QIcon( ":/icons/bookcase.svg" ), tr( "&Groups" ) );
+    connect( groups, &Groups::showDictionaryInfo, this, &EditDictionaries::showDictionaryInfo );
+    connect( orderAndProps, &OrderAndProps::showDictionaryHeadwords, this, &EditDictionaries::showDictionaryHeadwords );
 
     if ( noGroupEdits )
       origCfg.groups = groups->getGroups();
@@ -263,5 +247,8 @@ void EditDictionaries::acceptChangedSources( bool rebuildGroups )
       origCfg.inactiveDictionaries = orderAndProps->getCurrentInactiveDictionaries();
   }
   ui.tabs->setUpdatesEnabled( true );
-
+}
+EditDictionaries::~EditDictionaries()
+{
+  disconnect( ui.tabs, &QTabWidget::currentChanged, this, &EditDictionaries::currentChanged );
 }
diff --git a/src/ui/editdictionaries.hh b/src/ui/editdictionaries.hh
index 7f5e2042..526f9bf1 100644
--- a/src/ui/editdictionaries.hh
+++ b/src/ui/editdictionaries.hh
@@ -21,31 +21,36 @@ class EditDictionaries: public QDialog
 
 public:
 
-  EditDictionaries( QWidget * parent, Config::Class & cfg,
+  EditDictionaries( QWidget * parent,
+                    Config::Class & cfg,
                     std::vector< sptr< Dictionary::Class > > & dictionaries,
                     Instances::Groups & groupInstances, // We only clear those on rescan
                     QNetworkAccessManager & dictNetMgr );
 
-  ~EditDictionaries() = default;
+  ~EditDictionaries();
 
   /// Instructs the dialog to position itself on editing the given group.
   void editGroup( unsigned id );
 
   /// Returns true if any changes to the 'dictionaries' vector passed were done.
   bool areDictionariesChanged() const
-  { return dictionariesChanged; }
+  {
+    return dictionariesChanged;
+  }
 
   /// Returns true if groups were changed.
   bool areGroupsChanged() const
-  { return groupsChanged; }
+  {
+    return groupsChanged;
+  }
 
 protected:
 
   virtual void accept();
-  
+
 private slots:
 
-  void on_tabs_currentChanged( int index );
+  void currentChanged( int index );
 
   void buttonBoxClicked( QAbstractButton * button );
 
@@ -67,24 +72,24 @@ private:
   void save( bool rebuildGroups = false );
 
 private:
-   
+
   Config::Class & cfg;
   std::vector< sptr< Dictionary::Class > > & dictionaries;
   Instances::Groups & groupInstances;
   QNetworkAccessManager & dictNetMgr;
-  
+
   // Backed up to decide later if something was changed or not
   Config::Class origCfg;
 
   Ui::EditDictionaries ui;
   Sources sources;
-  QPointer<OrderAndProps> orderAndProps;
-  sptr< Groups > groups;
+  QPointer< OrderAndProps > orderAndProps;
+  QPointer< Groups > groups;
 
   bool dictionariesChanged;
   bool groupsChanged;
-  
-  int lastCurrentTab;
+
+  QString lastTabName;
 
   QAction helpAction;
 };
diff --git a/src/ui/favoritespanewidget.cc b/src/ui/favoritespanewidget.cc
index 8b4097d9..3aac937f 100644
--- a/src/ui/favoritespanewidget.cc
+++ b/src/ui/favoritespanewidget.cc
@@ -21,8 +21,8 @@
 
 void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
 {
-  m_cfg = cfg;
-  m_favoritesTree = findChild< QTreeView * >( "favoritesTree" );
+  m_cfg                       = cfg;
+  m_favoritesTree             = findChild< QTreeView * >( "favoritesTree" );
   QDockWidget * favoritesPane = qobject_cast< QDockWidget * >( parentWidget() );
   m_favoritesTree->setHeaderHidden( true );
 
@@ -51,7 +51,7 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
 
   // Handle context menu, reusing some of the top-level window's History menu
   m_favoritesMenu = new QMenu( this );
-  m_separator = m_favoritesMenu->addSeparator();
+  m_separator     = m_favoritesMenu->addSeparator();
   QListIterator< QAction * > actionsIter( menu->actions() );
   while ( actionsIter.hasNext() )
     m_favoritesMenu->addAction( actionsIter.next() );
@@ -60,19 +60,17 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
 
   favoritesLabel.setText( tr( "Favorites:" ) );
   favoritesLabel.setObjectName( "favoritesLabel" );
-  if ( layoutDirection() == Qt::LeftToRight )
-  {
+  if ( layoutDirection() == Qt::LeftToRight ) {
     favoritesLabel.setAlignment( Qt::AlignLeft );
   }
-  else
-  {
+  else {
     favoritesLabel.setAlignment( Qt::AlignRight );
   }
 
   favoritesPaneTitleBarLayout.addWidget( &favoritesLabel );
-  favoritesPaneTitleBarLayout.setContentsMargins(5, 5, 5, 5);
+  favoritesPaneTitleBarLayout.setContentsMargins( 5, 5, 5, 5 );
   favoritesPaneTitleBar.setLayout( &favoritesPaneTitleBarLayout );
-  favoritesPaneTitleBar.setObjectName("favoritesPaneTitleBar");
+  favoritesPaneTitleBar.setObjectName( "favoritesPaneTitleBar" );
   favoritesPane->setTitleBarWidget( &favoritesPaneTitleBar );
 
   // Favorites tree
@@ -83,7 +81,7 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
 
   QAbstractItemModel * oldModel = m_favoritesTree->model();
   m_favoritesTree->setModel( m_favoritesModel );
-  if( oldModel )
+  if ( oldModel )
     oldModel->deleteLater();
 
   connect( m_favoritesTree, &QTreeView::expanded, m_favoritesModel, &FavoritesModel::itemExpanded );
@@ -95,7 +93,7 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
   m_favoritesModel->checkAllNodesForExpand();
   m_favoritesTree->viewport()->setAcceptDrops( true );
   m_favoritesTree->setDragEnabled( true );
-//  m_favoritesTree->setDragDropMode( QAbstractItemView::InternalMove );
+  //  m_favoritesTree->setDragDropMode( QAbstractItemView::InternalMove );
   m_favoritesTree->setDragDropMode( QAbstractItemView::DragDrop );
   m_favoritesTree->setDefaultDropAction( Qt::MoveAction );
 
@@ -113,16 +111,16 @@ void FavoritesPaneWidget::setUp( Config::Class * cfg, QMenu * menu )
   connect( m_favoritesTree, &QAbstractItemView::clicked, this, &FavoritesPaneWidget::onItemClicked );
 
   connect( m_favoritesTree->selectionModel(),
-    SIGNAL( selectionChanged( QItemSelection const &, QItemSelection const & ) ),
-    this,
-    SLOT( onSelectionChanged( QItemSelection const & ) ) );
+           &QItemSelectionModel::selectionChanged,
+           this,
+           &FavoritesPaneWidget::onSelectionChanged );
 
   connect( m_favoritesTree, &QWidget::customContextMenuRequested, this, &FavoritesPaneWidget::showCustomMenu );
 }
 
 FavoritesPaneWidget::~FavoritesPaneWidget()
 {
-  if( listItemDelegate )
+  if ( listItemDelegate )
     delete listItemDelegate;
 }
 
@@ -137,8 +135,7 @@ void FavoritesPaneWidget::copySelectedItems()
 {
   QModelIndexList selectedIdxs = m_favoritesTree->selectionModel()->selectedIndexes();
 
-  if ( selectedIdxs.isEmpty() )
-  {
+  if ( selectedIdxs.isEmpty() ) {
     // nothing to do
     return;
   }
@@ -152,26 +149,25 @@ void FavoritesPaneWidget::deleteSelectedItems()
 {
   QModelIndexList selectedIdxs = m_favoritesTree->selectionModel()->selectedIndexes();
 
-  if ( selectedIdxs.isEmpty() )
-  {
+  if ( selectedIdxs.isEmpty() ) {
     // nothing to do
     return;
   }
 
-  if( m_cfg->preferences.confirmFavoritesDeletion )
-  {
-    QMessageBox mb( QMessageBox::Warning, "GoldenDict",
+  if ( m_cfg->preferences.confirmFavoritesDeletion ) {
+    QMessageBox mb( QMessageBox::Warning,
+                    "GoldenDict",
                     tr( "All selected items will be deleted. Continue?" ),
                     QMessageBox::Yes | QMessageBox::No );
     mb.exec();
-    if( mb.result() != QMessageBox::Yes )
+    if ( mb.result() != QMessageBox::Yes )
       return;
   }
 
   m_favoritesModel->removeItemsForIndexes( selectedIdxs );
 }
 
-void FavoritesPaneWidget::showCustomMenu(QPoint const & pos)
+void FavoritesPaneWidget::showCustomMenu( QPoint const & pos )
 {
   QModelIndexList selectedIdxs = m_favoritesTree->selectionModel()->selectedIndexes();
 
@@ -181,14 +177,12 @@ void FavoritesPaneWidget::showCustomMenu(QPoint const & pos)
 
   m_separator->setVisible( !selectedIdxs.isEmpty() );
 
-  if ( !selectedIdxs.isEmpty() )
-  {
+  if ( !selectedIdxs.isEmpty() ) {
     m_favoritesMenu->insertAction( m_separator, m_copySelectedToClipboard );
     m_favoritesMenu->insertAction( m_separator, m_deleteSelectedAction );
   }
 
-  if( selectedIdxs.size() <= 1 )
-  {
+  if ( selectedIdxs.size() <= 1 ) {
     m_favoritesMenu->insertAction( m_separator, m_addFolder );
     m_separator->setVisible( true );
   }
@@ -196,10 +190,11 @@ void FavoritesPaneWidget::showCustomMenu(QPoint const & pos)
   m_favoritesMenu->exec( m_favoritesTree->mapToGlobal( pos ) );
 }
 
-void FavoritesPaneWidget::onSelectionChanged( QItemSelection const & selection )
+void FavoritesPaneWidget::onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected )
 {
-  if ( m_favoritesTree->selectionModel()->selectedIndexes().size() != 1
-       || selection.indexes().isEmpty() )
+  Q_UNUSED( deselected )
+
+  if ( m_favoritesTree->selectionModel()->selectedIndexes().size() != 1 || selection.indexes().isEmpty() )
     return;
 
   itemSelectionChanged = true;
@@ -208,8 +203,7 @@ void FavoritesPaneWidget::onSelectionChanged( QItemSelection const & selection )
 
 void FavoritesPaneWidget::onItemClicked( QModelIndex const & idx )
 {
-  if ( !itemSelectionChanged && m_favoritesTree->selectionModel()->selectedIndexes().size() == 1 )
-  {
+  if ( !itemSelectionChanged && m_favoritesTree->selectionModel()->selectedIndexes().size() == 1 ) {
     emitFavoritesItemRequested( idx );
   }
   itemSelectionChanged = false;
@@ -217,32 +211,31 @@ void FavoritesPaneWidget::onItemClicked( QModelIndex const & idx )
 
 void FavoritesPaneWidget::emitFavoritesItemRequested( QModelIndex const & idx )
 {
-  if( m_favoritesModel->itemType( idx ) != TreeItem::Word )
-  {
+  if ( m_favoritesModel->itemType( idx ) != TreeItem::Word ) {
     // Item is not headword
     return;
   }
 
   QString headword = m_favoritesModel->data( idx, Qt::DisplayRole ).toString();
-  QString path = m_favoritesModel->pathToItem( idx );
+  QString path     = m_favoritesModel->pathToItem( idx );
 
-  if( !headword.isEmpty() )
+  if ( !headword.isEmpty() )
     emit favoritesItemRequested( headword, path );
 }
 
 void FavoritesPaneWidget::addFolder()
 {
   QModelIndexList selectedIdx = m_favoritesTree->selectionModel()->selectedIndexes();
-  if( selectedIdx.size() > 1 )
+  if ( selectedIdx.size() > 1 )
     return;
 
   QModelIndex folderIdx;
-  if( selectedIdx.size() )
+  if ( selectedIdx.size() )
     folderIdx = m_favoritesModel->addNewFolder( selectedIdx.front() );
   else
     folderIdx = m_favoritesModel->addNewFolder( QModelIndex() );
 
-  if( folderIdx.isValid() )
+  if ( folderIdx.isValid() )
     m_favoritesTree->edit( folderIdx );
 }
 
@@ -286,13 +279,11 @@ bool FavoritesPaneWidget::setDataFromTxt( QString const & dataStr )
 
 void FavoritesPaneWidget::setSaveInterval( unsigned interval )
 {
-  if( timerId )
-  {
+  if ( timerId ) {
     killTimer( timerId );
     timerId = 0;
   }
-  if( interval )
-  {
+  if ( interval ) {
     m_favoritesModel->saveData();
     timerId = startTimer( interval * 60000 );
   }
@@ -311,7 +302,7 @@ void FavoritesPaneWidget::saveData()
 
 /************************************************** TreeItem *********************************************/
 
-TreeItem::TreeItem( const QVariant &data, TreeItem *parent, Type type ) :
+TreeItem::TreeItem( const QVariant & data, TreeItem * parent, Type type ):
   itemData( data ),
   parentItem( parent ),
   m_type( type ),
@@ -324,29 +315,29 @@ TreeItem::~TreeItem()
   qDeleteAll( childItems );
 }
 
-void TreeItem::appendChild( TreeItem *item )
+void TreeItem::appendChild( TreeItem * item )
 {
   childItems.append( item );
 }
 
 void TreeItem::insertChild( int row, TreeItem * item )
 {
-  if( row > childItems.count() )
+  if ( row > childItems.count() )
     row = childItems.count();
   childItems.insert( row, item );
 }
 
-TreeItem *TreeItem::child( int row ) const
+TreeItem * TreeItem::child( int row ) const
 {
   return childItems.value( row );
 }
 
 void TreeItem::deleteChild( int row )
 {
-  if( row < 0 || row >= childItems.count() )
+  if ( row < 0 || row >= childItems.count() )
     return;
 
-  TreeItem *it = childItems.at( row );
+  TreeItem * it = childItems.at( row );
   childItems.removeAt( row );
   delete it;
 }
@@ -368,25 +359,23 @@ void TreeItem::setData( const QVariant & newData )
 
 int TreeItem::row() const
 {
-  if( parentItem )
-      return parentItem->childItems.indexOf( const_cast< TreeItem * >( this ) );
+  if ( parentItem )
+    return parentItem->childItems.indexOf( const_cast< TreeItem * >( this ) );
 
   return 0;
 }
 
-TreeItem *TreeItem::parent()
+TreeItem * TreeItem::parent()
 {
   return parentItem;
 }
 
 Qt::ItemFlags TreeItem::flags() const
 {
-  Qt::ItemFlags f = Qt::ItemIsEnabled | Qt::ItemIsSelectable |
-                    Qt::ItemIsDragEnabled;
-  if( m_type == Folder )
+  Qt::ItemFlags f = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
+  if ( m_type == Folder )
     f |= Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
-  else
-  if( m_type == Root )
+  else if ( m_type == Root )
     f |= Qt::ItemIsDropEnabled;
 
   return f;
@@ -397,12 +386,11 @@ QString TreeItem::fullPath() const
   // Get full path from root item
   QString path;
   TreeItem * par = parentItem;
-  for( ; ; )
-  {
-    if( !par )
+  for ( ;; ) {
+    if ( !par )
       break;
     path = par->data().toString() + "/" + path;
-    par = par->parentItem;
+    par  = par->parentItem;
   }
   return path;
 }
@@ -410,23 +398,21 @@ QString TreeItem::fullPath() const
 TreeItem * TreeItem::duplicateItem( TreeItem * newParent ) const
 {
   TreeItem * newItem = new TreeItem( itemData, newParent, m_type );
-  if( m_type == Folder )
-  {
+  if ( m_type == Folder ) {
     QList< TreeItem * >::const_iterator it = childItems.begin();
-    for( ; it != childItems.end(); ++it )
-      newItem->appendChild( (*it)->duplicateItem( newItem ) );
+    for ( ; it != childItems.end(); ++it )
+      newItem->appendChild( ( *it )->duplicateItem( newItem ) );
   }
   return newItem;
 }
 
 bool TreeItem::haveAncestor( TreeItem * item )
 {
-  TreeItem *par = parentItem;
-  for( ; ; )
-  {
-    if( !par )
+  TreeItem * par = parentItem;
+  for ( ;; ) {
+    if ( !par )
       break;
-    if( par == item )
+    if ( par == item )
       return true;
     par = par->parent();
   }
@@ -436,12 +422,11 @@ bool TreeItem::haveAncestor( TreeItem * item )
 bool TreeItem::haveSameItem( TreeItem * item, bool allowSelf )
 {
   QList< TreeItem * >::const_iterator it = childItems.begin();
-  QString name = item->data().toString();
-  for( ; it != childItems.end(); ++it )
-  {
-    if( *it == item && !allowSelf )
+  QString name                           = item->data().toString();
+  for ( ; it != childItems.end(); ++it ) {
+    if ( *it == item && !allowSelf )
       return true;
-    if( (*it)->data().toString() == name && (*it)->type() == item->type() && (*it) != item )
+    if ( ( *it )->data().toString() == name && ( *it )->type() == item->type() && ( *it ) != item )
       return true;
   }
 
@@ -452,16 +437,14 @@ QStringList TreeItem::getTextFromAllChilds() const
 {
   QStringList list;
   QList< TreeItem * >::const_iterator it = childItems.begin();
-  for( ; it != childItems.end(); ++it )
-  {
-    if( (*it)->type() == Word )
-    {
-      QString txt = (*it)->data().toString();
+  for ( ; it != childItems.end(); ++it ) {
+    if ( ( *it )->type() == Word ) {
+      QString txt = ( *it )->data().toString();
       list.append( txt );
     }
     else // Folder
     {
-      QStringList childList = (*it)->getTextFromAllChilds();
+      QStringList childList = ( *it )->getTextFromAllChilds();
       list.append( childList );
     }
   }
@@ -470,7 +453,7 @@ QStringList TreeItem::getTextFromAllChilds() const
 
 /************************************************** FavoritesModel *********************************************/
 
-FavoritesModel::FavoritesModel( QString favoritesFilename, QObject * parent ) :
+FavoritesModel::FavoritesModel( QString favoritesFilename, QObject * parent ):
   QAbstractItemModel( parent ),
   m_favoritesFilename( favoritesFilename ),
   rootItem( 0 ),
@@ -482,75 +465,74 @@ FavoritesModel::FavoritesModel( QString favoritesFilename, QObject * parent ) :
 
 FavoritesModel::~FavoritesModel()
 {
-  if( rootItem )
+  if ( rootItem )
     delete rootItem;
 }
 
-Qt::ItemFlags FavoritesModel::flags( const QModelIndex &idx ) const
+Qt::ItemFlags FavoritesModel::flags( const QModelIndex & idx ) const
 {
   TreeItem * item = getItem( idx );
   return item->flags();
 }
 
-QVariant FavoritesModel::headerData( int , Qt::Orientation,
-                                     int ) const
+QVariant FavoritesModel::headerData( int, Qt::Orientation, int ) const
 {
   return QVariant();
 }
 
-QModelIndex FavoritesModel::index( int row, int column, const QModelIndex &parentIdx ) const
+QModelIndex FavoritesModel::index( int row, int column, const QModelIndex & parentIdx ) const
 {
-//  if(!hasIndex(row, column, parent))
-//    return QModelIndex();
+  //  if(!hasIndex(row, column, parent))
+  //    return QModelIndex();
 
-  TreeItem *parentItem = getItem( parentIdx );
+  TreeItem * parentItem = getItem( parentIdx );
 
-  TreeItem *childItem = parentItem->child(row);
-  if( childItem )
+  TreeItem * childItem = parentItem->child( row );
+  if ( childItem )
     return createIndex( row, column, childItem );
 
   return QModelIndex();
 }
 
-QModelIndex FavoritesModel::parent( const QModelIndex &index ) const
+QModelIndex FavoritesModel::parent( const QModelIndex & index ) const
 {
   if ( !index.isValid() )
     return QModelIndex();
 
-  TreeItem *childItem = getItem( index );
-  if( childItem == rootItem )
+  TreeItem * childItem = getItem( index );
+  if ( childItem == rootItem )
     return QModelIndex();
 
-  TreeItem *parentItem = childItem->parent();
+  TreeItem * parentItem = childItem->parent();
 
-  if( parentItem == rootItem )
+  if ( parentItem == rootItem )
     return QModelIndex();
 
   return createIndex( parentItem->row(), 0, parentItem );
 }
 
-int FavoritesModel::rowCount(const QModelIndex &parent) const
+int FavoritesModel::rowCount( const QModelIndex & parent ) const
 {
   if ( parent.column() > 0 )
     return 0;
 
-  TreeItem *parentItem = getItem( parent );
+  TreeItem * parentItem = getItem( parent );
 
   return parentItem->childCount();
 }
 
-int FavoritesModel::columnCount(const QModelIndex & ) const
+int FavoritesModel::columnCount( const QModelIndex & ) const
 {
   return 1;
 }
 
-bool FavoritesModel::removeRows( int row, int count, const QModelIndex &parent )
+bool FavoritesModel::removeRows( int row, int count, const QModelIndex & parent )
 {
   TreeItem * parentItem = getItem( parent );
 
   beginRemoveRows( parent, row, row + count - 1 );
 
-  for( int i = 0; i < count; i++ )
+  for ( int i = 0; i < count; i++ )
     parentItem->deleteChild( row );
 
   endRemoveRows();
@@ -562,12 +544,11 @@ bool FavoritesModel::removeRows( int row, int count, const QModelIndex &parent )
 
 bool FavoritesModel::setData( const QModelIndex & index, const QVariant & value, int role )
 {
-  if( role != Qt::EditRole || !index.isValid() || value.toString().isEmpty() )
+  if ( role != Qt::EditRole || !index.isValid() || value.toString().isEmpty() )
     return false;
 
   QModelIndex parentIdx = parent( index );
-  if( findItemInFolder( value.toString(), TreeItem::Folder, parentIdx ).isValid() )
-  {
+  if ( findItemInFolder( value.toString(), TreeItem::Folder, parentIdx ).isValid() ) {
     // Such folder is already presented in parent folder
     return false;
   }
@@ -582,28 +563,24 @@ bool FavoritesModel::setData( const QModelIndex & index, const QVariant & value,
 
 QVariant FavoritesModel::data( QModelIndex const & index, int role ) const
 {
-  if( !index.isValid() )
+  if ( !index.isValid() )
     return QVariant();
 
-  TreeItem *item = getItem( index );
-  if( item == rootItem )
+  TreeItem * item = getItem( index );
+  if ( item == rootItem )
     return QVariant();
 
-  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole )
-  {
+  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole ) {
     return item->data();
   }
-  else
-  if( role == Qt::DecorationRole )
-  {
-    if( item->type() == TreeItem::Folder || item->type() == TreeItem::Root )
+  else if ( role == Qt::DecorationRole ) {
+    if ( item->type() == TreeItem::Folder || item->type() == TreeItem::Root )
       return QIcon( ":/icons/folder.svg" );
 
     return QVariant();
   }
-  if( role == Qt::EditRole )
-  {
-    if( item->type() == TreeItem::Folder )
+  if ( role == Qt::EditRole ) {
+    if ( item->type() == TreeItem::Folder )
       return item->data();
 
     return QVariant();
@@ -623,14 +600,13 @@ void FavoritesModel::readData()
 
   beginResetModel();
 
-  if( rootItem )
+  if ( rootItem )
     delete rootItem;
 
   rootItem = new TreeItem( QVariant(), 0, TreeItem::Root );
 
   QFile favoritesFile( m_favoritesFilename );
-  if( !favoritesFile.open( QFile::ReadOnly ) )
-  {
+  if ( !favoritesFile.open( QFile::ReadOnly ) ) {
     gdDebug( "No favorites file found" );
     return;
   }
@@ -639,14 +615,11 @@ void FavoritesModel::readData()
   int errorLine, errorColumn;
   dom.clear();
 
-  if ( !dom.setContent( &favoritesFile, false, &errorStr, &errorLine, &errorColumn  ) )
-  {
+  if ( !dom.setContent( &favoritesFile, false, &errorStr, &errorLine, &errorColumn ) ) {
     // Mailformed file
-    gdWarning( "Favorites file parsing error: %s at %d,%d\n", errorStr.toUtf8().data(),  errorLine,  errorColumn );
+    gdWarning( "Favorites file parsing error: %s at %d,%d\n", errorStr.toUtf8().data(), errorLine, errorColumn );
 
-    QMessageBox mb( QMessageBox::Warning, "GoldenDict",
-                      tr( "Error in favorities file" ),
-                      QMessageBox::Ok );
+    QMessageBox mb( QMessageBox::Warning, "GoldenDict", tr( "Error in favorities file" ), QMessageBox::Ok );
     mb.exec();
 
     dom.clear();
@@ -666,12 +639,11 @@ void FavoritesModel::readData()
 
 void FavoritesModel::saveData()
 {
-  if( !dirty )
+  if ( !dirty )
     return;
 
   QFile tmpFile( m_favoritesFilename + ".tmp" );
-  if( !tmpFile.open( QFile::WriteOnly ) )
-  {
+  if ( !tmpFile.open( QFile::WriteOnly ) ) {
     gdWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
     return;
   }
@@ -684,37 +656,33 @@ void FavoritesModel::saveData()
 
   QByteArray result( dom.toByteArray() );
 
-  if ( tmpFile.write( result ) != result.size() )
-  {
+  if ( tmpFile.write( result ) != result.size() ) {
     gdWarning( "Can't write favorites file, error: %s", tmpFile.errorString().toUtf8().data() );
     return;
   }
 
   tmpFile.close();
 
-  if( renameAtomically( tmpFile.fileName(), m_favoritesFilename ) )
+  if ( renameAtomically( tmpFile.fileName(), m_favoritesFilename ) )
     dirty = false;
 
   dom.clear();
 }
 
-void FavoritesModel::addFolder( TreeItem *parent, QDomNode &node )
+void FavoritesModel::addFolder( TreeItem * parent, QDomNode & node )
 {
   QDomNodeList nodes = node.childNodes();
-  for( int i = 0; i < nodes.count(); i++ )
-  {
+  for ( int i = 0; i < nodes.count(); i++ ) {
     QDomElement el = nodes.at( i ).toElement();
-    if( el.nodeName() == "folder" )
-    {
+    if ( el.nodeName() == "folder" ) {
       // New subfolder
-      QString name = el.attribute( "name", "" );
-      TreeItem *item = new TreeItem( name, parent, TreeItem::Folder );
+      QString name    = el.attribute( "name", "" );
+      TreeItem * item = new TreeItem( name, parent, TreeItem::Folder );
       item->setExpanded( el.attribute( "expanded", "0" ) == "1" );
       parent->appendChild( item );
       addFolder( item, el );
     }
-    else
-    {
+    else {
       QString word = el.text();
       parent->appendChild( new TreeItem( word, parent, TreeItem::Word ) );
 
@@ -727,20 +695,17 @@ void FavoritesModel::addFolder( TreeItem *parent, QDomNode &node )
 void FavoritesModel::storeFolder( TreeItem * folder, QDomNode & node )
 {
   int n = folder->childCount();
-  for( int i = 0; i < n; i++ )
-  {
+  for ( int i = 0; i < n; i++ ) {
     TreeItem * child = folder->child( i );
-    QString name = child->data().toString();
-    if( child->type() == TreeItem::Folder )
-    {
+    QString name     = child->data().toString();
+    if ( child->type() == TreeItem::Folder ) {
       QDomElement el = dom.createElement( "folder" );
       el.setAttribute( "name", name );
       el.setAttribute( "expanded", child->isExpanded() ? "1" : "0" );
       node.appendChild( el );
       storeFolder( child, el );
     }
-    else
-    {
+    else {
       QDomElement el = dom.createElement( "headword" );
       el.appendChild( dom.createTextNode( name ) );
       node.appendChild( el );
@@ -750,18 +715,16 @@ void FavoritesModel::storeFolder( TreeItem * folder, QDomNode & node )
 
 void FavoritesModel::itemExpanded( const QModelIndex & index )
 {
-  if( index.isValid() )
-  {
-    TreeItem *item = getItem( index );
+  if ( index.isValid() ) {
+    TreeItem * item = getItem( index );
     item->setExpanded( true );
   }
 }
 
 void FavoritesModel::itemCollapsed( const QModelIndex & index )
 {
-  if( index.isValid() )
-  {
-    TreeItem *item = getItem( index );
+  if ( index.isValid() ) {
+    TreeItem * item = getItem( index );
     item->setExpanded( false );
   }
 }
@@ -773,11 +736,9 @@ void FavoritesModel::checkAllNodesForExpand()
 
 void FavoritesModel::checkNodeForExpand( const TreeItem * item, const QModelIndex & parent )
 {
-  for( int i = 0; i < item->childCount(); i++ )
-  {
+  for ( int i = 0; i < item->childCount(); i++ ) {
     TreeItem * ch = item->child( i );
-    if( ch->type() == TreeItem::Folder && ch->isExpanded() )
-    {
+    if ( ch->type() == TreeItem::Folder && ch->isExpanded() ) {
       // We need to expand this node...
       QModelIndex idx = index( i, 0, parent );
       emit expandItem( idx );
@@ -793,42 +754,38 @@ QStringList FavoritesModel::mimeTypes() const
   return QStringList( QString::fromLatin1( FAVORITES_MIME_TYPE ) );
 }
 
-QMimeData *FavoritesModel::mimeData( const QModelIndexList & indexes ) const
+QMimeData * FavoritesModel::mimeData( const QModelIndexList & indexes ) const
 {
-  FavoritesMimeData *data = new FavoritesMimeData();
+  FavoritesMimeData * data = new FavoritesMimeData();
   data->setIndexesList( indexes );
   return data;
 }
 
-bool FavoritesModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
-                                   int row, int, const QModelIndex &par )
+bool FavoritesModel::dropMimeData(
+  const QMimeData * data, Qt::DropAction action, int row, int, const QModelIndex & par )
 {
-  if( action == Qt::MoveAction || action == Qt::CopyAction )
-  {
-    if( data->hasFormat( FAVORITES_MIME_TYPE ) )
-    {
+  if ( action == Qt::MoveAction || action == Qt::CopyAction ) {
+    if ( data->hasFormat( FAVORITES_MIME_TYPE ) ) {
       FavoritesMimeData const * mimeData = qobject_cast< FavoritesMimeData const * >( data );
-      if( mimeData )
-      {
+      if ( mimeData ) {
         QModelIndexList const & list = mimeData->getIndexesList();
 
-        if( list.isEmpty() )
+        if ( list.isEmpty() )
           return false;
 
         TreeItem * parentItem = getItem( par );
         QModelIndex parentIdx = par;
 
-        if( row < 0 )
+        if ( row < 0 )
           row = 0;
 
         QList< QModelIndex >::const_iterator it = list.begin();
         QList< TreeItem * > movedItems;
-        for( ; it != list.end(); ++it )
-        {
+        for ( ; it != list.end(); ++it ) {
           TreeItem * item = getItem( *it );
 
           // Check if we can copy/move this item
-          if( parentItem->haveAncestor( item ) || parentItem->haveSameItem( item, action == Qt::MoveAction ) )
+          if ( parentItem->haveAncestor( item ) || parentItem->haveSameItem( item, action == Qt::MoveAction ) )
             return false;
 
           movedItems.append( item );
@@ -837,10 +794,9 @@ bool FavoritesModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
         // Insert items to new place
 
         beginInsertRows( parentIdx, row, row + movedItems.count() - 1 );
-        for( int i = 0; i < movedItems.count(); i++ )
-        {
-          TreeItem * item = movedItems.at( i );
-          TreeItem *newItem = item->duplicateItem( parentItem );
+        for ( int i = 0; i < movedItems.count(); i++ ) {
+          TreeItem * item    = movedItems.at( i );
+          TreeItem * newItem = item->duplicateItem( parentItem );
           parentItem->insertChild( row + i, newItem );
         }
         endInsertRows();
@@ -854,25 +810,22 @@ bool FavoritesModel::dropMimeData( const QMimeData *data, Qt::DropAction action,
   return false;
 }
 
-QModelIndex FavoritesModel::findItemInFolder( const QString & itemName, int itemType,
-                                              const QModelIndex & parentIdx )
+QModelIndex FavoritesModel::findItemInFolder( const QString & itemName, int itemType, const QModelIndex & parentIdx )
 {
   TreeItem * parentItem = getItem( parentIdx );
-  for( int i = 0; i < parentItem->childCount(); i++ )
-  {
+  for ( int i = 0; i < parentItem->childCount(); i++ ) {
     TreeItem * item = parentItem->child( i );
-    if( item->data().toString() == itemName && item->type() == itemType )
+    if ( item->data().toString() == itemName && item->type() == itemType )
       return createIndex( i, 0, item );
   }
   return QModelIndex();
 }
 
-TreeItem *FavoritesModel::getItem( const QModelIndex &index ) const
+TreeItem * FavoritesModel::getItem( const QModelIndex & index ) const
 {
-  if( index.isValid() )
-  {
-    TreeItem *item = static_cast< TreeItem * >( index.internalPointer() );
-    if (item)
+  if ( index.isValid() ) {
+    TreeItem * item = static_cast< TreeItem * >( index.internalPointer() );
+    if ( item )
       return item;
   }
   return rootItem;
@@ -882,10 +835,9 @@ QStringList FavoritesModel::getTextForIndexes( const QModelIndexList & idxList )
 {
   QStringList list;
   QModelIndexList::const_iterator it = idxList.begin();
-  for( ; it != idxList.end(); ++it )
-  {
-    TreeItem *item = getItem( *it );
-    if( item->type() == TreeItem::Word )
+  for ( ; it != idxList.end(); ++it ) {
+    TreeItem * item = getItem( *it );
+    if ( item->type() == TreeItem::Word )
       list.append( item->data().toString() );
     else
       list.append( item->getTextFromAllChilds() );
@@ -902,29 +854,26 @@ void FavoritesModel::removeItemsForIndexes( const QModelIndexList & idxList )
   int lowestLevel = 0;
 
   QModelIndexList::const_iterator it = idxList.begin();
-  for( ; it != idxList.end(); ++it )
-  {
+  for ( ; it != idxList.end(); ++it ) {
     int n = level( *it );
-    if( n > lowestLevel )
+    if ( n > lowestLevel )
       lowestLevel = n;
     itemsToDelete[ n ].append( *it );
   }
 
-  for( int i = lowestLevel; i >= 0; i-- )
-  {
+  for ( int i = lowestLevel; i >= 0; i-- ) {
     QModelIndexList idxSublist = itemsToDelete[ i ];
-    // std::greater does not work as operator < not implemented
-    #if __cplusplus >= 201703L
+// std::greater does not work as operator < not implemented
+#if __cplusplus >= 201703L
     std::sort( idxSublist.begin(), idxSublist.end(), std::not_fn( std::less< QModelIndex >() ) );
-    #else
+#else
     std::sort( idxSublist.begin(), idxSublist.end(), std::not2( std::less< QModelIndex >() ) );
-    #endif
+#endif
 
     it = idxSublist.begin();
-    for( ; it != idxSublist.end(); ++it )
-    {
+    for ( ; it != idxSublist.end(); ++it ) {
       QModelIndex parentIdx = parent( *it );
-      removeRows( (*it).row(), 1, parentIdx );
+      removeRows( ( *it ).row(), 1, parentIdx );
     }
   }
 }
@@ -932,7 +881,7 @@ void FavoritesModel::removeItemsForIndexes( const QModelIndexList & idxList )
 QModelIndex FavoritesModel::addNewFolder( const QModelIndex & idx )
 {
   QModelIndex parentIdx;
-  if( idx.isValid() )
+  if ( idx.isValid() )
     parentIdx = parent( idx );
   else
     parentIdx = idx;
@@ -942,31 +891,27 @@ QModelIndex FavoritesModel::addNewFolder( const QModelIndex & idx )
   // Create unique name
 
   QString name = baseName;
-  if( findItemInFolder( name, TreeItem::Folder, parentIdx ).isValid() )
-  {
+  if ( findItemInFolder( name, TreeItem::Folder, parentIdx ).isValid() ) {
     int i;
-    for( i = 1; i < 1000; i++ )
-    {
+    for ( i = 1; i < 1000; i++ ) {
       name = baseName + QString::number( i );
-      if( !findItemInFolder( name, TreeItem::Folder, parentIdx ).isValid() )
+      if ( !findItemInFolder( name, TreeItem::Folder, parentIdx ).isValid() )
         break;
     }
-    if( i >= 1000 )
+    if ( i >= 1000 )
       return QModelIndex();
   }
 
   // Create folder with unique name
 
-  TreeItem *parentItem = getItem( parentIdx );
+  TreeItem * parentItem = getItem( parentIdx );
   int row;
 
-  if( idx.isValid() )
-  {
+  if ( idx.isValid() ) {
     // Insert after selected element
     row = idx.row() + 1;
   }
-  else
-  {
+  else {
     // No selected element - add to end of root folder
     row = parentItem->childCount();
   }
@@ -987,9 +932,9 @@ bool FavoritesModel::addNewHeadword( const QString & path, const QString & headw
 
   // Find or create target folder
 
-  QStringList folders = path.split( "/", Qt::SkipEmptyParts );
+  QStringList folders            = path.split( "/", Qt::SkipEmptyParts );
   QStringList::const_iterator it = folders.begin();
-  for( ; it != folders.end(); ++it )
+  for ( ; it != folders.end(); ++it )
     parentIdx = forceFolder( *it, parentIdx );
 
   // Add headword
@@ -1003,20 +948,17 @@ bool FavoritesModel::removeHeadword( const QString & path, const QString & headw
 
   // Find target folder
 
-  QStringList folders = path.split( "/", Qt::SkipEmptyParts );
+  QStringList folders            = path.split( "/", Qt::SkipEmptyParts );
   QStringList::const_iterator it = folders.begin();
-  for( ; it != folders.end(); ++it )
-  {
+  for ( ; it != folders.end(); ++it ) {
     idx = findItemInFolder( *it, TreeItem::Folder, idx );
-    if( !idx.isValid() )
+    if ( !idx.isValid() )
       break;
   }
 
-  if( path.isEmpty() || idx.isValid() )
-  {
+  if ( path.isEmpty() || idx.isValid() ) {
     idx = findItemInFolder( headword, TreeItem::Word, idx );
-    if( idx.isValid() )
-    {
+    if ( idx.isValid() ) {
       QModelIndexList list;
       list.append( idx );
       removeItemsForIndexes( list );
@@ -1033,17 +975,15 @@ bool FavoritesModel::isHeadwordPresent( const QString & path, const QString & he
 
   // Find target folder
 
-  QStringList folders = path.split( "/", Qt::SkipEmptyParts );
+  QStringList folders            = path.split( "/", Qt::SkipEmptyParts );
   QStringList::const_iterator it = folders.begin();
-  for( ; it != folders.end(); ++it )
-  {
+  for ( ; it != folders.end(); ++it ) {
     idx = findItemInFolder( *it, TreeItem::Folder, idx );
-    if( !idx.isValid() )
+    if ( !idx.isValid() )
       break;
   }
 
-  if( path.isEmpty() || idx.isValid() )
-  {
+  if ( path.isEmpty() || idx.isValid() ) {
     idx = findItemInFolder( headword, TreeItem::Word, idx );
     return idx.isValid();
   }
@@ -1054,13 +994,13 @@ bool FavoritesModel::isHeadwordPresent( const QString & path, const QString & he
 QModelIndex FavoritesModel::forceFolder( QString const & name, const QModelIndex & parentIdx )
 {
   QModelIndex idx = findItemInFolder( name, TreeItem::Folder, parentIdx );
-  if( idx.isValid() )
+  if ( idx.isValid() )
     return idx;
 
   // Folder not found, create it
   TreeItem * parentItem = getItem( parentIdx );
-  TreeItem * newItem = new TreeItem( name, parentItem, TreeItem::Folder );
-  int row = parentItem->childCount();
+  TreeItem * newItem    = new TreeItem( name, parentItem, TreeItem::Folder );
+  int row               = parentItem->childCount();
 
   beginInsertRows( parentIdx, row, row );
   parentItem->appendChild( newItem );
@@ -1074,13 +1014,13 @@ QModelIndex FavoritesModel::forceFolder( QString const & name, const QModelIndex
 bool FavoritesModel::addHeadword( const QString & word, const QModelIndex & parentIdx )
 {
   QModelIndex idx = findItemInFolder( word, TreeItem::Word, parentIdx );
-  if( idx.isValid() )
+  if ( idx.isValid() )
     return false;
 
   // Headword not found, append it
   TreeItem * parentItem = getItem( parentIdx );
-  TreeItem * newItem = new TreeItem( word, parentItem, TreeItem::Word );
-  int row = parentItem->childCount();
+  TreeItem * newItem    = new TreeItem( word, parentItem, TreeItem::Word );
+  int row               = parentItem->childCount();
 
   beginInsertRows( parentIdx, row, row );
   parentItem->appendChild( newItem );
@@ -1093,10 +1033,9 @@ bool FavoritesModel::addHeadword( const QString & word, const QModelIndex & pare
 
 int FavoritesModel::level( QModelIndex const & idx )
 {
-  int n = 0;
+  int n                 = 0;
   QModelIndex parentIdx = parent( idx );
-  while( parentIdx.isValid() )
-  {
+  while ( parentIdx.isValid() ) {
     n++;
     parentIdx = parent( parentIdx );
   }
@@ -1107,9 +1046,8 @@ QString FavoritesModel::pathToItem( QModelIndex const & idx )
 {
   QString path;
   QModelIndex parentIdx = parent( idx );
-  while( parentIdx.isValid() )
-  {
-    if( !path.isEmpty() )
+  while ( parentIdx.isValid() ) {
+    if ( !path.isEmpty() )
       path = "/" + path;
 
     path = data( parentIdx, Qt::DisplayRole ).toString() + path;
@@ -1144,17 +1082,16 @@ bool FavoritesModel::setDataFromXml( QString const & dataStr )
   int errorLine, errorColumn;
   dom.clear();
 
-  if ( !dom.setContent( dataStr, false, &errorStr, &errorLine, &errorColumn  ) )
-  {
+  if ( !dom.setContent( dataStr, false, &errorStr, &errorLine, &errorColumn ) ) {
     // Mailformed data
-    gdWarning( "XML parsing error: %s at %d,%d\n", errorStr.toUtf8().data(),  errorLine,  errorColumn );
+    gdWarning( "XML parsing error: %s at %d,%d\n", errorStr.toUtf8().data(), errorLine, errorColumn );
     dom.clear();
     return false;
   }
 
   beginResetModel();
 
-  if( rootItem )
+  if ( rootItem )
     delete rootItem;
 
   rootItem = new TreeItem( QVariant(), 0, TreeItem::Root );
@@ -1171,16 +1108,16 @@ bool FavoritesModel::setDataFromXml( QString const & dataStr )
 
 bool FavoritesModel::setDataFromTxt( QString const & dataStr )
 {
-  auto words = dataStr.split('\n',Qt::SkipEmptyParts);
+  auto words = dataStr.split( '\n', Qt::SkipEmptyParts );
 
   beginResetModel();
 
-  if( rootItem )
+  if ( rootItem )
     delete rootItem;
 
   rootItem = new TreeItem( QVariant(), 0, TreeItem::Root );
 
-  for(auto const & word : words){
+  for ( auto const & word : words ) {
     rootItem->appendChild( new TreeItem( word, rootItem, TreeItem::Word ) );
   }
   endResetModel();
diff --git a/src/ui/favoritespanewidget.hh b/src/ui/favoritespanewidget.hh
index 9c4db26e..ce55ec5c 100644
--- a/src/ui/favoritespanewidget.hh
+++ b/src/ui/favoritespanewidget.hh
@@ -21,21 +21,26 @@
 
 class FavoritesModel;
 
-class FavoritesPaneWidget : public QWidget
+class FavoritesPaneWidget: public QWidget
 {
   Q_OBJECT
+
 public:
-  FavoritesPaneWidget( QWidget * parent = 0 ): QWidget( parent ),
-    itemSelectionChanged( false )
-  , listItemDelegate( 0 )
-  , m_favoritesModel( 0 )
-  , timerId( 0 )
-  {}
+  FavoritesPaneWidget( QWidget * parent = 0 ):
+    QWidget( parent ),
+    itemSelectionChanged( false ),
+    listItemDelegate( 0 ),
+    m_favoritesModel( 0 ),
+    timerId( 0 )
+  {
+  }
 
   virtual ~FavoritesPaneWidget();
 
   virtual QSize sizeHint() const
-  { return QSize( 204, 204 ); }
+  {
+    return QSize( 204, 204 );
+  }
 
   void setUp( Config::Class * cfg, QMenu * menu );
 
@@ -50,7 +55,9 @@ public:
   bool setDataFromTxt( QString const & dataStr );
 
   void setFocusOnTree()
-  { m_favoritesTree->setFocus(); }
+  {
+    m_favoritesTree->setFocus();
+  }
 
   // Set interval for periodical save
   void setSaveInterval( unsigned interval );
@@ -67,10 +74,10 @@ protected:
   virtual void timerEvent( QTimerEvent * ev );
 
 private slots:
-  void emitFavoritesItemRequested(QModelIndex const &);
-  void onSelectionChanged(QItemSelection const & selection);
-  void onItemClicked(QModelIndex const & idx);
-  void showCustomMenu(QPoint const & pos);
+  void emitFavoritesItemRequested( QModelIndex const & );
+  void onSelectionChanged( const QItemSelection & selected, const QItemSelection & deselected );
+  void onItemClicked( QModelIndex const & idx );
+  void showCustomMenu( QPoint const & pos );
   void deleteSelectedItems();
   void copySelectedItems();
   void addFolder();
@@ -78,7 +85,7 @@ private slots:
 private:
   virtual bool eventFilter( QObject *, QEvent * );
 
-  Config::Class * m_cfg ;
+  Config::Class * m_cfg;
   QTreeView * m_favoritesTree;
   QMenu * m_favoritesMenu;
   QAction * m_deleteSelectedAction;
@@ -104,9 +111,13 @@ private:
 class TreeItem
 {
 public:
-  enum Type { Word, Folder, Root };
+  enum Type {
+    Word,
+    Folder,
+    Root
+  };
 
-  explicit TreeItem( const QVariant &data, TreeItem *parent = 0, Type type_ = Word );
+  explicit TreeItem( const QVariant & data, TreeItem * parent = 0, Type type_ = Word );
   ~TreeItem();
 
   void appendChild( TreeItem * child );
@@ -124,15 +135,21 @@ public:
   TreeItem * parent();
 
   Type type() const
-  { return m_type; }
+  {
+    return m_type;
+  }
 
   Qt::ItemFlags flags() const;
 
   void setExpanded( bool expanded )
-  { m_expanded = expanded; }
+  {
+    m_expanded = expanded;
+  }
 
   bool isExpanded() const
-  { return m_expanded; }
+  {
+    return m_expanded;
+  }
 
   // Full path from root folder
   QString fullPath() const;
@@ -152,39 +169,37 @@ public:
 private:
   QList< TreeItem * > childItems;
   QVariant itemData;
-  TreeItem *parentItem;
+  TreeItem * parentItem;
   Type m_type;
   bool m_expanded;
 };
 
-class FavoritesModel : public QAbstractItemModel
+class FavoritesModel: public QAbstractItemModel
 {
   Q_OBJECT
+
 public:
   explicit FavoritesModel( QString favoritesFilename, QObject * parent = 0 );
   ~FavoritesModel();
 
-  QVariant data( const QModelIndex &index, int role ) const;
-  Qt::ItemFlags flags( const QModelIndex &index ) const;
-  QVariant headerData( int section, Qt::Orientation orientation,
-                       int role = Qt::DisplayRole ) const;
-  QModelIndex index( int row, int column,
-                     const QModelIndex &parent = QModelIndex() ) const;
-  QModelIndex parent( const QModelIndex &index ) const;
-  int rowCount( const QModelIndex &parent = QModelIndex() ) const;
-  int columnCount( const QModelIndex &parent = QModelIndex() ) const;
-  bool removeRows( int row, int count, const QModelIndex &parent );
-  bool setData( const QModelIndex &index, const QVariant &value, int role );
+  QVariant data( const QModelIndex & index, int role ) const;
+  Qt::ItemFlags flags( const QModelIndex & index ) const;
+  QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const;
+  QModelIndex index( int row, int column, const QModelIndex & parent = QModelIndex() ) const;
+  QModelIndex parent( const QModelIndex & index ) const;
+  int rowCount( const QModelIndex & parent = QModelIndex() ) const;
+  int columnCount( const QModelIndex & parent = QModelIndex() ) const;
+  bool removeRows( int row, int count, const QModelIndex & parent );
+  bool setData( const QModelIndex & index, const QVariant & value, int role );
 
   // Drag & drop support
   Qt::DropActions supportedDropActions() const;
   QStringList mimeTypes() const;
-  QMimeData *mimeData(const QModelIndexList &indexes) const;
-  bool dropMimeData(const QMimeData *data, Qt::DropAction action,
-                    int row, int column, const QModelIndex &par);
+  QMimeData * mimeData( const QModelIndexList & indexes ) const;
+  bool dropMimeData( const QMimeData * data, Qt::DropAction action, int row, int column, const QModelIndex & par );
 
   // Restore nodes expanded state after data loading
-  void checkNodeForExpand( const TreeItem * item, const QModelIndex &parent );
+  void checkNodeForExpand( const TreeItem * item, const QModelIndex & parent );
   void checkAllNodesForExpand();
 
   // Retrieve text data for indexes
@@ -212,7 +227,9 @@ public:
   QString pathToItem( QModelIndex const & idx );
 
   TreeItem::Type itemType( QModelIndex const & idx )
-  { return getItem( idx )->type(); }
+  {
+    return getItem( idx )->type();
+  }
 
   // Export/import Favorites
   void getDataInXml( QByteArray & dataStr );
@@ -223,8 +240,8 @@ public:
   void saveData();
 
 public slots:
-  void itemCollapsed ( const QModelIndex & index );
-  void itemExpanded ( const QModelIndex & index );
+  void itemCollapsed( const QModelIndex & index );
+  void itemExpanded( const QModelIndex & index );
 
 signals:
   void expandItem( const QModelIndex & index );
@@ -235,10 +252,9 @@ protected:
   void storeFolder( TreeItem * folder, QDomNode & node );
 
   // Find item in folder
-  QModelIndex findItemInFolder( QString const & itemName, int itemType,
-                                QModelIndex const & parentIdx );
+  QModelIndex findItemInFolder( QString const & itemName, int itemType, QModelIndex const & parentIdx );
 
-  TreeItem *getItem( const QModelIndex &index ) const;
+  TreeItem * getItem( const QModelIndex & index ) const;
 
   // Find folder with given name or create it if folder not exist
   QModelIndex forceFolder( QString const & name, QModelIndex const & parentIdx );
@@ -259,24 +275,36 @@ private:
 
 #define FAVORITES_MIME_TYPE "application/x-goldendict-tree-items"
 
-class FavoritesMimeData : public QMimeData
+class FavoritesMimeData: public QMimeData
 {
   Q_OBJECT
+
 public:
-  FavoritesMimeData() : QMimeData()
-  {}
+  FavoritesMimeData():
+    QMimeData()
+  {
+  }
 
   virtual QStringList formats() const
-  { return QStringList( QString::fromLatin1( FAVORITES_MIME_TYPE ) ); }
+  {
+    return QStringList( QString::fromLatin1( FAVORITES_MIME_TYPE ) );
+  }
 
-  virtual bool hasFormat(const QString & mimetype) const
-  { return mimetype.compare( QString::fromLatin1( FAVORITES_MIME_TYPE ) ) == 0; }
+  virtual bool hasFormat( const QString & mimetype ) const
+  {
+    return mimetype.compare( QString::fromLatin1( FAVORITES_MIME_TYPE ) ) == 0;
+  }
 
   void setIndexesList( QModelIndexList const & list )
-  { indexes.clear(); indexes = list; }
+  {
+    indexes.clear();
+    indexes = list;
+  }
 
   QModelIndexList const & getIndexesList() const
-  { return indexes; }
+  {
+    return indexes;
+  }
 
 private:
   QStringList mimeFormats;
diff --git a/src/ui/ftssearchpanel.cc b/src/ui/ftssearchpanel.cc
index a80f4343..e34b4a34 100644
--- a/src/ui/ftssearchpanel.cc
+++ b/src/ui/ftssearchpanel.cc
@@ -1,13 +1,14 @@
 #include "ftssearchpanel.hh"
 #include <QHBoxLayout>
 
-FtsSearchPanel::FtsSearchPanel( QWidget * parent ): QWidget( parent )
+FtsSearchPanel::FtsSearchPanel( QWidget * parent ):
+  QWidget( parent )
 {
 
-  auto * layout    = new QHBoxLayout( this );
-  previous         = new QPushButton( this );
-  next             = new QPushButton( this );
-  statusLabel      = new QLabel( this );
+  auto * layout = new QHBoxLayout( this );
+  previous      = new QPushButton( this );
+  next          = new QPushButton( this );
+  statusLabel   = new QLabel( this );
 
   layout->addWidget( previous );
   layout->addWidget( next );
diff --git a/src/ui/ftssearchpanel.hh b/src/ui/ftssearchpanel.hh
index 53ebefe3..0339e5f2 100644
--- a/src/ui/ftssearchpanel.hh
+++ b/src/ui/ftssearchpanel.hh
@@ -8,7 +8,8 @@
 class FtsSearchPanel: public QWidget
 {
   Q_OBJECT
- public:
+
+public:
   explicit FtsSearchPanel( QWidget * parent = nullptr );
   QLabel * statusLabel;
   QPushButton * previous;
diff --git a/src/ui/groupcombobox.cc b/src/ui/groupcombobox.cc
index e03d1405..3905233d 100644
--- a/src/ui/groupcombobox.cc
+++ b/src/ui/groupcombobox.cc
@@ -5,7 +5,8 @@
 #include <QEvent>
 #include <QShortcutEvent>
 
-GroupComboBox::GroupComboBox( QWidget * parent ): QComboBox( parent ),
+GroupComboBox::GroupComboBox( QWidget * parent ):
+  QComboBox( parent ),
   popupAction( this ),
   selectNextAction( this ),
   selectPreviousAction( this )
@@ -38,23 +39,20 @@ void GroupComboBox::fill( Instances::Groups const & groups )
 
   clear();
 
-  for( QMap< int, int >::iterator i = shortcuts.begin(); i != shortcuts.end(); ++i )
+  for ( QMap< int, int >::iterator i = shortcuts.begin(); i != shortcuts.end(); ++i )
     releaseShortcut( i.key() );
 
   shortcuts.clear();
 
-  for( unsigned x  = 0; x < groups.size(); ++x )
-  {
-    addItem( groups[ x ].makeIcon(),
-             groups[ x ].name, groups[ x ].id );
+  for ( unsigned x = 0; x < groups.size(); ++x ) {
+    addItem( groups[ x ].makeIcon(), groups[ x ].name, groups[ x ].id );
 
     if ( prevId == groups[ x ].id )
       setCurrentIndex( x );
 
     // Create a shortcut
 
-    if ( !groups[ x ].shortcut.isEmpty() )
-    {
+    if ( !groups[ x ].shortcut.isEmpty() ) {
       int id = grabShortcut( groups[ x ].shortcut );
       setShortcutEnabled( id );
 
@@ -65,14 +63,12 @@ void GroupComboBox::fill( Instances::Groups const & groups )
 
 bool GroupComboBox::event( QEvent * event )
 {
-  if ( event->type() == QEvent::Shortcut )
-  {
-    QShortcutEvent * ev = ( QShortcutEvent * ) event;
+  if ( event->type() == QEvent::Shortcut ) {
+    QShortcutEvent * ev = (QShortcutEvent *)event;
 
     QMap< int, int >::const_iterator i = shortcuts.find( ev->shortcutId() );
 
-    if ( i != shortcuts.end() )
-    {
+    if ( i != shortcuts.end() ) {
       ev->accept();
       setCurrentIndex( i.value() );
       return true;
@@ -93,10 +89,8 @@ QList< QAction * > GroupComboBox::getExternActions()
 
 void GroupComboBox::setCurrentGroup( unsigned id )
 {
-  for( int x  = 0; x < count(); ++x )
-  {
-    if ( itemData( x ).toUInt() == id )
-    {
+  for ( int x = 0; x < count(); ++x ) {
+    if ( itemData( x ).toUInt() == id ) {
       setCurrentIndex( x );
       break;
     }
@@ -118,20 +112,20 @@ void GroupComboBox::popupGroups()
 
 void GroupComboBox::selectNextGroup()
 {
-  if( count() <= 1 )
+  if ( count() <= 1 )
     return;
   int n = currentIndex() + 1;
-  if( n >= count() )
+  if ( n >= count() )
     n = 0;
   setCurrentIndex( n );
 }
 
 void GroupComboBox::selectPreviousGroup()
 {
-  if( count() <= 1 )
+  if ( count() <= 1 )
     return;
   int n = currentIndex() - 1;
-  if( n < 0 )
+  if ( n < 0 )
     n = count() - 1;
   setCurrentIndex( n );
 }
diff --git a/src/ui/groupcombobox.hh b/src/ui/groupcombobox.hh
index beee6459..2ef672b6 100644
--- a/src/ui/groupcombobox.hh
+++ b/src/ui/groupcombobox.hh
@@ -56,4 +56,3 @@ private:
 };
 
 #endif
-
diff --git a/src/ui/groups.cc b/src/ui/groups.cc
index 8847bf8c..f01e0db7 100644
--- a/src/ui/groups.cc
+++ b/src/ui/groups.cc
@@ -12,16 +12,17 @@ using std::vector;
 Groups::Groups( QWidget * parent,
                 vector< sptr< Dictionary::Class > > const & dicts_,
                 Config::Groups const & groups_,
-                Config::Group const & order ): QWidget( parent ),
-  dicts( dicts_ ), groups( groups_ )
+                Config::Group const & order ):
+  QWidget( parent ),
+  dicts( dicts_ ),
+  groups( groups_ )
 {
   ui.setupUi( this );
 
   // Populate the dictionaries' list
 
   ui.dictionaries->setAsSource();
-  ui.dictionaries->populate( Instances::Group( order, dicts, Config::Group() ).dictionaries,
-                             dicts );
+  ui.dictionaries->populate( Instances::Group( order, dicts, Config::Group() ).dictionaries, dicts );
 
   ui.searchLine->applyTo( ui.dictionaries );
   addAction( ui.searchLine->getFocusAction() );
@@ -65,10 +66,8 @@ Groups::Groups( QWidget * parent,
 
 void Groups::editGroup( unsigned id )
 {
-  for( int x = 0; x < groups.size(); ++x )
-  {
-    if ( groups[ x ].id == id )
-    {
+  for ( int x = 0; x < groups.size(); ++x ) {
+    if ( groups[ x ].id == id ) {
       ui.groups->setCurrentIndex( x );
       ui.groups->currentWidget()->setFocus();
       break;
@@ -81,10 +80,9 @@ void Groups::updateDictionaryOrder( Config::Group const & order )
   // Make sure it differs from what we have
   Instances::Group newOrder( order, dicts, Config::Group() );
 
-  if( ui.dictionaries->getCurrentDictionaries() != newOrder.dictionaries )
-  {
+  if ( ui.dictionaries->getCurrentDictionaries() != newOrder.dictionaries ) {
     // Repopulate
-    ui.dictionaries->populate( Instances::Group( order, dicts, Config::Group() ).dictionaries, dicts );
+    ui.dictionaries->populate( newOrder.dictionaries, dicts );
   }
 }
 
@@ -102,7 +100,8 @@ void Groups::countChanged()
   ui.removeAllGroups->setEnabled( en );
 
   int stretch = ui.groups->count() / 5;
-  if( stretch > 3 ) stretch = 3;
+  if ( stretch > 3 )
+    stretch = 3;
   ui.gridLayout->setColumnStretch( 2, stretch );
 }
 
@@ -110,12 +109,14 @@ void Groups::addNew()
 {
   bool ok;
 
-  QString name = QInputDialog::getText( this, tr( "Add group" ),
-                                  tr("Give a name for the new group:"), QLineEdit::Normal,
-                                  "", &ok );
+  QString name = QInputDialog::getText( this,
+                                        tr( "Add group" ),
+                                        tr( "Give a name for the new group:" ),
+                                        QLineEdit::Normal,
+                                        "",
+                                        &ok );
 
-  if ( ok )
-  {
+  if ( ok ) {
     ui.groups->addNewGroup( name );
     countChanged();
   }
@@ -127,12 +128,14 @@ void Groups::addAutoGroups()
   countChanged();
 }
 
-void Groups::addAutoGroupsByFolders() {
+void Groups::addAutoGroupsByFolders()
+{
   ui.groups->addAutoGroupsByFolders();
   countChanged();
 }
 
-void Groups::groupsByMetadata() {
+void Groups::groupsByMetadata()
+{
   ui.groups->groupsByMetadata();
   countChanged();
 }
@@ -145,9 +148,12 @@ void Groups::renameCurrent()
 
   bool ok;
 
-  QString name = QInputDialog::getText( this, tr("Rename group"),
-                                  tr("Give a new name for the group:"), QLineEdit::Normal,
-                                  ui.groups->getCurrentGroupName(), &ok );
+  QString name = QInputDialog::getText( this,
+                                        tr( "Rename group" ),
+                                        tr( "Give a new name for the group:" ),
+                                        QLineEdit::Normal,
+                                        ui.groups->getCurrentGroupName(),
+                                        &ok );
 
   if ( ok )
     ui.groups->renameCurrentGroup( name );
@@ -157,10 +163,14 @@ void Groups::removeCurrent()
 {
   int current = ui.groups->currentIndex();
 
-  if ( current >= 0 && QMessageBox::question( this, tr( "Remove group" ),
-         tr( "Are you sure you want to remove the group <b>%1</b>?" ).arg( ui.groups->getCurrentGroupName() ),
-         QMessageBox::Yes, QMessageBox::Cancel ) == QMessageBox::Yes )
-  {
+  if ( current >= 0
+       && QMessageBox::question(
+            this,
+            tr( "Remove group" ),
+            tr( "Are you sure you want to remove the group <b>%1</b>?" ).arg( ui.groups->getCurrentGroupName() ),
+            QMessageBox::Yes,
+            QMessageBox::Cancel )
+         == QMessageBox::Yes ) {
     ui.groups->removeCurrentGroup();
     countChanged();
   }
@@ -170,10 +180,13 @@ void Groups::removeAll()
 {
   int current = ui.groups->currentIndex();
 
-  if ( current >= 0 && QMessageBox::question( this, tr( "Remove all groups" ),
-         tr( "Are you sure you want to remove all the groups?" ),
-         QMessageBox::Yes, QMessageBox::Cancel ) == QMessageBox::Yes )
-  {
+  if ( current >= 0
+       && QMessageBox::question( this,
+                                 tr( "Remove all groups" ),
+                                 tr( "Are you sure you want to remove all the groups?" ),
+                                 QMessageBox::Yes,
+                                 QMessageBox::Cancel )
+         == QMessageBox::Yes ) {
     ui.groups->removeAllGroups();
     countChanged();
   }
@@ -183,8 +196,7 @@ void Groups::addToGroup()
 {
   int current = ui.groups->currentIndex();
 
-  if ( current >= 0 )
-  {
+  if ( current >= 0 ) {
     ui.groups->getCurrentModel()->addSelectedUniqueFromModel( ui.dictionaries->selectionModel() );
   }
 }
@@ -193,28 +205,26 @@ void Groups::removeFromGroup()
 {
   int current = ui.groups->currentIndex();
 
-  if ( current >= 0 )
-  {
+  if ( current >= 0 ) {
     ui.groups->getCurrentModel()->removeSelectedRows( ui.groups->getCurrentSelectionModel() );
   }
 }
 
 void Groups::showDictInfo( QPoint const & pos )
 {
-  QVariant data = ui.dictionaries->getModel()->data(
-        ui.searchLine->mapToSource(ui.dictionaries->indexAt( pos ) ), Qt::EditRole );
+  QVariant data =
+    ui.dictionaries->getModel()->data( ui.searchLine->mapToSource( ui.dictionaries->indexAt( pos ) ), Qt::EditRole );
   QString id;
-  if( data.canConvert< QString >() )
+  if ( data.canConvert< QString >() )
     id = data.toString();
 
-  if( !id.isEmpty() )
-  {
+  if ( !id.isEmpty() ) {
     vector< sptr< Dictionary::Class > > const & dicts = ui.dictionaries->getCurrentDictionaries();
     unsigned n;
-    for( n = 0; n < dicts.size(); n++ )
-      if( id.compare( QString::fromUtf8( dicts.at( n )->getId().c_str() ) ) == 0 )
+    for ( n = 0; n < dicts.size(); n++ )
+      if ( id.compare( QString::fromUtf8( dicts.at( n )->getId().c_str() ) ) == 0 )
         break;
-    if( n < dicts.size() )
+    if ( n < dicts.size() )
       emit showDictionaryInfo( id );
   }
 }
@@ -222,24 +232,22 @@ void Groups::showDictInfo( QPoint const & pos )
 void Groups::fillGroupsMenu()
 {
   groupsListMenu->clear();
-  for( int i = 0; i < ui.groups->count(); i++ )
-  {
+  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)
-    {
+    if ( ui.groups->currentIndex() == i ) {
       QFont f( act->font() );
       f.setBold( true );
       act->setFont( f );
     }
   }
 
-  if( groupsListMenu->actions().size() > 1 )
+  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);
+  ui.groups->setCurrentIndex( idx );
 }
diff --git a/src/ui/groups.ui b/src/ui/groups.ui
index 6abbb416..3d542e0e 100644
--- a/src/ui/groups.ui
+++ b/src/ui/groups.ui
@@ -126,7 +126,7 @@
         <enum>QTabWidget::North</enum>
        </property>
        <property name="elideMode">
-        <enum>Qt::ElideRight</enum>
+        <enum>Qt::ElideNone</enum>
        </property>
        <widget class="QWidget" name="tab_4">
         <attribute name="title">
diff --git a/src/ui/groups_widgets.cc b/src/ui/groups_widgets.cc
index 882dcd73..b1abfbec 100644
--- a/src/ui/groups_widgets.cc
+++ b/src/ui/groups_widgets.cc
@@ -33,8 +33,8 @@ DictGroupWidget::DictGroupWidget( QWidget * parent,
   ui.setupUi( this );
   ui.dictionaries->populate( Instances::Group( group, dicts, Config::Group() ).dictionaries, dicts );
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)
-  ui.shortcut->setClearButtonEnabled(true);
+#if QT_VERSION >= QT_VERSION_CHECK( 6, 4, 0 )
+  ui.shortcut->setClearButtonEnabled( true );
   ui.clearShortCut->hide();
 #endif
 
@@ -44,15 +44,14 @@ DictGroupWidget::DictGroupWidget( QWidget * parent,
 
   ui.groupIcon->addItem( tr( "None" ), "" );
 
-  bool usesIconData = !group.iconData.isEmpty();
+  const bool usesIconData = !group.iconData.isEmpty();
 
   if ( !usesIconData )
     ui.groupIcon->addItem( tr( "From file..." ), "" );
   else
     ui.groupIcon->addItem( Instances::iconFromData( group.iconData ), group.icon, group.icon );
 
-  for( int x = 0; x < icons.size(); ++x )
-  {
+  for ( int x = 0; x < icons.size(); ++x ) {
     QString n( icons[ x ] );
     n.chop( 4 );
     n[ 0 ] = n[ 0 ].toUpper();
@@ -80,35 +79,32 @@ DictGroupWidget::DictGroupWidget( QWidget * parent,
 
 void DictGroupWidget::groupIconActivated( int index )
 {
-  if ( index == 1 )
-  {
+  if ( index == 1 ) {
     QList< QByteArray > supImageFormats = QImageReader::supportedImageFormats();
 
     QString formatList( " (" );
 
-    for( int x = 0; x < supImageFormats.size(); ++x )
-      formatList += "*." + QString::fromLatin1( supImageFormats[ x ] ) + " ";
+    for ( const auto & supImageFormat : supImageFormats )
+      formatList += "*." + QString::fromLatin1( supImageFormat ) + " ";
 
     formatList.chop( 1 );
     formatList.append( ")" );
 
-    QString chosenFile =
-        QFileDialog::getOpenFileName( this, tr( "Choose a file to use as group icon" ),
-                                      QString(),
-                                      tr( "Images" ) + formatList + ";;" +
-                                      tr( "All files" ) + " (*.*)" );
+    const QString chosenFile =
+      QFileDialog::getOpenFileName( this,
+                                    tr( "Choose a file to use as group icon" ),
+                                    QString(),
+                                    tr( "Images" ) + formatList + ";;" + tr( "All files" ) + " (*.*)" );
 
-    if ( !chosenFile.isEmpty() )
-    {
-      QIcon icon( chosenFile );
+    if ( !chosenFile.isEmpty() ) {
+      const QIcon icon( chosenFile );
 
       if ( icon.isNull() )
         QMessageBox::critical( this, tr( "Error" ), tr( "Can't read the specified image file." ) );
-      else
-      {
+      else {
         ui.groupIcon->setItemIcon( 1, icon );
 
-        QString baseName = QFileInfo( chosenFile ).completeBaseName();
+        const QString baseName = QFileInfo( chosenFile ).completeBaseName();
         ui.groupIcon->setItemText( 1, baseName );
         ui.groupIcon->setItemData( 1, baseName );
       }
@@ -124,7 +120,7 @@ Config::Group DictGroupWidget::makeGroup() const
 
   g.dictionaries = ui.dictionaries->getCurrentDictionaries();
 
-  int currentIndex = ui.groupIcon->currentIndex();
+  const int currentIndex = ui.groupIcon->currentIndex();
 
   if ( currentIndex == 1 ) // File
     g.iconData = ui.groupIcon->itemIcon( currentIndex );
@@ -140,19 +136,18 @@ Config::Group DictGroupWidget::makeGroup() const
 
 void DictGroupWidget::showDictInfo( QPoint const & pos )
 {
-  QVariant data = ui.dictionaries->getModel()->data( ui.dictionaries->indexAt( pos ), Qt::EditRole );
+  const QVariant data = ui.dictionaries->getModel()->data( ui.dictionaries->indexAt( pos ), Qt::EditRole );
   QString id;
-  if( data.canConvert< QString >() )
+  if ( data.canConvert< QString >() )
     id = data.toString();
 
-  if( !id.isEmpty() )
-  {
+  if ( !id.isEmpty() ) {
     vector< sptr< Dictionary::Class > > const & dicts = ui.dictionaries->getCurrentDictionaries();
     unsigned n;
-    for( n = 0; n < dicts.size(); n++ )
-      if( id.compare( QString::fromUtf8( dicts.at( n )->getId().c_str() ) ) == 0 )
+    for ( n = 0; n < dicts.size(); n++ )
+      if ( id.compare( QString::fromUtf8( dicts.at( n )->getId().c_str() ) ) == 0 )
         break;
-    if( n < dicts.size() )
+    if ( n < dicts.size() )
       emit showDictionaryInfo( id );
   }
 }
@@ -165,19 +160,17 @@ void DictGroupWidget::removeCurrentItem( QModelIndex const & index )
 
 /// DictListModel
 
-void DictListModel::populate(
-  std::vector< sptr< Dictionary::Class > > const & active,
-  std::vector< sptr< Dictionary::Class > > const & available )
+void DictListModel::populate( std::vector< sptr< Dictionary::Class > > const & active,
+                              std::vector< sptr< Dictionary::Class > > const & available )
 {
   dictionaries = active;
-  allDicts = &available;
+  allDicts     = &available;
 
   beginResetModel();
   endResetModel();
 }
 
-void DictListModel::populate(
-  std::vector< sptr< Dictionary::Class > > const & active )
+void DictListModel::populate( std::vector< sptr< Dictionary::Class > > const & active )
 {
   dictionaries = active;
   beginResetModel();
@@ -189,20 +182,19 @@ void DictListModel::setAsSource()
   isSource = true;
 }
 
-std::vector< sptr< Dictionary::Class > > const &
-  DictListModel::getCurrentDictionaries() const
+std::vector< sptr< Dictionary::Class > > const & DictListModel::getCurrentDictionaries() const
 {
   return dictionaries;
 }
 
 Qt::ItemFlags DictListModel::flags( QModelIndex const & index ) const
 {
-  Qt::ItemFlags defaultFlags = QAbstractListModel::flags( index );
+  const Qt::ItemFlags defaultFlags = QAbstractListModel::flags( index );
 
-  if (index.isValid())
-     return Qt::ItemIsDragEnabled | defaultFlags;
+  if ( index.isValid() )
+    return Qt::ItemIsDragEnabled | defaultFlags;
   else
-     return Qt::ItemIsDropEnabled | defaultFlags;
+    return Qt::ItemIsDropEnabled | defaultFlags;
 }
 
 int DictListModel::rowCount( QModelIndex const & ) const
@@ -212,24 +204,21 @@ int DictListModel::rowCount( QModelIndex const & ) const
 
 QVariant DictListModel::data( QModelIndex const & index, int role ) const
 {
-  if( index.row() < 0 )
+  if ( index.row() < 0 )
     return QVariant();
-  
+
   sptr< Dictionary::Class > const & item = dictionaries[ index.row() ];
 
   if ( !item )
     return QVariant();
 
-  switch ( role )
-  {
-    case Qt::ToolTipRole:
-    {
+  switch ( role ) {
+    case Qt::ToolTipRole: {
       QString tt = "<b>" + QString::fromUtf8( item->getName().c_str() ) + "</b>";
 
-      QString lfrom( Language::localizedNameForId( item->getLangFrom() ) );
-      QString lto( Language::localizedNameForId( item->getLangTo() ) );
-      if ( !lfrom.isEmpty() )
-      {
+      const QString lfrom( Language::localizedNameForId( item->getLangFrom() ) );
+      const QString lto( Language::localizedNameForId( item->getLangTo() ) );
+      if ( !lfrom.isEmpty() ) {
         if ( lfrom == lto )
           tt += "<br>" + lfrom;
         else
@@ -244,8 +233,7 @@ QVariant DictListModel::data( QModelIndex const & index, int role ) const
 
       const std::vector< std::string > & dirs = item->getDictionaryFilenames();
 
-      if ( dirs.size() )
-      {
+      if ( dirs.size() ) {
         tt += "<hr>";
         tt += dirs.at( 0 ).c_str();
       }
@@ -254,10 +242,10 @@ QVariant DictListModel::data( QModelIndex const & index, int role ) const
       return tt;
     }
 
-    case Qt::DisplayRole :
+    case Qt::DisplayRole:
       return QString::fromUtf8( item->getName().c_str() );
 
-    case Qt::EditRole :
+    case Qt::EditRole:
       return QString::fromUtf8( item->getId().c_str() );
 
     case Qt::DecorationRole:
@@ -276,64 +264,55 @@ bool DictListModel::insertRows( int row, int count, const QModelIndex & parent )
     return false;
 
   beginInsertRows( parent, row, row + count - 1 );
-  dictionaries.insert( dictionaries.begin() + row, count,
-                       sptr< Dictionary::Class >() );
+  dictionaries.insert( dictionaries.begin() + row, count, sptr< Dictionary::Class >() );
   endInsertRows();
   emit contentChanged();
   return true;
 }
 
-void DictListModel::addRow(const QModelIndex & parent, sptr< Dictionary::Class > dict)
+void DictListModel::addRow( const QModelIndex & parent, sptr< Dictionary::Class > dict )
 {
-  for (unsigned i = 0; i < dictionaries.size(); i++)
-  {
-    if (dictionaries[i]->getId() == dict->getId())
+  for ( const auto & dictionary : dictionaries ) {
+    if ( dictionary->getId() == dict->getId() )
       return;
   }
 
-  beginInsertRows( parent, dictionaries.size(), dictionaries.size()+1 );
-  dictionaries.push_back(dict);
+  beginInsertRows( parent, dictionaries.size(), dictionaries.size() + 1 );
+  dictionaries.push_back( dict );
   endInsertRows();
   emit contentChanged();
 }
 
-bool DictListModel::removeRows( int row, int count,
-                                const QModelIndex & parent )
+bool DictListModel::removeRows( int row, int count, const QModelIndex & parent )
 {
   if ( isSource )
     return false;
 
   beginRemoveRows( parent, row, row + count - 1 );
-  dictionaries.erase( dictionaries.begin() + row,
-                      dictionaries.begin() + row + count );
+  dictionaries.erase( dictionaries.begin() + row, dictionaries.begin() + row + count );
   endRemoveRows();
   emit contentChanged();
   return true;
 }
 
-bool DictListModel::setData( QModelIndex const & index, const QVariant & value,
-                             int role )
+bool DictListModel::setData( QModelIndex const & index, const QVariant & value, int role )
 {
-  if ( isSource || !allDicts || !index.isValid() ||
-       index.row() >= (int)dictionaries.size() )
+  if ( isSource || !allDicts || !index.isValid() || index.row() >= (int)dictionaries.size() )
     return false;
 
-  if ( ( role == Qt::DisplayRole ) || ( role ==  Qt::DecorationRole ) )
-  {
+  if ( ( role == Qt::DisplayRole ) || ( role == Qt::DecorationRole ) ) {
     // Allow changing that, but do nothing
     return true;
   }
 
-  if ( role == Qt::EditRole )
-  {
+  if ( role == Qt::EditRole ) {
     Config::Group g;
 
     g.dictionaries.push_back( Config::DictionaryRef( value.toString(), QString() ) );
 
-    Instances::Group i( g, *allDicts, Config::Group() );
+    const Instances::Group i( g, *allDicts, Config::Group() );
 
-    if ( i.dictionaries.size() == 1 )
-    {
+    if ( i.dictionaries.size() == 1 ) {
       // Found that dictionary
       dictionaries[ index.row() ] = i.dictionaries.front();
 
@@ -356,13 +335,12 @@ void DictListModel::removeSelectedRows( QItemSelectionModel * source )
   if ( !source )
     return;
 
-  QModelIndexList rows = source->selectedRows();
+  const QModelIndexList rows = source->selectedRows();
 
   if ( !rows.count() )
     return;
 
-  for ( int i = rows.count()-1; i >= 0; --i )
-  {
+  for ( int i = rows.count() - 1; i >= 0; --i ) {
     dictionaries.erase( dictionaries.begin() + rows.at( i ).row() );
   }
 
@@ -376,22 +354,20 @@ void DictListModel::addSelectedUniqueFromModel( QItemSelectionModel * source )
   if ( !source )
     return;
 
-  QModelIndexList rows = source->selectedRows();
+  const QModelIndexList rows = source->selectedRows();
 
   if ( !rows.count() )
     return;
 
-  const QSortFilterProxyModel * proxyModel = dynamic_cast< const QSortFilterProxyModel * > ( source->model() );
+  const QSortFilterProxyModel * proxyModel = dynamic_cast< const QSortFilterProxyModel * >( source->model() );
 
   const DictListModel * baseModel;
 
-  if ( proxyModel )
-  {
-    baseModel = dynamic_cast< const DictListModel * > ( proxyModel->sourceModel() );
+  if ( proxyModel ) {
+    baseModel = dynamic_cast< const DictListModel * >( proxyModel->sourceModel() );
   }
-  else
-  {
-    baseModel = dynamic_cast< const DictListModel * > ( source->model() );
+  else {
+    baseModel = dynamic_cast< const DictListModel * >( source->model() );
   }
 
   if ( !baseModel )
@@ -399,13 +375,12 @@ void DictListModel::addSelectedUniqueFromModel( QItemSelectionModel * source )
 
   QVector< std::string > list;
   QVector< std::string > dicts;
-  for ( unsigned i = 0; i < dictionaries.size(); i++ )
-    dicts.append( dictionaries.at( i )->getId() );
+  for ( const auto & dictionarie : dictionaries )
+    dicts.append( dictionarie->getId() );
 
-  for ( int i = 0; i < rows.count(); i++ )
-  {
-    QModelIndex idx = proxyModel ? proxyModel->mapToSource(rows.at( i )) : rows.at( i );
-    std::string id = baseModel->dictionaries.at( idx.row() )->getId();
+  for ( int i = 0; i < rows.count(); i++ ) {
+    QModelIndex idx = proxyModel ? proxyModel->mapToSource( rows.at( i ) ) : rows.at( i );
+    std::string id  = baseModel->dictionaries.at( idx.row() )->getId();
 
     if ( !dicts.contains( id ) )
       list.append( id );
@@ -414,13 +389,10 @@ void DictListModel::addSelectedUniqueFromModel( QItemSelectionModel * source )
   if ( list.empty() )
     return;
 
-  for ( int j = 0; j < list.size(); j++ )
-  {
-    for ( unsigned i = 0; i < allDicts->size(); i++ )
-    {
-      if ( allDicts->at( i )->getId() == list.at( j ) )
-      {
-        dictionaries.push_back( allDicts->at( i ) );
+  for ( const auto & j : list ) {
+    for ( const auto & allDict : *allDicts ) {
+      if ( allDict->getId() == j ) {
+        dictionaries.push_back( allDict );
         break;
       }
     }
@@ -436,12 +408,10 @@ void DictListModel::filterDuplicates()
   QSet< QString > ids;
   bool doReset = false;
 
-  for ( unsigned i = 0; i < dictionaries.size(); i++ )
-  {
+  for ( unsigned i = 0; i < dictionaries.size(); i++ ) {
     QString id = QString::fromStdString( dictionaries.at( i )->getId() );
 
-    if ( ids.contains( id ) )
-    {
+    if ( ids.contains( id ) ) {
       dictionaries.erase( dictionaries.begin() + i-- );
       doReset = true;
       continue;
@@ -450,8 +420,7 @@ void DictListModel::filterDuplicates()
     ids.insert( id );
   }
 
-  if ( doReset )
-  {
+  if ( doReset ) {
     beginResetModel();
     endResetModel();
     emit contentChanged();
@@ -460,7 +429,8 @@ void DictListModel::filterDuplicates()
 
 /// DictListWidget
 
-DictListWidget::DictListWidget( QWidget * parent ): QListView( parent ),
+DictListWidget::DictListWidget( QWidget * parent ):
+  QListView( parent ),
   model( this )
 {
   setModel( &model );
@@ -472,20 +442,13 @@ DictListWidget::DictListWidget( QWidget * parent ): QListView( parent ),
   setDropIndicatorShown( true );
 }
 
-DictListWidget::~DictListWidget()
-{
-  setModel( 0 );
-}
-
-void DictListWidget::populate(
-  std::vector< sptr< Dictionary::Class > > const & active,
-  std::vector< sptr< Dictionary::Class > > const & available )
+void DictListWidget::populate( std::vector< sptr< Dictionary::Class > > const & active,
+                               std::vector< sptr< Dictionary::Class > > const & available )
 {
   model.populate( active, available );
 }
 
-void DictListWidget::populate(
-  std::vector< sptr< Dictionary::Class > > const & active )
+void DictListWidget::populate( std::vector< sptr< Dictionary::Class > > const & active )
 {
   model.populate( active );
 }
@@ -496,20 +459,18 @@ void DictListWidget::setAsSource()
   model.setAsSource();
 }
 
-std::vector< sptr< Dictionary::Class > > const &
-  DictListWidget::getCurrentDictionaries() const
+std::vector< sptr< Dictionary::Class > > const & DictListWidget::getCurrentDictionaries() const
 {
   return model.getCurrentDictionaries();
 }
 
 void DictListWidget::dropEvent( QDropEvent * event )
 {
-  DictListWidget * sourceList = dynamic_cast< DictListWidget * > ( event->source() );
+  const auto sourceList = dynamic_cast< DictListWidget * >( event->source() );
 
   QListView::dropEvent( event );
 
-  if ( sourceList != this )
-  {
+  if ( sourceList != this ) {
     model.filterDuplicates();
   }
 }
@@ -524,20 +485,17 @@ void DictListWidget::rowsInserted( QModelIndex const & parent, int start, int en
   QListView::rowsInserted( parent, start, end );
 
   // When inserting new rows, make the first of them current
-  selectionModel()->setCurrentIndex( model.index( start, 0, parent ),
-                                     QItemSelectionModel::NoUpdate );
+  selectionModel()->setCurrentIndex( model.index( start, 0, parent ), QItemSelectionModel::NoUpdate );
 }
 
 void DictListWidget::rowsAboutToBeRemoved( QModelIndex const & parent, int start, int end )
 {
   // When removing rows, if the current row is among the removed ones, select
   // an item just before the first row to be removed, if there's one.
-  QModelIndex current = currentIndex();
 
-  if ( current.isValid() && current.row() &&
-       current.row() >= start && current.row() <= end )
-    selectionModel()->setCurrentIndex( model.index( current.row() - 1, 0, parent ),
-                                       QItemSelectionModel::NoUpdate );
+  if ( const QModelIndex current = currentIndex();
+       current.isValid() && current.row() && current.row() >= start && current.row() <= end )
+    selectionModel()->setCurrentIndex( model.index( current.row() - 1, 0, parent ), QItemSelectionModel::NoUpdate );
 
   QListView::rowsAboutToBeRemoved( parent, start, end );
 }
@@ -546,11 +504,17 @@ void DictListWidget::rowsAboutToBeRemoved( QModelIndex const & parent, int start
 // DictGroupsWidget
 
 DictGroupsWidget::DictGroupsWidget( QWidget * parent ):
-  QTabWidget( parent ), nextId( 1 ), allDicts( 0 ), activeDicts( 0 )
+  QTabWidget( parent ),
+  nextId( 1 ),
+  allDicts( nullptr ),
+  activeDicts( nullptr )
 {
   setMovable( true );
   setContextMenuPolicy( Qt::CustomContextMenu );
   connect( this, &QWidget::customContextMenuRequested, this, &DictGroupsWidget::contextMenu );
+
+  setElideMode( Qt::ElideNone );
+  setUsesScrollButtons( true );
 }
 
 namespace {
@@ -569,36 +533,31 @@ QString unescapeAmps( QString const & str )
   return result;
 }
 
-}
+} // namespace
 
 void DictGroupsWidget::populate( Config::Groups const & groups,
                                  vector< sptr< Dictionary::Class > > const & allDicts_,
                                  vector< sptr< Dictionary::Class > > const & activeDicts_ )
 {
-  while( count() )
-    removeCurrentGroup();
+  removeAllGroups();
 
-  allDicts = &allDicts_;
+  allDicts    = &allDicts_;
   activeDicts = &activeDicts_;
 
-  for( int x = 0; x < groups.size(); ++x )
-  {
-    DictGroupWidget *gr = new DictGroupWidget( this, *allDicts, groups[ x ] );
+  for ( int x = 0; x < groups.size(); ++x ) {
+    const auto gr = new DictGroupWidget( this, *allDicts, groups[ x ] );
     addTab( gr, escapeAmps( groups[ x ].name ) );
-    connect( gr, &DictGroupWidget::showDictionaryInfo,this, &DictGroupsWidget::showDictionaryInfo );
+    connect( gr, &DictGroupWidget::showDictionaryInfo, this, &DictGroupsWidget::showDictionaryInfo );
     connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
 
-    setCurrentIndex( x );
-    QString toolTipStr = "\"" + tabText( x ) + "\"\n" + tr( "Dictionaries: " )
-                         + QString::number( getCurrentModel()->getCurrentDictionaries().size() );
+    QString toolTipStr =
+      "\"" + tabText( x ) + "\"\n" + tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( x ) );
     setTabToolTip( x, toolTipStr );
   }
 
   nextId = groups.nextId;
 
   setCurrentIndex( 0 );
-
-  setUsesScrollButtons( count() > 3 );
 }
 
 /// Creates groups from what is currently set up
@@ -608,8 +567,7 @@ Config::Groups DictGroupsWidget::makeGroups() const
 
   result.nextId = nextId;
 
-  for( int x = 0; x < count(); ++x )
-  {
+  for ( int x = 0; x < count(); ++x ) {
     result.push_back( dynamic_cast< DictGroupWidget & >( *widget( x ) ).makeGroup() );
     result.back().name = unescapeAmps( tabText( x ) );
   }
@@ -619,117 +577,131 @@ Config::Groups DictGroupsWidget::makeGroups() const
 
 DictListModel * DictGroupsWidget::getCurrentModel() const
 {
-  int current = currentIndex();
+  const int current = currentIndex();
 
-  if ( current >= 0 )
-  {
-    DictGroupWidget * w = ( DictGroupWidget * ) widget( current );
+  if ( current >= 0 ) {
+    const auto w = (DictGroupWidget *)widget( current );
     return w->getModel();
   }
 
-  return 0;
+  return nullptr;
+}
+
+DictListModel * DictGroupsWidget::getModelAt( int current ) const
+{
+  if ( current >= 0 && current < count() ) {
+    const auto w = static_cast< DictGroupWidget * >( widget( current ) );
+    if ( !w )
+      return nullptr;
+    return w->getModel();
+  }
+
+  return nullptr;
+}
+
+int DictGroupsWidget::getDictionaryCountAt( int current ) const
+{
+  const auto model = getModelAt( current );
+  if ( !model )
+    return 0;
+  return model->getCurrentDictionaries().size();
+}
+
+std::vector< sptr< Dictionary::Class > > DictGroupsWidget::getDictionaryAt( int current ) const
+{
+  const auto model = getModelAt( current );
+  if ( !model )
+    return {};
+  return model->getCurrentDictionaries();
 }
 
 QItemSelectionModel * DictGroupsWidget::getCurrentSelectionModel() const
 {
-  int current = currentIndex();
+  const int current = currentIndex();
 
-  if ( current >= 0 )
-  {
-    DictGroupWidget * w = ( DictGroupWidget * ) widget( current );
+  if ( current >= 0 ) {
+    const auto w = (DictGroupWidget *)widget( current );
     return w->getSelectionModel();
   }
 
-  return 0;
+  return nullptr;
 }
 
 
-void DictGroupsWidget::addNewGroup( QString const & name )
+int DictGroupsWidget::addNewGroup( QString const & name )
 {
   if ( !allDicts )
-    return;
-
-  int idx = currentIndex() + 1;
+    return 0;
 
   Config::Group newGroup;
 
   newGroup.id = nextId++;
 
-  DictGroupWidget *gr = new DictGroupWidget( this, *allDicts, newGroup );
-  insertTab( idx, gr, escapeAmps( name ) );
+  const auto gr = new DictGroupWidget( this, *allDicts, newGroup );
+  const int idx = insertTab( currentIndex() + 1, gr, escapeAmps( name ) );
   connect( gr, &DictGroupWidget::showDictionaryInfo, this, &DictGroupsWidget::showDictionaryInfo );
 
-  setCurrentIndex( idx );
-
   connect( gr->getModel(), &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
 
-  QString toolTipStr = "\"" + tabText( idx ) + "\"\n" + tr( "Dictionaries: " )
-                       + QString::number( getCurrentModel()->getCurrentDictionaries().size() );
+  const QString toolTipStr =
+    "\"" + tabText( idx ) + "\"\n" + tr( "Dictionaries: " ) + QString::number( getDictionaryCountAt( idx ) );
   setTabToolTip( idx, toolTipStr );
-
-  setUsesScrollButtons( count() > 3 );
+  return idx;
 }
 
 int DictGroupsWidget::addUniqueGroup( const QString & name )
 {
-  for( int n = 0; n < count(); n++ )
-    if( tabText( n ) == name )
-    {
-      setCurrentIndex( n );
+  for ( int n = 0; n < count(); n++ )
+    if ( tabText( n ) == name ) {
       return n;
     }
 
-  addNewGroup( name );
-  return currentIndex();
+  return addNewGroup( name );
 }
 
 void DictGroupsWidget::addAutoGroups()
 {
-  if( !activeDicts )
+  if ( !activeDicts )
     return;
 
-  if ( QMessageBox::information( this, tr( "Confirmation" ),
-         tr( "Are you sure you want to generate a set of groups "
-             "based on language pairs?" ), QMessageBox::Yes,
-             QMessageBox::Cancel ) != QMessageBox::Yes )
+  if ( QMessageBox::information( this,
+                                 tr( "Confirmation" ),
+                                 tr( "Are you sure you want to generate a set of groups "
+                                     "based on language pairs?" ),
+                                 QMessageBox::Yes,
+                                 QMessageBox::Cancel )
+       != QMessageBox::Yes )
     return;
 
-  QMap< QString, QVector< sptr<Dictionary::Class> > > dictMap;
-  QMap< QString, QVector< sptr<Dictionary::Class> > > morphoMap;
+  QMap< QString, QVector< sptr< Dictionary::Class > > > dictMap;
+  QMap< QString, QVector< sptr< Dictionary::Class > > > morphoMap;
 
   // Put active dictionaries into lists
 
-  for ( unsigned i = 0; i < activeDicts->size(); i++ )
-  {
-    sptr<Dictionary::Class> dict = activeDicts->at( i );
-
+  for ( const auto & dict : *activeDicts ) {
     int idFrom = dict->getLangFrom();
-    int idTo = dict->getLangTo();
-    if( idFrom == 0)
-    {
+    int idTo   = dict->getLangTo();
+    if ( idFrom == 0 ) {
       // Attempt to find language pair in dictionary name
 
-      QPair<quint32,quint32> ids = LangCoder::findIdsForName( QString::fromUtf8( dict->getName().c_str() ) );
-      idFrom = ids.first;
-      idTo = ids.second;
+      const QPair< quint32, quint32 > ids = LangCoder::findIdsForName( QString::fromUtf8( dict->getName().c_str() ) );
+      idFrom                              = ids.first;
+      idTo                                = ids.second;
     }
 
     QString name( tr( "Unassigned" ) );
-    if ( idFrom != 0 && idTo != 0 )
-    {
+    if ( idFrom != 0 && idTo != 0 ) {
       QString lfrom = LangCoder::intToCode2( idFrom );
-      QString lto = LangCoder::intToCode2( idTo );
-      lfrom[ 0 ] = lfrom[ 0 ].toTitleCase();
-      lto[ 0 ] = lto[ 0 ].toTitleCase();
-      name = lfrom + " - " + lto;
+      QString lto   = LangCoder::intToCode2( idTo );
+      lfrom[ 0 ]    = lfrom[ 0 ].toTitleCase();
+      lto[ 0 ]      = lto[ 0 ].toTitleCase();
+      name          = lfrom + " - " + lto;
     }
-    else if( !dict->getDictionaryFilenames().empty() )
-    {
+    else if ( !dict->getDictionaryFilenames().empty() ) {
       // Handle special case - morphology dictionaries
 
       QString fileName = QFileInfo( dict->getDictionaryFilenames()[ 0 ].c_str() ).fileName();
-      if( fileName.endsWith( ".aff", Qt::CaseInsensitive ) )
-      {
+      if ( fileName.endsWith( ".aff", Qt::CaseInsensitive ) ) {
         QString code = fileName.left( 2 ).toLower();
         morphoMap[ code ].push_back( dict );
         continue;
@@ -740,35 +712,27 @@ void DictGroupsWidget::addAutoGroups()
   }
 
   QStringList groupList = dictMap.keys();
-  QStringList morphoList = morphoMap.keys();
 
   // Insert morphology dictionaries into corresponding lists
-
-  for( QStringList::ConstIterator ln = morphoList.begin(); ln != morphoList.end(); ++ln )
-  {
-    for( QStringList::ConstIterator gr = groupList.begin(); gr != groupList.end(); ++gr )
-      if( ln->compare( gr->left( 2 ), Qt::CaseInsensitive ) == 0 )
-      {
-        QVector<sptr<Dictionary::Class> > vdg = dictMap[ *gr ];
-        vdg += morphoMap[ *ln ];
-        dictMap[ *gr ] = vdg;
-      }
+  for ( const auto & gr : groupList ) {
+    if ( auto morpho_key = gr.left( 2 ).toLower(); morphoMap.contains( morpho_key ) ) {
+      QVector< sptr< Dictionary::Class > > vdg = dictMap[ gr ];
+      vdg += morphoMap[ morpho_key ];
+      dictMap[ gr ] = vdg;
+    }
   }
-
   // Make groups
 
-  for( QStringList::ConstIterator gr = groupList.begin(); gr != groupList.end(); ++gr )
-  {
-    if( count() )
-      setCurrentIndex( count() - 1 );
-
-    addUniqueGroup( *gr );
+  for ( const auto & gr : groupList ) {
+    const auto idx = addUniqueGroup( gr );
 
     // add dictionaries into the current group
-    QVector< sptr<Dictionary::Class> > vd = dictMap[ *gr ];
-    DictListModel *model = getCurrentModel();
-    for( int i = 0; i < vd.count(); i++ )
-      model->addRow(QModelIndex(), vd.at( i ) );
+    QVector< sptr< Dictionary::Class > > vd = dictMap[ gr ];
+    DictListModel * model                   = getModelAt( idx );
+    if ( !model )
+      continue;
+    for ( int i = 0; i < vd.count(); i++ )
+      model->addRow( QModelIndex(), vd.at( i ) );
   }
 }
 
@@ -799,7 +763,14 @@ void DictGroupsWidget::addAutoGroupsByFolders()
   QMap< sptr< Dictionary::Class >, QString > dictToContainerFolder;
 
   for ( const auto & dict : *activeDicts ) {
-    QDir c = dict->getContainingFolder();
+    auto containingFolder = dict->getContainingFolder();
+
+    // website/program dicts will return empty string, ignore them
+    if ( containingFolder.isEmpty() ) {
+      continue;
+    }
+
+    QDir c = containingFolder;
 
     if ( !c.cdUp() ) {
       cdUpWentWrong( c.absolutePath() );
@@ -865,16 +836,15 @@ void DictGroupsWidget::addAutoGroupsByFolders()
   addGroupBasedOnMap( groupToDicts );
 }
 
-void DictGroupsWidget::addGroupBasedOnMap( const QMultiMap<QString, sptr<Dictionary::Class>> & groupToDicts )
+void DictGroupsWidget::addGroupBasedOnMap( const QMultiMap< QString, sptr< Dictionary::Class > > & groupToDicts )
 {
   for ( const auto & group : groupToDicts.uniqueKeys() ) {
-    if ( count() != 0 ) {
-      setCurrentIndex( count() - 1 );
+    const auto idx        = addUniqueGroup( group );
+    DictListModel * model = getModelAt( idx );
+
+    if ( !model ) {
+      continue;
     }
-
-    addUniqueGroup( group );
-    DictListModel * model = getCurrentModel();
-
     for ( const auto & dict : groupToDicts.values( group ) ) {
       model->addRow( QModelIndex(), dict );
     }
@@ -904,7 +874,7 @@ void DictGroupsWidget::groupsByMetadata()
 
     auto filePath = Utils::Path::combine( baseDir, "metadata.toml" );
 
-    auto dictMetaData = Metadata::load( filePath.toStdString() );
+    const auto dictMetaData = Metadata::load( filePath.toStdString() );
     if ( dictMetaData && dictMetaData->categories ) {
       for ( const auto & category : dictMetaData->categories.value() ) {
         auto group = QString::fromStdString( category ).trimmed();
@@ -924,7 +894,7 @@ void DictGroupsWidget::groupsByMetadata()
 
 QString DictGroupsWidget::getCurrentGroupName() const
 {
-  int current = currentIndex();
+  const int current = currentIndex();
 
   if ( current >= 0 )
     return unescapeAmps( tabText( current ) );
@@ -934,7 +904,7 @@ QString DictGroupsWidget::getCurrentGroupName() const
 
 void DictGroupsWidget::renameCurrentGroup( QString const & name )
 {
-  int current = currentIndex();
+  const int current = currentIndex();
 
   if ( current >= 0 )
     setTabText( current, escapeAmps( name ) );
@@ -942,23 +912,17 @@ void DictGroupsWidget::renameCurrentGroup( QString const & name )
 
 void DictGroupsWidget::removeCurrentGroup()
 {
-  int current = currentIndex();
+  const int current = currentIndex();
 
-  if ( current >= 0 )
-  {
-    QWidget * w = widget( current );
+  if ( current >= 0 ) {
     removeTab( current );
-    delete w;
   }
-
-  setUsesScrollButtons( count() > 3 );
 }
 
 void DictGroupsWidget::removeAllGroups()
 {
-  while ( count() )
-  {
-    QWidget * w = widget( 0 );
+  while ( count() ) {
+    const QWidget * w = widget( 0 );
     removeTab( 0 );
     delete w;
   }
@@ -966,83 +930,78 @@ void DictGroupsWidget::removeAllGroups()
 
 void DictGroupsWidget::combineGroups( int source, int target )
 {
-  if( source < 0 || source >= count() || target < 0 || target >= count() )
+  if ( source < 0 || source >= count() || target < 0 || target >= count() )
     return;
 
-  setCurrentIndex( source );
-  vector< sptr< Dictionary::Class > > const & dicts = getCurrentModel()->getCurrentDictionaries();
+  vector< sptr< Dictionary::Class > > const & dicts = getDictionaryAt( source );
 
-  setCurrentIndex( target );
-  DictListModel *model = getCurrentModel();
+  const auto model = getModelAt( target );
+
+  if ( !model )
+    return;
 
   disconnect( model, &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
 
-  for( unsigned i = 0; i < dicts.size(); i++ )
-    model->addRow( QModelIndex(), dicts[ i ] );
+  for ( const auto & dict : dicts ) {
+    model->addRow( QModelIndex(), dict );
+  }
 
   connect( model, &DictListModel::contentChanged, this, &DictGroupsWidget::tabDataChanged );
 
-  QString toolTipStr = "\"" + tabText( target ) + "\"\n" + tr( "Dictionaries: " )
-                       + QString::number( model->getCurrentDictionaries().size() );
+  const QString toolTipStr = "\"" + tabText( target ) + "\"\n" + tr( "Dictionaries: " )
+    + QString::number( model->getCurrentDictionaries().size() );
   setTabToolTip( target, toolTipStr );
 }
 
 void DictGroupsWidget::contextMenu( QPoint const & pos )
 {
-  int clickedGroup = tabBar()->tabAt( pos );
-  if( clickedGroup < 0 )
+  const int clickedGroup = tabBar()->tabAt( pos );
+  if ( clickedGroup < 0 )
     return;
-  QString name = tabText( clickedGroup );
-  if( name.length() != 7 || name.mid( 2, 3 ) != " - " )
+  const QString name = tabText( clickedGroup );
+  if ( name.length() != 7 || name.mid( 2, 3 ) != " - " )
     return;
 
   QMenu menu( this );
 
-  QAction *combineSourceAction = new QAction( QString( tr( "Combine groups by source language to \"%1->\"" ) )
-                                              .arg( name.left( 2 ) ), &menu );
+  const auto combineSourceAction =
+    new QAction( QString( tr( "Combine groups by source language to \"%1->\"" ) ).arg( name.left( 2 ) ), &menu );
   combineSourceAction->setEnabled( false );
 
-  QString grLeft = name.left( 2 );
+  QString grLeft  = name.left( 2 );
   QString grRight = name.right( 2 );
-  for( int i = 0; i < count(); i++ )
-  {
+  for ( int i = 0; i < count(); i++ ) {
     QString str = tabText( i );
-    if( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " && str.startsWith( grLeft ) )
-    {
+    if ( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " && str.startsWith( grLeft ) ) {
       combineSourceAction->setEnabled( true );
       break;
     }
   }
   menu.addAction( combineSourceAction );
 
-  QAction *combineTargetAction = new QAction( QString( tr( "Combine groups by target language to \"->%1\"" ) )
-                                              .arg( name.right( 2 ) ), &menu );
+  const auto combineTargetAction =
+    new QAction( QString( tr( "Combine groups by target language to \"->%1\"" ) ).arg( name.right( 2 ) ), &menu );
   combineTargetAction->setEnabled( false );
 
-  for( int i = 0; i < count(); i++ )
-  {
+  for ( int i = 0; i < count(); i++ ) {
     QString str = tabText( i );
-    if( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " && str.endsWith( grRight ) )
-    {
+    if ( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " && str.endsWith( grRight ) ) {
       combineTargetAction->setEnabled( true );
       break;
     }
   }
   menu.addAction( combineTargetAction );
 
-  QAction *combineTwoSidedAction = NULL;
-  if( grLeft != grRight )
-  {
-    combineTwoSidedAction = new QAction( QString( tr( "Make two-side translate group \"%1-%2-%1\"" ) )
-                                         .arg( grLeft ).arg( grRight ), &menu );
+  QAction * combineTwoSidedAction = nullptr;
+  if ( grLeft != grRight ) {
+    combineTwoSidedAction =
+      new QAction( QString( tr( "Make two-side translate group \"%1-%2-%1\"" ) ).arg( grLeft, grRight ), &menu );
 
     combineTwoSidedAction->setEnabled( false );
 
-    QString str = grRight + " - " + grLeft;
-    for( int i = 0; i < count(); i++ )
-    {
-      if( str == tabText( i ) )
-      {
+    const QString str = grRight + " - " + grLeft;
+    for ( int i = 0; i < count(); i++ ) {
+      if ( str == tabText( i ) ) {
         combineTwoSidedAction->setEnabled( true );
         break;
       }
@@ -1051,35 +1010,28 @@ void DictGroupsWidget::contextMenu( QPoint const & pos )
     menu.addAction( combineTwoSidedAction );
   }
 
-  QAction *combineFirstAction = new QAction( QString( tr( "Combine groups with \"%1\"" ) )
-                                             .arg( grLeft ), &menu );
+  const auto combineFirstAction = new QAction( QString( tr( "Combine groups with \"%1\"" ) ).arg( grLeft ), &menu );
   combineFirstAction->setEnabled( false );
-  for( int i = 0; i < count(); i++ )
-  {
+  for ( int i = 0; i < count(); i++ ) {
     QString str = tabText( i );
-    if( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " &&
-        ( str.startsWith( grLeft ) || str.endsWith( grLeft ) ) )
-    {
+    if ( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - "
+         && ( str.startsWith( grLeft ) || str.endsWith( grLeft ) ) ) {
       combineFirstAction->setEnabled( true );
       break;
     }
   }
   menu.addAction( combineFirstAction );
 
-  QAction *combineSecondAction = NULL;
+  QAction * combineSecondAction = nullptr;
 
-  if( grLeft != grRight )
-  {
-    combineSecondAction = new QAction( QString( tr( "Combine groups with \"%1\"" ) )
-                                        .arg( grRight ), &menu );
+  if ( grLeft != grRight ) {
+    combineSecondAction = new QAction( QString( tr( "Combine groups with \"%1\"" ) ).arg( grRight ), &menu );
     combineSecondAction->setEnabled( false );
 
-    for( int i = 0; i < count(); i++ )
-    {
+    for ( int i = 0; i < count(); i++ ) {
       QString str = tabText( i );
-      if( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - " &&
-          ( str.startsWith( grRight ) || str.endsWith( grRight ) ) )
-      {
+      if ( i != clickedGroup && str.length() == 7 && str.mid( 2, 3 ) == " - "
+           && ( str.startsWith( grRight ) || str.endsWith( grRight ) ) ) {
         combineSecondAction->setEnabled( true );
         break;
       }
@@ -1087,65 +1039,50 @@ void DictGroupsWidget::contextMenu( QPoint const & pos )
     menu.addAction( combineSecondAction );
   }
 
-  QAction *result = menu.exec( mapToGlobal( pos ) );
+  const QAction * result = menu.exec( mapToGlobal( pos ) );
 
   setUpdatesEnabled( false );
   int targetGroup;
 
-  if( result && result == combineSourceAction )
-  {
-    setCurrentIndex( clickedGroup );
+  if ( result && result == combineSourceAction ) {
     targetGroup = addUniqueGroup( grLeft + "->" );
 
-    for( int i = 0; i < count(); i++ )
-    {
+    for ( int i = 0; i < count(); i++ ) {
       QString str = tabText( i );
-      if( str.length() == 7 && str.mid( 2, 3 ) == " - " && str.startsWith( grLeft ) )
+      if ( str.length() == 7 && str.mid( 2, 3 ) == " - " && str.startsWith( grLeft ) )
         combineGroups( i, targetGroup );
     }
 
     setCurrentIndex( targetGroup );
   }
-  else
-  if( result && result == combineTargetAction )
-  {
-    setCurrentIndex( clickedGroup );
+  else if ( result && result == combineTargetAction ) {
     targetGroup = addUniqueGroup( "->" + grRight );
 
-    for( int i = 0; i < count(); i++ )
-    {
+    for ( int i = 0; i < count(); i++ ) {
       QString str = tabText( i );
-      if( str.length() == 7 && str.mid( 2, 3 ) == " - " && str.endsWith( grRight ) )
+      if ( str.length() == 7 && str.mid( 2, 3 ) == " - " && str.endsWith( grRight ) )
         combineGroups( i, targetGroup );
     }
 
     setCurrentIndex( targetGroup );
   }
-  else
-  if( result && result == combineTwoSidedAction )
-  {
-    setCurrentIndex( clickedGroup );
-    targetGroup = addUniqueGroup( name + " - " + grLeft );
-    QString str = grRight + " - " + grLeft;
+  else if ( result && result == combineTwoSidedAction ) {
+    targetGroup       = addUniqueGroup( name + " - " + grLeft );
+    const QString str = grRight + " - " + grLeft;
 
-    for( int i = 0; i < count(); i++ )
-      if( tabText( i ) == name || tabText( i ) == str )
+    for ( int i = 0; i < count(); i++ )
+      if ( tabText( i ) == name || tabText( i ) == str )
         combineGroups( i, targetGroup );
 
     setCurrentIndex( targetGroup );
   }
-  else
-  if( result && ( result == combineFirstAction || result == combineSecondAction ) )
-  {
+  else if ( result && ( result == combineFirstAction || result == combineSecondAction ) ) {
     QString const & grBase = result == combineFirstAction ? grLeft : grRight;
-    setCurrentIndex( clickedGroup );
-    targetGroup = addUniqueGroup( grBase );
+    targetGroup            = addUniqueGroup( grBase );
 
-    for( int i = 0; i < count(); i++ )
-    {
+    for ( int i = 0; i < count(); i++ ) {
       QString str = tabText( i );
-      if( str.length() == 7 && str.mid( 2, 3 ) == " - " &&
-          ( str.startsWith( grBase ) || str.endsWith( grBase ) ) )
+      if ( str.length() == 7 && str.mid( 2, 3 ) == " - " && ( str.startsWith( grBase ) || str.endsWith( grBase ) ) )
         combineGroups( i, targetGroup );
     }
 
@@ -1157,12 +1094,14 @@ void DictGroupsWidget::contextMenu( QPoint const & pos )
 
 void DictGroupsWidget::tabDataChanged()
 {
-  QString toolTipStr = "\"" + tabText( currentIndex() ) + "\"\n" + tr( "Dictionaries: " )
-                       + QString::number( getCurrentModel()->getCurrentDictionaries().size() );
+  const QString toolTipStr = "\"" + tabText( currentIndex() ) + "\"\n" + tr( "Dictionaries: " )
+    + QString::number( getCurrentModel()->getCurrentDictionaries().size() );
   setTabToolTip( currentIndex(), toolTipStr );
 }
 
-QuickFilterLine::QuickFilterLine( QWidget * parent ): QLineEdit( parent ), m_focusAction(this)
+QuickFilterLine::QuickFilterLine( QWidget * parent ):
+  QLineEdit( parent ),
+  m_focusAction( this )
 {
   m_proxyModel.setFilterCaseSensitivity( Qt::CaseInsensitive );
 
@@ -1171,20 +1110,18 @@ QuickFilterLine::QuickFilterLine( QWidget * parent ): QLineEdit( parent ), m_foc
   m_focusAction.setShortcut( QKeySequence( "Ctrl+F" ) );
   connect( &m_focusAction, &QAction::triggered, this, &QuickFilterLine::focusFilterLine );
 
-  QAction * clear = new QAction( QIcon(":/icons/clear.png"), tr("Clear Search"),this);
-  connect(clear,&QAction::triggered,this, &QLineEdit::clear);
+  QAction * clear = new QAction( QIcon( ":/icons/clear.png" ), tr( "Clear Search" ), this );
+  connect( clear, &QAction::triggered, this, &QLineEdit::clear );
 
-  addAction(clear,QLineEdit::TrailingPosition);
-  addAction(new QAction(QIcon(":/icons/system-search.svg"),"",this),QLineEdit::LeadingPosition);
+  addAction( clear, QLineEdit::TrailingPosition );
+  addAction( new QAction( QIcon( ":/icons/system-search.svg" ), "", this ), QLineEdit::LeadingPosition );
 
-  setFocusPolicy(Qt::StrongFocus);
+  setFocusPolicy( Qt::StrongFocus );
 
   connect( this, &QLineEdit::textChanged, this, &QuickFilterLine::filterChangedInternal );
 }
 
-QuickFilterLine::~QuickFilterLine()
-{
-}
+QuickFilterLine::~QuickFilterLine() {}
 
 void QuickFilterLine::applyTo( QAbstractItemView * source )
 {
@@ -1195,12 +1132,10 @@ void QuickFilterLine::applyTo( QAbstractItemView * source )
 
 QModelIndex QuickFilterLine::mapToSource( QModelIndex const & idx )
 {
-  if ( &m_proxyModel == idx.model() )
-  {
+  if ( &m_proxyModel == idx.model() ) {
     return m_proxyModel.mapToSource( idx );
   }
-  else
-  {
+  else {
     return idx;
   }
 }
@@ -1213,7 +1148,7 @@ void QuickFilterLine::filterChangedInternal()
 
 void QuickFilterLine::emitFilterChanged()
 {
-  m_proxyModel.setFilterFixedString(text());
+  m_proxyModel.setFilterFixedString( text() );
   emit filterChanged( text() );
 }
 
@@ -1225,12 +1160,10 @@ void QuickFilterLine::focusFilterLine()
 
 void QuickFilterLine::keyPressEvent( QKeyEvent * event )
 {
-  switch ( event->key() )
-  {
+  switch ( event->key() ) {
     case Qt::Key_Down:
-      if ( m_source )
-      {
-        m_source->setCurrentIndex( m_source->model()->index( 0,0 ) );
+      if ( m_source ) {
+        m_source->setCurrentIndex( m_source->model()->index( 0, 0 ) );
         m_source->setFocus();
       }
       break;
diff --git a/src/ui/groups_widgets.hh b/src/ui/groups_widgets.hh
index 3a61ae00..7ddb0a75 100644
--- a/src/ui/groups_widgets.hh
+++ b/src/ui/groups_widgets.hh
@@ -24,8 +24,11 @@ class DictListModel: public QAbstractListModel
 public:
 
   DictListModel( QWidget * parent ):
-    QAbstractListModel( parent ), isSource( false ), allDicts( 0 )
-  {}
+    QAbstractListModel( parent ),
+    isSource( false ),
+    allDicts( 0 )
+  {
+  }
 
   /// Populates the current model with the given dictionaries. This is
   /// ought to be part of construction process.
@@ -35,7 +38,10 @@ public:
 
   /// Marks that this model is used as an immutable dictionary source
   void setAsSource();
-  bool sourceModel() const { return isSource; }
+  bool sourceModel() const
+  {
+    return isSource;
+  }
 
   /// Returns the dictionaries the model currently has listed
   std::vector< sptr< Dictionary::Class > > const & getCurrentDictionaries() const;
@@ -43,16 +49,16 @@ public:
   void removeSelectedRows( QItemSelectionModel * source );
   void addSelectedUniqueFromModel( QItemSelectionModel * source );
 
-  Qt::ItemFlags flags( QModelIndex const &index ) const;
-  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 );
+  Qt::ItemFlags flags( QModelIndex const & index ) const override;
+  int rowCount( QModelIndex const & parent ) const override;
+  QVariant data( QModelIndex const & index, int role ) const override;
+  bool insertRows( int row, int count, const QModelIndex & parent ) override;
+  bool removeRows( int row, int count, const QModelIndex & parent ) override;
+  bool setData( QModelIndex const & index, const QVariant & value, int role ) override;
 
-  void addRow(const QModelIndex & parent, sptr< Dictionary::Class > dict);
+  void addRow( const QModelIndex & parent, sptr< Dictionary::Class > dict );
 
-  Qt::DropActions supportedDropActions() const;
+  Qt::DropActions supportedDropActions() const override;
 
   void filterDuplicates();
 
@@ -71,9 +77,10 @@ signals:
 class DictListWidget: public QListView
 {
   Q_OBJECT
+
 public:
   DictListWidget( QWidget * parent );
-  ~DictListWidget();
+  ~DictListWidget() override = default;
 
   /// Populates the current list with the given dictionaries.
   void populate( std::vector< sptr< Dictionary::Class > > const & active,
@@ -87,18 +94,20 @@ public:
   std::vector< sptr< Dictionary::Class > > const & getCurrentDictionaries() const;
 
   DictListModel * getModel()
-  { return & model; }
+  {
+    return &model;
+  }
 
 signals:
   void gotFocus();
 
 protected:
-  virtual void dropEvent( QDropEvent * event );
-  virtual void focusInEvent(QFocusEvent *);
+  void dropEvent( QDropEvent * event ) override;
+  void focusInEvent( QFocusEvent * ) override;
 
   // We need these to to handle drag-and-drop focus issues
-  virtual void rowsInserted( QModelIndex const & parent, int start, int end );
-  virtual void rowsAboutToBeRemoved( QModelIndex const & parent, int start, int end );
+  void rowsInserted( QModelIndex const & parent, int start, int end ) override;
+  void rowsAboutToBeRemoved( QModelIndex const & parent, int start, int end ) override;
 
 private:
   DictListModel model;
@@ -112,9 +121,7 @@ class DictGroupWidget: public QWidget
   Q_OBJECT
 
 public:
-  DictGroupWidget( QWidget * parent,
-                   std::vector< sptr< Dictionary::Class > > const &,
-                   Config::Group const & );
+  DictGroupWidget( QWidget * parent, std::vector< sptr< Dictionary::Class > > const &, Config::Group const & );
 
   /// Makes the group's configuration out of the data currently held.
   /// Since the group's name is not part of the widget by design right now
@@ -122,10 +129,14 @@ public:
   Config::Group makeGroup() const;
 
   DictListModel * getModel() const
-  { return ui.dictionaries->getModel(); }
+  {
+    return ui.dictionaries->getModel();
+  }
 
   QItemSelectionModel * getSelectionModel() const
-  { return ui.dictionaries->selectionModel(); }
+  {
+    return ui.dictionaries->selectionModel();
+  }
 
 private slots:
 
@@ -156,7 +167,7 @@ public:
                  std::vector< sptr< Dictionary::Class > > const & activeDicts );
 
   /// Creates new empty group with the given name
-  void addNewGroup( QString const & );
+  int addNewGroup( QString const & );
 
   /// Creates new empty group with the given name if no such group
   /// and return it index
@@ -166,7 +177,7 @@ public:
 
   /// auto grouping by containning folder
   void addAutoGroupsByFolders();
-  void addGroupBasedOnMap( const QMultiMap<QString, sptr<Dictionary::Class>> & groupToDicts );
+  void addGroupBasedOnMap( const QMultiMap< QString, sptr< Dictionary::Class > > & groupToDicts );
 
   void groupsByMetadata();
 
@@ -187,13 +198,17 @@ public:
 
   DictListModel * getCurrentModel() const;
 
+  DictListModel * getModelAt( int current ) const;
+  int getDictionaryCountAt( int current ) const;
+  std::vector< sptr< Dictionary::Class > > getDictionaryAt( int current ) const;
+
   QItemSelectionModel * getCurrentSelectionModel() const;
 
 private:
 
   /// Add source group to target group
   void combineGroups( int source, int target );
-  
+
   unsigned nextId;
   std::vector< sptr< Dictionary::Class > > const * allDicts;
   std::vector< sptr< Dictionary::Class > > const * activeDicts;
@@ -213,17 +228,20 @@ class QuickFilterLine: public QLineEdit
 public:
 
   QuickFilterLine( QWidget * parent );
-  ~QuickFilterLine();
+  ~QuickFilterLine() override;
 
   /// Sets the source view to filter
   void applyTo( QAbstractItemView * source );
 
-  QAction * getFocusAction() { return & m_focusAction; }
+  QAction * getFocusAction()
+  {
+    return &m_focusAction;
+  }
 
   QModelIndex mapToSource( QModelIndex const & idx );
 
 protected:
-  virtual void keyPressEvent( QKeyEvent * event );
+  void keyPressEvent( QKeyEvent * event ) override;
 
 private:
   QSortFilterProxyModel m_proxyModel;
@@ -236,9 +254,7 @@ private slots:
   void focusFilterLine();
 
 signals:
-  void filterChanged(QString const & filter);
-
-
+  void filterChanged( QString const & filter );
 };
 
 #endif
diff --git a/src/ui/historypanewidget.cc b/src/ui/historypanewidget.cc
index d2cde59f..19389810 100644
--- a/src/ui/historypanewidget.cc
+++ b/src/ui/historypanewidget.cc
@@ -10,12 +10,12 @@
 
 #include "historypanewidget.hh"
 
-void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu * menu )
+void HistoryPaneWidget::setUp( Config::Class * cfg, History * history, QMenu * menu )
 {
-  m_cfg = cfg;
-  m_history = history;
-  m_historyList = findChild<QListView*>( "historyList" );
-  QDockWidget * historyPane = qobject_cast<QDockWidget*>( parentWidget() );
+  m_cfg                     = cfg;
+  m_history                 = history;
+  m_historyList             = findChild< QListView * >( "historyList" );
+  QDockWidget * historyPane = qobject_cast< QDockWidget * >( parentWidget() );
 
   // Delete selected items action
   m_deleteSelectedAction = new QAction( this );
@@ -36,8 +36,8 @@ void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu *
 
   // Handle context menu, reusing some of the top-level window's History menu
   m_historyMenu = new QMenu( this );
-  m_separator = m_historyMenu->addSeparator();
-  QListIterator<QAction *> actionsIter( menu->actions() );
+  m_separator   = m_historyMenu->addSeparator();
+  QListIterator< QAction * > actionsIter( menu->actions() );
   while ( actionsIter.hasNext() )
     m_historyMenu->addAction( actionsIter.next() );
 
@@ -46,13 +46,11 @@ void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu *
   historyLabel.setText( tr( "History:" ) );
   historyLabel.setObjectName( "historyLabel" );
   historyCountLabel.setObjectName( "historyCountLabel" );
-  if ( layoutDirection() == Qt::LeftToRight )
-  {
+  if ( layoutDirection() == Qt::LeftToRight ) {
     historyLabel.setAlignment( Qt::AlignLeft );
     historyCountLabel.setAlignment( Qt::AlignRight );
   }
-  else
-  {
+  else {
     historyLabel.setAlignment( Qt::AlignRight );
     historyCountLabel.setAlignment( Qt::AlignLeft );
   }
@@ -60,9 +58,9 @@ void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu *
 
   historyPaneTitleBarLayout.addWidget( &historyLabel );
   historyPaneTitleBarLayout.addWidget( &historyCountLabel );
-  historyPaneTitleBarLayout.setContentsMargins(5, 5, 5, 5);
+  historyPaneTitleBarLayout.setContentsMargins( 5, 5, 5, 5 );
   historyPaneTitleBar.setLayout( &historyPaneTitleBarLayout );
-  historyPaneTitleBar.setObjectName("historyPaneTitleBar");
+  historyPaneTitleBar.setObjectName( "historyPaneTitleBar" );
   historyPane->setTitleBarWidget( &historyPaneTitleBar );
 
   // History list
@@ -78,8 +76,10 @@ void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu *
   // list selection and keyboard navigation
   connect( m_historyList, &QAbstractItemView::clicked, this, &HistoryPaneWidget::onItemClicked );
   connect( m_history, &History::itemsChanged, this, &HistoryPaneWidget::updateHistoryCounts );
-  connect ( m_historyList->selectionModel(), SIGNAL( selectionChanged ( QItemSelection const & , QItemSelection const & ) ),
-      this, SLOT( onSelectionChanged( QItemSelection const & ) ) );
+  connect( m_historyList->selectionModel(),
+           &QItemSelectionModel::selectionChanged,
+           this,
+           &HistoryPaneWidget::onSelectionChanged );
 
   connect( m_historyList, &QWidget::customContextMenuRequested, this, &HistoryPaneWidget::showCustomMenu );
 
@@ -89,7 +89,7 @@ void HistoryPaneWidget::setUp( Config::Class * cfg,  History * history, QMenu *
 
 HistoryPaneWidget::~HistoryPaneWidget()
 {
-  if( listItemDelegate )
+  if ( listItemDelegate )
     delete listItemDelegate;
 }
 
@@ -97,16 +97,14 @@ void HistoryPaneWidget::copySelectedItems()
 {
   QModelIndexList selectedIdxs = m_historyList->selectionModel()->selectedIndexes();
 
-  if ( selectedIdxs.isEmpty() )
-  {
+  if ( selectedIdxs.isEmpty() ) {
     // nothing to do
     return;
   }
 
   QStringList selectedStrings;
-  QListIterator<QModelIndex> i( selectedIdxs );
-  while ( i.hasNext() )
-  {
+  QListIterator< QModelIndex > i( selectedIdxs );
+  while ( i.hasNext() ) {
     selectedStrings << m_historyList->model()->data( i.next() ).toString();
   }
 
@@ -117,38 +115,33 @@ void HistoryPaneWidget::deleteSelectedItems()
 {
   QModelIndexList selectedIdxs = m_historyList->selectionModel()->selectedIndexes();
 
-  if ( selectedIdxs.isEmpty() )
-  {
+  if ( selectedIdxs.isEmpty() ) {
     // nothing to do
     return;
   }
 
-  QList<int> idxsToDelete;
+  QList< int > idxsToDelete;
 
-  QListIterator<QModelIndex> i( selectedIdxs );
-  while ( i.hasNext() )
-  {
+  QListIterator< QModelIndex > i( selectedIdxs );
+  while ( i.hasNext() ) {
     idxsToDelete << i.next().row();
   }
 
   // Need to sort indexes in the decreasing order so that
   // the first deletions won't affect the indexes for subsequent deletions.
-  std::sort( idxsToDelete.begin(), idxsToDelete.end(), std::greater<int>() );
+  std::sort( idxsToDelete.begin(), idxsToDelete.end(), std::greater< int >() );
 
-  QListIterator<int> idxs( idxsToDelete );
+  QListIterator< int > idxs( idxsToDelete );
   while ( idxs.hasNext() )
     m_history->removeItem( idxs.next() );
 
-  if ( idxsToDelete.size() == 1 )
-  {
+  if ( idxsToDelete.size() == 1 ) {
     // We've just removed a single entry,
     // keep the selection at the same index.
-    m_historyList->setCurrentIndex(selectedIdxs.front());
-    m_historyList->selectionModel()->select(
-          selectedIdxs.front(), QItemSelectionModel::SelectCurrent );
+    m_historyList->setCurrentIndex( selectedIdxs.front() );
+    m_historyList->selectionModel()->select( selectedIdxs.front(), QItemSelectionModel::SelectCurrent );
   }
-  else
-  {
+  else {
     // Too many deletions, better to reset the selection.
     m_historyList->selectionModel()->reset();
   }
@@ -161,7 +154,7 @@ bool HistoryPaneWidget::eventFilter( QObject * obj, QEvent * ev )
   return QWidget::eventFilter( obj, ev );
 }
 
-void HistoryPaneWidget::showCustomMenu(QPoint const & pos)
+void HistoryPaneWidget::showCustomMenu( QPoint const & pos )
 {
   bool selectionEmpty = m_historyList->selectionModel()->selection().empty();
 
@@ -170,8 +163,7 @@ void HistoryPaneWidget::showCustomMenu(QPoint const & pos)
 
   m_separator->setVisible( !selectionEmpty );
 
-  if ( !selectionEmpty )
-  {
+  if ( !selectionEmpty ) {
     m_historyMenu->insertAction( m_separator, m_copySelectedToClipboard );
     m_historyMenu->insertAction( m_separator, m_deleteSelectedAction );
   }
@@ -182,15 +174,14 @@ void HistoryPaneWidget::showCustomMenu(QPoint const & pos)
 void HistoryPaneWidget::emitHistoryItemRequested( QModelIndex const & idx )
 {
   QVariant value = m_historyList->model()->data( idx );
-  if ( !value.isNull() )
-  {
+  if ( !value.isNull() ) {
     emit historyItemRequested( value.toString() );
   }
 }
 
-void HistoryPaneWidget::onSelectionChanged( QItemSelection const & selection )
+void HistoryPaneWidget::onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected )
 {
-  // qDebug() << "selectionChanged";
+  Q_UNUSED( deselected );
 
   if ( selection.empty() )
     return;
@@ -203,8 +194,7 @@ void HistoryPaneWidget::onItemClicked( QModelIndex const & idx )
 {
   // qDebug() << "clicked";
 
-  if ( !itemSelectionChanged )
-  {
+  if ( !itemSelectionChanged ) {
     emitHistoryItemRequested( idx );
   }
   itemSelectionChanged = false;
@@ -212,17 +202,15 @@ void HistoryPaneWidget::onItemClicked( QModelIndex const & idx )
 
 void HistoryPaneWidget::updateHistoryCounts()
 {
-  historyCountLabel.setText( tr( "%1/%2" ).
-                             arg( m_history->size() ).
-                             arg( m_cfg->preferences.maxStringsInHistory ) );
-  historyCountLabel.setToolTip(
-        tr( "History size: %1 entries out of maximum %2" ).
-        arg( m_history->size() ).
-        arg( m_cfg->preferences.maxStringsInHistory ));
+  historyCountLabel.setText( tr( "%1/%2" ).arg( m_history->size() ).arg( m_cfg->preferences.maxStringsInHistory ) );
+  historyCountLabel.setToolTip( tr( "History size: %1 entries out of maximum %2" )
+                                  .arg( m_history->size() )
+                                  .arg( m_cfg->preferences.maxStringsInHistory ) );
 }
 
-HistoryModel::HistoryModel( History * history, QObject * parent )
-  : QAbstractListModel( parent ), m_history(history)
+HistoryModel::HistoryModel( History * history, QObject * parent ):
+  QAbstractListModel( parent ),
+  m_history( history )
 {
 
   connect( m_history, &History::itemsChanged, this, &HistoryModel::historyChanged );
@@ -237,24 +225,21 @@ QVariant HistoryModel::data( QModelIndex const & index, int role ) const
 {
   // qDebug() << "data: " << index;
 
-  if ( !index.isValid() || index.row() >= m_history->size() )
-  {
+  if ( !index.isValid() || index.row() >= m_history->size() ) {
     return QVariant();
   }
 
-  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole )
-  {
+  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole ) {
     return m_history->getItem( index.row() ).word;
   }
-  else
-  {
+  else {
     return QVariant();
   }
 }
 
 void HistoryModel::historyChanged()
 {
-//  qDebug() << "History Changed!!";
+  //  qDebug() << "History Changed!!";
 
   beginResetModel();
   endResetModel();
diff --git a/src/ui/historypanewidget.hh b/src/ui/historypanewidget.hh
index a8487f63..722dc1df 100644
--- a/src/ui/historypanewidget.hh
+++ b/src/ui/historypanewidget.hh
@@ -17,20 +17,25 @@
 #include "delegate.hh"
 
 /// A widget holding the contents of the 'History' docklet.
-class HistoryPaneWidget : public QWidget
+class HistoryPaneWidget: public QWidget
 {
   Q_OBJECT
+
 public:
-  explicit HistoryPaneWidget( QWidget * parent = 0 ): QWidget( parent ),
-    itemSelectionChanged( false )
-  , listItemDelegate( 0 )
-  {}
+  explicit HistoryPaneWidget( QWidget * parent = 0 ):
+    QWidget( parent ),
+    itemSelectionChanged( false ),
+    listItemDelegate( 0 )
+  {
+  }
   virtual ~HistoryPaneWidget();
 
   virtual QSize sizeHint() const
-  { return QSize( 204, 204 ); }
+  {
+    return QSize( 204, 204 );
+  }
 
-  void setUp( Config::Class * cfg,  History * history, QMenu * menu );
+  void setUp( Config::Class * cfg, History * history, QMenu * menu );
 
 signals:
   void historyItemRequested( QString const & word );
@@ -39,17 +44,17 @@ public slots:
   void updateHistoryCounts();
 
 private slots:
-  void emitHistoryItemRequested(QModelIndex const &);
-  void onSelectionChanged(QItemSelection const & selection);
-  void onItemClicked(QModelIndex const & idx);
-  void showCustomMenu(QPoint const & pos);
+  void emitHistoryItemRequested( QModelIndex const & );
+  void onSelectionChanged( const QItemSelection & selection, const QItemSelection & deselected );
+  void onItemClicked( QModelIndex const & idx );
+  void showCustomMenu( QPoint const & pos );
   void deleteSelectedItems();
   void copySelectedItems();
 
 private:
   virtual bool eventFilter( QObject *, QEvent * );
 
-  Config::Class * m_cfg ;
+  Config::Class * m_cfg;
   History * m_history;
   QListView * m_historyList;
   QMenu * m_historyMenu;
@@ -69,11 +74,12 @@ private:
   WordListItemDelegate * listItemDelegate;
 };
 
-class HistoryModel : public QAbstractListModel
+class HistoryModel: public QAbstractListModel
 {
   Q_OBJECT
+
 public:
-  explicit HistoryModel( History * history , QObject * parent = 0 );
+  explicit HistoryModel( History * history, QObject * parent = 0 );
 
   int rowCount( QModelIndex const & parent = QModelIndex() ) const;
 
diff --git a/src/ui/initializing.ui b/src/ui/initializing.ui
index 493119d1..59358217 100644
--- a/src/ui/initializing.ui
+++ b/src/ui/initializing.ui
@@ -1,74 +1,144 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Initializing</class>
- <widget class="QDialog" name="Initializing" >
-  <property name="windowModality" >
+ <widget class="QDialog" name="Initializing">
+  <property name="windowModality">
    <enum>Qt::ApplicationModal</enum>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>326</width>
-    <height>84</height>
+    <width>680</width>
+    <height>383</height>
    </rect>
   </property>
-  <property name="minimumSize">
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="maximumSize">
    <size>
-    <width>326</width>
-    <height>0</height>
+    <width>680</width>
+    <height>383</height>
    </size>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>GoldenDict-ng - Initializing</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
-    <widget class="QLabel" name="operation" >
-     <property name="text" >
-      <string>Please wait while indexing dictionary</string>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="dictionary" >
-     <property name="font" >
-      <font>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text" >
-      <string>Dictionary Name</string>
-     </property>
-     <property name="scaledContents" >
-      <bool>false</bool>
-     </property>
-     <property name="alignment" >
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QProgressBar" name="progressBar" >
-     <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>
+  <widget class="QLabel" name="splashImage">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>680</width>
+     <height>382</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="../../resources.qrc">:/icons/splash.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <widget class="QProgressBar" name="progressBar">
+   <property name="geometry">
+    <rect>
+     <x>100</x>
+     <y>280</y>
+     <width>441</width>
+     <height>25</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="maximum">
+    <number>0</number>
+   </property>
+   <property name="value">
+    <number>-1</number>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="layoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>130</x>
+     <y>310</y>
+     <width>411</width>
+     <height>61</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <item>
+     <widget class="QLabel" name="operation">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>12</pointsize>
+       </font>
+      </property>
+      <property name="text">
+       <string>Indexing: </string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="dictionary">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>12</pointsize>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Dictionary Name</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="../../resources.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/ui/mainstatusbar.cc b/src/ui/mainstatusbar.cc
index dc8374a9..9b557a5a 100644
--- a/src/ui/mainstatusbar.cc
+++ b/src/ui/mainstatusbar.cc
@@ -9,7 +9,8 @@
 #include <QEvent>
 #include <QApplication>
 
-MainStatusBar::MainStatusBar( QWidget *parent ) : QWidget( parent )
+MainStatusBar::MainStatusBar( QWidget * parent ):
+  QWidget( parent )
 {
   textWidget = new QLabel( QString(), this );
   textWidget->setObjectName( "text" );
@@ -26,7 +27,7 @@ MainStatusBar::MainStatusBar( QWidget *parent ) : QWidget( parent )
   timer->setSingleShot( true );
 
   // layout
-  QHBoxLayout * layout = new QHBoxLayout;
+  const auto layout = new QHBoxLayout;
   layout->setSpacing( 0 );
   layout->setSizeConstraint( QLayout::SetFixedSize );
   layout->setAlignment( Qt::AlignLeft | Qt::AlignVCenter );
@@ -48,7 +49,6 @@ void MainStatusBar::clearMessage()
   textWidget->setText( backgroungMessage );
   picWidget->setPixmap( QPixmap() );
   timer->stop();
-  hide();
 }
 
 QString MainStatusBar::currentMessage() const
@@ -56,41 +56,36 @@ QString MainStatusBar::currentMessage() const
   return message;
 }
 
-void MainStatusBar::setBackgroundMessage(const QString & bkg_message )
+void MainStatusBar::setBackgroundMessage( const QString & bkg_message )
 {
   backgroungMessage = bkg_message;
-  if( message.isEmpty() )
-  {
+  if ( message.isEmpty() ) {
     textWidget->setText( backgroungMessage );
-    raise();
-    show();
   }
 }
 
-void MainStatusBar::showMessage(const QString & str, int timeout, const QPixmap & pixmap)
+void MainStatusBar::showMessage( const QString & str, int timeout, const QPixmap & pixmap )
 {
   textWidget->setText( message = str );
   picWidget->setPixmap( pixmap );
 
-  if ( !picWidget->pixmap().isNull() )
-  {
+  if ( !picWidget->pixmap().isNull() ) {
     picWidget->setFixedSize( textWidget->height(), textWidget->height() );
   }
-  else
-  {
+  else {
     picWidget->setFixedSize( 0, 0 );
   }
 
-  if ( timeout > 0 )
-  {
+  if ( timeout > 0 ) {
     timer->start( timeout );
   }
-  raise();
-  show();
-  move( QPoint( 0, parentWidget()->height() - height() ) );
+
+  if ( parentWidget() ) {
+    move( 0, parentWidget()->height() - height() );
+  }
 }
 
-void MainStatusBar::mousePressEvent ( QMouseEvent * )
+void MainStatusBar::mousePressEvent( QMouseEvent * )
 {
   clearMessage();
 }
diff --git a/src/ui/mainstatusbar.hh b/src/ui/mainstatusbar.hh
index 3b6f565b..921d0554 100644
--- a/src/ui/mainstatusbar.hh
+++ b/src/ui/mainstatusbar.hh
@@ -9,23 +9,23 @@
 #include <QString>
 #include <QTimer>
 
-class MainStatusBar : public QWidget
+class MainStatusBar: public QWidget
 {
   Q_OBJECT
 
 public:
-  explicit MainStatusBar(QWidget * parent);
+  explicit MainStatusBar( QWidget * parent );
   QString currentMessage() const;
 
 signals:
 
 public slots:
-  void showMessage(const QString & text, int timeout = 0, const QPixmap & pixmap = QPixmap());
+  void showMessage( const QString & text, int timeout = 0, const QPixmap & pixmap = QPixmap() );
   void clearMessage();
   void setBackgroundMessage( QString const & message );
 
 protected:
-  virtual void mousePressEvent(QMouseEvent * event);
+  virtual void mousePressEvent( QMouseEvent * event );
 
 private:
   // component to display a small picture
@@ -38,7 +38,7 @@ private:
   QString backgroungMessage;
   QString message;
 
-  bool eventFilter(QObject *obj, QEvent * event);
+  bool eventFilter( QObject * obj, QEvent * event );
 };
 
 #endif // MAINSTATUSBAR_HH
diff --git a/src/ui/maintabwidget.cc b/src/ui/maintabwidget.cc
index a6ddf9ad..fffae353 100644
--- a/src/ui/maintabwidget.cc
+++ b/src/ui/maintabwidget.cc
@@ -5,30 +5,32 @@
 #include <QEvent>
 #include <QMouseEvent>
 
-MainTabWidget::MainTabWidget( QWidget * parent) : QTabWidget( parent ) {
+MainTabWidget::MainTabWidget( QWidget * parent ):
+  QTabWidget( parent )
+{
   hideSingleTab = false;
   installEventFilter( this );
   tabBar()->installEventFilter( this );
 }
 
-void MainTabWidget::setHideSingleTab(bool hide)
+void MainTabWidget::setHideSingleTab( bool hide )
 {
   hideSingleTab = hide;
   updateTabBarVisibility();
 }
 
-void MainTabWidget::tabInserted(int index)
+void MainTabWidget::tabInserted( int index )
 {
-  (void) index;
+  (void)index;
   updateTabBarVisibility();
 
   // Avoid bug in Qt 4.8.0
   setUsesScrollButtons( count() > 10 );
 }
 
-void MainTabWidget::tabRemoved(int index)
+void MainTabWidget::tabRemoved( int index )
 {
-  (void) index;
+  (void)index;
   updateTabBarVisibility();
 
   // Avoid bug in Qt 4.8.0
@@ -51,26 +53,21 @@ void MainTabWidget::mouseDoubleClickEvent ( QMouseEvent * event )
 bool MainTabWidget::eventFilter( QObject * obj, QEvent * ev )
 {
   // mouseDoubleClickEvent don't called under Ubuntu
-  if( ev->type() == QEvent::MouseButtonDblClick )
-  {
-    QMouseEvent * mev = static_cast< QMouseEvent *>( ev );
-    if( mev->y() >= tabBar()->rect().y()
-        && mev->y() <= tabBar()->rect().y() + tabBar()->rect().height()
-        && tabBar()->tabAt( mev->pos() ) == -1 )
-    {
+  if ( ev->type() == QEvent::MouseButtonDblClick ) {
+    QMouseEvent * mev = static_cast< QMouseEvent * >( ev );
+    if ( mev->y() >= tabBar()->rect().y() && mev->y() <= tabBar()->rect().y() + tabBar()->rect().height()
+         && tabBar()->tabAt( mev->pos() ) == -1 ) {
       emit doubleClicked();
       return true;
     }
   }
 
-  if( obj == tabBar() && ev->type() == QEvent::MouseButtonPress )
-  {
-     QMouseEvent * mev = static_cast< QMouseEvent *>( ev );
-     if( mev->button() == Qt::MiddleButton )
-     {
-         emit tabCloseRequested( tabBar()->tabAt( mev->pos() ) );
-         return true;
-     }
+  if ( obj == tabBar() && ev->type() == QEvent::MouseButtonPress ) {
+    QMouseEvent * mev = static_cast< QMouseEvent * >( ev );
+    if ( mev->button() == Qt::MiddleButton ) {
+      emit tabCloseRequested( tabBar()->tabAt( mev->pos() ) );
+      return true;
+    }
   }
 
   return QTabWidget::eventFilter( obj, ev );
diff --git a/src/ui/maintabwidget.hh b/src/ui/maintabwidget.hh
index bf13c8a5..dcbc2404 100644
--- a/src/ui/maintabwidget.hh
+++ b/src/ui/maintabwidget.hh
@@ -12,23 +12,26 @@
 class MainTabWidget: public QTabWidget
 {
   Q_OBJECT
-  Q_PROPERTY(bool hideSingleTab READ isHideSingleTab WRITE setHideSingleTab)
+  Q_PROPERTY( bool hideSingleTab READ isHideSingleTab WRITE setHideSingleTab )
 
 public:
   MainTabWidget( QWidget * parent = 0 );
 
-  bool isHideSingleTab() const { return hideSingleTab; }
-  void setHideSingleTab(bool hide);
+  bool isHideSingleTab() const
+  {
+    return hideSingleTab;
+  }
+  void setHideSingleTab( bool hide );
 
 signals:
   void doubleClicked();
 
 protected:
-//  virtual void mouseDoubleClickEvent ( QMouseEvent * event );
+  //  virtual void mouseDoubleClickEvent ( QMouseEvent * event );
 
 private:
-  virtual void tabInserted(int index);
-  virtual void tabRemoved(int index);
+  virtual void tabInserted( int index );
+  virtual void tabRemoved( int index );
   void updateTabBarVisibility();
   virtual bool eventFilter( QObject * obj, QEvent * ev );
 
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
index c7f1747b..a6cbeed3 100644
--- a/src/ui/mainwindow.cc
+++ b/src/ui/mainwindow.cc
@@ -1,8 +1,9 @@
 /* This file is (c) 2008-2012 Konstantin Isakov <ikm@goldendict.org>
  * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
 
+#include <QScopeGuard>
 #ifndef NO_EPWING_SUPPORT
-#include "dict/epwing_book.hh"
+  #include "dict/epwing_book.hh"
 #endif
 
 #include "mainwindow.hh"
@@ -34,6 +35,8 @@
 #include <QThreadPool>
 #include <QSslConfiguration>
 #include <QStyleFactory>
+#include "weburlrequestinterceptor.hh"
+#include "folding.hh"
 
 #include <set>
 #include <map>
@@ -45,30 +48,29 @@
 #include "help.hh"
 #include "ui_authentication.h"
 #include "resourceschemehandler.hh"
+#include <QListWidgetItem>
 
 #include "globalregex.hh"
 
 #ifdef Q_OS_MAC
-#include "macos/macmouseover.hh"
+  #include "macos/macmouseover.hh"
 #endif
 
 #ifdef Q_OS_WIN32
-#include <windows.h>
-#include "wstring.hh"
-#include "wstring_qt.hh"
+  #include <windows.h>
 #endif
 
 #include <QWebEngineSettings>
 #include <QProxyStyle>
 
 #ifdef HAVE_X11
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
-#include <QGuiApplication>
-#else
-#include <QX11Info>
-#endif
-#include <X11/Xlib.h>
-#include <fixx11h.h>
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+    #include <QGuiApplication>
+  #else
+    #include <QX11Info>
+  #endif
+  #include <X11/Xlib.h>
+  #include <fixx11h.h>
 #endif
 
 #define MIN_THREAD_COUNT 4
@@ -79,7 +81,7 @@ using std::pair;
 
 #ifndef QT_NO_SSL
 
-class InitSSLRunnable : public QRunnable
+class InitSSLRunnable: public QRunnable
 {
   void run() override
   {
@@ -90,22 +92,47 @@ class InitSSLRunnable : public QRunnable
 
 #endif
 
-void MainWindow::changeWebEngineViewFont()
+namespace {
+QString ApplicationSettingName = "GoldenDict";
+}
+
+void MainWindow::changeWebEngineViewFont() const
 {
-  if( cfg.preferences.webFontFamily.isEmpty() )
-  {
+  if ( cfg.preferences.customFonts.standard.isEmpty() ) {
     QWebEngineProfile::defaultProfile()->settings()->resetFontFamily( QWebEngineSettings::StandardFont );
   }
-  else
-  {
+  else {
     QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::StandardFont,
-                                                                    cfg.preferences.webFontFamily );
+                                                                    cfg.preferences.customFonts.standard );
+  }
+
+  if ( cfg.preferences.customFonts.serif.isEmpty() ) {
+    QWebEngineProfile::defaultProfile()->settings()->resetFontFamily( QWebEngineSettings::SerifFont );
+  }
+  else {
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::SerifFont,
+                                                                    cfg.preferences.customFonts.serif );
+  }
+
+  if ( cfg.preferences.customFonts.sansSerif.isEmpty() ) {
+    QWebEngineProfile::defaultProfile()->settings()->resetFontFamily( QWebEngineSettings::SansSerifFont );
+  }
+  else {
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::SansSerifFont,
+                                                                    cfg.preferences.customFonts.sansSerif );
+  }
+
+  if ( cfg.preferences.customFonts.monospace.isEmpty() ) {
+    QWebEngineProfile::defaultProfile()->settings()->resetFontFamily( QWebEngineSettings::FixedFont );
+  }
+  else {
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::FixedFont,
+                                                                    cfg.preferences.customFonts.monospace );
   }
 }
 
 MainWindow::MainWindow( Config::Class & cfg_ ):
-  trayIcon( 0 ),
-  //  groupLabel( &searchPaneTitleBar ),
+  trayIcon( nullptr ),
   foundInDictsLabel( &dictsPaneTitleBar ),
   escAction( this ),
   focusTranslateLineAction( this ),
@@ -135,27 +162,25 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   dictNetMgr( this ),
   audioPlayerFactory( cfg.preferences ),
   wordFinder( this ),
-  newReleaseCheckTimer( this ),
-  latestReleaseReply( 0 ),
   wordListSelChanged( false ),
   wasMaximized( false ),
   blockUpdateWindowTitle( false ),
-  headwordsDlg( 0 ),
+  headwordsDlg( nullptr ),
   ftsIndexing( dictionaries ),
-  ftsDlg( 0 ),
+  ftsDlg( nullptr ),
   starIcon( ":/icons/star.svg" ),
   blueStarIcon( ":/icons/star_blue.svg" )
 {
-  if( QThreadPool::globalInstance()->maxThreadCount() < MIN_THREAD_COUNT )
+  if ( QThreadPool::globalInstance()->maxThreadCount() < MIN_THREAD_COUNT )
     QThreadPool::globalInstance()->setMaxThreadCount( MIN_THREAD_COUNT );
 
 #ifndef QT_NO_SSL
   QThreadPool::globalInstance()->start( new InitSSLRunnable );
 #endif
 
-  GlobalBroadcaster::instance()->setPreference(&cfg.preferences);
+  GlobalBroadcaster::instance()->setPreference( &cfg.preferences );
 
-  localSchemeHandler = new LocalSchemeHandler( articleNetMgr, this);
+  localSchemeHandler = new LocalSchemeHandler( articleNetMgr, this );
   QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "gdlookup", localSchemeHandler );
   QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "bword", localSchemeHandler );
   QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "entry", localSchemeHandler );
@@ -164,17 +189,16 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( "ifr", iframeSchemeHandler );
 
   QStringList localSchemes = { "gdau", "gico", "qrcx", "bres", "gdprg", "gdvideo", "gdpicture", "gdtts" };
-  resourceSchemeHandler    = new ResourceSchemeHandler( articleNetMgr, this);
-  for( int i = 0; i < localSchemes.size(); i++ )
-  {
-    QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localSchemes.at( i ).toLatin1(),
-                                                                  resourceSchemeHandler );
+  resourceSchemeHandler    = new ResourceSchemeHandler( articleNetMgr, this );
+  for ( const auto & localScheme : localSchemes ) {
+    QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( localScheme.toLatin1(), resourceSchemeHandler );
   }
 
-  QWebEngineProfile::defaultProfile()->setUrlRequestInterceptor( new WebUrlRequestInterceptor(this) );
+  QWebEngineProfile::defaultProfile()->setUrlRequestInterceptor( new WebUrlRequestInterceptor( this ) );
 
-  if(!cfg.preferences.hideGoldenDictHeader){
-    QWebEngineProfile::defaultProfile()->setHttpUserAgent(QWebEngineProfile::defaultProfile()->httpUserAgent()+" GoldenDict/WebEngine");
+  if ( !cfg.preferences.hideGoldenDictHeader ) {
+    QWebEngineProfile::defaultProfile()->setHttpUserAgent( QWebEngineProfile::defaultProfile()->httpUserAgent()
+                                                           + " GoldenDict/WebEngine" );
   }
 
 #ifndef NO_EPWING_SUPPORT
@@ -188,7 +212,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   Gestures::registerRecognizers();
 #endif
   // use our own, custom statusbar
-  setStatusBar(0);
+  setStatusBar( nullptr );
   mainStatusBar = new MainStatusBar( this );
 
   // Make the toolbar
@@ -200,7 +224,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   navForward = navToolbar->addAction( QIcon( ":/icons/next.svg" ), tr( "Forward" ) );
   navToolbar->widgetForAction( navForward )->setObjectName( "forwardButton" );
 
-  QWidget * translateBoxWidget = new QWidget( this );
+  QWidget * translateBoxWidget     = new QWidget( this );
   QHBoxLayout * translateBoxLayout = new QHBoxLayout( translateBoxWidget );
   translateBoxWidget->setLayout( translateBoxLayout );
   translateBoxLayout->setContentsMargins( 0, 0, 0, 0 );
@@ -242,9 +266,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   navToolbar->widgetForAction( navToolbar->addSeparator() )->setObjectName( "separatorBeforeZoom" );
 
   zoomIn = navToolbar->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Zoom In" ) );
-  zoomIn->setShortcuts( QList< QKeySequence >() <<
-                       QKeySequence::ZoomIn <<
-                       QKeySequence( "Ctrl+=" ) );
+  zoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence::ZoomIn << QKeySequence( "Ctrl+=" ) );
   navToolbar->widgetForAction( zoomIn )->setObjectName( "zoomInButton" );
 
   zoomOut = navToolbar->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Zoom Out" ) );
@@ -274,7 +296,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   beforeOptionsSeparator = navToolbar->addSeparator();
   navToolbar->widgetForAction( beforeOptionsSeparator )->setObjectName( "beforeOptionsSeparator" );
-  beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar);
+  beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar );
 
   QMenu * buttonMenu = new QMenu( this );
   buttonMenu->addAction( ui.dictionaries );
@@ -293,20 +315,20 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   menuButton = new QToolButton( navToolbar );
   menuButton->setPopupMode( QToolButton::InstantPopup );
   menuButton->setMenu( buttonMenu );
-  menuButton->setIcon( QIcon (":/icons/menu_button.svg") );
+  menuButton->setIcon( QIcon( ":/icons/menu_button.svg" ) );
   menuButton->addAction( ui.menuOptions );
   menuButton->setToolTip( tr( "Menu Button" ) );
   menuButton->setObjectName( "menuButton" );
   menuButton->setFocusPolicy( Qt::NoFocus );
 
-  menuButtonAction = navToolbar->addWidget(menuButton);
+  menuButtonAction = navToolbar->addWidget( menuButton );
   menuButtonAction->setVisible( cfg.preferences.hideMenubar );
 
   // Make the search pane's titlebar
   //  groupLabel.setText( tr( "Look up in:" ) );
   groupListInDock = new GroupComboBox( &searchPaneTitleBar );
 
-  searchPaneTitleBarLayout.setContentsMargins( 8, 5, 8, 4 );
+  searchPaneTitleBarLayout.setContentsMargins( 3, 5, 3, 5 );
   //  searchPaneTitleBarLayout.addWidget( &groupLabel );
   searchPaneTitleBarLayout.addWidget( groupListInDock );
   searchPaneTitleBarLayout.addStretch();
@@ -316,36 +338,31 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   ui.searchPane->setTitleBarWidget( &searchPaneTitleBar );
   connect( ui.searchPane->toggleViewAction(), &QAction::triggered, this, &MainWindow::updateSearchPaneAndBar );
 
-  if ( cfg.preferences.searchInDock )
-  {
-    groupList = groupListInDock;
+  if ( cfg.preferences.searchInDock ) {
+    groupList     = groupListInDock;
     translateLine = ui.translateLine;
-    wordList = ui.wordList;
   }
-  else
-  {
-    groupList = groupListInToolbar;
+  else {
+    groupList     = groupListInToolbar;
     translateLine = translateBox->translateLine();
-    wordList = translateBox->wordList();
   }
-  wordList->attachFinder( &wordFinder );
+  connect( &wordFinder, &WordFinder::updated, this, &MainWindow::prefixMatchUpdated );
+  connect( &wordFinder, &WordFinder::finished, this, &MainWindow::prefixMatchFinished );
 
-  // for the old UI:
-  ui.wordList->setTranslateLine( ui.translateLine );
 
-  groupList->setFocusPolicy(Qt::ClickFocus);
-  wordList->setFocusPolicy(Qt::ClickFocus);
+  groupList->setFocusPolicy( Qt::ClickFocus );
+  ui.wordList->setFocusPolicy( Qt::ClickFocus );
 
-  wordListDefaultFont = wordList->font();
+  wordListDefaultFont      = ui.wordList->font();
   translateLineDefaultFont = translateLine->font();
-  groupListDefaultFont = groupList->font();
+  groupListDefaultFont     = groupList->font();
 
   // Make the dictionaries pane's titlebar
   foundInDictsLabel.setText( tr( "Found in Dictionaries:" ) );
   dictsPaneTitleBarLayout.addWidget( &foundInDictsLabel );
-  dictsPaneTitleBarLayout.setContentsMargins(5, 5, 5, 5);
+  dictsPaneTitleBarLayout.setContentsMargins( 5, 5, 5, 5 );
   dictsPaneTitleBar.setLayout( &dictsPaneTitleBarLayout );
-  dictsPaneTitleBar.setObjectName("dictsPaneTitleBar");
+  dictsPaneTitleBar.setObjectName( "dictsPaneTitleBar" );
   ui.dictsPane->setTitleBarWidget( &dictsPaneTitleBar );
   ui.dictsList->setContextMenuPolicy( Qt::CustomContextMenu );
 
@@ -366,9 +383,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   ui.menuZoom->addSeparator();
 
   wordsZoomIn = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomin.png" ), tr( "Words Zoom In" ) );
-  wordsZoomIn->setShortcuts( QList< QKeySequence >() <<
-                            QKeySequence( "Alt++" ) <<
-                            QKeySequence( "Alt+=" ) );
+  wordsZoomIn->setShortcuts( QList< QKeySequence >() << QKeySequence( "Alt++" ) << QKeySequence( "Alt+=" ) );
   wordsZoomOut = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoomout.png" ), tr( "Words Zoom Out" ) );
   wordsZoomOut->setShortcut( QKeySequence( "Alt+-" ) );
   wordsZoomBase = ui.menuZoom->addAction( QIcon( ":/icons/icon32_zoombase.png" ), tr( "Words Normal Size" ) );
@@ -380,35 +395,44 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   // tray icon
   connect( trayIconMenu.addAction( tr( "Show &Main Window" ) ),
-    &QAction::triggered,
-    this,
-    &MainWindow::showMainWindow );
+           &QAction::triggered,
+           this,
+           &MainWindow::showMainWindow );
   trayIconMenu.addAction( enableScanningAction );
 
   trayIconMenu.addSeparator();
   connect( trayIconMenu.addAction( tr( "&Quit" ) ), &QAction::triggered, this, &MainWindow::quitApp );
 
-  addGlobalAction( &escAction, SLOT( handleEsc() ) );
+  addGlobalAction( &escAction, [ this ]() {
+    handleEsc();
+  } );
   escAction.setShortcut( QKeySequence( "Esc" ) );
 
-  addGlobalAction( &focusTranslateLineAction, SLOT( focusTranslateLine() ) );
-  focusTranslateLineAction.setShortcuts( QList< QKeySequence >() <<
-                                         QKeySequence( "Alt+D" ) <<
-                                         QKeySequence( "Ctrl+L" ) );
+  addGlobalAction( &focusTranslateLineAction, [ this ]() {
+    focusTranslateLine();
+  } );
+  focusTranslateLineAction.setShortcuts( QList< QKeySequence >()
+                                         << QKeySequence( "Alt+D" ) << QKeySequence( "Ctrl+L" ) );
 
-  addGlobalAction( &focusHeadwordsDlgAction, SLOT( focusHeadwordsDialog() ) );
+  addGlobalAction( &focusHeadwordsDlgAction, [ this ]() {
+    focusHeadwordsDialog();
+  } );
   focusHeadwordsDlgAction.setShortcut( QKeySequence( "Ctrl+D" ) );
 
-  addGlobalAction( &focusArticleViewAction, SLOT( focusArticleView() ) );
+  addGlobalAction( &focusArticleViewAction, [ this ]() {
+    focusArticleView();
+  } );
   focusArticleViewAction.setShortcut( QKeySequence( "Ctrl+N" ) );
 
-  addGlobalAction( ui.fullTextSearchAction, SLOT( showFullTextSearchDialog() ) );
+  addGlobalAction( ui.fullTextSearchAction, [ this ]() {
+    showFullTextSearchDialog();
+  } );
 
   addTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   addTabAction.setShortcut( QKeySequence( "Ctrl+T" ) );
 
   // Tab management
-  tabListMenu = new MRUQMenu(tr("Opened tabs"), ui.tabWidget);
+  tabListMenu = new MRUQMenu( tr( "Opened tabs" ), ui.tabWidget );
 
   connect( tabListMenu, &MRUQMenu::requestTabChange, ui.tabWidget, &MainTabWidget::setCurrentIndex );
 
@@ -418,7 +442,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   closeCurrentTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   closeCurrentTabAction.setShortcut( QKeySequence( "Ctrl+W" ) );
-  closeCurrentTabAction.setText( tr("Close current tab") );
+  closeCurrentTabAction.setText( tr( "Close current tab" ) );
 
   connect( &closeCurrentTabAction, &QAction::triggered, this, &MainWindow::closeCurrentTab );
 
@@ -426,14 +450,14 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   closeAllTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   closeAllTabAction.setShortcut( QKeySequence( "Ctrl+Shift+W" ) );
-  closeAllTabAction.setText( tr("Close all tabs") );
+  closeAllTabAction.setText( tr( "Close all tabs" ) );
 
   connect( &closeAllTabAction, &QAction::triggered, this, &MainWindow::closeAllTabs );
 
   addAction( &closeAllTabAction );
 
   closeRestTabAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
-  closeRestTabAction.setText( tr("Close all tabs except current") );
+  closeRestTabAction.setText( tr( "Close all tabs except current" ) );
 
   connect( &closeRestTabAction, &QAction::triggered, this, &MainWindow::closeRestTabs );
 
@@ -457,7 +481,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   connect( &addAllTabToFavoritesAction, &QAction::triggered, this, &MainWindow::addAllTabsToFavorites );
 
-  tabMenu = new QMenu(this);
+  tabMenu = new QMenu( this );
   tabMenu->addAction( &closeCurrentTabAction );
   tabMenu->addAction( &closeRestTabAction );
   tabMenu->addSeparator();
@@ -511,18 +535,16 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   // Dictionary bar
 
   Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
-  if( cfg.lastMainGroupId == Instances::Group::AllGroupId )
-  {
-    if( igrp )
+  if ( cfg.lastMainGroupId == Instances::Group::AllGroupId ) {
+    if ( igrp )
       igrp->checkMutedDictionaries( &cfg.mutedDictionaries );
     dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
   }
-  else
-  {
+  else {
     Config::Group * grp = cfg.getGroup( cfg.lastMainGroupId );
-    if( igrp && grp )
+    if ( igrp && grp )
       igrp->checkMutedDictionaries( &grp->mutedDictionaries );
-    dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : 0 );
+    dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : nullptr );
   }
   GlobalBroadcaster::instance()->currentGroupId = cfg.lastMainGroupId;
 
@@ -542,7 +564,7 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   connect( &dictionaryBar, &DictionaryBar::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
 
-  connect( &dictionaryBar,&DictionaryBar::showDictionaryHeadwords,this,&MainWindow::showDictionaryHeadwords);
+  connect( &dictionaryBar, &DictionaryBar::showDictionaryHeadwords, this, &MainWindow::showDictionaryHeadwords );
 
   connect( &dictionaryBar, &DictionaryBar::openDictionaryFolder, this, &MainWindow::openDictionaryFolder );
 
@@ -552,12 +574,12 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   ui.favoritesPaneWidget->setSaveInterval( cfg.preferences.favoritesStoreInterval );
 
   connect( ui.favoritesPane, &QDockWidget::visibilityChanged, this, &MainWindow::updateFavoritesMenu );
-  connect(ui.showHideFavorites,&QAction::triggered,this,&MainWindow::toggle_favoritesPane);
+  connect( ui.showHideFavorites, &QAction::triggered, this, &MainWindow::toggle_favoritesPane );
 
   connect( ui.favoritesPaneWidget,
-    &FavoritesPaneWidget::favoritesItemRequested,
-    this,
-    &MainWindow::headwordFromFavorites );
+           &FavoritesPaneWidget::favoritesItemRequested,
+           this,
+           &MainWindow::headwordFromFavorites );
 
   // History
   ui.historyPaneWidget->setUp( &cfg, &history, ui.menuHistory );
@@ -575,9 +597,9 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   // Do not create dummy tray icon in X. Cause QT5 failed to upgrade systemtray context menu.
   // And as result menu for some DEs apppear to be empty, for example in MATE DE.
 
-  if ( cfg.preferences.enableTrayIcon )
-  {
-    trayIcon = new QSystemTrayIcon( QIcon::fromTheme("goldendict-tray", QIcon( ":/icons/programicon_old.png" )), this );
+  if ( cfg.preferences.enableTrayIcon ) {
+    trayIcon =
+      new QSystemTrayIcon( QIcon::fromTheme( "goldendict-tray", QIcon( ":/icons/programicon_old.png" ) ), this );
     trayIcon->setToolTip( tr( "Loading..." ) );
     trayIcon->show();
   }
@@ -587,11 +609,11 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   connect( navForward, &QAction::triggered, this, &MainWindow::forwardClicked );
 
   addTab.setAutoRaise( true );
-  addTab.setToolTip( tr( "New Tab"  ) );
+  addTab.setToolTip( tr( "New Tab" ) );
   addTab.setFocusPolicy( Qt::NoFocus );
   addTab.setIcon( QIcon( ":/icons/addtab.svg" ) );
 
-  ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);
+  ui.tabWidget->setHideSingleTab( cfg.preferences.hideSingleTab );
   ui.tabWidget->clear();
 
   ui.tabWidget->setCornerWidget( &addTab, Qt::TopLeftCorner );
@@ -631,15 +653,13 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
     Help::openHelpWebpage();
   } );
 
-  connect( groupListInDock, &GroupComboBox::currentIndexChanged,
-           this, &MainWindow::currentGroupChanged );
+  connect( groupListInDock, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
 
-  connect( groupListInToolbar, &GroupComboBox::currentIndexChanged,
-           this, &MainWindow::currentGroupChanged );
+  connect( groupListInToolbar, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
 
   connect( ui.translateLine, &QLineEdit::textChanged, this, &MainWindow::translateInputChanged );
 
-  connect( translateBox->translateLine(), &QLineEdit::textChanged, this, &MainWindow::translateInputChanged );
+  connect( translateBox->translateLine(), &QLineEdit::textEdited, this, &MainWindow::translateInputChanged );
 
   connect( ui.translateLine, &QLineEdit::returnPressed, [ this ]() {
     translateInputFinished( true );
@@ -650,15 +670,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
 
   connect( ui.wordList, &QListWidget::itemSelectionChanged, this, &MainWindow::wordListSelectionChanged );
 
-  connect( translateBox->wordList(), SIGNAL( itemDoubleClicked ( QListWidgetItem * ) ),
-           this, SLOT( wordListItemActivated( QListWidgetItem * ) ) );
-
   connect( ui.wordList, &QListWidget::itemClicked, this, &MainWindow::wordListItemActivated );
 
-  connect( ui.wordList, &WordList::statusBarMessage, this, &MainWindow::showStatusBarMessage );
-
-  connect( translateBox->wordList(), &WordList::statusBarMessage, this, &MainWindow::showStatusBarMessage );
-
   connect( ui.dictsList, &QListWidget::itemSelectionChanged, this, &MainWindow::dictsListSelectionChanged );
 
   connect( ui.dictsList, &QListWidget::itemDoubleClicked, this, &MainWindow::dictsListItemActivated );
@@ -671,10 +684,8 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   translateBox->translateLine()->installEventFilter( this );
 
   ui.wordList->installEventFilter( this );
-  translateBox->wordList()->installEventFilter( this );
 
   ui.wordList->viewport()->installEventFilter( this );
-  translateBox->wordList()->viewport()->installEventFilter( this );
 
   ui.dictsList->installEventFilter( this );
   ui.dictsList->viewport()->installEventFilter( this );
@@ -694,6 +705,15 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
            this,
            &MainWindow::showFTSIndexingName );
 
+  connect( &GlobalBroadcaster::instance()->pronounce_engine,
+           &PronounceEngine::emitAudio,
+           this,
+           [ this ]( auto audioUrl ) {
+             auto view = getCurrentArticleView();
+             if ( ( cfg.preferences.pronounceOnLoadMain || cfg.preferences.pronounceOnLoadPopup ) && view != nullptr ) {
+               view->openLink( QUrl::fromEncoded( audioUrl.toUtf8() ), {} );
+             }
+           } );
   applyProxySettings();
 
   //set  webengineview font
@@ -702,121 +722,122 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   connect( &dictNetMgr, &QNetworkAccessManager::proxyAuthenticationRequired, this, &MainWindow::proxyAuthentication );
 
   connect( &articleNetMgr,
-    &QNetworkAccessManager::proxyAuthenticationRequired,
-    this,
-    &MainWindow::proxyAuthentication );
+           &QNetworkAccessManager::proxyAuthenticationRequired,
+           this,
+           &MainWindow::proxyAuthentication );
 
   setupNetworkCache( cfg.preferences.maxNetworkCacheSize );
 
   makeDictionaries();
 
   // After we have dictionaries and groups, we can populate history
-//  historyChanged();
+  //  historyChanged();
 
   setWindowTitle( "GoldenDict-ng" );
 
   blockUpdateWindowTitle = true;
-  addNewTab();
 
   // Create tab list menu
   createTabList();
 
-  if( cfg.mainWindowGeometry.size() )
+  if ( cfg.mainWindowState.size() && !cfg.resetState )
+    restoreState( cfg.mainWindowState );
+  if ( cfg.mainWindowGeometry.size() )
     restoreGeometry( cfg.mainWindowGeometry );
-  if( cfg.mainWindowState.size() )
-    restoreState( cfg.mainWindowState, 1 );
+
+#if defined( Q_OS_LINUX )
+  #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
+  defaultInterfaceStyle = QApplication::style()->name();
+  #else
+  defaultInterfaceStyle = QApplication::style()->objectName();
+  #endif
+#elif defined( Q_OS_MAC )
+  defaultInterfaceStyle = "Fusion";
+#endif
+
+  updateAppearances( cfg.preferences.addonStyle,
+                     cfg.preferences.displayStyle,
+                     cfg.preferences.darkMode
+#if !defined( Q_OS_WIN )
+                     ,
+                     cfg.preferences.interfaceStyle
+#endif
+  );
 
   // Show the initial welcome text
-
-  {
-    ArticleView *view = getCurrentArticleView();
-
-    history.enableAdd( false );
-
-    blockUpdateWindowTitle = true;
-
-    view->showDefinition( tr( "Welcome!" ), Instances::Group::HelpGroupId );
-
-    history.enableAdd( cfg.preferences.storeHistory );
-  }
+  addNewTab();
+  ArticleView * view = getCurrentArticleView();
+  history.enableAdd( false );
+  blockUpdateWindowTitle = true;
+  view->showDefinition( tr( "Welcome!" ), Instances::Group::HelpGroupId );
+  history.enableAdd( cfg.preferences.storeHistory );
 
   translateLine->setFocus();
 
-  applyQtStyleSheet( cfg.preferences.addonStyle, cfg.preferences.displayStyle, cfg.preferences.darkMode );
-
   // Scanpopup related
-  scanPopup = new ScanPopup(nullptr, cfg, articleNetMgr, audioPlayerFactory.player(),
-    dictionaries, groupInstances, history );
+  scanPopup =
+    new ScanPopup( nullptr, cfg, articleNetMgr, audioPlayerFactory.player(), dictionaries, groupInstances, history );
 
-  scanPopup->setStyleSheet(styleSheet());
+  scanPopup->setStyleSheet( styleSheet() );
 
-  connect( scanPopup,SIGNAL(editGroupRequested(unsigned)),
-    this, SLOT(editDictionaries(unsigned)),
-    Qt::QueuedConnection);
+  connect( scanPopup, &ScanPopup::editGroupRequest, this, &MainWindow::editDictionaries, Qt::QueuedConnection );
 
   connect( scanPopup, &ScanPopup::sendPhraseToMainWindow, this, [ this ]( QString const & word ) {
     wordReceived( word );
   } );
 
-  connect( scanPopup, &ScanPopup::inspectSignal,this,&MainWindow::inspectElement );
+  connect( scanPopup, &ScanPopup::inspectSignal, this, &MainWindow::inspectElement );
   connect( scanPopup, &ScanPopup::forceAddWordToHistory, this, &MainWindow::forceAddWordToHistory );
   connect( scanPopup, &ScanPopup::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
-  connect ( scanPopup, &ScanPopup::openDictionaryFolder, this, &MainWindow::openDictionaryFolder );
+  connect( scanPopup, &ScanPopup::openDictionaryFolder, this, &MainWindow::openDictionaryFolder );
   connect( scanPopup, &ScanPopup::sendWordToHistory, this, &MainWindow::addWordToHistory );
   connect( this, &MainWindow::setPopupGroupByName, scanPopup, &ScanPopup::setGroupByName );
   connect( scanPopup, &ScanPopup::sendWordToFavorites, this, &MainWindow::addWordToFavorites );
 
 #ifdef Q_OS_MAC
-  macClipboard = new gd_clipboard(this);
-  connect(macClipboard, &gd_clipboard::changed, this, &MainWindow::clipboardChange );
+  macClipboard = new gd_clipboard( this );
+  connect( macClipboard, &gd_clipboard::changed, this, &MainWindow::clipboardChange );
 #endif
 
   connect( enableScanningAction, &QAction::toggled, this, [ = ]( bool on ) {
-    if( on )
-    {
+    if ( on ) {
       enableScanningAction->setIcon( QIcon( ":/icons/wizard-selected.svg" ) );
     }
-    else
-    {
+    else {
       enableScanningAction->setIcon( QIcon( ":/icons/wizard.svg" ) );
     }
 
 #ifdef Q_OS_MAC
-    if( !MacMouseOver::isAXAPIEnabled() )
+    if ( !MacMouseOver::isAXAPIEnabled() )
       mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000, QPixmap( ":/icons/error.svg" ) );
 
-    if( on )
-    {
+    if ( on ) {
       macClipboard->start();
     }
-    else
-    {
+    else {
       macClipboard->stop();
     }
 #else
-      if( on ) {
-        connect( QApplication::clipboard(), &QClipboard::changed, this, &MainWindow::clipboardChange );
-      }
-      else
-      {
-        disconnect(QApplication::clipboard(), &QClipboard::changed, this, &MainWindow::clipboardChange);
-      }
+    if ( on ) {
+      connect( QApplication::clipboard(), &QClipboard::changed, this, &MainWindow::clipboardChange );
+    }
+    else {
+      disconnect( QApplication::clipboard(), &QClipboard::changed, this, &MainWindow::clipboardChange );
+    }
 #endif
 
     installHotKeys();
     updateTrayIcon();
   } );
 
-  if( cfg.preferences.startWithScanPopupOn )
-  {
+  if ( cfg.preferences.startWithScanPopupOn ) {
     enableScanningAction->trigger();
   }
 
   updateSearchPaneAndBar( cfg.preferences.searchInDock );
   ui.searchPane->setVisible( cfg.preferences.searchInDock );
 
-  if ( trayIcon )
-  {
+  if ( trayIcon ) {
     // Upgrade existing dummy tray icon into a full-functional one
 
     trayIcon->setContextMenu( &trayIconMenu );
@@ -833,41 +854,33 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   applyWordsZoomLevel();
 
   // Update autostart info
-  setAutostart(cfg.preferences.autoStart);
+  setAutostart( cfg.preferences.autoStart );
 
   // Initialize global hotkeys
   installHotKeys();
 
-  if ( cfg.preferences.alwaysOnTop )
-  {
+  if ( cfg.preferences.alwaysOnTop ) {
     on_alwaysOnTop_triggered( true );
   }
 
   // Only show window initially if it wasn't configured differently
-  if ( !cfg.preferences.enableTrayIcon || !cfg.preferences.startToTray )
-  {
+  if ( !cfg.preferences.enableTrayIcon || !cfg.preferences.startToTray ) {
     show();
     focusTranslateLine();
   }
 
-  connect( &newReleaseCheckTimer, &QTimer::timeout, this, &MainWindow::checkForNewRelease );
-
-  if ( cfg.preferences.hideMenubar )
-  {
+  if ( cfg.preferences.hideMenubar ) {
     toggleMenuBarTriggered( false );
   }
 
-  prepareNewReleaseChecks();
-
   // makeDictionaries() didn't do deferred init - we do it here, at the end.
   doDeferredInit( dictionaries );
 
   updateStatusLine();
 
 #ifdef Q_OS_MAC
-  if( cfg.preferences.startWithScanPopupOn && !MacMouseOver::isAXAPIEnabled() )
-      mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000,
-                                      QPixmap( ":/icons/error.svg" ) );
+  if ( cfg.preferences.startWithScanPopupOn && !MacMouseOver::isAXAPIEnabled() )
+    mainStatusBar->showMessage( tr( "Accessibility API is not enabled" ), 10000, QPixmap( ":/icons/error.svg" ) );
 #endif
 
   wasMaximized = isMaximized();
@@ -877,150 +890,224 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   ui.centralWidget->grabGesture( Gestures::GDPinchGestureType );
   ui.centralWidget->grabGesture( Gestures::GDSwipeGestureType );
 
-  if( layoutDirection() == Qt::RightToLeft )
-  {
+  if ( layoutDirection() == Qt::RightToLeft ) {
     // Adjust button icons for Right-To-Left layout
     navBack->setIcon( QIcon( ":/icons/next.svg" ) );
     navForward->setIcon( QIcon( ":/icons/previous.svg" ) );
   }
 
-  inspector.reset( new ArticleInspector( this ));
+  inspector.reset( new ArticleInspector( this ) );
 
 #ifdef Q_OS_WIN
   // Regiser and update URL Scheme for windows
   // https://learn.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/platform-apis/aa767914(v=vs.85)
 
   // Windows will automatically map registry key to Computer\HKEY_CLASSES_ROOT\ */
-  QSettings urlRegistry(R"(HKEY_CURRENT_USER\Software\Classes)", QSettings::NativeFormat);
+  QSettings urlRegistry( R"(HKEY_CURRENT_USER\Software\Classes)", QSettings::NativeFormat );
 
-  urlRegistry.beginGroup("goldendict");
-  urlRegistry.setValue("Default", "URL: goldendict Protocol");
-  urlRegistry.setValue("URL Protocol", "");
-  urlRegistry.setValue("shell/open/command/Default",
-    QString("\"%1\"").arg( QDir::toNativeSeparators(QApplication::applicationFilePath())) + " \"%1\"");
+  urlRegistry.beginGroup( "goldendict" );
+  urlRegistry.setValue( "Default", "URL: goldendict Protocol" );
+  urlRegistry.setValue( "URL Protocol", "" );
+  urlRegistry.setValue( "shell/open/command/Default",
+                        QString( "\"%1\"" ).arg( QDir::toNativeSeparators( QApplication::applicationFilePath() ) )
+                          + " \"%1\"" );
   urlRegistry.endGroup();
 #endif
 
   useSmallIconsInToolbarsTriggered();
+
+  if ( cfg.preferences.checkForNewReleases ) {
+    QTimer::singleShot( 0, this, &MainWindow::checkNewRelease );
+  }
 }
 
-void MainWindow::clipboardChange( QClipboard::Mode m)
+void MainWindow::prefixMatchUpdated()
 {
-  if( !scanPopup )
-  {
+  updateMatchResults( false );
+}
+
+void MainWindow::prefixMatchFinished()
+{
+  updateMatchResults( true );
+}
+
+void MainWindow::updateMatchResults( bool finished )
+{
+  WordFinder::SearchResults const & results = wordFinder.getResults();
+
+  if ( cfg.preferences.searchInDock ) {
+    ui.wordList->setUpdatesEnabled( false );
+    //clear all existed items
+    ui.wordList->clear();
+
+    for ( const auto & result : results ) {
+      auto i = new QListWidgetItem( result.first, ui.wordList );
+      i->setToolTip( result.first );
+
+      if ( result.second ) {
+        QFont f = i->font();
+        f.setItalic( true );
+        i->setFont( f );
+      }
+
+      i->setTextAlignment( Qt::AlignLeft );
+    }
+
+    if ( ui.wordList->count() ) {
+      ui.wordList->scrollToItem( ui.wordList->item( 0 ), QAbstractItemView::PositionAtTop );
+      ui.wordList->setCurrentItem( nullptr, QItemSelectionModel::Clear );
+    }
+
+    ui.wordList->setUpdatesEnabled( true );
+    ui.wordList->unsetCursor();
+  }
+  else {
+
+    QStringList _results;
+    _results.clear();
+
+    for ( const auto & result : results ) {
+      _results << result.first;
+    }
+    translateBox->setModel( _results );
+  }
+
+  if ( finished ) {
+
+    refreshTranslateLine();
+
+    if ( !wordFinder.getErrorString().isEmpty() )
+      emit showStatusBarMessage( tr( "WARNING: %1" ).arg( wordFinder.getErrorString() ),
+                                 20000,
+                                 QPixmap( ":/icons/error.svg" ) );
+  }
+}
+
+void MainWindow::refreshTranslateLine()
+{
+  if ( !translateLine )
+    return;
+
+  // Visually mark the input line to mark if there's no results
+  bool setMark = wordFinder.getResults().empty() && !wordFinder.wasSearchUncertain();
+
+  if ( translateLine->property( "noResults" ).toBool() != setMark ) {
+    translateLine->setProperty( "noResults", setMark );
+
+    Utils::Widget::setNoResultColor( translateLine, setMark );
+  }
+}
+
+void MainWindow::clipboardChange( QClipboard::Mode m )
+{
+  if ( !scanPopup ) {
     return;
   }
 
-#if defined(HAVE_X11)
-      if(m == QClipboard::Clipboard){
-        if(!cfg.preferences.trackClipboardScan) return;
-        scanPopup->translateWordFromClipboard();
-        return;
-      }
+#if defined( HAVE_X11 )
+  if ( m == QClipboard::Clipboard ) {
+    if ( !cfg.preferences.trackClipboardScan )
+      return;
+    scanPopup->translateWordFromClipboard();
+    return;
+  }
 
-      if(m == QClipboard::Selection){
+  if ( m == QClipboard::Selection ) {
 
-        // Multiple ways to stopping a word from showing up when selecting
+    // Multiple ways to stopping a word from showing up when selecting
 
-        // Explicitly disabled on preferences
-        if(!cfg.preferences.trackSelectionScan) return;
+    // Explicitly disabled on preferences
+    if ( !cfg.preferences.trackSelectionScan )
+      return;
 
-        // Explicitly disabled on preferences to ignore gd's own selection
+    // Explicitly disabled on preferences to ignore gd's own selection
 
-        if( cfg.preferences.ignoreOwnClipboardChanges
-          && QApplication::clipboard()->ownsSelection() ){
-          return ;
-        }
+    if ( cfg.preferences.ignoreOwnClipboardChanges && QApplication::clipboard()->ownsSelection() ) {
+      return;
+    }
 
-        // Keyboard Modifier
-        if(cfg.preferences.enableScanPopupModifiers &&
-          !KeyboardState::checkModifiersPressed(cfg.preferences.scanPopupModifiers)){
-          return;
-        }
+    // Keyboard Modifier
+    if ( cfg.preferences.enableScanPopupModifiers
+         && !KeyboardState::checkModifiersPressed( cfg.preferences.scanPopupModifiers ) ) {
+      return;
+    }
 
-        // Show a Flag instead of translate directly.
-        // And hand over the control of showing the popup to scanFlag
-        if ( cfg.preferences.showScanFlag ) {
-          scanPopup->showScanFlag();
-          return;
-        }
+    // Show a Flag instead of translate directly.
+    // And hand over the control of showing the popup to scanFlag
+    if ( cfg.preferences.showScanFlag ) {
+      scanPopup->showScanFlag();
+      return;
+    }
 
-        // Use delay show to prevent multiple popups while selection in progress
-        scanPopup->selectionDelayTimer.start();
-      }
-#elif defined(Q_OS_MAC)
-      scanPopup->translateWord(macClipboard->text());
+    // Use delay show to prevent multiple popups while selection in progress
+    scanPopup->selectionDelayTimer.start();
+  }
+#elif defined( Q_OS_MAC )
+  scanPopup->translateWord( macClipboard->text() );
 #else
-      scanPopup->translateWordFromClipboard();
+  scanPopup->translateWordFromClipboard();
 #endif
-
 }
 
 void MainWindow::ctrlTabPressed()
 {
-    emit fillWindowsMenu();
-    tabListButton->click();
+  emit fillWindowsMenu();
+  tabListButton->click();
 }
 
 void MainWindow::updateSearchPaneAndBar( bool searchInDock )
 {
   QString text = translateLine->text();
 
-  if( ftsDlg )
+  if ( ftsDlg )
     removeGroupComboBoxActionsFromDialog( ftsDlg, groupList );
-  if( headwordsDlg )
+  if ( headwordsDlg )
     removeGroupComboBoxActionsFromDialog( headwordsDlg, groupList );
 
-  if ( searchInDock )
-  {
+  if ( searchInDock ) {
     cfg.preferences.searchInDock = true;
 
     navToolbar->setAllowedAreas( Qt::AllToolBarAreas );
 
-    groupList = groupListInDock;
+    groupList     = groupListInDock;
     translateLine = ui.translateLine;
-    wordList = ui.wordList;
 
     translateBoxToolBarAction->setVisible( false );
+
+    translateBox->setPopupEnabled( false );
   }
-  else
-  {
+  else {
     cfg.preferences.searchInDock = false;
 
     // handle the main toolbar, it must not be on the side, since it should
     // contain the group widget and the translate line. Valid locations: Top and Bottom.
     navToolbar->setAllowedAreas( Qt::BottomToolBarArea | Qt::TopToolBarArea );
-    if ( toolBarArea( navToolbar ) & ( Qt::LeftToolBarArea | Qt::RightToolBarArea ) )
-    {
-      if ( toolBarArea( &dictionaryBar ) == Qt::TopToolBarArea )
-      {
+    if ( toolBarArea( navToolbar ) & ( Qt::LeftToolBarArea | Qt::RightToolBarArea ) ) {
+      if ( toolBarArea( &dictionaryBar ) == Qt::TopToolBarArea ) {
         insertToolBar( &dictionaryBar, navToolbar );
       }
-      else
-      {
+      else {
         addToolBar( Qt::TopToolBarArea, navToolbar );
       }
     }
 
-    groupList = groupListInToolbar;
+    groupList     = groupListInToolbar;
     translateLine = translateBox->translateLine();
-    wordList = translateBox->wordList();
 
     translateBoxToolBarAction->setVisible( true );
   }
 
-  if( ftsDlg )
+  if ( ftsDlg )
     addGroupComboBoxActionsToDialog( ftsDlg, groupList );
-  if( headwordsDlg )
+  if ( headwordsDlg )
     addGroupComboBoxActionsToDialog( headwordsDlg, groupList );
 
-  translateLine->setToolTip( tr( "String to search in dictionaries. The wildcards '*', '?' and sets of symbols '[...]' are allowed.\nTo find '*', '?', '[', ']' symbols use '\\*', '\\?', '\\[', '\\]' respectively" ) );
+  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;
 
-  wordList->attachFinder( &wordFinder );
-
   updateGroupList();
   applyWordsZoomLevel();
 
@@ -1028,16 +1115,14 @@ void MainWindow::updateSearchPaneAndBar( bool searchInDock )
   focusTranslateLine();
 }
 
-void MainWindow::mousePressEvent( QMouseEvent *event)
+void MainWindow::mousePressEvent( QMouseEvent * event )
 {
-
-  if (handleBackForwardMouseButtons( event ) )
-  {
+  if ( handleBackForwardMouseButtons( event ) ) {
     return;
   }
 
-  if (event->button() != Qt::MiddleButton)
-    return QMainWindow::mousePressEvent(event);
+  if ( event->button() != Qt::MiddleButton )
+    return QMainWindow::mousePressEvent( event );
 
   // middle clicked
   QString subtype = "plain";
@@ -1057,12 +1142,11 @@ MainWindow::~MainWindow()
 
   ui.centralWidget->ungrabGesture( Gestures::GDPinchGestureType );
   ui.centralWidget->ungrabGesture( Gestures::GDSwipeGestureType );
-//  Gestures::unregisterRecognizers();
+  //  Gestures::unregisterRecognizers();
 
   // Close all tabs -- they should be destroyed before network managers
   // do.
-  while( ui.tabWidget->count() )
-  {
+  while ( ui.tabWidget->count() ) {
     QWidget * w = ui.tabWidget->widget( 0 );
 
     ui.tabWidget->removeTab( 0 );
@@ -1070,15 +1154,20 @@ MainWindow::~MainWindow()
     delete w;
   }
 
+  if ( scanPopup ) {
+    delete scanPopup;
+    scanPopup = nullptr;
+  }
+
 #ifndef NO_EPWING_SUPPORT
   Epwing::finalize();
 #endif
 }
 
-void MainWindow::addGlobalAction( QAction * action, const char * slot )
+void MainWindow::addGlobalAction( QAction * action, const std::function< void() > & slotFunc )
 {
   action->setShortcutContext( Qt::WidgetWithChildrenShortcut );
-  connect( action, SIGNAL( triggered() ), this, slot );
+  connect( action, &QAction::triggered, this, slotFunc );
 
   ui.centralWidget->addAction( action );
   ui.dictsPane->addAction( action );
@@ -1105,7 +1194,7 @@ void MainWindow::addGroupComboBoxActionsToDialog( QDialog * dialog, GroupComboBo
 void MainWindow::removeGroupComboBoxActionsFromDialog( QDialog * dialog, GroupComboBox * pGroupComboBox )
 {
   QList< QAction * > actions = pGroupComboBox->getExternActions();
-  for( QList< QAction * >::iterator it = actions.begin(); it != actions.end(); ++it )
+  for ( QList< QAction * >::iterator it = actions.begin(); it != actions.end(); ++it )
     dialog->removeAction( *it );
 }
 
@@ -1116,27 +1205,24 @@ void MainWindow::commitData( QSessionManager & )
 
 void MainWindow::commitData()
 {
-  if( cfg.preferences.clearNetworkCacheOnExit )
-    if( QAbstractNetworkCache * cache = articleNetMgr.cache() )
+  if ( cfg.preferences.clearNetworkCacheOnExit )
+    if ( QAbstractNetworkCache * cache = articleNetMgr.cache() )
       cache->clear();
 
-  try
-  {
+  try {
     // Save MainWindow state and geometry
-    cfg.mainWindowState = saveState( 1 );
+    cfg.mainWindowState    = saveState();
     cfg.mainWindowGeometry = saveGeometry();
 
     // Save popup window state and geometry
-    if( scanPopup )
+    if ( scanPopup )
       scanPopup->saveConfigData();
 
     // Save any changes in last chosen groups etc
-    try
-    {
+    try {
       Config::save( cfg );
     }
-    catch( std::exception & e )
-    {
+    catch ( std::exception & e ) {
       gdWarning( "Configuration saving failed, error: %s\n", e.what() );
     }
 
@@ -1146,8 +1232,7 @@ void MainWindow::commitData()
     // Save favorites
     ui.favoritesPaneWidget->saveData();
   }
-  catch( std::exception & e )
-  {
+  catch ( std::exception & e ) {
     gdWarning( "Commit data failed, error: %s\n", e.what() );
   }
 }
@@ -1157,20 +1242,26 @@ QPrinter & MainWindow::getPrinter()
   if ( printer.get() )
     return *printer;
 
-  printer =  std::make_shared<QPrinter>( QPrinter::HighResolution );
+  printer = std::make_shared< QPrinter >( QPrinter::HighResolution );
 
   return *printer;
 }
 
-void MainWindow::applyQtStyleSheet( QString const & addonStyle,QString const & displayStyle, bool const & darkMode )
+void MainWindow::updateAppearances( QString const & addonStyle,
+                                    QString const & displayStyle,
+                                    bool const & darkMode
+#if !defined( Q_OS_WIN )
+                                    ,
+                                    const QString & interfaceStyle
+#endif
+)
 {
+#ifdef Q_OS_WIN32
+  if ( darkMode ) {
+  //https://forum.qt.io/topic/101391/windows-10-dark-theme
   #ifdef Q_OS_WIN32
-  if( darkMode )
-  {
-    //https://forum.qt.io/topic/101391/windows-10-dark-theme
-    #ifdef Q_OS_WIN32
     qApp->setStyle( QStyleFactory::create( "Fusion" ) );
-    #endif
+  #endif
     QPalette darkPalette;
     QColor darkColor     = QColor( 45, 45, 45 );
     QColor disabledColor = QColor( 127, 127, 127 );
@@ -1196,33 +1287,37 @@ void MainWindow::applyQtStyleSheet( QString const & addonStyle,QString const & d
 
     qApp->setPalette( darkPalette );
   }
-  else
-  {
+  else {
     qApp->setStyle( new QProxyStyle() );
     qApp->setPalette( QPalette() );
   }
-  #endif
+#endif
+
+#if !defined( Q_OS_WIN )
+  if ( interfaceStyle == "Default" ) {
+    QApplication::setStyle( QStyleFactory::create( defaultInterfaceStyle ) );
+  }
+  else {
+    if ( QStyleFactory::keys().contains( interfaceStyle ) ) {
+      QApplication::setStyle( QStyleFactory::create( interfaceStyle ) );
+    }
+  }
+#endif
 
   QFile builtInCssFile( ":qt-style.css" );
   builtInCssFile.open( QFile::ReadOnly );
   QByteArray css = builtInCssFile.readAll();
 
-#if defined(Q_OS_MAC)
-  QFile macCssFile( ":qt-style-macos.css" );
-  macCssFile.open( QFile::ReadOnly );
-  css += macCssFile.readAll();
-#endif
-
-#if defined(Q_OS_WIN)
+#if defined( Q_OS_WIN )
   QFile winCssFile( ":qt-style-win.css" );
   winCssFile.open( QFile::ReadOnly );
   css += winCssFile.readAll();
 
   // Load an additional stylesheet
   // Dark Mode doesn't work nice with custom qt style sheets,
-  if (!darkMode){
+  if ( !darkMode ) {
     QFile additionalStyle( QString( ":qt-%1.css" ).arg( displayStyle ) );
-    if ( additionalStyle.open( QFile::ReadOnly ) ){
+    if ( additionalStyle.open( QFile::ReadOnly ) ) {
       css += additionalStyle.readAll();
     }
   }
@@ -1235,48 +1330,46 @@ void MainWindow::applyQtStyleSheet( QString const & addonStyle,QString const & d
   if ( cssFile.open( QFile::ReadOnly ) )
     css += cssFile.readAll();
 
-  if( !addonStyle.isEmpty() )
-  {
-    QString name = Config::getStylesDir() + addonStyle
-                   + QDir::separator() + "qt-style.css";
+  if ( !addonStyle.isEmpty() ) {
+    QString name = Config::getStylesDir() + addonStyle + QDir::separator() + "qt-style.css";
     QFile addonCss( name );
-    if( addonCss.open( QFile::ReadOnly ) )
+    if ( addonCss.open( QFile::ReadOnly ) )
       css += addonCss.readAll();
   }
 
-  #ifdef Q_OS_WIN32
-  if(darkMode){
+#ifdef Q_OS_WIN32
+  if ( darkMode ) {
     css += "QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }";
   }
-  #endif
+#endif
 
-  setStyleSheet( css );
+  if ( !css.isEmpty() ) {
+    setStyleSheet( css );
+  }
 }
 
 void MainWindow::updateTrayIcon()
 {
-  if ( !trayIcon && cfg.preferences.enableTrayIcon )
-  {
+  if ( !trayIcon && cfg.preferences.enableTrayIcon ) {
     // Need to show it
-    trayIcon = new QSystemTrayIcon( QIcon::fromTheme("goldendict-tray", QIcon( ":/icons/programicon_old.png" )), this );
+    trayIcon =
+      new QSystemTrayIcon( QIcon::fromTheme( "goldendict-tray", QIcon( ":/icons/programicon_old.png" ) ), this );
     trayIcon->setContextMenu( &trayIconMenu );
     trayIcon->show();
 
     connect( trayIcon, &QSystemTrayIcon::activated, this, &MainWindow::trayIconActivated );
   }
-  else if( trayIcon && !cfg.preferences.enableTrayIcon )
-  {
+  else if ( trayIcon && !cfg.preferences.enableTrayIcon ) {
     // Need to hide it
     delete trayIcon;
 
-    trayIcon = 0;
+    trayIcon = nullptr;
   }
-  if ( trayIcon )
-  {
+  if ( trayIcon ) {
     // Update the icon to reflect the scanning mode
     trayIcon->setIcon( enableScanningAction->isChecked() ?
-        QIcon::fromTheme("goldendict-scan-tray", QIcon( ":/icons/programicon_scan.png" )) :
-        QIcon::fromTheme("goldendict-tray", QIcon( ":/icons/programicon_old.png" )) );
+                         QIcon::fromTheme( "goldendict-scan-tray", QIcon( ":/icons/programicon_scan.png" ) ) :
+                         QIcon::fromTheme( "goldendict-tray", QIcon( ":/icons/programicon_old.png" ) ) );
 
     trayIcon->setToolTip( "GoldenDict-ng" );
   }
@@ -1286,35 +1379,30 @@ void MainWindow::updateTrayIcon()
   ui.actionCloseToTray->setVisible( cfg.preferences.enableTrayIcon );
 }
 
-void MainWindow::wheelEvent( QWheelEvent *ev )
+void MainWindow::wheelEvent( QWheelEvent * ev )
 {
-  if ( ev->modifiers().testFlag( Qt::ControlModifier ) )
-  {
-    if ( ev->angleDelta().y() > 0 )
-    {
-        zoomin();
+  if ( ev->modifiers().testFlag( Qt::ControlModifier ) ) {
+    if ( ev->angleDelta().y() > 0 ) {
+      zoomin();
     }
-    else if ( ev->angleDelta().y()  < 0 )
-    {
-        zoomout();
+    else if ( ev->angleDelta().y() < 0 ) {
+      zoomout();
     }
     ev->accept();
   }
-  else
-  {
+  else {
     ev->ignore();
   }
 }
 
 void MainWindow::closeEvent( QCloseEvent * ev )
 {
-  if ( cfg.preferences.enableTrayIcon && cfg.preferences.closeToTray )
-  {
-    if( !cfg.preferences.searchInDock )
+  if ( cfg.preferences.enableTrayIcon && cfg.preferences.closeToTray ) {
+    if ( !cfg.preferences.searchInDock )
       translateBox->setPopupEnabled( false );
 
 #ifdef Q_OS_MACOS
-    if (!ev->spontaneous() || !isVisible()) {
+    if ( !ev->spontaneous() || !isVisible() ) {
       return;
     }
 #endif
@@ -1323,16 +1411,15 @@ void MainWindow::closeEvent( QCloseEvent * ev )
     // the main window is visible when the user attempts to log out.
     // The main window will be only hidden, because QApplication::quitOnLastWindowClosed
     // property is false and Qt::WA_DeleteOnClose widget  is not set.
-    Q_ASSERT(!QApplication::quitOnLastWindowClosed());
-    Q_ASSERT(!testAttribute(Qt::WA_DeleteOnClose));
+    Q_ASSERT( !QApplication::quitOnLastWindowClosed() );
+    Q_ASSERT( !testAttribute( Qt::WA_DeleteOnClose ) );
 #else
     // Ignore the close event because closing the main window breaks global hotkeys on Windows.
     ev->ignore();
     hide();
 #endif
   }
-  else
-  {
+  else {
     ev->accept();
     quitApp();
   }
@@ -1340,8 +1427,7 @@ void MainWindow::closeEvent( QCloseEvent * ev )
 
 void MainWindow::quitApp()
 {
-  if( inspector && inspector->isVisible() )
-  {
+  if ( inspector && inspector->isVisible() ) {
     inspector->close();
   }
   commitData();
@@ -1350,11 +1436,9 @@ void MainWindow::quitApp()
 
 void MainWindow::applyProxySettings()
 {
-  if( cfg.preferences.proxyServer.enabled && cfg.preferences.proxyServer.useSystemProxy )
-  {
-    QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery();
-    if( !cfg.preferences.proxyServer.systemProxyUser.isEmpty() )
-    {
+  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 );
     }
@@ -1364,37 +1448,34 @@ void MainWindow::applyProxySettings()
 
   QNetworkProxy::ProxyType type = QNetworkProxy::NoProxy;
 
-  if ( cfg.preferences.proxyServer.enabled )
-  {
-    switch( cfg.preferences.proxyServer.type )
-    {
+  if ( cfg.preferences.proxyServer.enabled ) {
+    switch ( cfg.preferences.proxyServer.type ) {
       case Config::ProxyServer::Socks5:
         type = QNetworkProxy::Socks5Proxy;
-      break;
+        break;
       case Config::ProxyServer::HttpConnect:
         type = QNetworkProxy::HttpProxy;
-      break;
+        break;
       case Config::ProxyServer::HttpGet:
         type = QNetworkProxy::HttpCachingProxy;
-      break;
+        break;
 
       default:
-      break;
+        break;
     }
   }
 
   QNetworkProxy proxy( type );
 
-  if ( cfg.preferences.proxyServer.enabled )
-  {
-   proxy.setHostName( cfg.preferences.proxyServer.host );
-   proxy.setPort( cfg.preferences.proxyServer.port );
+  if ( cfg.preferences.proxyServer.enabled ) {
+    proxy.setHostName( cfg.preferences.proxyServer.host );
+    proxy.setPort( cfg.preferences.proxyServer.port );
 
-   if ( cfg.preferences.proxyServer.user.size() )
-     proxy.setUser( cfg.preferences.proxyServer.user );
+    if ( cfg.preferences.proxyServer.user.size() )
+      proxy.setUser( cfg.preferences.proxyServer.user );
 
-   if ( cfg.preferences.proxyServer.password.size() )
-     proxy.setPassword( cfg.preferences.proxyServer.password );
+    if ( cfg.preferences.proxyServer.password.size() )
+      proxy.setPassword( cfg.preferences.proxyServer.password );
   }
 
   QNetworkProxy::setApplicationProxy( proxy );
@@ -1405,14 +1486,13 @@ void MainWindow::setupNetworkCache( int maxSize )
   // x << 20 == x * 2^20 converts mebibytes to bytes.
   qint64 const maxCacheSizeInBytes = maxSize <= 0 ? qint64( 0 ) : static_cast< qint64 >( maxSize ) << 20;
 
-  if( QAbstractNetworkCache * abstractCache = articleNetMgr.cache() )
-  {
+  if ( QAbstractNetworkCache * abstractCache = articleNetMgr.cache() ) {
     QNetworkDiskCache * const diskCache = qobject_cast< QNetworkDiskCache * >( abstractCache );
     Q_ASSERT_X( diskCache, Q_FUNC_INFO, "Unexpected network cache type." );
     diskCache->setMaximumCacheSize( maxCacheSizeInBytes );
     return;
   }
-  if( maxCacheSizeInBytes == 0 )
+  if ( maxCacheSizeInBytes == 0 )
     return; // There is currently no cache and it is not needed.
 
   QString cacheDirectory = Config::getCacheDir();
@@ -1440,10 +1520,9 @@ void MainWindow::makeDictionaries()
   loadDictionaries( this, isVisible(), cfg, dictionaries, dictNetMgr, false );
 
   //create map
-  dictMap = Dictionary::dictToMap(dictionaries);
+  dictMap = Dictionary::dictToMap( dictionaries );
 
-  for( unsigned x = 0; x < dictionaries.size(); x++ )
-  {
+  for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
     dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
     dictionaries[ x ]->setSynonymSearchEnabled( cfg.preferences.synonymSearchEnabled );
   }
@@ -1459,15 +1538,14 @@ void MainWindow::updateStatusLine()
 {
   unsigned articleCount = 0, wordCount = 0;
 
-  for( unsigned x = dictionaries.size(); x--; )
-  {
+  for ( unsigned x = dictionaries.size(); x--; ) {
     articleCount += dictionaries[ x ]->getArticleCount();
     wordCount += dictionaries[ x ]->getWordCount();
   }
 
-  mainStatusBar->showMessage( tr( "%1 dictionaries, %2 articles, %3 words" ).
-                              arg( dictionaries.size() ).arg( articleCount ).
-                              arg( wordCount ), 10000 );
+  mainStatusBar->showMessage(
+    tr( "%1 dictionaries, %2 articles, %3 words" ).arg( dictionaries.size() ).arg( articleCount ).arg( wordCount ),
+    10000 );
 }
 
 void MainWindow::updateGroupList()
@@ -1480,8 +1558,7 @@ void MainWindow::updateGroupList()
 
   // currentIndexChanged() signal is very trigger-happy. To avoid triggering
   // it, we disconnect it while we're clearing and filling back groups.
-  disconnect( groupList, &GroupComboBox::currentIndexChanged,
-              this, &MainWindow::currentGroupChanged );
+  disconnect( groupList, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
 
   groupInstances.clear();
 
@@ -1495,7 +1572,7 @@ void MainWindow::updateGroupList()
                                           dictionaries );
 
     g.name = tr( "All" );
-    g.id = Instances::Group::AllGroupId;
+    g.id   = Instances::Group::AllGroupId;
     g.icon = "folder.png";
 
     groupInstances.push_back( g );
@@ -1522,16 +1599,13 @@ void MainWindow::updateGroupList()
   qDebug() << "Reloading all the tabs...";
 #endif
 
-  for( int i = 0; i < ui.tabWidget->count(); ++i )
-  {
-    ArticleView & view =
-      dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( i ) ) );
+  for ( int i = 0; i < ui.tabWidget->count(); ++i ) {
+    ArticleView & view = dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( i ) ) );
 
     view.reload();
   }
 
-  connect( groupList, &GroupComboBox::currentIndexChanged,
-           this, &MainWindow::currentGroupChanged );
+  connect( groupList, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
 }
 
 void MainWindow::updateDictionaryBar()
@@ -1539,24 +1613,23 @@ void MainWindow::updateDictionaryBar()
   if ( !dictionaryBar.toggleViewAction()->isChecked() )
     return; // It's not enabled, therefore hidden -- don't waste time
 
-  unsigned currentId = groupList -> getCurrentGroup();
+  unsigned currentId     = groupList->getCurrentGroup();
   Instances::Group * grp = groupInstances.findGroup( currentId );
 
-  dictionaryBar.setMutedDictionaries( 0 );
+  dictionaryBar.setMutedDictionaries( nullptr );
   if ( grp ) { // Should always be !0, but check as a safeguard
-    if( currentId == Instances::Group::AllGroupId )
+    if ( currentId == Instances::Group::AllGroupId )
       dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
-    else
-    {
+    else {
       Config::Group * grp = cfg.getGroup( currentId );
-      dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : 0 );
+      dictionaryBar.setMutedDictionaries( grp ? &grp->mutedDictionaries : nullptr );
     }
 
     dictionaryBar.setDictionaries( grp->dictionaries );
 
     int extent = useSmallIconsInToolbarsAction.isChecked() ?
-               QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
-               QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+      QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
+      QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
 
     dictionaryBar.setDictionaryIconSize( extent );
   }
@@ -1569,19 +1642,16 @@ vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts()
 
   int current = groupList->currentIndex();
 
-  if ( current < 0 || current >= (int) groupInstances.size() )
-  {
+  if ( current < 0 || current >= (int)groupInstances.size() ) {
     // This shouldn't ever happen
     return dictionaries;
   }
 
   Config::MutedDictionaries const * mutedDictionaries = dictionaryBar.getMutedDictionaries();
-  if ( !dictionaryBar.toggleViewAction()->isChecked() || mutedDictionaries == 0 )
+  if ( !dictionaryBar.toggleViewAction()->isChecked() || mutedDictionaries == nullptr )
     return groupInstances[ current ].dictionaries;
-  else
-  {
-    vector< sptr< Dictionary::Class > > const & activeDicts =
-      groupInstances[ current ].dictionaries;
+  else {
+    vector< sptr< Dictionary::Class > > const & activeDicts = groupInstances[ current ].dictionaries;
 
     // Populate the special dictionariesUnmuted array with only unmuted
     // dictionaries
@@ -1589,9 +1659,8 @@ vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts()
     dictionariesUnmuted.clear();
     dictionariesUnmuted.reserve( activeDicts.size() );
 
-    for( unsigned x = 0; x < activeDicts.size(); ++x )
-      if ( !mutedDictionaries->contains(
-              QString::fromStdString( activeDicts[ x ]->getId() ) ) )
+    for ( unsigned x = 0; x < activeDicts.size(); ++x )
+      if ( !mutedDictionaries->contains( QString::fromStdString( activeDicts[ x ]->getId() ) ) )
         dictionariesUnmuted.push_back( activeDicts[ x ] );
 
     return dictionariesUnmuted;
@@ -1600,54 +1669,47 @@ vector< sptr< Dictionary::Class > > const & MainWindow::getActiveDicts()
 
 void MainWindow::createTabList()
 {
-  tabListMenu->setIcon(QIcon(":/icons/windows-list.svg"));
+  tabListMenu->setIcon( QIcon( ":/icons/windows-list.svg" ) );
   connect( tabListMenu, &QMenu::aboutToShow, this, &MainWindow::fillWindowsMenu );
   connect( tabListMenu, &QMenu::triggered, this, &MainWindow::switchToWindow );
 
-  tabListButton = new QToolButton(ui.tabWidget);
-  tabListButton->setAutoRaise(true);
-  tabListButton->setIcon(tabListMenu->icon());
-  tabListButton->setMenu(tabListMenu);
+  tabListButton = new QToolButton( ui.tabWidget );
+  tabListButton->setAutoRaise( true );
+  tabListButton->setIcon( tabListMenu->icon() );
+  tabListButton->setMenu( tabListMenu );
   tabListButton->setToolTip( tr( "Open Tabs List" ) );
-  tabListButton->setPopupMode(QToolButton::InstantPopup);
-  ui.tabWidget->setCornerWidget(tabListButton);
-  tabListButton->setFocusPolicy(Qt::NoFocus);
+  tabListButton->setPopupMode( QToolButton::InstantPopup );
+  ui.tabWidget->setCornerWidget( tabListButton );
+  tabListButton->setFocusPolicy( Qt::NoFocus );
 }
 
 void MainWindow::fillWindowsMenu()
 {
   tabListMenu->clear();
 
-  if(cfg.preferences.mruTabOrder)
-  {
-    for (int i = 0; i < mruList.count(); i++)
-    {
-      QAction *act = tabListMenu->addAction(ui.tabWidget->tabIcon(ui.tabWidget->indexOf(mruList.at(i))), ui.tabWidget->tabText(ui.tabWidget->indexOf(mruList.at(i))));
+  if ( cfg.preferences.mruTabOrder ) {
+    for ( int i = 0; i < mruList.count(); i++ ) {
+      QAction * act = tabListMenu->addAction( ui.tabWidget->tabIcon( ui.tabWidget->indexOf( mruList.at( i ) ) ),
+                                              ui.tabWidget->tabText( ui.tabWidget->indexOf( mruList.at( i ) ) ) );
 
       //remember the index of the Tab to be later used in ctrlReleased()
-      act->setData(ui.tabWidget->indexOf(mruList.at(i)));
+      act->setData( ui.tabWidget->indexOf( mruList.at( i ) ) );
 
-      if (ui.tabWidget->currentIndex() == ui.tabWidget->indexOf(mruList.at(i)))
-      {
+      if ( ui.tabWidget->currentIndex() == ui.tabWidget->indexOf( mruList.at( i ) ) ) {
         QFont f( act->font() );
         f.setBold( true );
         act->setFont( f );
       }
     }
-    if (tabListMenu->actions().size() > 1)
-    {
-      tabListMenu->setActiveAction(tabListMenu->actions().at(1));
+    if ( tabListMenu->actions().size() > 1 ) {
+      tabListMenu->setActiveAction( tabListMenu->actions().at( 1 ) );
     }
   }
-  else
-  {
-    for (int i = 0; i < ui.tabWidget->count(); i++)
-    {
-      QAction *act = tabListMenu->addAction( ui.tabWidget->tabIcon( i ),
-      ui.tabWidget->tabText( i ) );
+  else {
+    for ( int i = 0; i < ui.tabWidget->count(); i++ ) {
+      QAction * act = tabListMenu->addAction( ui.tabWidget->tabIcon( i ), ui.tabWidget->tabText( i ) );
       act->setData( i );
-      if (ui.tabWidget->currentIndex() == i)
-      {
+      if ( ui.tabWidget->currentIndex() == i ) {
         QFont f( act->font() );
         f.setBold( true );
         act->setFont( f );
@@ -1657,10 +1719,10 @@ void MainWindow::fillWindowsMenu()
   return;
 }
 
-void MainWindow::switchToWindow(QAction *act)
+void MainWindow::switchToWindow( QAction * act )
 {
   int idx = act->data().toInt();
-  ui.tabWidget->setCurrentIndex(idx);
+  ui.tabWidget->setCurrentIndex( idx );
 }
 
 void MainWindow::addNewTab()
@@ -1668,17 +1730,21 @@ void MainWindow::addNewTab()
   createNewTab( true, tr( "(untitled)" ) );
 }
 
-ArticleView * MainWindow::createNewTab( bool switchToIt,
-                                        QString const & name )
+ArticleView * MainWindow::createNewTab( bool switchToIt, QString const & name )
 {
-  ArticleView * view = new ArticleView( this, articleNetMgr, audioPlayerFactory.player(),
-                                        dictionaries, groupInstances, false, cfg,
+  ArticleView * view = new ArticleView( this,
+                                        articleNetMgr,
+                                        audioPlayerFactory.player(),
+                                        dictionaries,
+                                        groupInstances,
+                                        false,
+                                        cfg,
                                         *ui.searchInPageAction,
                                         translateLine,
                                         dictionaryBar.toggleViewAction(),
                                         groupList );
 
-  connect( view, &ArticleView::inspectSignal,this,&MainWindow::inspectElement);
+  connect( view, &ArticleView::inspectSignal, this, &MainWindow::inspectElement );
 
   connect( view, &ArticleView::titleChanged, this, &MainWindow::titleChanged );
 
@@ -1715,14 +1781,13 @@ ArticleView * MainWindow::createNewTab( bool switchToIt,
 
   view->setSelectionBySingleClick( cfg.preferences.selectWordBySingleClick );
 
-  int index = cfg.preferences.newTabsOpenAfterCurrentOne ?
-              ui.tabWidget->currentIndex() + 1 : ui.tabWidget->count();
+  int index = cfg.preferences.newTabsOpenAfterCurrentOne ? ui.tabWidget->currentIndex() + 1 : ui.tabWidget->count();
 
   QString escaped = name;
   escaped.replace( "&", "&&" );
 
   ui.tabWidget->insertTab( index, view, escaped );
-  mruList.append(dynamic_cast<QWidget*>(view));
+  mruList.append( dynamic_cast< QWidget * >( view ) );
 
   if ( switchToIt )
     ui.tabWidget->setCurrentIndex( index );
@@ -1744,20 +1809,19 @@ void MainWindow::tabCloseRequested( int x )
 {
   QWidget * w = ui.tabWidget->widget( x );
 
-  mruList.removeOne(w);
+  mruList.removeOne( w );
 
   // In MRU case: First, we switch to the appropriate tab
   // and only then remove the old one.
 
   //activate a tab in accordance with MRU
   if ( cfg.preferences.mruTabOrder && mruList.size() > 0 ) {
-    ui.tabWidget->setCurrentWidget(mruList.at(0));
+    ui.tabWidget->setCurrentWidget( mruList.at( 0 ) );
   }
-  else if( ui.tabWidget->count() > 1 )
-  {
+  else if ( ui.tabWidget->count() > 1 ) {
     //activate neighboring tab
     int n = x >= ui.tabWidget->count() - 1 ? x - 1 : x + 1;
-    if( n >= 0 )
+    if ( n >= 0 )
       ui.tabWidget->setCurrentIndex( n );
   }
 
@@ -1776,7 +1840,7 @@ void MainWindow::closeCurrentTab()
 
 void MainWindow::closeAllTabs()
 {
-  while (ui.tabWidget->count() > 1)
+  while ( ui.tabWidget->count() > 1 )
     closeCurrentTab();
 
   // close last tab
@@ -1790,13 +1854,13 @@ void MainWindow::closeRestTabs()
 
   int idx = ui.tabWidget->currentIndex();
 
-  for (int i = 0; i < idx; i++)
-    tabCloseRequested(0);
+  for ( int i = 0; i < idx; i++ )
+    tabCloseRequested( 0 );
 
-  ui.tabWidget->setCurrentIndex(0);
+  ui.tabWidget->setCurrentIndex( 0 );
 
-  while (ui.tabWidget->count() > 1)
-    tabCloseRequested(1);
+  while ( ui.tabWidget->count() > 1 )
+    tabCloseRequested( 1 );
 }
 
 void MainWindow::switchToNextTab()
@@ -1822,7 +1886,7 @@ void MainWindow::backClicked()
 {
   GD_DPRINTF( "Back\n" );
 
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
   view->back();
 }
@@ -1831,7 +1895,7 @@ void MainWindow::forwardClicked()
 {
   GD_DPRINTF( "Forward\n" );
 
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
   view->forward();
 }
@@ -1839,30 +1903,28 @@ void MainWindow::forwardClicked()
 void MainWindow::titleChanged( ArticleView * view, QString const & title )
 {
   //the title can be url if html title is empty.according to qwebenginepage title() document.
-  QString escaped ;
-  if (title!=nullptr && title.contains(":")) {
+  QString escaped;
+  if ( title != nullptr && title.contains( ":" ) ) {
     //check if the title is url.
-    QUrl url(title);
-    escaped = Utils::Url::queryItemValue(url,"word");
-  } else {
+    QUrl url( title );
+    escaped = Utils::Url::queryItemValue( url, "word" );
+  }
+  else {
     escaped = title;
   }
   escaped.replace( "&", "&&" );
 
   int index = ui.tabWidget->indexOf( view );
-  if( !escaped.isEmpty() )
+  if ( !escaped.isEmpty() )
     ui.tabWidget->setTabText( index, escaped );
 
-  if( index == ui.tabWidget->currentIndex() )
-  {
+  if ( index == ui.tabWidget->currentIndex() ) {
     // Set icon for "Add to Favorites" action
-    if( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) )
-    {
+    if ( isWordPresentedInFavorites( title, cfg.lastMainGroupId ) ) {
       addToFavorites->setIcon( blueStarIcon );
       addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) );
     }
-    else
-    {
+    else {
       addToFavorites->setIcon( starIcon );
       addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) );
     }
@@ -1878,12 +1940,11 @@ void MainWindow::iconChanged( ArticleView * view, QIcon const & icon )
 
 void MainWindow::updateWindowTitle()
 {
-  ArticleView *view = getCurrentArticleView();
-  if ( view )
-  {
+  ArticleView * view = getCurrentArticleView();
+  if ( view ) {
     QString str = view->getTitle();
     if ( !str.isEmpty() ) {
-      if( !blockUpdateWindowTitle )
+      if ( !blockUpdateWindowTitle )
         setWindowTitle( tr( "%1 - %2" ).arg( str, "GoldenDict-ng" ) );
       blockUpdateWindowTitle = false;
     }
@@ -1892,21 +1953,16 @@ void MainWindow::updateWindowTitle()
 
 void MainWindow::pageLoaded( ArticleView * view )
 {
-  if( view != getCurrentArticleView() )
+  if ( view != getCurrentArticleView() )
     return; // It was background action
 
   updateBackForwardButtons();
-
   updatePronounceAvailability();
-
-  if ( cfg.preferences.pronounceOnLoadMain && view != nullptr ) {
-    view->playSound();
-  }
 }
 
 void MainWindow::showStatusBarMessage( QString const & message, int timeout, QPixmap const & icon )
 {
-  if( message.isEmpty() )
+  if ( message.isEmpty() )
     mainStatusBar->clearMessage();
   else
     mainStatusBar->showMessage( message, timeout, icon );
@@ -1919,34 +1975,36 @@ void MainWindow::tabSwitched( int )
   updatePronounceAvailability();
   updateFoundInDictsList();
   updateWindowTitle();
-  if (mruList.size() > 1)
-  {
+  if ( mruList.size() > 1 ) {
     int from = mruList.indexOf( ui.tabWidget->widget( ui.tabWidget->currentIndex() ) );
-    if ( from > 0)
+    if ( from > 0 )
       mruList.move( from, 0 );
   }
 
   // Set icon for "Add to Favorites" action
   QString headword = ui.tabWidget->tabText( ui.tabWidget->currentIndex() );
-  if( isWordPresentedInFavorites( unescapeTabHeader( headword ), cfg.lastMainGroupId ) )
-  {
+  if ( isWordPresentedInFavorites( unescapeTabHeader( headword ), cfg.lastMainGroupId ) ) {
     addToFavorites->setIcon( blueStarIcon );
     addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) );
   }
-  else
-  {
+  else {
     addToFavorites->setIcon( starIcon );
     addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) );
   }
+
+  auto view = getCurrentArticleView();
+  if ( view ) {
+    groupList->setCurrentGroup( view->getCurrentGroupId() );
+  }
 }
 
-void MainWindow::tabMenuRequested(QPoint pos)
+void MainWindow::tabMenuRequested( QPoint pos )
 {
-//  // do not show this menu for single tab
-//  if ( ui.tabWidget->count() < 2 )
-//    return;
+  //  // do not show this menu for single tab
+  //  if ( ui.tabWidget->count() < 2 )
+  //    return;
 
-  tabMenu->popup(ui.tabWidget->mapToGlobal(pos));
+  tabMenu->popup( ui.tabWidget->mapToGlobal( pos ) );
 }
 
 void MainWindow::dictionaryBarToggled( bool )
@@ -1954,62 +2012,53 @@ void MainWindow::dictionaryBarToggled( bool )
   // From now on, only the triggered() signal is interesting to us
   disconnect( dictionaryBar.toggleViewAction(), &QAction::toggled, this, &MainWindow::dictionaryBarToggled );
 
-  updateDictionaryBar(); // Updates dictionary bar contents if it's shown
+  updateDictionaryBar();         // Updates dictionary bar contents if it's shown
   applyMutedDictionariesState(); // Visibility change affects searches and results
 }
 
-void MainWindow::showDictsPane( )
+void MainWindow::showDictsPane()
 {
-  if( !ui.dictsPane->isVisible() )
+  if ( !ui.dictsPane->isVisible() )
     ui.dictsPane->show();
 }
 
 void MainWindow::dictsPaneVisibilityChanged( bool visible )
 {
-  if (visible) {
+  if ( visible ) {
     updateFoundInDictsList();
   }
 }
 
 void MainWindow::updateFoundInDictsList()
 {
-  if (!ui.dictsList->isVisible())
-  {
+  if ( !ui.dictsList->isVisible() ) {
     // nothing to do, the list is not visible
     return;
   }
 
   ui.dictsList->clear();
 
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
-  if ( view )
-  {
-    QStringList ids = view->getArticlesList();
+  if ( view ) {
+    QStringList ids  = view->getArticlesList();
     QString activeId = view->getActiveArticleId();
 
-    for( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd(); ++i)
-    {
+    for ( QStringList::const_iterator i = ids.constBegin(); i != ids.constEnd(); ++i ) {
       // Find this dictionary
 
-      for( unsigned x = dictionaries.size(); x--; )
-      {
-        if ( dictionaries[ x ]->getId() == i->toUtf8().data() )
-        {
+      for ( unsigned x = dictionaries.size(); x--; ) {
+        if ( dictionaries[ x ]->getId() == i->toUtf8().data() ) {
           QString dictName = QString::fromUtf8( dictionaries[ x ]->getName().c_str() );
-          QString dictId = QString::fromUtf8( dictionaries[ x ]->getId().c_str() );
+          QString dictId   = QString::fromUtf8( dictionaries[ x ]->getId().c_str() );
           QListWidgetItem * item =
-              new QListWidgetItem(
-                dictionaries[ x ]->getIcon(),
-                dictName,
-                ui.dictsList, QListWidgetItem::Type );
-          item->setData(Qt::UserRole, QVariant( dictId ) );
-          item->setToolTip(dictName);
+            new QListWidgetItem( dictionaries[ x ]->getIcon(), dictName, ui.dictsList, QListWidgetItem::Type );
+          item->setData( Qt::UserRole, QVariant( dictId ) );
+          item->setToolTip( dictName );
 
           ui.dictsList->addItem( item );
-          if (dictId == activeId)
-          {
-            ui.dictsList->setCurrentItem(item);
+          if ( dictId == activeId ) {
+            ui.dictsList->setCurrentItem( item );
           }
           break;
         }
@@ -2017,34 +2066,32 @@ void MainWindow::updateFoundInDictsList()
     }
 
     //if no item in dict List panel has been choose ,select first one.
-    if (ui.dictsList->count() > 0 && ui.dictsList->selectedItems().empty()) {
-        ui.dictsList->setCurrentRow(0);
+    if ( ui.dictsList->count() > 0 && ui.dictsList->selectedItems().empty() ) {
+      ui.dictsList->setCurrentRow( 0 );
     }
-
   }
 }
 
 void MainWindow::updateBackForwardButtons()
 {
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
-  if ( view )
-  {
-    navBack->setEnabled(view->canGoBack());
-    navForward->setEnabled(view->canGoForward());
+  if ( view ) {
+    navBack->setEnabled( view->canGoBack() );
+    navForward->setEnabled( view->canGoForward() );
   }
 }
 
 void MainWindow::updatePronounceAvailability()
 {
-    if (ui.tabWidget->count() > 0) {
-        getCurrentArticleView()->hasSound([this](bool has) {
-            navPronounce->setEnabled( has );
-        });
-    }
-    else {
-        navPronounce->setEnabled( false );
-    }
+  if ( ui.tabWidget->count() > 0 ) {
+    getCurrentArticleView()->hasSound( [ this ]( bool has ) {
+      navPronounce->setEnabled( has );
+    } );
+  }
+  else {
+    navPronounce->setEnabled( false );
+  }
 }
 
 void MainWindow::editDictionaries( unsigned editDictionaryGroup )
@@ -2058,57 +2105,51 @@ void MainWindow::editDictionaries( unsigned editDictionaryGroup )
 
   { // Limit existence of newCfg
 
-  Config::Class newCfg = cfg;
-  EditDictionaries dicts( this, newCfg, dictionaries, groupInstances, dictNetMgr );
+    Config::Class newCfg = cfg;
+    EditDictionaries dicts( this, newCfg, dictionaries, groupInstances, dictNetMgr );
 
-  connect( &dicts, &EditDictionaries::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
+    connect( &dicts, &EditDictionaries::showDictionaryInfo, this, &MainWindow::showDictionaryInfo );
 
-  connect( &dicts, &EditDictionaries::showDictionaryHeadwords,this, &MainWindow::showDictionaryHeadwords);
+    connect( &dicts, &EditDictionaries::showDictionaryHeadwords, this, &MainWindow::showDictionaryHeadwords );
 
-  if ( editDictionaryGroup != Instances::Group::NoGroupId )
-    dicts.editGroup( editDictionaryGroup );
+    if ( editDictionaryGroup != Instances::Group::NoGroupId )
+      dicts.editGroup( editDictionaryGroup );
 
-  dicts.restoreGeometry( cfg.dictionariesDialogGeometry );
-  dicts.exec();
-  cfg.dictionariesDialogGeometry = newCfg.dictionariesDialogGeometry = dicts.saveGeometry();
+    dicts.restoreGeometry( cfg.dictionariesDialogGeometry );
+    dicts.exec();
+    cfg.dictionariesDialogGeometry = newCfg.dictionariesDialogGeometry = dicts.saveGeometry();
 
-  if ( dicts.areDictionariesChanged() || dicts.areGroupsChanged() )
-  {
-    ftsIndexing.stopIndexing();
-    ftsIndexing.clearDictionaries();
-    // Set muted dictionaries from old groups
-    for( int x = 0; x < newCfg.groups.size(); x++ )
-    {
-      unsigned id = newCfg.groups[ x ].id;
-      if( id != Instances::Group::NoGroupId )
-      {
-        Config::Group const * grp = cfg.getGroup( id );
-        if( grp )
-        {
-          newCfg.groups[ x ].mutedDictionaries = grp->mutedDictionaries;
-          newCfg.groups[ x ].popupMutedDictionaries = grp->popupMutedDictionaries;
+    if ( dicts.areDictionariesChanged() || dicts.areGroupsChanged() ) {
+      ftsIndexing.stopIndexing();
+      ftsIndexing.clearDictionaries();
+      // Set muted dictionaries from old groups
+      for ( auto & group : newCfg.groups ) {
+        unsigned id = group.id;
+        if ( id != Instances::Group::NoGroupId ) {
+          Config::Group const * grp = cfg.getGroup( id );
+          if ( grp ) {
+            group.mutedDictionaries      = grp->mutedDictionaries;
+            group.popupMutedDictionaries = grp->popupMutedDictionaries;
+          }
         }
       }
+
+      cfg = newCfg;
+
+      updateGroupList();
+
+      Config::save( cfg );
+
+      updateSuggestionList();
+
+      for ( auto & dictionary : dictionaries ) {
+        dictionary->setFTSParameters( cfg.preferences.fts );
+        dictionary->setSynonymSearchEnabled( cfg.preferences.synonymSearchEnabled );
+      }
+
+      ftsIndexing.setDictionaries( dictionaries );
+      ftsIndexing.doIndexing();
     }
-
-    cfg = newCfg;
-
-    updateGroupList();
-
-    Config::save( cfg );
-
-    updateSuggestionList();
-
-    for( unsigned x = 0; x < dictionaries.size(); x++ )
-    {
-      dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
-      dictionaries[ x ]->setSynonymSearchEnabled( cfg.preferences.synonymSearchEnabled );
-    }
-
-    ftsIndexing.setDictionaries( dictionaries );
-    ftsIndexing.doIndexing();
-  }
-
   }
 
   scanPopup->refresh();
@@ -2133,44 +2174,52 @@ void MainWindow::editPreferences()
 
   preferences.show();
 
-  if ( preferences.exec() == QDialog::Accepted )
-  {
+  if ( preferences.exec() == QDialog::Accepted ) {
     Config::Preferences p = preferences.getPreferences();
 
     // These parameters are not set in dialog
-    p.zoomFactor = cfg.preferences.zoomFactor;
+    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;
+    p.hideMenubar    = cfg.preferences.hideMenubar;
+    p.searchInDock   = cfg.preferences.searchInDock;
+    p.alwaysOnTop    = cfg.preferences.alwaysOnTop;
 
-    p.proxyServer.systemProxyUser = cfg.preferences.proxyServer.systemProxyUser;
+    p.proxyServer.systemProxyUser     = cfg.preferences.proxyServer.systemProxyUser;
     p.proxyServer.systemProxyPassword = cfg.preferences.proxyServer.systemProxyPassword;
 
     p.fts.dialogGeometry = cfg.preferences.fts.dialogGeometry;
 
     p.fts.searchMode = cfg.preferences.fts.searchMode;
 
-    // See if we need to reapply Qt stylesheets
-    if( cfg.preferences.displayStyle != p.displayStyle ||
-      cfg.preferences.darkMode != p.darkMode )
-    {
-      applyQtStyleSheet( p.addonStyle, p.displayStyle, p.darkMode );
+    // See if we need to update Appearances
+    if ( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.darkMode != p.darkMode
+#if !defined( Q_OS_WIN )
+         || cfg.preferences.interfaceStyle != p.interfaceStyle
+#endif
+    ) {
+      updateAppearances( p.addonStyle,
+                         p.displayStyle,
+                         p.darkMode
+#if !defined( Q_OS_WIN )
+                         ,
+                         p.interfaceStyle
+#endif
+      );
     }
 
-    if( cfg.preferences.historyStoreInterval != p.historyStoreInterval )
+
+    if ( cfg.preferences.historyStoreInterval != p.historyStoreInterval )
       history.setSaveInterval( p.historyStoreInterval );
 
-    if( cfg.preferences.favoritesStoreInterval != p.favoritesStoreInterval )
+    if ( cfg.preferences.favoritesStoreInterval != p.favoritesStoreInterval )
       ui.favoritesPaneWidget->setSaveInterval( p.favoritesStoreInterval );
 
-    if( cfg.preferences.maxNetworkCacheSize != p.maxNetworkCacheSize )
+    if ( cfg.preferences.maxNetworkCacheSize != p.maxNetworkCacheSize )
       setupNetworkCache( p.maxNetworkCacheSize );
 
     bool needReload =
-      ( cfg.preferences.displayStyle != p.displayStyle
-        || cfg.preferences.addonStyle != p.addonStyle
+      ( cfg.preferences.displayStyle != p.displayStyle || cfg.preferences.addonStyle != p.addonStyle
         || cfg.preferences.darkReaderMode != p.darkReaderMode
         || cfg.preferences.collapseBigArticles != p.collapseBigArticles
         || cfg.preferences.articleSizeLimit != p.articleSizeLimit
@@ -2182,14 +2231,12 @@ void MainWindow::editPreferences()
     cfg.preferences = p;
 
     // Loop through all tabs and reload pages due to ArticleMaker's change.
-    for( int x = 0; x < ui.tabWidget->count(); ++x )
-    {
-      ArticleView & view =
-        dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( x ) ) );
+    for ( int x = 0; x < ui.tabWidget->count(); ++x ) {
+      ArticleView & view = dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( x ) ) );
 
       view.setSelectionBySingleClick( p.selectWordBySingleClick );
 
-      if( needReload ) {
+      if ( needReload ) {
         view.reload();
       }
     }
@@ -2199,18 +2246,15 @@ void MainWindow::editPreferences()
     updateTrayIcon();
     applyProxySettings();
 
-    ui.tabWidget->setHideSingleTab(cfg.preferences.hideSingleTab);
+    ui.tabWidget->setHideSingleTab( cfg.preferences.hideSingleTab );
 
     setAutostart( cfg.preferences.autoStart );
 
-    prepareNewReleaseChecks();
-
     history.enableAdd( cfg.preferences.storeHistory );
     history.setMaxSize( cfg.preferences.maxStringsInHistory );
     ui.historyPaneWidget->updateHistoryCounts();
 
-    for( unsigned x = 0; x < dictionaries.size(); x++ )
-    {
+    for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
       dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
       dictionaries[ x ]->setSynonymSearchEnabled( cfg.preferences.synonymSearchEnabled );
     }
@@ -2229,29 +2273,27 @@ void MainWindow::editPreferences()
 
 void MainWindow::currentGroupChanged( int )
 {
-  cfg.lastMainGroupId = groupList->getCurrentGroup();
-  Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
-  if( cfg.lastMainGroupId == Instances::Group::AllGroupId )
-  {
-    if( igrp )
+  unsigned grg_id               = groupList->getCurrentGroup();
+  cfg.lastMainGroupId           = grg_id;
+  Instances::Group const * igrp = groupInstances.findGroup( grg_id );
+  if ( grg_id == Instances::Group::AllGroupId ) {
+    if ( igrp )
       igrp->checkMutedDictionaries( &cfg.mutedDictionaries );
     dictionaryBar.setMutedDictionaries( &cfg.mutedDictionaries );
   }
-  else
-  {
-    Config::Group * grp = cfg.getGroup( cfg.lastMainGroupId );
-    if( grp )
-    {
-      if( igrp )
+  else {
+    Config::Group * grp = cfg.getGroup( grg_id );
+    if ( grp ) {
+      if ( igrp )
         igrp->checkMutedDictionaries( &grp->mutedDictionaries );
       dictionaryBar.setMutedDictionaries( &grp->mutedDictionaries );
     }
     else
-      dictionaryBar.setMutedDictionaries( 0 );
+      dictionaryBar.setMutedDictionaries( nullptr );
   }
 
-  if(igrp){
-    GlobalBroadcaster::instance()->currentGroupId = cfg.lastMainGroupId;
+  if ( igrp ) {
+    GlobalBroadcaster::instance()->currentGroupId = grg_id;
   }
 
   updateDictionaryBar();
@@ -2259,31 +2301,33 @@ void MainWindow::currentGroupChanged( int )
   // Update word search results
   translateBox->setPopupEnabled( false );
   updateSuggestionList();
-  translateInputFinished( false );
+
+  if ( auto view = getCurrentArticleView() ) {
+    view->setCurrentGroupId( grg_id );
+    QString word = Folding::unescapeWildcardSymbols( view->getWord() );
+    respondToTranslationRequest( word, false );
+  }
 
   updateCurrentGroupProperty();
 
-  if( ftsDlg )
-    ftsDlg->setCurrentGroup( cfg.lastMainGroupId );
+  if ( ftsDlg )
+    ftsDlg->setCurrentGroup( grg_id );
 }
 
 void MainWindow::updateCurrentGroupProperty()
 {
   // We maintain currentGroup property so styles could use that to change
   // fonts based on group names
-  Instances::Group * grp =
-      groupInstances.findGroup( groupList->getCurrentGroup() );
+  Instances::Group * grp = groupInstances.findGroup( groupList->getCurrentGroup() );
 
-  if ( grp && translateLine->property( "currentGroup" ).toString() !=
-       grp->name )
-  {
+  if ( grp && translateLine->property( "currentGroup" ).toString() != grp->name ) {
     translateLine->setProperty( "currentGroup", grp->name );
-    wordList->setProperty( "currentGroup", grp->name );
+    ui.wordList->setProperty( "currentGroup", grp->name );
     QString ss = styleSheet();
 
     // Only update stylesheet if it mentions currentGroup, as updating the
     // stylesheet is a slow operation
-    if ( ss.contains("currentGroup") )
+    if ( ss.contains( "currentGroup" ) )
       setStyleSheet( ss );
   }
 }
@@ -2304,29 +2348,26 @@ void MainWindow::updateSuggestionList( QString const & newValue )
 {
   // If there's some status bar message present, clear it since it may be
   // about the previous search that has failed.
-  if ( !mainStatusBar->currentMessage().isEmpty() )
-  {
+  if ( !mainStatusBar->currentMessage().isEmpty() ) {
     mainStatusBar->clearMessage();
   }
 
   // If some word is selected in the word list, unselect it. This prevents
   // triggering a set of spurious activation signals when the list changes.
 
-  if ( wordList->selectionModel()->hasSelection() )
-    wordList->setCurrentItem( 0, QItemSelectionModel::Clear );
+  if ( ui.wordList->selectionModel()->hasSelection() )
+    ui.wordList->setCurrentItem( nullptr, QItemSelectionModel::Clear );
 
   QString req = newValue.trimmed();
 
-  if ( !req.size() )
-  {
+  if ( !req.size() ) {
     // An empty request always results in an empty result
     wordFinder.cancel();
-    wordList->clear();
-    wordList->unsetCursor();
+    ui.wordList->clear();
+    ui.wordList->unsetCursor();
 
     // Reset the noResults mark if it's on right now
-    if ( translateLine->property( "noResults" ).toBool() )
-    {
+    if ( translateLine->property( "noResults" ).toBool() ) {
       translateLine->setProperty( "noResults", false );
 
       Utils::Widget::setNoResultColor( translateLine, false );
@@ -2334,8 +2375,7 @@ void MainWindow::updateSuggestionList( QString const & newValue )
     return;
   }
 
-  wordList->setCursor( Qt::WaitCursor );
-
+  ui.wordList->setCursor( Qt::WaitCursor );
   wordFinder.prefixMatch( req, getActiveDicts() );
 }
 
@@ -2345,19 +2385,16 @@ void MainWindow::translateInputFinished( bool checkModifiers )
   respondToTranslationRequest( word, checkModifiers );
 }
 
-void MainWindow::respondToTranslationRequest( QString const & word,
-                                              bool checkModifiers, QString const & scrollTo )
+void MainWindow::respondToTranslationRequest( QString const & word, bool checkModifiers, QString const & scrollTo )
 {
-  if ( !word.isEmpty())
-  {
+  if ( !word.isEmpty() ) {
     Qt::KeyboardModifiers mods = QApplication::keyboardModifiers();
-    if ( checkModifiers && ( mods & (Qt::ControlModifier | Qt::ShiftModifier) ) )
+    if ( checkModifiers && ( mods & ( Qt::ControlModifier | Qt::ShiftModifier ) ) )
       addNewTab();
 
     showTranslationFor( word, 0, scrollTo );
 
-    if ( cfg.preferences.searchInDock )
-    {
+    if ( cfg.preferences.searchInDock ) {
       if ( ui.searchPane->isFloating() )
         activateWindow();
     }
@@ -2368,23 +2405,25 @@ void MainWindow::respondToTranslationRequest( QString const & word,
 
 void MainWindow::setInputLineText( QString text, WildcardPolicy wildcardPolicy, TranslateBoxPopup popupAction )
 {
-  if ( wildcardPolicy ==WildcardPolicy::EscapeWildcards )
+  if ( wildcardPolicy == WildcardPolicy::EscapeWildcards )
     text = Folding::escapeWildcardSymbols( text );
 
-  if ( popupAction == NoPopupChange || cfg.preferences.searchInDock )
+  if ( popupAction == NoPopupChange || cfg.preferences.searchInDock ) {
     translateLine->setText( text );
-  else
+  }
+  else {
     translateBox->setText( text, popupAction == EnablePopup );
+  }
+  GlobalBroadcaster::instance()->translateLineText = text;
 }
 
 void MainWindow::handleEsc()
 {
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
   if ( view && view->closeSearch() )
     return;
 
-  if( cfg.preferences.escKeyHidesMainWindow )
-  {
+  if ( cfg.preferences.escKeyHidesMainWindow ) {
     toggleMainWindow();
   }
   else
@@ -2393,13 +2432,11 @@ void MainWindow::handleEsc()
 
 void MainWindow::focusTranslateLine()
 {
-  if ( cfg.preferences.searchInDock )
-  {
+  if ( cfg.preferences.searchInDock ) {
     if ( ui.searchPane->isFloating() )
       ui.searchPane->activateWindow();
   }
-  else
-  {
+  else {
     if ( !isActiveWindow() )
       activateWindow();
   }
@@ -2415,22 +2452,21 @@ void MainWindow::applyMutedDictionariesState()
 
   updateSuggestionList();
 
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
-  if ( view )
-  {
+  if ( view ) {
     // Update active article view
     view->updateMutedContents();
   }
 }
 
-bool MainWindow::handleBackForwardMouseButtons ( QMouseEvent * event) {
+bool MainWindow::handleBackForwardMouseButtons( QMouseEvent * event )
+{
   if ( event->button() == Qt::XButton1 ) {
     backClicked();
     return true;
   }
-  else
-  if ( event->button() == Qt::XButton2 ) {
+  else if ( event->button() == Qt::XButton2 ) {
     forwardClicked();
     return true;
   }
@@ -2440,15 +2476,12 @@ bool MainWindow::handleBackForwardMouseButtons ( QMouseEvent * event) {
 
 bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
 {
-  if ( ev->type() == QEvent::ShortcutOverride
-       || ev->type() == QEvent::KeyPress )
-  {
-    QKeyEvent * ke = static_cast<QKeyEvent*>( ev );
+  if ( ev->type() == QEvent::ShortcutOverride || ev->type() == QEvent::KeyPress ) {
+    QKeyEvent * ke = static_cast< QKeyEvent * >( ev );
     // Handle F3/Shift+F3 shortcuts
-    if ( ke->key() == Qt::Key_F3 )
-    {
-      ArticleView  * view = getCurrentArticleView();
-      if ( view  && view->handleF3( obj, ev ) )
+    if ( ke->key() == Qt::Key_F3 ) {
+      ArticleView * view = getCurrentArticleView();
+      if ( view && view->handleF3( obj, ev ) )
         return true;
     }
 
@@ -2463,80 +2496,71 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
   }
 
   // when the main window is moved or resized, hide the word list suggestions
-  if ( obj == this && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) )
-  {
-    if ( !cfg.preferences.searchInDock )
-    {
-        translateBox->setPopupEnabled( false );
-        return false;
+  if ( obj == this && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) ) {
+    if ( !cfg.preferences.searchInDock ) {
+      translateBox->setPopupEnabled( false );
+      return false;
     }
   }
 
-  if ( obj == this && ev->type() == QEvent::WindowStateChange )
-  {
-    QWindowStateChangeEvent *stev = static_cast< QWindowStateChangeEvent *>( ev );
-    wasMaximized = ( stev->oldState() == Qt::WindowMaximized && isMinimized() );
+  if ( obj == this && ev->type() == QEvent::WindowStateChange ) {
+    QWindowStateChangeEvent * stev = static_cast< QWindowStateChangeEvent * >( ev );
+    wasMaximized                   = ( stev->oldState() == Qt::WindowMaximized && isMinimized() );
   }
 
   if ( ev->type() == QEvent::MouseButtonPress ) {
     QMouseEvent * event = static_cast< QMouseEvent * >( ev );
 
-    // clicks outside of the word list should hide it.
-    if (obj != translateBox->wordList() && obj != translateBox->wordList()->viewport()) {
-      translateBox->setPopupEnabled( false );
-    }
-
     return handleBackForwardMouseButtons( event );
   }
 
-  if (ev->type() == QEvent::KeyPress)
-  {
-    QKeyEvent *keyevent = static_cast<QKeyEvent*>(ev);
+  if ( ev->type() == QEvent::KeyPress ) {
+    auto keyevent = dynamic_cast< QKeyEvent * >( ev );
 
-    bool handleCtrlTab = ( obj == translateLine
-                           || obj == wordList
-                           || obj == ui.historyList
-                           || obj == ui.favoritesTree
-                           || obj == ui.dictsList
-                           || obj == groupList );
+    bool handleCtrlTab = ( obj == translateLine || obj == ui.wordList || obj == ui.historyList
+                           || obj == ui.favoritesTree || obj == ui.dictsList || obj == groupList );
 
-    if (keyevent->modifiers() == Qt::ControlModifier && keyevent->key() == Qt::Key_Tab)
-    {
-      if (cfg.preferences.mruTabOrder)
-      {
+    if ( keyevent->modifiers() == Qt::ControlModifier && keyevent->key() == Qt::Key_Tab ) {
+      if ( cfg.preferences.mruTabOrder ) {
         ctrlTabPressed();
         return true;
       }
-      else if( handleCtrlTab )
-      {
+      else if ( handleCtrlTab ) {
         QApplication::sendEvent( ui.tabWidget, ev );
         return true;
       }
       return false;
     }
-    if( handleCtrlTab && keyevent->matches( QKeySequence::PreviousChild ) ) // Handle only Ctrl+Shist+Tab here because Ctrl+Tab was already handled before
+    if ( handleCtrlTab
+         && keyevent->matches(
+           QKeySequence::
+             PreviousChild ) ) // Handle only Ctrl+Shist+Tab here because Ctrl+Tab was already handled before
     {
       QApplication::sendEvent( ui.tabWidget, ev );
       return true;
     }
   }
 
-  if ( obj == translateLine )
-  {
-    if ( ev->type() == QEvent::KeyPress )
-    {
+  if ( obj == translateLine ) {
+    if ( ev->type() == QEvent::KeyPress ) {
       QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
 
-      if ( cfg.preferences.searchInDock )
-      {
-        if ( keyEvent->matches( QKeySequence::MoveToNextLine ) && wordList->count() )
-        {
-          wordList->setFocus( Qt::ShortcutFocusReason );
-          wordList->setCurrentRow( 0, QItemSelectionModel::ClearAndSelect );
+      if ( cfg.preferences.searchInDock ) {
+        if ( keyEvent->matches( QKeySequence::MoveToNextLine ) && ui.wordList->count() ) {
+          ui.wordList->setFocus( Qt::ShortcutFocusReason );
+          ui.wordList->setCurrentRow( 0, QItemSelectionModel::ClearAndSelect );
           return true;
         }
       }
+    }
 
+    if ( ev->type() == QEvent::FocusIn ) {
+
+      // select all on mouse click
+      if ( const auto focusEvent = dynamic_cast< QFocusEvent * >( ev ); focusEvent->reason() == Qt::MouseFocusReason ) {
+        QTimer::singleShot( 0, this, SLOT( focusTranslateLine() ) );
+      }
+      return false;
     }
 
     if ( ev->type() == QEvent::Resize ) {
@@ -2545,25 +2569,18 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
       return false;
     }
   }
-  else
-  if ( obj == wordList )
-  {
+  else if ( obj == ui.wordList ) {
     if ( ev->type() == QEvent::KeyPress ) {
       QKeyEvent * keyEvent = static_cast< QKeyEvent * >( ev );
 
-      if ( keyEvent->matches( QKeySequence::MoveToPreviousLine ) &&
-           !wordList->currentRow() )
-      {
-        wordList->setCurrentRow( 0, QItemSelectionModel::Clear );
+      if ( keyEvent->matches( QKeySequence::MoveToPreviousLine ) && !ui.wordList->currentRow() ) {
+        ui.wordList->setCurrentRow( 0, QItemSelectionModel::Clear );
         translateLine->setFocus( Qt::ShortcutFocusReason );
         return true;
       }
 
-      if ( keyEvent->matches( QKeySequence::InsertParagraphSeparator ) &&
-           wordList->selectedItems().size() )
-      {
-        if ( cfg.preferences.searchInDock )
-        {
+      if ( keyEvent->matches( QKeySequence::InsertParagraphSeparator ) && ui.wordList->selectedItems().size() ) {
+        if ( cfg.preferences.searchInDock ) {
           if ( ui.searchPane->isFloating() )
             activateWindow();
         }
@@ -2577,12 +2594,11 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
 
   if ( ev->type() == QEvent::KeyPress && obj != translateLine ) {
 
-    if ( const auto key_event = dynamic_cast< QKeyEvent * >(ev);  key_event->modifiers() == Qt::NoModifier ) {
+    if ( const auto key_event = dynamic_cast< QKeyEvent * >( ev ); key_event->modifiers() == Qt::NoModifier ) {
       const QString text = key_event->text();
 
-      if ( Utils::ignoreKeyEvent( key_event ) ||
-        key_event->key() == Qt::Key_Return ||
-        key_event->key() == Qt::Key_Enter )
+      if ( Utils::ignoreKeyEvent( key_event ) || key_event->key() == Qt::Key_Return
+           || key_event->key() == Qt::Key_Enter )
         return false; // Those key have other uses than to start typing
       // or don't make sense
       if ( !text.isEmpty() ) {
@@ -2590,7 +2606,6 @@ bool MainWindow::eventFilter( QObject * obj, QEvent * ev )
         return true;
       }
     }
-
   }
 
   return QMainWindow::eventFilter( obj, ev );
@@ -2608,10 +2623,9 @@ void MainWindow::wordListItemActivated( QListWidgetItem * item )
 
 void MainWindow::wordListSelectionChanged()
 {
-  QList< QListWidgetItem * > selected = wordList->selectedItems();
+  QList< QListWidgetItem * > selected = ui.wordList->selectedItems();
 
-  if ( selected.size() )
-  {
+  if ( selected.size() ) {
     wordListSelChanged = true;
     showTranslationFor( selected.front()->text() );
   }
@@ -2625,8 +2639,7 @@ void MainWindow::dictsListItemActivated( QListWidgetItem * item )
 void MainWindow::dictsListSelectionChanged()
 {
   QList< QListWidgetItem * > selected = ui.dictsList->selectedItems();
-  if( selected.size() )
-  {
+  if ( selected.size() ) {
     jumpToDictionary( selected.front() );
   }
 }
@@ -2634,8 +2647,7 @@ void MainWindow::dictsListSelectionChanged()
 void MainWindow::jumpToDictionary( QListWidgetItem * item, bool force )
 {
   ArticleView * view = getCurrentArticleView();
-  if ( view )
-  {
+  if ( view ) {
     view->jumpToDictionary( item->data( Qt::UserRole ).toString(), force );
   }
 }
@@ -2645,8 +2657,7 @@ void MainWindow::openLinkInNewTab( QUrl const & url,
                                    QString const & fromArticle,
                                    Contexts const & contexts )
 {
-  createNewTab( !cfg.preferences.newTabsOpenInBackground, "" )->
-      openLink( url, referrer, fromArticle, contexts );
+  createNewTab( !cfg.preferences.newTabsOpenInBackground, "" )->openLink( url, referrer, fromArticle, contexts );
 }
 
 void MainWindow::showDefinitionInNewTab( QString const & word,
@@ -2654,26 +2665,23 @@ void MainWindow::showDefinitionInNewTab( QString const & word,
                                          QString const & fromArticle,
                                          Contexts const & contexts )
 {
-  createNewTab( !cfg.preferences.newTabsOpenInBackground, word )->
-      showDefinition( word, group, fromArticle, contexts );
+  createNewTab( !cfg.preferences.newTabsOpenInBackground, word )->showDefinition( word, group, fromArticle, contexts );
 }
 
 void MainWindow::activeArticleChanged( ArticleView const * view, QString const & id )
 {
-  if( view != getCurrentArticleView() )
+  if ( view != getCurrentArticleView() )
     return; // It was background action
 
   // select the row with the corresponding id
-  for (int i = 0; i < ui.dictsList->count(); ++i) {
+  for ( int i = 0; i < ui.dictsList->count(); ++i ) {
     QListWidgetItem * w = ui.dictsList->item( i );
-    QString dictId = w->data( Qt::UserRole ).toString();
+    QString dictId      = w->data( Qt::UserRole ).toString();
 
-    if ( dictId == id )
-    {
+    if ( dictId == id ) {
       // update the current row, but only if necessary
-      if ( i != ui.dictsList->currentRow() )
-      {
-        ui.dictsList->setCurrentRow(i);
+      if ( i != ui.dictsList->currentRow() ) {
+        ui.dictsList->setCurrentRow( i );
       }
       return;
     }
@@ -2682,13 +2690,11 @@ void MainWindow::activeArticleChanged( ArticleView const * view, QString const &
 
 void MainWindow::typingEvent( QString const & t )
 {
-  if ( t == "\n" || t == "\r" )
-  {
-    if( translateLine->isEnabled() )
+  if ( t == "\n" || t == "\r" ) {
+    if ( translateLine->isEnabled() )
       focusTranslateLine();
   }
-  else
-  {
+  else {
     if ( ( cfg.preferences.searchInDock && ui.searchPane->isFloating() ) || ui.dictsPane->isFloating() )
       ui.searchPane->activateWindow();
 
@@ -2720,17 +2726,13 @@ void MainWindow::showHistoryItem( QString const & word )
   history.enableAdd( cfg.preferences.storeHistory );
 }
 
-void MainWindow::showTranslationFor( QString const & word,
-                                     unsigned inGroup,
-                                     QString const & scrollTo )
+void MainWindow::showTranslationFor( QString const & word, unsigned inGroup, QString const & scrollTo )
 {
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
   navPronounce->setEnabled( false );
 
-  unsigned group = inGroup ? inGroup :
-                   ( groupInstances.empty() ? 0 :
-                        groupInstances[ groupList->currentIndex() ].id );
+  unsigned group = inGroup ? inGroup : ( groupInstances.empty() ? 0 : groupInstances[ groupList->currentIndex() ].id );
 
   view->showDefinition( word, group, scrollTo );
 
@@ -2753,19 +2755,15 @@ void MainWindow::showTranslationForDicts( QString const & inWord,
                         ignoreDiacritics );
 }
 
-#ifdef HAVE_X11
-void MainWindow::toggleMainWindow( bool onlyShow, bool byIconClick )
-#else
 void MainWindow::toggleMainWindow( bool onlyShow )
-#endif
 {
   bool shown = false;
 
-  if( !cfg.preferences.searchInDock )
+  if ( !cfg.preferences.searchInDock )
     translateBox->setPopupEnabled( false );
 
-  if ( !isVisible() )
-  {
+  qDebug() << "Current state:" << isVisible() << isMinimized() << isActiveWindow() << onlyShow;
+  if ( !isVisible() ) {
     show();
 
     qApp->setActiveWindow( this );
@@ -2773,10 +2771,8 @@ void MainWindow::toggleMainWindow( bool onlyShow )
     raise();
     shown = true;
   }
-  else
-  if ( isMinimized() )
-  {
-    if( wasMaximized )
+  else if ( isMinimized() ) {
+    if ( wasMaximized )
       showMaximized();
     else
       showNormal();
@@ -2784,53 +2780,48 @@ void MainWindow::toggleMainWindow( bool onlyShow )
     raise();
     shown = true;
   }
-  else if( !isActiveWindow() ) {
+  else if ( !isActiveWindow() ) {
     qApp->setActiveWindow( this );
-    if( cfg.preferences.raiseWindowOnSearch ) {
+    if ( cfg.preferences.raiseWindowOnSearch ) {
       raise();
       activateWindow();
     }
     shown = true;
   }
-  else
-  if ( !onlyShow )
-  {
+  else if ( !onlyShow ) {
 
-// On Windows and Linux, a hidden window won't show a task bar icon
-// When trayicon is enabled, the duplication is unneeded
+    // On Windows and Linux, a hidden window won't show a task bar icon
+    // When trayicon is enabled, the duplication is unneeded
 
-// On macOS, a hidden window will still show on the Dock,
-// but click it won't bring it back, thus we can only minimize it.
+    // On macOS, a hidden window will still show on the Dock,
+    // but click it won't bring it back, thus we can only minimize it.
 
 #ifdef Q_OS_MAC
-      if (cfg.preferences.enableTrayIcon)
-          showMinimized();
+    if ( cfg.preferences.enableTrayIcon )
+      showMinimized();
 #else
-    if (cfg.preferences.enableTrayIcon)
-        hide();
+    if ( cfg.preferences.enableTrayIcon )
+      hide();
     else
-        showMinimized();
+      showMinimized();
 #endif
 
 
-    if( headwordsDlg )
+    if ( headwordsDlg )
       headwordsDlg->hide();
 
-    if( ftsDlg )
+    if ( ftsDlg )
       ftsDlg->hide();
-
   }
 
-  if ( shown )
-  {
-    if( headwordsDlg )
+  if ( shown ) {
+    if ( headwordsDlg )
       headwordsDlg->show();
 
-    if( ftsDlg )
+    if ( ftsDlg )
       ftsDlg->show();
 
     focusTranslateLine();
-
   }
 }
 
@@ -2838,35 +2829,31 @@ void MainWindow::installHotKeys()
 {
   hotkeyWrapper.reset(); // Remove the old one
 
-  if ( cfg.preferences.enableMainWindowHotkey ||
-       cfg.preferences.enableClipboardHotkey )
-  {
-    try
-    {
-      hotkeyWrapper =  std::make_shared<HotkeyWrapper>( this );
+  if ( cfg.preferences.enableMainWindowHotkey || cfg.preferences.enableClipboardHotkey ) {
+    try {
+      hotkeyWrapper = std::make_shared< HotkeyWrapper >( this );
     }
-    catch( HotkeyWrapper::exInit & )
-    {
-      QMessageBox::critical( this, "GoldenDict",
-        tr( "Failed to initialize hotkeys monitoring mechanism.<br>"
-            "Make sure your XServer has RECORD extension turned on." ) );
+    catch ( HotkeyWrapper::exInit & ) {
+      QMessageBox::critical( this,
+                             "GoldenDict",
+                             tr( "Failed to initialize hotkeys monitoring mechanism.<br>"
+                                 "Make sure your XServer has RECORD extension turned on." ) );
 
       return;
     }
 
     if ( cfg.preferences.enableMainWindowHotkey )
-      hotkeyWrapper->setGlobalKey( cfg.preferences.mainWindowHotkey,0 );
+      hotkeyWrapper->setGlobalKey( cfg.preferences.mainWindowHotkey, 0 );
 
-    if ( cfg.preferences.enableClipboardHotkey && !enableScanningAction->isChecked() )
-    {
-      hotkeyWrapper->setGlobalKey( cfg.preferences.clipboardHotkey,1 );
+    if ( cfg.preferences.enableClipboardHotkey && !enableScanningAction->isChecked() ) {
+      hotkeyWrapper->setGlobalKey( cfg.preferences.clipboardHotkey, 1 );
     }
 
     connect( hotkeyWrapper.get(),
-      &HotkeyWrapper::hotkeyActivated,
-      this,
-      &MainWindow::hotKeyActivated,
-      Qt::AutoConnection );
+             &HotkeyWrapper::hotkeyActivated,
+             this,
+             &MainWindow::hotKeyActivated,
+             Qt::AutoConnection );
   }
 }
 
@@ -2874,9 +2861,7 @@ void MainWindow::hotKeyActivated( int hk )
 {
   if ( !hk )
     toggleMainWindow();
-  else
-  if ( scanPopup )
-  {
+  else if ( scanPopup ) {
 #ifdef HAVE_X11
     // When the user requests translation with the Ctrl+C+C hotkey in certain apps
     // on some GNU/Linux systems, GoldenDict appears to handle Ctrl+C+C before the
@@ -2891,157 +2876,83 @@ void MainWindow::hotKeyActivated( int hk )
   }
 }
 
-void MainWindow::prepareNewReleaseChecks()
+void MainWindow::checkNewRelease()
 {
-  if ( cfg.preferences.checkForNewReleases )
-  {
-    QDateTime now = QDateTime::currentDateTime();
+  // Limit release check to 1 per day.
+  if ( cfg.timeForNewReleaseCheck < QDateTime::currentDateTime().addDays( 1 ) ) {
+    return;
+  }
 
-    if ( !cfg.timeForNewReleaseCheck.isValid() ||
-         now.daysTo( cfg.timeForNewReleaseCheck ) > 2 )
-    {
-      // The date is invalid, or the check is set to happen more than 2 days
-      // in the future -- fix that.
-      cfg.timeForNewReleaseCheck = now.addDays( 2 );
+  QNetworkRequest github_release_api;
+  github_release_api.setUrl( QUrl( "https://api.github.com/repos/xiaoyifang/goldendict-ng/releases/latest" ) );
+  github_release_api.setRawHeader( QByteArray( "Accept" ), QByteArray( "application/vnd.github+json" ) );
+  // github_release_api.setRawHeader( QByteArray( "Authorization" ), QByteArray( "" ) );
+  github_release_api.setRawHeader( QByteArray( "X-GitHub-Api-Version" ), QByteArray( "2022-11-28" ) );
+
+  auto * github_reply = dictNetMgr.get( github_release_api ); // will be marked as deleteLater when reply finished.
+
+  QObject::connect( github_reply, &QNetworkReply::finished, [ github_reply, this ]() {
+    if ( github_reply->error() != QNetworkReply::NoError ) {
+      qWarning() << "Version check failed: " << github_reply->errorString();
     }
+    else {
+      auto latest_release = QJsonDocument::fromJson( github_reply->readAll() );
+      if ( !latest_release.isNull() ) {
+        const QJsonValue tag_name = latest_release[ "tag_name" ];
+        const QJsonValue html_url = latest_release[ "html_url" ];
 
-    int secsToCheck = now.secsTo( cfg.timeForNewReleaseCheck );
+        if ( tag_name.isString() && html_url.isString() ) {
+          QString latestVersion = tag_name.toString().mid( 1, 8 );
+          QString downloadUrl   = html_url.toString();
 
-    if ( secsToCheck < 1 )
-      secsToCheck = 1;
+          if ( latestVersion > PROGRAM_VERSION && latestVersion != cfg.skippedRelease ) {
+            QMessageBox msg( QMessageBox::Information,
+                             tr( "New Release Available" ),
+                             tr( "Version <b>%1</b> of GoldenDict is now available for download.<br>"
+                                 "Click <b>Download</b> to get to the download page." )
+                               .arg( latestVersion ),
+                             QMessageBox::NoButton,
+                             this );
 
-    newReleaseCheckTimer.setSingleShot( true );
-    newReleaseCheckTimer.start( secsToCheck * 1000 );
-  }
-  else
-    newReleaseCheckTimer.stop(); // In case it was started before
-}
+            QPushButton * dload = msg.addButton( tr( "Download" ), QMessageBox::AcceptRole );
+            QPushButton * skip  = msg.addButton( tr( "Skip This Release" ), QMessageBox::DestructiveRole );
+            msg.addButton( QMessageBox::Cancel );
 
-void MainWindow::checkForNewRelease()
-{
-  if( latestReleaseReply )
-  {
-    disconnect( latestReleaseReply, 0, 0, 0 );
-    latestReleaseReply->deleteLater();
-  }
-  latestReleaseReply = 0;
+            msg.exec();
 
-  QNetworkRequest req(
-    QUrl( "https://github.com/xiaoyifang/goldendict/releases") );
-
-  latestReleaseReply = articleNetMgr.get( req );
-
-  connect( latestReleaseReply,
-    &QNetworkReply::finished,
-    this,
-    &MainWindow::latestReleaseReplyReady,
-    Qt::QueuedConnection );
-}
-
-void MainWindow::latestReleaseReplyReady()
-{
-  if ( !latestReleaseReply )
-    return; // Some stray signal
-
-  bool success = false;
-  QString latestVersion, downloadUrl;
-
-  // See if we succeeded
-
-  if ( latestReleaseReply->error() == QNetworkReply::NoError )
-  {
-    QString latestReleaseInfo = QString::fromUtf8( latestReleaseReply->readAll() );
-    QRegularExpression firstReleaseAnchor (R"(<a\s+[^>]*?class=\"Link--primary\"[^>]*?>[^<]*?<\/a>)",QRegularExpression::DotMatchesEverythingOption|QRegularExpression::CaseInsensitiveOption);
-    auto match = firstReleaseAnchor.match(latestReleaseInfo);
-    if(match.hasMatch()){
-      auto releaseAnchor = match.captured();
-      QRegularExpression extractReleaseRx (R"(<a\s+.*?href=\"([^\"]*)\".*?>(.*?)<\/a>)",QRegularExpression::DotMatchesEverythingOption|QRegularExpression::CaseInsensitiveOption);
-      auto matchParts = extractReleaseRx.match(releaseAnchor);
-      if(matchParts.hasMatch()){
-        latestVersion = matchParts.captured(2);
-        QString prefix("GoldenDict-ng-v");
-        if(latestVersion.startsWith(prefix)){
-          latestVersion = latestVersion.mid(prefix.length());
+            if ( msg.clickedButton() == dload )
+              QDesktopServices::openUrl( QUrl( downloadUrl ) );
+            else if ( msg.clickedButton() == skip ) {
+              cfg.skippedRelease = latestVersion;
+            }
+          }
         }
-        downloadUrl = matchParts.captured(1);
-        if(downloadUrl.startsWith("/")){
-          downloadUrl = latestReleaseReply->request().url().host() + downloadUrl;
-        }
-        success = true;
       }
     }
-  }
 
-  disconnect( latestReleaseReply, 0, 0, 0 );
-  latestReleaseReply->deleteLater();
-  latestReleaseReply = 0;
-
-  if ( !success )
-  {
-    // Failed -- reschedule to check in two hours
-    newReleaseCheckTimer.start( 2 * 60 * 60 * 1000 );
-
-    GD_DPRINTF( "Failed to check program version, retry in two hours\n" );
-  }
-  else
-  {
-    // Success -- reschedule for a normal check and save config
-    cfg.timeForNewReleaseCheck = QDateTime();
-
-    prepareNewReleaseChecks();
+    cfg.timeForNewReleaseCheck = QDateTime::currentDateTime();
 
     Config::save( cfg );
 
-    GD_DPRINTF( "Program version's check successful, current version is %ls\n",
-                latestVersion.toStdWString().c_str() );
-  }
-
-  if ( success && latestVersion > PROGRAM_VERSION && latestVersion != cfg.skippedRelease )
-  {
-    QMessageBox msg( QMessageBox::Information,
-                     tr( "New Release Available" ),
-                     tr( "Version <b>%1</b> of GoldenDict is now available for download.<br>"
-                         "Click <b>Download</b> to get to the download page." ).arg( latestVersion ),
-                     QMessageBox::NoButton,
-                     this );
-
-    QPushButton * dload = msg.addButton( tr( "Download" ), QMessageBox::AcceptRole );
-    QPushButton * skip = msg.addButton( tr( "Skip This Release" ), QMessageBox::DestructiveRole );
-    msg.addButton( QMessageBox::Cancel );
-
-    msg.exec();
-
-    if ( msg.clickedButton() == dload )
-      QDesktopServices::openUrl( QUrl( downloadUrl ) );
-    else
-    if ( msg.clickedButton() == skip )
-    {
-      cfg.skippedRelease = latestVersion;
-      Config::save( cfg );
-    }
-  }
+    github_reply->deleteLater();
+  } );
 }
 
 void MainWindow::trayIconActivated( QSystemTrayIcon::ActivationReason r )
 {
-  switch(r) {
+  switch ( r ) {
     case QSystemTrayIcon::Trigger:
       // Left click toggles the visibility of main window
-#ifdef HAVE_X11
-      toggleMainWindow( false, true );
-#else
       toggleMainWindow();
-#endif
       break;
 
     case QSystemTrayIcon::MiddleClick:
       // Middle mouse click on Tray translates selection
       // it is functional like as stardict
-        scanPopup->translateWordFromSelection();
+      scanPopup->translateWordFromSelection();
       break;
     default:
       break;
-
   }
 }
 
@@ -3067,7 +2978,7 @@ void MainWindow::visitForum()
 
 void MainWindow::showAbout()
 {
-  About about(this, &dictionaries);
+  About about( this, &dictionaries );
 
   about.show();
   about.exec();
@@ -3077,8 +2988,7 @@ void MainWindow::showDictBarNamesTriggered()
 {
   bool show = showDictBarNamesAction.isChecked();
 
-  dictionaryBar.setToolButtonStyle( show ? Qt::ToolButtonTextBesideIcon :
-                                           Qt::ToolButtonIconOnly );
+  dictionaryBar.setToolButtonStyle( show ? Qt::ToolButtonTextBesideIcon : Qt::ToolButtonIconOnly );
   cfg.showingDictBarNames = show;
 }
 
@@ -3086,8 +2996,8 @@ void MainWindow::useSmallIconsInToolbarsTriggered()
 {
   bool useSmallIcons = useSmallIconsInToolbarsAction.isChecked();
 
-  int extent = useSmallIcons ? QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) :
-                               QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+  int extent = useSmallIcons ? QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
+                               QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
 
   navToolbar->setIconSize( QSize( extent, extent ) );
 
@@ -3101,22 +3011,19 @@ void MainWindow::useSmallIconsInToolbarsTriggered()
   scanPopup->setDictionaryIconSize();
 }
 
-void MainWindow::toggleMenuBarTriggered(bool announce)
+void MainWindow::toggleMenuBarTriggered( bool announce )
 {
   cfg.preferences.hideMenubar = !toggleMenuBarAction.isChecked();
 
-  if ( announce )
-  {
-    if ( cfg.preferences.hideMenubar )
-    {
-      mainStatusBar->showMessage(
-            tr( "You have chosen to hide a menubar. Use %1 to show it back." )
-            .arg( QString( "<b>%1</b>" ) ).arg( tr( "Ctrl+M" ) ),
-            10000,
-            QPixmap( ":/icons/warning.png" ) );
+  if ( announce ) {
+    if ( cfg.preferences.hideMenubar ) {
+      mainStatusBar->showMessage( tr( "You have chosen to hide a menubar. Use %1 to show it back." )
+                                    .arg( QString( "<b>%1</b>" ) )
+                                    .arg( tr( "Ctrl+M" ) ),
+                                  10000,
+                                  QPixmap( ":/icons/warning.png" ) );
     }
-    else
-    {
+    else {
       mainStatusBar->clearMessage();
     }
   }
@@ -3125,26 +3032,21 @@ void MainWindow::toggleMenuBarTriggered(bool announce)
   // and either add them to the main window or remove them,
   // depending on the menubar state.
 
-  QList<QMenu *> allMenus = menuBar()->findChildren<QMenu *>();
-  QListIterator<QMenu *> menuIter( allMenus );
-  while( menuIter.hasNext() )
-  {
-    QMenu * menu = menuIter.next();
-    QList<QAction *> allMenuActions = menu->actions();
-    QListIterator<QAction *> actionsIter( allMenuActions );
-    while( actionsIter.hasNext() )
-    {
+  QList< QMenu * > allMenus = menuBar()->findChildren< QMenu * >();
+  QListIterator< QMenu * > menuIter( allMenus );
+  while ( menuIter.hasNext() ) {
+    QMenu * menu                      = menuIter.next();
+    QList< QAction * > allMenuActions = menu->actions();
+    QListIterator< QAction * > actionsIter( allMenuActions );
+    while ( actionsIter.hasNext() ) {
       QAction * action = actionsIter.next();
-      if ( !action->shortcut().isEmpty() )
-      {
-        if ( cfg.preferences.hideMenubar )
-        {
+      if ( !action->shortcut().isEmpty() ) {
+        if ( cfg.preferences.hideMenubar ) {
           // add all menubar actions to the main window,
           // before we hide the menubar
           addAction( action );
         }
-        else
-        {
+        else {
           // remove all menubar actions from the main window
           removeAction( action );
         }
@@ -3153,7 +3055,7 @@ void MainWindow::toggleMenuBarTriggered(bool announce)
   }
 
   menuBar()->setVisible( !cfg.preferences.hideMenubar );
-  beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar);
+  beforeOptionsSeparator->setVisible( cfg.preferences.hideMenubar );
   menuButtonAction->setVisible( cfg.preferences.hideMenubar );
 }
 
@@ -3168,26 +3070,24 @@ void MainWindow::on_newTab_triggered()
   addNewTab();
 }
 
-void MainWindow::setAutostart(bool autostart)
+void MainWindow::setAutostart( bool autostart )
 {
 #if defined Q_OS_WIN32
-    QSettings reg("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run",
-                  QSettings::NativeFormat);
-    if (autostart) {
-        QString app_fname = QString("\"%1\"").arg( QCoreApplication::applicationFilePath() );
-        app_fname.replace("/", "\\");
-        reg.setValue(QCoreApplication::applicationName(), app_fname);
-    }
-    else {
-        reg.remove(QCoreApplication::applicationName());
-    }
-    reg.sync();
+  QSettings reg( "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run", QSettings::NativeFormat );
+  if ( autostart ) {
+    QString app_fname = QString( "\"%1\"" ).arg( QCoreApplication::applicationFilePath() );
+    app_fname.replace( "/", "\\" );
+    reg.setValue( ApplicationSettingName, app_fname );
+  }
+  else {
+    reg.remove( ApplicationSettingName );
+  }
+  reg.sync();
 #elif defined HAVE_X11
   const QString destinationPath = QDir::homePath() + "/.config/autostart/goldendict-owned-by-preferences.desktop";
-  if( autostart == QFile::exists( destinationPath ) )
+  if ( autostart == QFile::exists( destinationPath ) )
     return; // Nothing to do.
-  if( autostart )
-  {
+  if ( autostart ) {
     const QString sourcePath = Config::getProgramDataDir() + "../applications/org.xiaoyifang.GoldenDict_NG.desktop";
     QFile::copy( sourcePath, destinationPath );
   }
@@ -3203,23 +3103,21 @@ void MainWindow::on_actionCloseToTray_triggered()
 
 void MainWindow::on_pageSetup_triggered()
 {
-  if ( getPrinter().isValid() )
-  {
+  if ( getPrinter().isValid() ) {
     QPageSetupDialog dialog( &getPrinter(), this );
 
     dialog.exec();
   }
   else
-    QMessageBox::critical( this, tr( "Page Setup" ),
-                           tr( "No printer is available. Please install one first." ) );
+    QMessageBox::critical( this, tr( "Page Setup" ), tr( "No printer is available. Please install one first." ) );
 }
 
 void MainWindow::on_printPreview_triggered()
 {
   QPrinter printer;
-  QPrintPreviewDialog dialog(  &printer, this );
-  auto combox = dialog.findChild< QComboBox *>();
-  int index=combox->findText( "100%" );
+  QPrintPreviewDialog dialog( &printer, this );
+  auto combox = dialog.findChild< QComboBox * >();
+  int index   = combox->findText( "100%" );
   combox->setCurrentIndex( index );
 
   connect( &dialog, &QPrintPreviewDialog::paintRequested, this, &MainWindow::printPreviewPaintRequested );
@@ -3232,33 +3130,35 @@ void MainWindow::on_print_triggered()
 {
   QPrintDialog dialog( &getPrinter(), this );
 
-  dialog.setWindowTitle( tr( "Print Article") );
+  dialog.setWindowTitle( tr( "Print Article" ) );
 
   if ( dialog.exec() != QDialog::Accepted )
-   return;
+    return;
 
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
   view->print( &getPrinter() );
 }
 
 void MainWindow::printPreviewPaintRequested( QPrinter * printer )
 {
-  ArticleView *view = getCurrentArticleView();
+  ArticleView * view = getCurrentArticleView();
 
   view->print( printer );
 }
 
-static void filterAndCollectResources( QString & html, QRegExp & rx, const QString & sep,
-                                       const QString & folder, set< QByteArray > & resourceIncluded,
+static void filterAndCollectResources( QString & html,
+                                       QRegExp & rx,
+                                       const QString & sep,
+                                       const QString & folder,
+                                       set< QByteArray > & resourceIncluded,
                                        vector< pair< QUrl, QString > > & downloadResources )
 {
   int pos = 0;
 
-  while ( ( pos = rx.indexIn( html, pos ) ) != -1 )
-  {
+  while ( ( pos = rx.indexIn( html, pos ) ) != -1 ) {
     QUrl url( rx.cap( 1 ) );
-    QString host = url.host();
+    QString host         = url.host();
     QString resourcePath = Utils::Url::path( url );
 
     if ( !host.startsWith( '/' ) )
@@ -3269,14 +3169,13 @@ static void filterAndCollectResources( QString & html, QRegExp & rx, const QStri
     QCryptographicHash hash( QCryptographicHash::Md5 );
     hash.addData( rx.cap().toUtf8() );
 
-    if ( resourceIncluded.insert( hash.result() ).second )
-    {
+    if ( resourceIncluded.insert( hash.result() ).second ) {
       // Gather resource information (url, filename) to be download later
-      downloadResources.push_back( pair<QUrl, QString>( url, folder + host + resourcePath ) );
+      downloadResources.push_back( pair< QUrl, QString >( url, folder + host + resourcePath ) );
     }
 
     // Modify original url, set to the native one
-    resourcePath = QString::fromLatin1( QUrl::toPercentEncoding( resourcePath, "/" ) );
+    resourcePath   = QString::fromLatin1( QUrl::toPercentEncoding( resourcePath, "/" ) );
     QString newUrl = sep + QDir( folder ).dirName() + host + resourcePath + sep;
     html.replace( pos, rx.cap().length(), newUrl );
     pos += newUrl.length();
@@ -3296,12 +3195,11 @@ void MainWindow::on_saveArticle_triggered()
   fileName += ".html";
   QString savePath;
 
-  if( cfg.articleSavePath.isEmpty() )
+  if ( cfg.articleSavePath.isEmpty() )
     savePath = QDir::homePath();
-  else
-  {
+  else {
     savePath = QDir::fromNativeSeparators( cfg.articleSavePath );
-    if( !QDir( savePath ).exists() )
+    if ( !QDir( savePath ).exists() )
       savePath = QDir::homePath();
   }
 
@@ -3322,95 +3220,85 @@ void MainWindow::on_saveArticle_triggered()
   // The " (*.html)" part of filters[i] is absent from selectedFilter in Qt 5.
   bool const complete = filters.at( 0 ).startsWith( selectedFilter );
 
-  if( fileName.isEmpty() )
+  if ( fileName.isEmpty() )
     return;
 
-  view->toHtml(
-    [ = ]( QString & html ) mutable
-    {
-      QFile file( fileName );
-      if( !file.open( QIODevice::WriteOnly ) )
-      {
-        QMessageBox::critical( this, tr( "Error" ), tr( "Can't save article: %1" ).arg( file.errorString() ) );
+  view->toHtml( [ = ]( QString & html ) mutable {
+    QFile file( fileName );
+    if ( !file.open( QIODevice::WriteOnly ) ) {
+      QMessageBox::critical( this, tr( "Error" ), tr( "Can't save article: %1" ).arg( file.errorString() ) );
+    }
+    else {
+      QFileInfo fi( fileName );
+      cfg.articleSavePath = QDir::toNativeSeparators( fi.absoluteDir().absolutePath() );
+
+      // Convert internal links
+
+      QRegExp rx3( "href=\"(bword:|gdlookup://localhost/)([^\"]+)\"" );
+      int pos = 0;
+      QRegularExpression anchorRx( "(g[0-9a-f]{32}_)[0-9a-f]+_" );
+      while ( ( pos = rx3.indexIn( html, pos ) ) != -1 ) {
+        QString name = QUrl::fromPercentEncoding( rx3.cap( 2 ).simplified().toLatin1() );
+        QString anchor;
+        name.replace( "?gdanchor=", "#" );
+        int n = name.indexOf( '#' );
+        if ( n > 0 ) {
+          anchor = name.mid( n );
+          name.truncate( n );
+          anchor.replace( anchorRx, "\\1" ); // MDict anchors
+        }
+        name.replace( rxName, "_" );
+        name = QString( "href=\"" ) + QUrl::toPercentEncoding( name ) + ".html" + anchor + "\"";
+        html.replace( pos, rx3.cap().length(), name );
+        pos += name.length();
       }
-      else
-      {
-        QFileInfo fi( fileName );
-        cfg.articleSavePath = QDir::toNativeSeparators( fi.absoluteDir().absolutePath() );
 
-        // Convert internal links
+      // MDict anchors
+      QRegularExpression anchorLinkRe(
+        R"((<\s*a\s+[^>]*\b(?:name|id)\b\s*=\s*["']*g[0-9a-f]{32}_)([0-9a-f]+_)(?=[^"']))",
+        QRegularExpression::PatternOption::CaseInsensitiveOption | QRegularExpression::UseUnicodePropertiesOption );
+      html.replace( anchorLinkRe, "\\1" );
 
-        QRegExp rx3( "href=\"(bword:|gdlookup://localhost/)([^\"]+)\"" );
-        int pos = 0;
-        QRegularExpression anchorRx( "(g[0-9a-f]{32}_)[0-9a-f]+_" );
-        while( ( pos = rx3.indexIn( html, pos ) ) != -1 )
-        {
-          QString name = QUrl::fromPercentEncoding( rx3.cap( 2 ).simplified().toLatin1() );
-          QString anchor;
-          name.replace( "?gdanchor=", "#" );
-          int n = name.indexOf( '#' );
-          if( n > 0 )
-          {
-            anchor = name.mid( n );
-            name.truncate( n );
-            anchor.replace( anchorRx, "\\1" ); // MDict anchors
+      if ( complete ) {
+        QString folder = fi.absoluteDir().absolutePath() + "/" + fi.baseName() + "_files";
+        QRegExp rx1( "\"((?:bres|gico|gdau|qrcx|gdvideo)://[^\"]+)\"" );
+        QRegExp rx2( "'((?:bres|gico|gdau|qrcx|gdvideo)://[^']+)'" );
+        set< QByteArray > resourceIncluded;
+        vector< pair< QUrl, QString > > downloadResources;
+
+        filterAndCollectResources( html, rx1, "\"", folder, resourceIncluded, downloadResources );
+        filterAndCollectResources( html, rx2, "'", folder, resourceIncluded, downloadResources );
+
+        ArticleSaveProgressDialog * progressDialog = new ArticleSaveProgressDialog( this );
+        // reserve '1' for saving main html file
+        int maxVal = 1;
+
+        // Pull and save resources to files
+        for ( vector< pair< QUrl, QString > >::const_iterator i = downloadResources.begin();
+              i != downloadResources.end();
+              ++i ) {
+          ResourceToSaveHandler * handler = view->saveResource( i->first, i->second );
+          if ( !handler->isEmpty() ) {
+            maxVal += 1;
+            connect( handler, &ResourceToSaveHandler::done, progressDialog, &ArticleSaveProgressDialog::perform );
           }
-          name.replace( rxName, "_" );
-          name = QString( "href=\"" ) + QUrl::toPercentEncoding( name ) + ".html" + anchor + "\"";
-          html.replace( pos, rx3.cap().length(), name );
-          pos += name.length();
         }
 
-        // MDict anchors
-        QRegularExpression anchorLinkRe(
-          R"((<\s*a\s+[^>]*\b(?:name|id)\b\s*=\s*["']*g[0-9a-f]{32}_)([0-9a-f]+_)(?=[^"']))",
-          QRegularExpression::PatternOption::CaseInsensitiveOption|QRegularExpression::UseUnicodePropertiesOption );
-        html.replace( anchorLinkRe, "\\1" );
+        progressDialog->setLabelText( tr( "Saving article..." ) );
+        progressDialog->setRange( 0, maxVal );
+        progressDialog->setValue( 0 );
+        progressDialog->show();
 
-        if( complete )
-        {
-          QString folder = fi.absoluteDir().absolutePath() + "/" + fi.baseName() + "_files";
-          QRegExp rx1( "\"((?:bres|gico|gdau|qrcx|gdvideo)://[^\"]+)\"" );
-          QRegExp rx2( "'((?:bres|gico|gdau|qrcx|gdvideo)://[^']+)'" );
-          set< QByteArray > resourceIncluded;
-          vector< pair< QUrl, QString > > downloadResources;
-
-          filterAndCollectResources( html, rx1, "\"", folder, resourceIncluded, downloadResources );
-          filterAndCollectResources( html, rx2, "'", folder, resourceIncluded, downloadResources );
-
-          ArticleSaveProgressDialog * progressDialog = new ArticleSaveProgressDialog( this );
-          // reserve '1' for saving main html file
-          int maxVal                                 = 1;
-
-          // Pull and save resources to files
-          for( vector< pair< QUrl, QString > >::const_iterator i = downloadResources.begin();
-               i != downloadResources.end();
-               ++i )
-          {
-            ResourceToSaveHandler * handler = view->saveResource( i->first, i->second );
-            if( !handler->isEmpty() )
-            {
-              maxVal += 1;
-              connect( handler, &ResourceToSaveHandler::done, progressDialog, &ArticleSaveProgressDialog::perform );
-            }
-          }
-
-          progressDialog->setLabelText( tr( "Saving article..." ) );
-          progressDialog->setRange( 0, maxVal );
-          progressDialog->setValue( 0 );
-          progressDialog->show();
-
-          file.write( html.toUtf8() );
-          progressDialog->perform();
-        }
-        else
-        {
-          file.write( html.toUtf8() );
-        }
-
-        mainStatusBar->showMessage( tr( "Save article complete" ), 5000 );
+        file.write( html.toUtf8() );
+        progressDialog->perform();
       }
-    } );
+      else {
+        file.write( html.toUtf8() );
+      }
+
+      mainStatusBar->showMessage( tr( "Save article complete" ), 5000 );
+    }
+  } );
 }
 
 void MainWindow::on_rescanFiles_triggered()
@@ -3428,10 +3316,9 @@ void MainWindow::on_rescanFiles_triggered()
   dictionaryBar.setDictionaries( dictionaries );
 
   loadDictionaries( this, true, cfg, dictionaries, dictNetMgr );
-  dictMap = Dictionary::dictToMap(dictionaries);
+  dictMap = Dictionary::dictToMap( dictionaries );
 
-  for( unsigned x = 0; x < dictionaries.size(); x++ )
-  {
+  for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
     dictionaries[ x ]->setFTSParameters( cfg.preferences.fts );
     dictionaries[ x ]->setSynonymSearchEnabled( cfg.preferences.synonymSearchEnabled );
   }
@@ -3450,31 +3337,27 @@ void MainWindow::on_rescanFiles_triggered()
 
 void MainWindow::on_alwaysOnTop_triggered( bool checked )
 {
-    cfg.preferences.alwaysOnTop = checked;
+  cfg.preferences.alwaysOnTop = checked;
 
-    bool wasVisible = isVisible();
+  bool wasVisible = isVisible();
 
-    Qt::WindowFlags flags = this->windowFlags();
-    if (checked)
-    {
-        setWindowFlags(flags | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint);
-        mainStatusBar->showMessage(
-              tr( "The main window is set to be always on top." ),
-              10000,
-              QPixmap( ":/icons/warning.png" ) );
-    }
-    else
-    {
-        setWindowFlags(flags ^ (Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint));
-        mainStatusBar->clearMessage();
-    }
+  Qt::WindowFlags flags = this->windowFlags();
+  if ( checked ) {
+    setWindowFlags( flags | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint );
+    mainStatusBar->showMessage( tr( "The main window is set to be always on top." ),
+                                10000,
+                                QPixmap( ":/icons/warning.png" ) );
+  }
+  else {
+    setWindowFlags( flags ^ ( Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint ) );
+    mainStatusBar->clearMessage();
+  }
 
-    if ( wasVisible )
-    {
-      show();
-    }
+  if ( wasVisible ) {
+    show();
+  }
 
-    installHotKeys();
+  installHotKeys();
 }
 
 void MainWindow::zoomin()
@@ -3527,10 +3410,8 @@ void MainWindow::adjustCurrentZoomFactor()
 
 void MainWindow::scaleArticlesByCurrentZoomFactor()
 {
-  for ( int i = 0; i < ui.tabWidget->count(); i++ )
-  {
-    ArticleView & view =
-      dynamic_cast< ArticleView & >( *( ui.tabWidget->widget(i) ) );
+  for ( int i = 0; i < ui.tabWidget->count(); i++ ) {
+    ArticleView & view = dynamic_cast< ArticleView & >( *( ui.tabWidget->widget( i ) ) );
     view.setZoomFactor( cfg.preferences.zoomFactor );
   }
 
@@ -3564,8 +3445,7 @@ void MainWindow::applyWordsZoomLevel()
 
   int ps = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
 
     if ( ps < 1 )
@@ -3574,15 +3454,14 @@ void MainWindow::applyWordsZoomLevel()
     font.setPointSize( ps );
   }
 
-  if ( wordList->font().pointSize() != ps )
-    wordList->setFont( font );
+  if ( ui.wordList->font().pointSize() != ps )
+    ui.wordList->setFont( font );
 
   font = translateLineDefaultFont;
 
   ps = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
 
     if ( ps < 1 )
@@ -3598,8 +3477,7 @@ void MainWindow::applyWordsZoomLevel()
 
   ps = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
 
     if ( ps < 1 )
@@ -3608,23 +3486,19 @@ void MainWindow::applyWordsZoomLevel()
     font.setPointSize( ps );
   }
 
-  if ( groupList->font().pointSize() != ps )
-  {
-    disconnect( groupList, &GroupComboBox::currentIndexChanged,
-                this, &MainWindow::currentGroupChanged );
+  if ( groupList->font().pointSize() != ps ) {
+    disconnect( groupList, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
     int n = groupList->currentIndex();
     groupList->clear();
     groupList->setFont( font );
     groupList->fill( groupInstances );
     groupList->setCurrentIndex( n );
-    connect( groupList, &GroupComboBox::currentIndexChanged,
-                this, &MainWindow::currentGroupChanged );
+    connect( groupList, &GroupComboBox::currentIndexChanged, this, &MainWindow::currentGroupChanged );
   }
 
   wordsZoomBase->setEnabled( cfg.preferences.wordsZoomLevel != 0 );
 
-  if( !cfg.preferences.searchInDock )
-  {
+  if ( !cfg.preferences.searchInDock ) {
     // Invalidating navToolbar's layout displays translateBoxWidget w/o the need to press the toolbar
     // extension button when Words Zoom level decreases enough for translateBoxWidget to fit in the toolbar.
     navToolbar->layout()->invalidate();
@@ -3645,21 +3519,16 @@ void MainWindow::messageFromAnotherInstanceReceived( QString const & message )
     return;
   }
 
-  if( message.left( 15 ) == "translateWord: " )
-  {
-    if( scanPopup )
+  if ( message.left( 15 ) == "translateWord: " ) {
+    if ( scanPopup )
       scanPopup->translateWord( message.mid( 15 ) );
     else
       wordReceived( message.mid( 15 ) );
   }
-  else
-  if( message.left( 10 ) == "setGroup: " )
-  {
+  else if ( message.left( 10 ) == "setGroup: " ) {
     setGroupByName( message.mid( 10 ), true );
   }
-  else
-  if( message.left( 15 ) == "setPopupGroup: " )
-  {
+  else if ( message.left( 15 ) == "setPopupGroup: " ) {
     setGroupByName( message.mid( 15 ), false );
   }
   else
@@ -3668,14 +3537,13 @@ void MainWindow::messageFromAnotherInstanceReceived( QString const & message )
 
 ArticleView * MainWindow::getCurrentArticleView()
 {
-  if ( QWidget * cw = ui.tabWidget->currentWidget() )
-  {
+  if ( QWidget * cw = ui.tabWidget->currentWidget() ) {
     return dynamic_cast< ArticleView * >( cw );
   }
-  return 0;
+  return nullptr;
 }
 
-void MainWindow::wordReceived( const QString & word)
+void MainWindow::wordReceived( const QString & word )
 {
   toggleMainWindow( true );
   setInputLineText( word, WildcardPolicy::EscapeWildcards, NoPopupChange );
@@ -3686,42 +3554,35 @@ void MainWindow::headwordReceived( const QString & word, const QString & ID )
 {
   toggleMainWindow( true );
   setInputLineText( word, WildcardPolicy::EscapeWildcards, NoPopupChange );
-  respondToTranslationRequest( word,
-                               false, ArticleView::scrollToFromDictionaryId( ID ) );
+  respondToTranslationRequest( word, false, ArticleView::scrollToFromDictionaryId( ID ) );
 }
 
 void MainWindow::updateFavoritesMenu()
 {
-  if ( ui.favoritesPane->isVisible() )
-  {
+  if ( ui.favoritesPane->isVisible() ) {
     ui.showHideFavorites->setText( tr( "&Hide" ) );
   }
-  else
-  {
+  else {
     ui.showHideFavorites->setText( tr( "&Show" ) );
   }
 }
 
 void MainWindow::updateHistoryMenu()
 {
-  if( ui.historyPane->isVisible() )
-  {
+  if ( ui.historyPane->isVisible() ) {
     ui.showHideHistory->setText( tr( "&Hide" ) );
   }
-  else
-  {
+  else {
     ui.showHideHistory->setText( tr( "&Show" ) );
   }
 }
 
 void MainWindow::toggle_favoritesPane()
 {
-  if( ui.favoritesPane->isVisible() )
-  {
+  if ( ui.favoritesPane->isVisible() ) {
     ui.favoritesPane->hide();
   }
-  else
-  {
+  else {
     ui.favoritesPane->show();
     ui.favoritesPane->raise(); // useful when the Pane is tabbed.
   }
@@ -3729,258 +3590,92 @@ void MainWindow::toggle_favoritesPane()
 
 void MainWindow::toggle_historyPane()
 {
-  if( ui.historyPane->isVisible() )
-  {
+  if ( ui.historyPane->isVisible() ) {
     ui.historyPane->hide();
   }
-  else
-  {
+  else {
     ui.historyPane->show();
     ui.historyPane->raise();
   }
 }
 
 void MainWindow::on_exportHistory_triggered()
-{
-    QString exportPath;
-    if( cfg.historyExportPath.isEmpty() )
-        exportPath = QDir::homePath();
-    else
-    {
-        exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
-        if( !QDir( exportPath ).exists() )
-            exportPath = QDir::homePath();
-    }
-
-    QString fileName = QFileDialog::getSaveFileName( this, tr( "Export history to file" ),
-                                                     exportPath,
-                                                     tr( "Text files (*.txt);;All files (*.*)" ) );
-    if( fileName.size() == 0)
-        return;
-
-    cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
-    QFile file( fileName );
-
-    for(;;)
-    {
-        if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
-          break;
-
-        // Write UTF-8 BOM
-        QByteArray line;
-        line.append( 0xEF ).append( 0xBB ).append( 0xBF );
-        if ( file.write( line ) != line.size() )
-          break;
-
-        // Write history
-        QList< History::Item > const & items = history.getItems();
-
-        QList< History::Item >::const_iterator i;
-        for( i = items.constBegin(); i != items.constEnd(); ++i )
-        {
-          line = i->word.toUtf8();
-
-          line.replace( '\n', ' ' );
-          line.replace( '\r', ' ' );
-
-          line += "\n";
-
-          if ( file.write( line ) != line.size() )
-            break;
-        }
-
-        if( i != items.constEnd() )
-          break;
-
-        file.close();
-        mainStatusBar->showMessage( tr( "History export complete" ), 5000 );
-        return;
-    }
-    QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
-    file.close();
-    mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
-}
-
-// TODO: consider moving parts of this method into History class.
-void MainWindow::on_importHistory_triggered()
-{
-    QString importPath;
-    if( cfg.historyExportPath.isEmpty() )
-        importPath = QDir::homePath();
-    else
-    {
-        importPath = QDir::fromNativeSeparators( cfg.historyExportPath );
-        if( !QDir( importPath ).exists() )
-            importPath = QDir::homePath();
-    }
-
-    QString fileName = QFileDialog::getOpenFileName( this, tr( "Import history from file" ),
-                                                     importPath,
-                                                     tr( "Text files (*.txt);;All files (*.*)" ) );
-    if( fileName.size() == 0)
-        return;
-
-    QFileInfo fileInfo( fileName );
-    cfg.historyExportPath = QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() );
-    QString errStr;
-    QFile file( fileName );
-
-    for(;;)
-    {
-        if ( !file.open( QFile::ReadOnly | QIODevice::Text ) )
-          break;
-
-        QTextStream fileStream( & file );
-        QString itemStr, trimmedStr;
-        QList< QString > itemList;
-
-        history.clear();
-
-        do
-        {
-            itemStr = fileStream.readLine();
-            if( fileStream.status() >= QTextStream::ReadCorruptData )
-                break;
-
-            trimmedStr = itemStr.trimmed();
-            if( trimmedStr.isEmpty() )
-                continue;
-
-            if( (unsigned)trimmedStr.size() <= history.getMaxItemLength( ) )
-                itemList.prepend( trimmedStr );
-
-        } while( !fileStream.atEnd() && itemList.size() < (int)history.getMaxSize() );
-
-        history.enableAdd( true );
-
-        for( QList< QString >::const_iterator i = itemList.constBegin(); i != itemList.constEnd(); ++i )
-            history.addItem( History::Item( 1, *i ) );
-
-        history.enableAdd( cfg.preferences.storeHistory );
-
-        if( file.error() != QFile::NoError )
-            break;
-
-        if( fileStream.status() >= QTextStream::ReadCorruptData )
-        {
-            errStr = QString ( tr( "Import error: invalid data in file" ) );
-            mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
-        }
-        else
-            mainStatusBar->showMessage( tr( "History import complete" ), 5000 );
-        return;
-    }
-    errStr = QString( tr( "Import error: " ) ) + file.errorString();
-    file.close();
-    mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
-}
-
-void MainWindow::on_exportFavorites_triggered()
 {
   QString exportPath;
-  if( cfg.historyExportPath.isEmpty() )
+  if ( cfg.historyExportPath.isEmpty() )
     exportPath = QDir::homePath();
-  else
-  {
+  else {
     exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
-    if( !QDir( exportPath ).exists() )
+    if ( !QDir( exportPath ).exists() )
       exportPath = QDir::homePath();
   }
 
-  QString fileName = QFileDialog::getSaveFileName( this, tr( "Export Favorites to file" ),
-                                                   exportPath,
-                                                   tr( "XML files (*.xml);;All files (*.*)" ) );
-  if( fileName.size() == 0)
-    return;
-
-  cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
-  QFile file( fileName );
-
-  for(;;)
-  {
-    if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
-      break;
-
-    QByteArray data;
-    ui.favoritesPaneWidget->getDataInXml( data );
-
-    if( file.write( data ) != data.size() )
-      break;
-
-    file.close();
-    mainStatusBar->showMessage( tr( "Favorites export complete" ), 5000 );
-    return;
-  }
-  QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
-  file.close();
-  mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
-}
-
-void MainWindow::on_ExportFavoritesToList_triggered()
-{
-  QString exportPath;
-  if( cfg.historyExportPath.isEmpty() )
-    exportPath = QDir::homePath();
-  else
-  {
-    exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
-    if( !QDir( exportPath ).exists() )
-      exportPath = QDir::homePath();
-  }
-
-  QString fileName = QFileDialog::getSaveFileName( this, tr( "Export Favorites to file as plain list" ),
+  QString fileName = QFileDialog::getSaveFileName( this,
+                                                   tr( "Export history to file" ),
                                                    exportPath,
                                                    tr( "Text files (*.txt);;All files (*.*)" ) );
-  if( fileName.size() == 0)
+  if ( fileName.size() == 0 )
     return;
 
   cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
   QFile file( fileName );
 
-  for(;;)
-  {
-    if ( !file.open( QFile::WriteOnly | QIODevice::Text ) )
-      break;
 
-    // Write UTF-8 BOM
-    QByteArray line;
-    line.append( 0xEF ).append( 0xBB ).append( 0xBF );
-    if ( file.write( line ) != line.size() )
-      break;
-
-    // Write Favorites
-    QString data;
-    ui.favoritesPaneWidget->getDataInPlainText( data );
-
-    line = data.toUtf8();
-    if( file.write( line ) != line.size() )
-      break;
-
-    file.close();
-    mainStatusBar->showMessage( tr( "Favorites export complete" ), 5000 );
+  if ( !file.open( QFile::WriteOnly | QIODevice::Text ) ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
     return;
   }
-  QString errStr = QString( tr( "Export error: " ) ) + file.errorString();
-  file.close();
-  mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
+
+  auto guard = qScopeGuard( [ &file ]() {
+    file.close();
+  } );
+  Q_UNUSED( guard )
+
+  // Write UTF-8 BOM
+  QByteArray line;
+  line.append( 0xEF ).append( 0xBB ).append( 0xBF );
+  if ( file.write( line ) != line.size() ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
+
+  // Write history
+  QList< History::Item > const & items = history.getItems();
+
+  QList< History::Item >::const_iterator i;
+  for ( i = items.constBegin(); i != items.constEnd(); ++i ) {
+    line = i->word.toUtf8();
+
+    line.replace( '\n', ' ' );
+    line.replace( '\r', ' ' );
+
+    line += "\n";
+
+    if ( file.write( line ) != line.size() ) {
+      errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+      return;
+    }
+  }
+
+  mainStatusBar->showMessage( tr( "History export complete" ), 5000 );
 }
 
-void MainWindow::on_importFavorites_triggered()
+void MainWindow::on_importHistory_triggered()
 {
   QString importPath;
-  if( cfg.historyExportPath.isEmpty() )
+  if ( cfg.historyExportPath.isEmpty() )
     importPath = QDir::homePath();
-  else
-  {
+  else {
     importPath = QDir::fromNativeSeparators( cfg.historyExportPath );
-    if( !QDir( importPath ).exists() )
+    if ( !QDir( importPath ).exists() )
       importPath = QDir::homePath();
   }
 
-  QString fileName = QFileDialog::getOpenFileName( this, tr( "Import Favorites from file" ),
+  QString fileName = QFileDialog::getOpenFileName( this,
+                                                   tr( "Import history from file" ),
                                                    importPath,
-                                                   tr( "XML files (*.xml);;Txt files (*.txt);;All files (*.*)" ) );
-  if( fileName.size() == 0)
+                                                   tr( "Text files (*.txt);;All files (*.*)" ) );
+  if ( fileName.size() == 0 )
     return;
 
   QFileInfo fileInfo( fileName );
@@ -3988,113 +3683,259 @@ void MainWindow::on_importFavorites_triggered()
   QString errStr;
   QFile file( fileName );
 
-  for(;;)
-  {
-    if ( !file.open( QFile::ReadOnly | QIODevice::Text ) )
-      break;
-
-    if( file.error() != QFile::NoError )
-        break;
-
-    QByteArray data = file.readAll();
-
-    if(fileInfo.suffix().compare("txt",Qt::CaseInsensitive)==0){
-      if( !ui.favoritesPaneWidget->setDataFromTxt( QString::fromUtf8( data.data(), data.size() ) ) )
-        break;
-    }
-    else{
-      if( !ui.favoritesPaneWidget->setDataFromXml( QString::fromUtf8( data.data(), data.size() ) ) )
-        break;
-    }
-
-    file.close();
-    mainStatusBar->showMessage( tr( "Favorites import complete" ), 5000 );
+  if ( !file.open( QFile::ReadOnly | QIODevice::Text ) ) {
+    errStr = QString( tr( "Import error: " ) ) + file.errorString();
+    errorMessageOnStatusBar( errStr );
     return;
   }
-  if( file.error() != QFile::NoError )
+
+  QTextStream fileStream( &file );
+  QString itemStr, trimmedStr;
+  QList< QString > itemList;
+
+  do {
+    itemStr = fileStream.readLine();
+    if ( fileStream.status() >= QTextStream::ReadCorruptData )
+      break;
+
+    trimmedStr = itemStr.trimmed();
+    if ( trimmedStr.isEmpty() )
+      continue;
+
+    if ( (unsigned)trimmedStr.size() <= history.getMaxItemLength() )
+      itemList.prepend( trimmedStr );
+
+  } while ( !fileStream.atEnd() && itemList.size() < (int)history.getMaxSize() );
+
+  history.enableAdd( true );
+
+  for ( QList< QString >::const_iterator i = itemList.constBegin(); i != itemList.constEnd(); ++i )
+    history.addItem( History::Item( 1, *i ) );
+
+  history.enableAdd( cfg.preferences.storeHistory );
+
+  if ( file.error() != QFile::NoError ) {
     errStr = QString( tr( "Import error: " ) ) + file.errorString();
-  else
-    errStr = QString( tr( "Data parsing error" ) );
+    errorMessageOnStatusBar( errStr );
+    return;
+  }
+
+  if ( fileStream.status() >= QTextStream::ReadCorruptData ) {
+    errStr = QString( tr( "Import error: invalid data in file" ) );
+    errorMessageOnStatusBar( errStr );
+    return;
+  }
+  //even without this line, the destructor of QFile will close the file as documented.
+  file.close();
+  mainStatusBar->showMessage( tr( "History import complete" ), 5000 );
+}
+
+void MainWindow::errorMessageOnStatusBar( const QString & errStr )
+{
+  this->mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
+}
+
+void MainWindow::on_exportFavorites_triggered()
+{
+  QString exportPath;
+  if ( cfg.historyExportPath.isEmpty() )
+    exportPath = QDir::homePath();
+  else {
+    exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
+    if ( !QDir( exportPath ).exists() )
+      exportPath = QDir::homePath();
+  }
+
+  QString fileName = QFileDialog::getSaveFileName( this,
+                                                   tr( "Export Favorites to file" ),
+                                                   exportPath,
+                                                   tr( "XML files (*.xml);;All files (*.*)" ) );
+  if ( fileName.size() == 0 )
+    return;
+
+  cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
+  QFile file( fileName );
+
+
+  if ( !file.open( QFile::WriteOnly | QIODevice::Text ) ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
+
+  QByteArray data;
+  ui.favoritesPaneWidget->getDataInXml( data );
+
+  if ( file.write( data ) != data.size() ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
 
   file.close();
-  mainStatusBar->showMessage( errStr, 10000, QPixmap( ":/icons/error.svg" ) );
+  mainStatusBar->showMessage( tr( "Favorites export complete" ), 5000 );
+}
+
+void MainWindow::on_ExportFavoritesToList_triggered()
+{
+  QString exportPath;
+  if ( cfg.historyExportPath.isEmpty() )
+    exportPath = QDir::homePath();
+  else {
+    exportPath = QDir::fromNativeSeparators( cfg.historyExportPath );
+    if ( !QDir( exportPath ).exists() )
+      exportPath = QDir::homePath();
+  }
+
+  QString fileName = QFileDialog::getSaveFileName( this,
+                                                   tr( "Export Favorites to file as plain list" ),
+                                                   exportPath,
+                                                   tr( "Text files (*.txt);;All files (*.*)" ) );
+  if ( fileName.size() == 0 )
+    return;
+
+  cfg.historyExportPath = QDir::toNativeSeparators( QFileInfo( fileName ).absoluteDir().absolutePath() );
+  QFile file( fileName );
+
+  if ( !file.open( QFile::WriteOnly | QIODevice::Text ) ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
+
+  // Write UTF-8 BOM
+  QByteArray line;
+  line.append( 0xEF ).append( 0xBB ).append( 0xBF );
+  if ( file.write( line ) != line.size() ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
+
+  // Write Favorites
+  QString data;
+  ui.favoritesPaneWidget->getDataInPlainText( data );
+
+  line = data.toUtf8();
+  if ( file.write( line ) != line.size() ) {
+    errorMessageOnStatusBar( QString( tr( "Export error: " ) ) + file.errorString() );
+    return;
+  }
+
+  file.close();
+  mainStatusBar->showMessage( tr( "Favorites export complete" ), 5000 );
+}
+
+void MainWindow::on_importFavorites_triggered()
+{
+  QString importPath;
+  if ( cfg.historyExportPath.isEmpty() )
+    importPath = QDir::homePath();
+  else {
+    importPath = QDir::fromNativeSeparators( cfg.historyExportPath );
+    if ( !QDir( importPath ).exists() )
+      importPath = QDir::homePath();
+  }
+
+  QString fileName = QFileDialog::getOpenFileName( this,
+                                                   tr( "Import Favorites from file" ),
+                                                   importPath,
+                                                   tr( "XML files (*.xml);;Txt files (*.txt);;All files (*.*)" ) );
+  if ( fileName.size() == 0 )
+    return;
+
+  QFileInfo fileInfo( fileName );
+  cfg.historyExportPath = QDir::toNativeSeparators( fileInfo.absoluteDir().absolutePath() );
+  QString errStr;
+  QFile file( fileName );
+
+  if ( !file.open( QFile::ReadOnly | QIODevice::Text ) ) {
+    errorMessageOnStatusBar( QString( tr( "Import error: " ) ) + file.errorString() );
+    return;
+  }
+
+  QByteArray data = file.readAll();
+
+  if ( fileInfo.suffix().compare( "txt", Qt::CaseInsensitive ) == 0 ) {
+    if ( !ui.favoritesPaneWidget->setDataFromTxt( QString::fromUtf8( data.data(), data.size() ) ) ) {
+      errorMessageOnStatusBar( QString( tr( "Data parsing error" ) ) );
+      return;
+    }
+  }
+  else {
+    if ( !ui.favoritesPaneWidget->setDataFromXml( QString::fromUtf8( data.data(), data.size() ) ) ) {
+      errorMessageOnStatusBar( QString( tr( "Data parsing error" ) ) );
+      return;
+    }
+  }
+
+  file.close();
+  mainStatusBar->showMessage( tr( "Favorites import complete" ), 5000 );
 }
 
 void MainWindow::fillWordListFromHistory()
 {
-    ui.wordList->setUpdatesEnabled( false );
-    ui.wordList->clear();
+  ui.wordList->setUpdatesEnabled( false );
+  ui.wordList->clear();
 
-    QList< History::Item > const & items = history.getItems();
-    for( int x = 0; x < items.size(); ++x )
-    {
-      History::Item const * i = &items[ x ];
-      QListWidgetItem * s = new QListWidgetItem( i->word, ui.wordList );
-      if (s->text().at(0).direction() == QChar::DirR)
-          s->setTextAlignment(Qt::AlignRight);
-      if (s->text().at(0).direction() == QChar::DirL)
-          s->setTextAlignment(Qt::AlignLeft);
-      ui.wordList->addItem( s );
-    }
+  QList< History::Item > const & items = history.getItems();
+  for ( const auto & item : items ) {
+    History::Item const * i = &item;
+    auto s                  = new QListWidgetItem( i->word, ui.wordList );
+    if ( s->text().at( 0 ).direction() == QChar::DirR )
+      s->setTextAlignment( Qt::AlignRight );
+    if ( s->text().at( 0 ).direction() == QChar::DirL )
+      s->setTextAlignment( Qt::AlignLeft );
+    ui.wordList->addItem( s );
+  }
 
-    ui.wordList->setUpdatesEnabled( true );
+  ui.wordList->setUpdatesEnabled( true );
 }
 
 void MainWindow::focusWordList()
 {
-    if( ui.wordList->count() > 0 )
-        ui.wordList->setFocus();
+  if ( ui.wordList->count() > 0 )
+    ui.wordList->setFocus();
 }
 
 void MainWindow::addWordToHistory( const QString & word )
 {
-//    skip epwing reference link. epwing reference link has the pattern of r%dAt%d
-    if(QRegularExpressionMatch m = RX::Epwing::refWord.match( word ); m.hasMatch() )
-        return;
-    history.addItem( History::Item( 1, word.trimmed() ) );
+  //    skip epwing reference link. epwing reference link has the pattern of r%dAt%d
+  if ( QRegularExpressionMatch m = RX::Epwing::refWord.match( word ); m.hasMatch() )
+    return;
+  history.addItem( History::Item( 1, word.trimmed() ) );
 }
 
 void MainWindow::forceAddWordToHistory( const QString & word )
 {
-    history.enableAdd( true );
-    history.addItem( History::Item( 1, word.trimmed() ) );
-    history.enableAdd( cfg.preferences.storeHistory );
+  history.enableAdd( true );
+  history.addItem( History::Item( 1, word.trimmed() ) );
+  history.enableAdd( cfg.preferences.storeHistory );
 }
 
 void MainWindow::foundDictsPaneClicked( QListWidgetItem * item )
 {
   Qt::KeyboardModifiers m = QApplication::keyboardModifiers();
-  if ( ( m & ( Qt::ControlModifier | Qt::ShiftModifier ) )
-       || ( m == Qt::AltModifier ) )
-  {
+  if ( ( m & ( Qt::ControlModifier | Qt::ShiftModifier ) ) || ( m == Qt::AltModifier ) ) {
     QString id = item->data( Qt::UserRole ).toString();
     emit clickOnDictPane( id );
   }
 
-   jumpToDictionary( item,true);
+  jumpToDictionary( item, true );
 }
 
 void MainWindow::showDictionaryInfo( const QString & id )
 {
-  for( unsigned x = 0; x < dictionaries.size(); x++ )
-  {
-    if( dictionaries[ x ]->getId() == id.toUtf8().data() )
-    {
+  for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
+    if ( dictionaries[ x ]->getId() == id.toUtf8().data() ) {
       DictInfo infoMsg( cfg, this );
       infoMsg.showInfo( dictionaries[ x ] );
       int result = infoMsg.exec();
 
-      if ( result == DictInfo::OPEN_FOLDER )
-      {
+      if ( result == DictInfo::OPEN_FOLDER ) {
         openDictionaryFolder( id );
       }
-      else if ( result == DictInfo::EDIT_DICTIONARY)
-      {
-        editDictionary( dictionaries[x].get() );
+      else if ( result == DictInfo::EDIT_DICTIONARY ) {
+        editDictionary( dictionaries[ x ].get() );
       }
-      else if( result == DictInfo::SHOW_HEADWORDS )
-      {
-        showDictionaryHeadwords( dictionaries[x].get() );
+      else if ( result == DictInfo::SHOW_HEADWORDS ) {
+        showDictionaryHeadwords( dictionaries[ x ].get() );
       }
 
       break;
@@ -4122,10 +3963,13 @@ void MainWindow::showDictionaryHeadwords( Dictionary::Class * dict )
       addGlobalActionsToDialog( headwordsDlg );
       addGroupComboBoxActionsToDialog( headwordsDlg, groupList );
       connect( headwordsDlg, &DictHeadwords::headwordSelected, this, &MainWindow::headwordReceived );
-      connect( headwordsDlg, &DictHeadwords::closeDialog,
-               this, &MainWindow::closeHeadwordsDialog, Qt::QueuedConnection );
+      connect( headwordsDlg,
+               &DictHeadwords::closeDialog,
+               this,
+               &MainWindow::closeHeadwordsDialog,
+               Qt::QueuedConnection );
     }
-    else{
+    else {
       headwordsDlg->setup( dict );
     }
     headwordsDlg->show();
@@ -4135,17 +3979,15 @@ void MainWindow::showDictionaryHeadwords( Dictionary::Class * dict )
 
 void MainWindow::closeHeadwordsDialog()
 {
-  if( headwordsDlg )
-  {
+  if ( headwordsDlg ) {
     delete headwordsDlg;
-    headwordsDlg = NULL;
+    headwordsDlg = nullptr;
   }
 }
 
 void MainWindow::focusHeadwordsDialog()
 {
-  if( headwordsDlg )
-  {
+  if ( headwordsDlg ) {
     headwordsDlg->activateWindow();
     if ( ftsDlg )
       ftsDlg->lower();
@@ -4155,8 +3997,7 @@ void MainWindow::focusHeadwordsDialog()
 void MainWindow::focusArticleView()
 {
   ArticleView * view = getCurrentArticleView();
-  if ( view )
-  {
+  if ( view ) {
     if ( !isActiveWindow() )
       activateWindow();
     view->focus();
@@ -4166,26 +4007,22 @@ void MainWindow::focusArticleView()
 void MainWindow::editDictionary( Dictionary::Class * dict )
 {
   QString dictFilename = dict->getMainFilename();
-  if( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() )
-  {
+  if ( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() ) {
     QString command( cfg.editDictionaryCommandLine );
     command.replace( "%GDDICT%", "\"" + dictFilename + "\"" );
-    if( command.contains( "%GDWORD%" ) )
-    {
+    if ( command.contains( "%GDWORD%" ) ) {
       QString headword = unescapeTabHeader( ui.tabWidget->tabText( ui.tabWidget->currentIndex() ) );
       command.replace( "%GDWORD%", headword );
     }
-    if( !QProcess::startDetached( command,QStringList() ) )
+    if ( !QProcess::startDetached( command, QStringList() ) )
       QApplication::beep();
   }
 }
 
 void MainWindow::openDictionaryFolder( const QString & id )
 {
-  for( unsigned x = 0; x < dictionaries.size(); x++ )
-  {
-    if( dictionaries[ x ]->getId() == id.toUtf8().data() )
-    {
+  for ( unsigned x = 0; x < dictionaries.size(); x++ ) {
+    if ( dictionaries[ x ]->getId() == id.toUtf8().data() ) {
       if ( !dictionaries[ x ]->getDictionaryFilenames().empty() ) {
         QDesktopServices::openUrl( QUrl::fromLocalFile( dictionaries[ x ]->getContainingFolder() ) );
       }
@@ -4194,78 +4031,66 @@ void MainWindow::openDictionaryFolder( const QString & id )
   }
 }
 
-void MainWindow::foundDictsContextMenuRequested( const QPoint &pos )
+void MainWindow::foundDictsContextMenuRequested( const QPoint & pos )
 {
-  QListWidgetItem *item = ui.dictsList->itemAt( pos );
-  if( item )
-  {
-    QString id = item->data( Qt::UserRole ).toString();
-    Dictionary::Class *pDict = NULL;
+  QListWidgetItem * item = ui.dictsList->itemAt( pos );
+  if ( item ) {
+    QString id                = item->data( Qt::UserRole ).toString();
+    Dictionary::Class * pDict = nullptr;
 
-    for( unsigned i = 0; i < dictionaries.size(); i++ )
-    {
-      if( id.compare( dictionaries[ i ]->getId().c_str() ) == 0 )
-      {
+    for ( unsigned i = 0; i < dictionaries.size(); i++ ) {
+      if ( id.compare( dictionaries[ i ]->getId().c_str() ) == 0 ) {
         pDict = dictionaries[ i ].get();
         break;
       }
     }
 
-    if( pDict == NULL )
+    if ( pDict == nullptr )
       return;
 
-    if( !pDict->isLocalDictionary() )
-    {
+    if ( !pDict->isLocalDictionary() ) {
       if ( scanPopup )
         scanPopup->blockSignals( true );
       showDictionaryInfo( id );
       if ( scanPopup )
         scanPopup->blockSignals( false );
     }
-    else
-    {
+    else {
       QMenu menu( ui.dictsList );
       QAction * infoAction = menu.addAction( tr( "Dictionary info" ) );
 
-      QAction * headwordsAction = NULL;
-      if( pDict->getWordCount() > 0 )
+      QAction * headwordsAction = nullptr;
+      if ( pDict->getWordCount() > 0 )
         headwordsAction = menu.addAction( tr( "Dictionary headwords" ) );
 
       QAction * openDictFolderAction = menu.addAction( tr( "Open dictionary folder" ) );
 
-      QAction * editAction = NULL;
+      QAction * editAction = nullptr;
 
       QString dictFilename = pDict->getMainFilename();
-      if( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() )
+      if ( !cfg.editDictionaryCommandLine.isEmpty() && !dictFilename.isEmpty() )
         editAction = menu.addAction( tr( "Edit dictionary" ) );
 
       QAction * result = menu.exec( ui.dictsList->mapToGlobal( pos ) );
 
-      if( result && result == infoAction )
-      {
+      if ( result && result == infoAction ) {
         if ( scanPopup )
           scanPopup->blockSignals( true );
         showDictionaryInfo( id );
         if ( scanPopup )
           scanPopup->blockSignals( false );
       }
-      else
-      if( result && result == headwordsAction )
-      {
+      else if ( result && result == headwordsAction ) {
         if ( scanPopup )
           scanPopup->blockSignals( true );
         showDictionaryHeadwords( pDict );
         if ( scanPopup )
           scanPopup->blockSignals( false );
       }
-      else
-      if( result && result == openDictFolderAction )
-      {
+      else if ( result && result == openDictFolderAction ) {
         openDictionaryFolder( id );
       }
-      else
-      if( result && result == editAction )
-      {
+      else if ( result && result == editAction ) {
         editDictionary( pDict );
       }
     }
@@ -4282,25 +4107,21 @@ void MainWindow::storeResourceSavePath( const QString & newPath )
   cfg.resourceSavePath = newPath;
 }
 
-void MainWindow::proxyAuthentication( const QNetworkProxy &,
-                                      QAuthenticator * authenticator )
+void MainWindow::proxyAuthentication( const QNetworkProxy &, QAuthenticator * authenticator )
 {
   QNetworkProxy proxy = QNetworkProxy::applicationProxy();
 
-  QString * userStr, * passwordStr;
-  if( cfg.preferences.proxyServer.useSystemProxy )
-  {
-    userStr = &cfg.preferences.proxyServer.systemProxyUser;
+  QString *userStr, *passwordStr;
+  if ( cfg.preferences.proxyServer.useSystemProxy ) {
+    userStr     = &cfg.preferences.proxyServer.systemProxyUser;
     passwordStr = &cfg.preferences.proxyServer.systemProxyPassword;
   }
-  else
-  {
-    userStr = &cfg.preferences.proxyServer.user;
+  else {
+    userStr     = &cfg.preferences.proxyServer.user;
     passwordStr = &cfg.preferences.proxyServer.password;
   }
 
-  if( proxy.user().isEmpty() && !userStr->isEmpty() )
-  {
+  if ( proxy.user().isEmpty() && !userStr->isEmpty() ) {
     authenticator->setUser( *userStr );
     authenticator->setPassword( *passwordStr );
 
@@ -4308,8 +4129,7 @@ void MainWindow::proxyAuthentication( const QNetworkProxy &,
     proxy.setPassword( *passwordStr );
     QNetworkProxy::setApplicationProxy( proxy );
   }
-  else
-  {
+  else {
     QDialog dlg;
     Ui::Dialog ui;
     ui.setupUi( &dlg );
@@ -4318,9 +4138,8 @@ void MainWindow::proxyAuthentication( const QNetworkProxy &,
     ui.userEdit->setText( *userStr );
     ui.passwordEdit->setText( *passwordStr );
 
-    if ( dlg.exec() == QDialog::Accepted )
-    {
-      *userStr = ui.userEdit->text();
+    if ( dlg.exec() == QDialog::Accepted ) {
+      *userStr     = ui.userEdit->text();
       *passwordStr = ui.passwordEdit->text();
 
       authenticator->setUser( *userStr );
@@ -4335,8 +4154,7 @@ void MainWindow::proxyAuthentication( const QNetworkProxy &,
 
 void MainWindow::showFullTextSearchDialog()
 {
-  if( !ftsDlg )
-  {
+  if ( !ftsDlg ) {
     ftsDlg = new FTS::FullTextSearchDialog( this, cfg, dictionaries, groupInstances, ftsIndexing );
     ftsDlg->setSearchText( translateLine->text() );
 
@@ -4345,22 +4163,19 @@ void MainWindow::showFullTextSearchDialog()
 
     connect( ftsDlg, &FTS::FullTextSearchDialog::showTranslationFor, this, &MainWindow::showTranslationForDicts );
     connect( ftsDlg,
-      &FTS::FullTextSearchDialog::closeDialog,
-      this,
-      &MainWindow::closeFullTextSearchDialog,
-      Qt::QueuedConnection );
-    connect( &configEvents, SIGNAL( mutedDictionariesChanged() ),
-             ftsDlg, SLOT( updateDictionaries() ) );
+             &FTS::FullTextSearchDialog::closeDialog,
+             this,
+             &MainWindow::closeFullTextSearchDialog,
+             Qt::QueuedConnection );
+    connect( &configEvents, SIGNAL( mutedDictionariesChanged() ), ftsDlg, SLOT( updateDictionaries() ) );
 
-    unsigned group = groupInstances.empty() ? 0
-                                            : groupInstances[ groupList->currentIndex() ].id;
+    unsigned group = groupInstances.empty() ? 0 : groupInstances[ groupList->currentIndex() ].id;
     ftsDlg->setCurrentGroup( group );
   }
 
-  if( !ftsDlg ->isVisible() )
+  if ( !ftsDlg->isVisible() )
     ftsDlg->show();
-  else
-  {
+  else {
     ftsDlg->activateWindow();
     if ( headwordsDlg )
       headwordsDlg->lower();
@@ -4369,23 +4184,22 @@ void MainWindow::showFullTextSearchDialog()
 
 void MainWindow::closeFullTextSearchDialog()
 {
-  if( ftsDlg )
-  {
+  if ( ftsDlg ) {
     ftsDlg->stopSearch();
     delete ftsDlg;
-    ftsDlg = 0;
+    ftsDlg = nullptr;
   }
 }
 
 void MainWindow::showFTSIndexingName( QString const & name )
 {
-  if( name.isEmpty() )
+  if ( name.isEmpty() )
     mainStatusBar->setBackgroundMessage( QString() );
   else
     mainStatusBar->setBackgroundMessage( tr( "Now indexing for full-text search: " ) + name );
 }
 
-QString MainWindow::unescapeTabHeader(QString const & header )
+QString MainWindow::unescapeTabHeader( QString const & header )
 {
   // Reset table header to original headword
 
@@ -4399,7 +4213,7 @@ void MainWindow::addCurrentTabToFavorites()
 {
   QString folder;
   Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
-  if( igrp )
+  if ( igrp )
     folder = igrp->favoritesFolder;
 
   QString headword = ui.tabWidget->tabText( ui.tabWidget->currentIndex() );
@@ -4414,25 +4228,24 @@ void MainWindow::handleAddToFavoritesButton()
 {
   QString folder;
   Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
-  if( igrp )
+  if ( igrp )
     folder = igrp->favoritesFolder;
   QString headword = unescapeTabHeader( ui.tabWidget->tabText( ui.tabWidget->currentIndex() ) );
 
-  if( ui.favoritesPaneWidget->isHeadwordPresent( folder, headword ) )
-  {
-    QMessageBox mb( QMessageBox::Question, "GoldenDict", tr( "Remove headword \"%1\" from Favorites?" ).arg( headword ),
-                    QMessageBox::Yes | QMessageBox::No, this );
-    if( mb.exec() == QMessageBox::Yes )
-    {
-      if( ui.favoritesPaneWidget->removeHeadword( folder, headword ) )
-      {
+  if ( ui.favoritesPaneWidget->isHeadwordPresent( folder, headword ) ) {
+    QMessageBox mb( QMessageBox::Question,
+                    "GoldenDict",
+                    tr( "Remove headword \"%1\" from Favorites?" ).arg( headword ),
+                    QMessageBox::Yes | QMessageBox::No,
+                    this );
+    if ( mb.exec() == QMessageBox::Yes ) {
+      if ( ui.favoritesPaneWidget->removeHeadword( folder, headword ) ) {
         addToFavorites->setIcon( starIcon );
         addToFavorites->setToolTip( tr( "Add current tab to Favorites" ) );
       }
     }
   }
-  else
-  {
+  else {
     ui.favoritesPaneWidget->addHeadword( folder, headword );
     addToFavorites->setIcon( blueStarIcon );
     addToFavorites->setToolTip( tr( "Remove current tab from Favorites" ) );
@@ -4443,7 +4256,7 @@ void MainWindow::addWordToFavorites( QString const & word, unsigned groupId, boo
 {
   QString folder;
   Instances::Group const * igrp = groupInstances.findGroup( groupId );
-  if( igrp )
+  if ( igrp )
     folder = igrp->favoritesFolder;
 
   if ( !exist )
@@ -4465,11 +4278,10 @@ void MainWindow::addAllTabsToFavorites()
 {
   QString folder;
   Instances::Group const * igrp = groupInstances.findGroup( cfg.lastMainGroupId );
-  if( igrp )
+  if ( igrp )
     folder = igrp->favoritesFolder;
 
-  for( int i = 0; i < ui.tabWidget->count(); i++ )
-  {
+  for ( int i = 0; i < ui.tabWidget->count(); i++ ) {
     QString headword = ui.tabWidget->tabText( i );
     ui.favoritesPaneWidget->addHeadword( folder, unescapeTabHeader( headword ) );
   }
@@ -4481,7 +4293,7 @@ bool MainWindow::isWordPresentedInFavorites( QString const & word, unsigned grou
 {
   QString folder;
   Instances::Group const * igrp = groupInstances.findGroup( groupId );
-  if( igrp )
+  if ( igrp )
     folder = igrp->favoritesFolder;
 
   return ui.favoritesPaneWidget->isHeadwordPresent( folder, word );
@@ -4489,39 +4301,30 @@ bool MainWindow::isWordPresentedInFavorites( QString const & word, unsigned grou
 
 void MainWindow::setGroupByName( QString const & name, bool main_window )
 {
-  if( main_window )
-  {
+  if ( main_window ) {
     int i;
-    for( i = 0; i < groupList->count(); i++ )
-    {
-      if( groupList->itemText( i ) == name )
-      {
+    for ( i = 0; i < groupList->count(); i++ ) {
+      if ( groupList->itemText( i ) == name ) {
         groupList->setCurrentIndex( i );
         break;
       }
     }
-    if( i >= groupList->count() )
+    if ( i >= groupList->count() )
       gdWarning( "Group \"%s\" for main window is not found\n", name.toUtf8().data() );
   }
-  else
-  {
+  else {
     emit setPopupGroupByName( name );
   }
 }
 
-void MainWindow::headwordFromFavorites( QString const & headword,
-                                        QString const & favoritesFolder )
+void MainWindow::headwordFromFavorites( QString const & headword, QString const & favoritesFolder )
 {
-  if( !favoritesFolder.isEmpty() )
-  {
+  if ( !favoritesFolder.isEmpty() ) {
     // Find group by it Favorites folder
-    for( Instances::Groups::size_type i = 0; i < groupInstances.size(); i++ )
-    {
-      if( groupInstances[ i ].favoritesFolder == favoritesFolder )
-      {
+    for ( Instances::Groups::size_type i = 0; i < groupInstances.size(); i++ ) {
+      if ( groupInstances[ i ].favoritesFolder == favoritesFolder ) {
         // Group found. Select it and stop search.
-        if( groupList->currentIndex() != (int)i )
-        {
+        if ( groupList->currentIndex() != (int)i ) {
           groupList->setCurrentIndex( i );
 
           // Restore focus on Favorites tree
@@ -4536,15 +4339,13 @@ void MainWindow::headwordFromFavorites( QString const & headword,
   // bookmark cases:   the favorite item may like this   "word~~~selectedtext"
   auto words = headword.split( "~~~" );
 
-  setInputLineText( words[0], WildcardPolicy::EscapeWildcards, DisablePopup );
+  setInputLineText( words[ 0 ], WildcardPolicy::EscapeWildcards, DisablePopup );
 
   //must be a bookmark.
-  if(words.size()>1)
-  {
+  if ( words.size() > 1 ) {
     auto view = getCurrentArticleView();
-    if(view)
-    {
-      view->setDelayedHighlightText(words[1]);// findText( words[ 1 ], QWebEnginePage::FindCaseSensitively );
+    if ( view ) {
+      view->setDelayedHighlightText( words[ 1 ] ); // findText( words[ 1 ], QWebEnginePage::FindCaseSensitively );
     }
   }
 
diff --git a/src/ui/mainwindow.hh b/src/ui/mainwindow.hh
index e2be7e50..6aab7318 100644
--- a/src/ui/mainwindow.hh
+++ b/src/ui/mainwindow.hh
@@ -10,8 +10,8 @@
 #include <QSystemTrayIcon>
 #include <QNetworkAccessManager>
 #include <QProgressDialog>
+#include <functional>
 #include "ui_mainwindow.h"
-#include "folding.hh"
 #include "config.hh"
 #include "dict/dictionary.hh"
 #include "article_netmgr.hh"
@@ -26,21 +26,19 @@
 #include "mainstatusbar.hh"
 #include "mruqmenu.hh"
 #include "translatebox.hh"
-#include "wordlist.hh"
 #include "dictheadwords.hh"
 #include "fulltextsearch.hh"
 #include "base_type.hh"
 
 #include "hotkeywrapper.hh"
-#include "weburlrequestinterceptor.hh"
 #include "resourceschemehandler.hh"
 #include "iframeschemehandler.hh"
 #ifdef HAVE_X11
-#include <fixx11h.h>
+  #include <fixx11h.h>
 #endif
 
-#if defined(Q_OS_MAC)
-#include "macos/gd_clipboard.hh"
+#if defined( Q_OS_MAC )
+  #include "macos/gd_clipboard.hh"
 #endif
 
 using std::string;
@@ -60,18 +58,21 @@ public:
   /// Set group for main/popup window
   void setGroupByName( QString const & name, bool main_window );
 
-  enum class WildcardPolicy { EscapeWildcards, WildcardsAreAlreadyEscaped };
+  enum class WildcardPolicy {
+    EscapeWildcards,
+    WildcardsAreAlreadyEscaped
+  };
 public slots:
 
   void messageFromAnotherInstanceReceived( QString const & );
-  void showStatusBarMessage ( QString const &, int, QPixmap const & );
+  void showStatusBarMessage( QString const &, int, QPixmap const & );
   void wordReceived( QString const & );
   void headwordReceived( QString const &, QString const & );
   void headwordFromFavorites( QString const &, QString const & );
   void quitApp();
 
 private:
-  void addGlobalAction( QAction * action, const char * slot );
+  void addGlobalAction( QAction * action, const std::function< void() > & slotFunc );
   void addGlobalActionsToDialog( QDialog * dialog );
   void addGroupComboBoxActionsToDialog( QDialog * dialog, GroupComboBox * pGroupComboBox );
   void removeGroupComboBoxActionsFromDialog( QDialog * dialog, GroupComboBox * pGroupComboBox );
@@ -89,7 +90,7 @@ private:
   QWidget searchPaneTitleBar;
   QHBoxLayout searchPaneTitleBarLayout;
   QLabel groupLabel;
-  GroupComboBox * groupList, * groupListInToolbar, * groupListInDock;
+  GroupComboBox *groupList, *groupListInToolbar, *groupListInDock;
 
   // Needed to be able to show/hide the translate box in the toolbar, since hiding
   // the list expilictily doesn't work, see docs for QToolBar::addWidget().
@@ -104,33 +105,31 @@ private:
   /// Fonts saved before words zooming is in effect, so it could be reset back.
   QFont wordListDefaultFont, translateLineDefaultFont, groupListDefaultFont;
 
-  QAction escAction, focusTranslateLineAction, addTabAction, closeCurrentTabAction,
-          closeAllTabAction, closeRestTabAction,
-          switchToNextTabAction, switchToPrevTabAction,
-          showDictBarNamesAction, useSmallIconsInToolbarsAction, toggleMenuBarAction,
-          focusHeadwordsDlgAction, focusArticleViewAction,
-          addAllTabToFavoritesAction;
+  QAction escAction, focusTranslateLineAction, addTabAction, closeCurrentTabAction, closeAllTabAction,
+    closeRestTabAction, switchToNextTabAction, switchToPrevTabAction, showDictBarNamesAction,
+    useSmallIconsInToolbarsAction, toggleMenuBarAction, focusHeadwordsDlgAction, focusArticleViewAction,
+    addAllTabToFavoritesAction;
   QToolBar * navToolbar;
   MainStatusBar * mainStatusBar;
-  QAction * navBack, * navForward, * navPronounce, * enableScanningAction;
+  QAction *navBack, *navForward, *navPronounce, *enableScanningAction;
   QAction * beforeOptionsSeparator;
-  QAction * zoomIn, * zoomOut, * zoomBase;
-  QAction * wordsZoomIn, * wordsZoomOut, * wordsZoomBase;
-  QAction * addToFavorites, * beforeAddToFavoritesSeparator;
+  QAction *zoomIn, *zoomOut, *zoomBase;
+  QAction *wordsZoomIn, *wordsZoomOut, *wordsZoomBase;
+  QAction *addToFavorites, *beforeAddToFavoritesSeparator;
   QMenu trayIconMenu;
   QMenu * tabMenu;
   QAction * menuButtonAction;
   QToolButton * menuButton;
-  MRUQMenu *tabListMenu;
+  MRUQMenu * tabListMenu;
   //List that contains indexes of tabs arranged in a most-recently-used order
-  QList<QWidget*> mruList;
+  QList< QWidget * > mruList;
   QToolButton addTab, *tabListButton;
   Config::Class & cfg;
   Config::Events configEvents;
   History history;
   DictionaryBar dictionaryBar;
   vector< sptr< Dictionary::Class > > dictionaries;
-  QMap<std::string, sptr< Dictionary::Class > > dictMap;
+  QMap< std::string, sptr< Dictionary::Class > > dictMap;
   /// Here we store unmuted dictionaries when the dictionary bar is active
   vector< sptr< Dictionary::Class > > dictionariesUnmuted;
   Instances::Groups groupInstances;
@@ -141,7 +140,7 @@ private:
                                     // in a separate thread
   AudioPlayerFactory audioPlayerFactory;
 
-  WordList * wordList;
+  //current active translateLine;
   QLineEdit * translateLine;
 
   WordFinder wordFinder;
@@ -150,10 +149,6 @@ private:
 
   sptr< HotkeyWrapper > hotkeyWrapper;
 
-  QTimer newReleaseCheckTimer; // Countdown to a check for the new program
-                               // release, if enabled
-  QNetworkReply *latestReleaseReply;
-
   sptr< QPrinter > printer; // The printer we use for all printing operations
 
   bool wordListSelChanged;
@@ -177,11 +172,23 @@ private:
   ResourceSchemeHandler * resourceSchemeHandler;
 
 #ifdef Q_OS_MAC
-    gd_clipboard * macClipboard;
+  gd_clipboard * macClipboard;
 #endif
 
-  /// Applies the custom Qt stylesheet
-  void applyQtStyleSheet( QString const & addonStyle, QString const & displayStyle ,bool const & darkMode );
+#if !defined( Q_OS_WIN )
+  // On Linux, this will be the style before getting overriden by custom styles
+  // On macOS, this will be just Fusion.
+  QString defaultInterfaceStyle;
+#endif
+  /// Applies Qt stylesheets, use Windows dark palette etc....
+  void updateAppearances( const QString & addonStyle,
+                          const QString & displayStyle,
+                          const bool & darkMode
+#if !defined( Q_OS_WIN )
+                          ,
+                          const QString & interfaceStyle
+#endif
+  );
 
   /// Creates, destroys or otherwise updates tray icon, according to the
   /// current configuration and situation.
@@ -215,11 +222,7 @@ private:
 
   /// Brings the main window to front if it's not currently, or hides it
   /// otherwise. The hiding part is omitted if onlyShow is true.
-#ifdef HAVE_X11
-  void toggleMainWindow( bool onlyShow = false, bool byIconClick = false );
-#else
   void toggleMainWindow( bool onlyShow = false );
-#endif
 
   /// Creates hotkeyWrapper and hooks the currently set keys for it
   void installHotKeys();
@@ -227,13 +230,14 @@ private:
   void applyZoomFactor();
   void adjustCurrentZoomFactor();
 
-  void mousePressEvent ( QMouseEvent * event );
+  void mousePressEvent( QMouseEvent * event );
 
   void updateCurrentGroupProperty();
 
+
   /// Handles backward and forward mouse buttons and
   /// returns true if the event is handled.
-  bool handleBackForwardMouseButtons(QMouseEvent *ev);
+  bool handleBackForwardMouseButtons( QMouseEvent * ev );
 
   ArticleView * getCurrentArticleView();
   void ctrlTabPressed();
@@ -242,35 +246,34 @@ private:
 
   QString unescapeTabHeader( QString const & header );
 
-  void respondToTranslationRequest( QString const & word,
-                                    bool checkModifiers, QString const & scrollTo = QString() );
+  void respondToTranslationRequest( QString const & word, bool checkModifiers, QString const & scrollTo = QString() );
 
   void updateSuggestionList();
   void updateSuggestionList( QString const & text );
 
-  enum TranslateBoxPopup { NoPopupChange, EnablePopup, DisablePopup };
+  enum TranslateBoxPopup {
+    NoPopupChange,
+    EnablePopup,
+    DisablePopup
+  };
+
 
   /// Change the text of translateLine (Input line in the dock) or TranslateBox (Input line in toolbar)
   void setInputLineText( QString text, WildcardPolicy wildcardPolicy, TranslateBoxPopup popupAction );
 
-  void changeWebEngineViewFont();
+  void changeWebEngineViewFont() const;
   bool isWordPresentedInFavorites( QString const & word, unsigned groupId );
+  void errorMessageOnStatusBar( const QString & errStr );
+
 private slots:
 
+  /// Try check new release, popup a dialog, and update the check time & skippedRelease version
+  void checkNewRelease();
+
   void hotKeyActivated( int );
 
-  /// If new release checks are on, santizies the next check time and starts
-  /// the timer. Does nothing otherwise.
-  void prepareNewReleaseChecks();
-
   void updateFoundInDictsList();
 
-  /// Does the new release check.
-  void checkForNewRelease();
-
-  /// Signalled when the lastestReleaseReply is finished()
-  void latestReleaseReplyReady();
-
   /// Receive click on "Found in:" pane
   void foundDictsPaneClicked( QListWidgetItem * item );
 
@@ -283,7 +286,7 @@ private slots:
 
   void openDictionaryFolder( QString const & id );
 
-  void editDictionary ( Dictionary::Class * dict );
+  void editDictionary( Dictionary::Class * dict );
 
   void showFTSIndexingName( QString const & name );
 
@@ -307,7 +310,7 @@ private slots:
   // Handling of active tab list
   void createTabList();
   void fillWindowsMenu();
-  void switchToWindow(QAction *act);
+  void switchToWindow( QAction * act );
 
   /// Triggered by the actions in the nav toolbar
   void backClicked();
@@ -320,7 +323,7 @@ private slots:
 
   void pageLoaded( ArticleView * );
   void tabSwitched( int );
-  void tabMenuRequested(QPoint pos);
+  void tabMenuRequested( QPoint pos );
 
   void dictionaryBarToggled( bool checked );
 
@@ -362,16 +365,15 @@ private slots:
 
   void jumpToDictionary( QListWidgetItem *, bool force = false );
 
-  void showDictsPane( );
-  void dictsPaneVisibilityChanged ( bool );
+  void showDictsPane();
+  void dictsPaneVisibilityChanged( bool );
 
   /// Creates a new tab, which is to be populated then with some content.
-  ArticleView * createNewTab( bool switchToIt,
-                              QString const & name );
+  ArticleView * createNewTab( bool switchToIt, QString const & name );
 
-  void openLinkInNewTab( QUrl const &, QUrl const &, QString const &,
-                         Contexts const & contexts );
-  void showDefinitionInNewTab( QString const & word, unsigned group,
+  void openLinkInNewTab( QUrl const &, QUrl const &, QString const &, Contexts const & contexts );
+  void showDefinitionInNewTab( QString const & word,
+                               unsigned group,
                                QString const & fromArticle,
                                Contexts const & contexts );
   void typingEvent( QString const & );
@@ -380,11 +382,12 @@ private slots:
 
   void mutedDictionariesChanged();
 
-  void showTranslationFor(QString const &, unsigned inGroup = 0,
-                           QString const & scrollTo = QString() );
+  void showTranslationFor( QString const &, unsigned inGroup = 0, QString const & scrollTo = QString() );
 
-  void showTranslationForDicts( QString const &, QStringList const & dictIDs,
-                           QRegExp const & searchRegExp, bool ignoreDiacritics );
+  void showTranslationForDicts( QString const &,
+                                QStringList const & dictIDs,
+                                QRegExp const & searchRegExp,
+                                bool ignoreDiacritics );
 
   void showHistoryItem( QString const & );
 
@@ -437,7 +440,8 @@ private slots:
   /// Add word to history
   void addWordToHistory( const QString & word );
   /// Add word to history even if history is disabled in options
-  void forceAddWordToHistory( const QString & word);
+  void forceAddWordToHistory( const QString & word );
+
 
   void addWordToFavorites( QString const & word, unsigned groupId, bool );
 
@@ -458,10 +462,13 @@ private slots:
   void showFullTextSearchDialog();
   void closeFullTextSearchDialog();
 
-  void clipboardChange(QClipboard::Mode m);
+  void clipboardChange( QClipboard::Mode m );
 
   void inspectElement( QWebEnginePage * );
-
+  void prefixMatchUpdated();
+  void prefixMatchFinished();
+  void updateMatchResults( bool finished );
+  void refreshTranslateLine();
 signals:
   /// Retranslate Ctrl(Shift) + Click on dictionary pane to dictionary toolbar
   void clickOnDictPane( QString const & id );
@@ -470,12 +477,12 @@ signals:
   void setPopupGroupByName( QString const & name );
 };
 
-class ArticleSaveProgressDialog : public QProgressDialog
+class ArticleSaveProgressDialog: public QProgressDialog
 {
-Q_OBJECT
+  Q_OBJECT
 
 public:
-  explicit ArticleSaveProgressDialog( QWidget * parent = 0,  Qt::WindowFlags f = Qt::Widget ):
+  explicit ArticleSaveProgressDialog( QWidget * parent = nullptr, Qt::WindowFlags f = Qt::Widget ):
     QProgressDialog( parent, f )
   {
     setAutoReset( false );
@@ -486,8 +493,7 @@ public slots:
   void perform()
   {
     int progress = value() + 1;
-    if ( progress == maximum() )
-    {
+    if ( progress == maximum() ) {
       emit close();
       deleteLater();
     }
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 30c4d3a2..056fbc21 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -192,7 +192,7 @@
       </widget>
      </item>
      <item>
-      <widget class="WordList" name="wordList"/>
+      <widget class="QListWidget" name="wordList"/>
      </item>
     </layout>
    </widget>
@@ -607,11 +607,6 @@
    <header>historypanewidget.hh</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>WordList</class>
-   <extends>QListWidget</extends>
-   <header>wordlist.hh</header>
-  </customwidget>
   <customwidget>
    <class>FavoritesPaneWidget</class>
    <extends>QWidget</extends>
diff --git a/src/ui/mruqmenu.cc b/src/ui/mruqmenu.cc
index 156da0f1..f917adfc 100644
--- a/src/ui/mruqmenu.cc
+++ b/src/ui/mruqmenu.cc
@@ -1,14 +1,16 @@
 #include "mruqmenu.hh"
 #include <QKeyEvent>
 
-MRUQMenu::MRUQMenu(const QString title, QWidget *parent):
-  QMenu(title,parent)
-{}
+MRUQMenu::MRUQMenu( const QString title, QWidget * parent ):
+  QMenu( title, parent )
+{
+}
 
-void MRUQMenu::keyReleaseEvent (QKeyEvent * kev){
-  if (kev->key() == Qt::Key_Control && actions().size() > 1){
-    QAction *act = activeAction();
-    if( act == nullptr ){
+void MRUQMenu::keyReleaseEvent( QKeyEvent * kev )
+{
+  if ( kev->key() == Qt::Key_Control && actions().size() > 1 ) {
+    QAction * act = activeAction();
+    if ( act == nullptr ) {
       act = actions().at( 1 );
     }
     emit requestTabChange( act->data().toInt() );
diff --git a/src/ui/mruqmenu.hh b/src/ui/mruqmenu.hh
index 83a7350b..238dc6db 100644
--- a/src/ui/mruqmenu.hh
+++ b/src/ui/mruqmenu.hh
@@ -11,15 +11,14 @@ class MRUQMenu: public QMenu
   Q_OBJECT
 
 public:
-  explicit MRUQMenu(const QString title, QWidget *parent = 0);
+  explicit MRUQMenu( const QString title, QWidget * parent = 0 );
 
 private:
-  void keyReleaseEvent (QKeyEvent * kev) override;
+  void keyReleaseEvent( QKeyEvent * kev ) override;
 
 signals:
-  void requestTabChange(int index);
+  void requestTabChange( int index );
 };
 
 
-
 #endif // MRUQMENU_HH
diff --git a/src/ui/orderandprops.cc b/src/ui/orderandprops.cc
index 4b97f547..2f65e231 100644
--- a/src/ui/orderandprops.cc
+++ b/src/ui/orderandprops.cc
@@ -16,65 +16,61 @@ using std::sort;
 
 namespace {
 
-bool dictNameLessThan( sptr< Dictionary::Class > const & dict1,
-                       sptr< Dictionary::Class > const & dict2 )
+bool dictNameLessThan( sptr< Dictionary::Class > const & dict1, sptr< Dictionary::Class > const & dict2 )
 {
   QString str1 = QString::fromUtf8( dict1->getName().c_str() );
   QString str2 = QString::fromUtf8( dict2->getName().c_str() );
-  if( str1.isEmpty() && !str2.isEmpty() )
+  if ( str1.isEmpty() && !str2.isEmpty() )
     return false;
-  if( !str1.isEmpty() && str2.isEmpty() )
+  if ( !str1.isEmpty() && str2.isEmpty() )
     return true;
 
   return str1.localeAwareCompare( str2 ) < 0;
 }
 
-bool dictLessThan( sptr< Dictionary::Class > const & dict1,
-                   sptr< Dictionary::Class > const & dict2 )
+bool dictLessThan( sptr< Dictionary::Class > const & dict1, sptr< Dictionary::Class > const & dict2 )
 {
   int idFrom1 = dict1->getLangFrom();
-  int idTo1 = dict1->getLangTo();
-  if( idFrom1 == 0)
-  {
-    QPair<quint32,quint32> ids = LangCoder::findIdsForName( QString::fromUtf8( dict1->getName().c_str() ) );
-    idFrom1 = ids.first;
-    idTo1 = ids.second;
+  int idTo1   = dict1->getLangTo();
+  if ( idFrom1 == 0 ) {
+    QPair< quint32, quint32 > ids = LangCoder::findIdsForName( QString::fromUtf8( dict1->getName().c_str() ) );
+    idFrom1                       = ids.first;
+    idTo1                         = ids.second;
   }
 
   int idFrom2 = dict2->getLangFrom();
-  int idTo2 = dict2->getLangTo();
-  if( idFrom2 == 0)
-  {
-    QPair<quint32,quint32> ids = LangCoder::findIdsForName( QString::fromUtf8( dict2->getName().c_str() ) );
-    idFrom2 = ids.first;
-    idTo2 = ids.second;
+  int idTo2   = dict2->getLangTo();
+  if ( idFrom2 == 0 ) {
+    QPair< quint32, quint32 > ids = LangCoder::findIdsForName( QString::fromUtf8( dict2->getName().c_str() ) );
+    idFrom2                       = ids.first;
+    idTo2                         = ids.second;
   }
 
   QString str1 = LangCoder::decode( idFrom1 );
   QString str2 = LangCoder::decode( idFrom2 );
-  if( str1.isEmpty() && !str2.isEmpty() )
+  if ( str1.isEmpty() && !str2.isEmpty() )
     return false;
-  if( !str1.isEmpty() && str2.isEmpty() )
+  if ( !str1.isEmpty() && str2.isEmpty() )
     return true;
   int res = str1.localeAwareCompare( str2 );
-  if( res )
+  if ( res )
     return res < 0;
 
   str1 = LangCoder::decode( idTo1 );
   str2 = LangCoder::decode( idTo2 );
-  if( str1.isEmpty() && !str2.isEmpty() )
+  if ( str1.isEmpty() && !str2.isEmpty() )
     return false;
-  if( !str1.isEmpty() && str2.isEmpty() )
+  if ( !str1.isEmpty() && str2.isEmpty() )
     return true;
   res = str1.localeAwareCompare( str2 );
-  if( res )
+  if ( res )
     return res < 0;
 
   str1 = QString::fromUtf8( dict1->getName().c_str() );
   str2 = QString::fromUtf8( dict2->getName().c_str() );
-  if( str1.isEmpty() && !str2.isEmpty() )
+  if ( str1.isEmpty() && !str2.isEmpty() )
     return false;
-  if( !str1.isEmpty() && str2.isEmpty() )
+  if ( !str1.isEmpty() && str2.isEmpty() )
     return true;
 
   return str1.localeAwareCompare( str2 ) < 0;
@@ -85,7 +81,7 @@ bool dictLessThan( sptr< Dictionary::Class > const & dict1,
 OrderAndProps::OrderAndProps( QWidget * parent,
                               Config::Group const & dictionaryOrder,
                               Config::Group const & inactiveDictionaries,
-                              std::vector< sptr< Dictionary::Class > >  const & allDictionaries):
+                              std::vector< sptr< Dictionary::Class > > const & allDictionaries ):
   QWidget( parent )
 {
   ui.setupUi( this );
@@ -108,12 +104,14 @@ OrderAndProps::OrderAndProps( QWidget * parent,
   connect( ui.dictionaryOrder, &DictListWidget::gotFocus, this, &OrderAndProps::dictListFocused );
   connect( ui.inactiveDictionaries, &DictListWidget::gotFocus, this, &OrderAndProps::inactiveDictListFocused );
 
-  connect ( ui.dictionaryOrder->selectionModel(), SIGNAL( selectionChanged ( const QItemSelection & , const QItemSelection & ) ),
-      this, SLOT( dictionarySelectionChanged( const QItemSelection & ) ) );
+  connect( ui.dictionaryOrder->selectionModel(),
+           &QItemSelectionModel::selectionChanged,
+           this,
+           &OrderAndProps::dictionarySelectionChanged );
   connect( ui.inactiveDictionaries->selectionModel(),
-    &QItemSelectionModel::selectionChanged,
-    this,
-    &OrderAndProps::inactiveDictionarySelectionChanged );
+           &QItemSelectionModel::selectionChanged,
+           this,
+           &OrderAndProps::inactiveDictionarySelectionChanged );
 
   connect( ui.searchLine, &QuickFilterLine::filterChanged, this, &OrderAndProps::filterChanged );
 
@@ -141,11 +139,11 @@ Config::Group OrderAndProps::getCurrentInactiveDictionaries() const
   return g.makeConfigGroup();
 }
 
-void OrderAndProps::filterChanged( QString const & filterText)
+void OrderAndProps::filterChanged( QString const & filterText )
 {
   // when the filter is active, disable the possibility
   // to drop dictionaries to this filtered list
-  ui.dictionaryOrder->setAcceptDrops(filterText.isEmpty());
+  ui.dictionaryOrder->setAcceptDrops( filterText.isEmpty() );
 }
 
 void OrderAndProps::dictListFocused()
@@ -158,8 +156,10 @@ void OrderAndProps::inactiveDictListFocused()
   describeDictionary( ui.inactiveDictionaries, ui.inactiveDictionaries->currentIndex() );
 }
 
-void OrderAndProps::dictionarySelectionChanged( const QItemSelection & current )
+void OrderAndProps::dictionarySelectionChanged( const QItemSelection & current, const QItemSelection & deselected )
 {
+  Q_UNUSED( deselected )
+
   if ( current.empty() )
     return;
 
@@ -193,14 +193,12 @@ void OrderAndProps::disableDictionaryDescription()
 
 void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const & idx )
 {
-  if ( !idx.isValid() || (unsigned) idx.row() >= lst->getCurrentDictionaries().size() )
+  if ( !idx.isValid() || (unsigned)idx.row() >= lst->getCurrentDictionaries().size() )
     disableDictionaryDescription();
-  else
-  {
+  else {
     sptr< Dictionary::Class > dict = lst->getCurrentDictionaries()[ idx.row() ];
 
-    if ( !dict )
-    {
+    if ( !dict ) {
       return;
     }
 
@@ -217,8 +215,7 @@ void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const
 
     QString filenamesText;
 
-    for( unsigned x = 0; x < filenames.size(); x++ )
-    {
+    for ( unsigned x = 0; x < filenames.size(); x++ ) {
       filenamesText += filenames[ x ].c_str();
       filenamesText += '\n';
     }
@@ -226,8 +223,7 @@ void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const
     ui.dictionaryFileList->setPlainText( filenamesText );
 
     QString descText = dict->getDescription();
-    if( !descText.isEmpty() && descText.compare( "NONE" ) != 0 )
-    {
+    if ( !descText.isEmpty() && descText.compare( "NONE" ) != 0 ) {
       //qtbug QTBUG-112020
       descText.remove( QRegularExpression( R"(<link[^>]*>)", QRegularExpression::CaseInsensitiveOption ) );
       ui.dictionaryDescription->setHtml( descText );
@@ -235,8 +231,7 @@ void OrderAndProps::describeDictionary( DictListWidget * lst, QModelIndex const
       ui.dictionaryDescriptionLabel->setVisible( true );
       ui.infoVerticalSpacer->changeSize( 0, 0, QSizePolicy::Minimum, QSizePolicy::Minimum );
     }
-    else
-    {
+    else {
       ui.dictionaryDescription->setVisible( false );
       ui.dictionaryDescriptionLabel->setVisible( false );
       ui.infoVerticalSpacer->changeSize( 20, 5, QSizePolicy::Minimum, QSizePolicy::Expanding );
@@ -250,12 +245,11 @@ void OrderAndProps::contextMenuRequested( const QPoint & pos )
   QMenu menu( this );
 
   QAction * showHeadwordsAction = NULL;
-  QModelIndex idx = ui.searchLine->mapToSource( ui.dictionaryOrder->indexAt( pos ) );
+  QModelIndex idx               = ui.searchLine->mapToSource( ui.dictionaryOrder->indexAt( pos ) );
   sptr< Dictionary::Class > dict;
-  if( idx.isValid() && (unsigned)idx.row() < ui.dictionaryOrder->getCurrentDictionaries().size() )
+  if ( idx.isValid() && (unsigned)idx.row() < ui.dictionaryOrder->getCurrentDictionaries().size() )
     dict = ui.dictionaryOrder->getCurrentDictionaries()[ idx.row() ];
-  if ( dict && dict->getWordCount() > 0 )
-  {
+  if ( dict && dict->getWordCount() > 0 ) {
     showHeadwordsAction = new QAction( tr( "Dictionary headwords" ), &menu );
     menu.addAction( showHeadwordsAction );
   }
@@ -267,25 +261,24 @@ void OrderAndProps::contextMenuRequested( const QPoint & pos )
 
   QAction * result = menu.exec( ui.dictionaryOrder->mapToGlobal( pos ) );
 
-  if( result == sortNameAction || result == sortLangAction )
-  {
+  if ( result == sortNameAction || result == sortLangAction ) {
     vector< sptr< Dictionary::Class > > sortedDicts = ui.dictionaryOrder->getCurrentDictionaries();
-    if( result == sortNameAction )
+    if ( result == sortNameAction )
       sort( sortedDicts.begin(), sortedDicts.end(), dictNameLessThan );
     else
       sort( sortedDicts.begin(), sortedDicts.end(), dictLessThan );
     ui.dictionaryOrder->populate( sortedDicts );
   }
 
-  if( result && result == showHeadwordsAction )
-  {
+  if ( result && result == showHeadwordsAction ) {
     emit showDictionaryHeadwords( dict.get() );
   }
 }
 
 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() ) ) ) );
+  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 --git a/src/ui/orderandprops.hh b/src/ui/orderandprops.hh
index d9234753..dce11782 100644
--- a/src/ui/orderandprops.hh
+++ b/src/ui/orderandprops.hh
@@ -14,17 +14,17 @@ class OrderAndProps: public QWidget
 
 public:
 
-  OrderAndProps( QWidget * parent, Config::Group const & dictionaryOrder,
+  OrderAndProps( QWidget * parent,
+                 Config::Group const & dictionaryOrder,
                  Config::Group const & inactiveDictionaries,
-                 std::vector< sptr< Dictionary::Class > > const & allDictionaries);
+                 std::vector< sptr< Dictionary::Class > > const & allDictionaries );
 
   Config::Group getCurrentDictionaryOrder() const;
   Config::Group getCurrentInactiveDictionaries() const;
 
 private slots:
-
-  void dictionarySelectionChanged( const QItemSelection &current );
-  void inactiveDictionarySelectionChanged( const QItemSelection &current );
+  void dictionarySelectionChanged( const QItemSelection & current, const QItemSelection & deselected );
+  void inactiveDictionarySelectionChanged( const QItemSelection & current );
   void contextMenuRequested( const QPoint & pos );
   void filterChanged( QString const & filterText );
   void dictListFocused();
diff --git a/src/ui/preferences.cc b/src/ui/preferences.cc
index 3d9aa5f9..2d2bdea1 100644
--- a/src/ui/preferences.cc
+++ b/src/ui/preferences.cc
@@ -7,21 +7,23 @@
 #include <QDir>
 #include <QFontDatabase>
 #include <QMessageBox>
+#include <QThread>
 #include <QWebEngineProfile>
 #include <QWebEngineSettings>
+#include <QStyleFactory>
 
 Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
-  QDialog( parent ), prevInterfaceLanguage( 0 )
-, cfg( cfg_ )
-, helpAction( this )
+  QDialog( parent ),
+  cfg( cfg_ ),
+  helpAction( this )
 {
   Config::Preferences const & p = cfg_.preferences;
   ui.setupUi( this );
 
   connect( ui.enableScanPopupModifiers,
-    &QAbstractButton::toggled,
-    this,
-    &Preferences::enableScanPopupModifiersToggled );
+           &QAbstractButton::toggled,
+           this,
+           &Preferences::enableScanPopupModifiersToggled );
 
   connect( ui.showScanFlag, &QAbstractButton::toggled, this, &Preferences::showScanFlagToggled );
 
@@ -59,16 +61,13 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   // Load values into form
 
   ui.interfaceLanguage->addItem( tr( "System default" ), QString() );
-  ui.fontFamilies->addItem( tr( "System default" ), QString() );
-
   // See which other translations do we have
 
-  QStringList availLocs = QDir( Config::getLocDir() ).entryList( QStringList( "*.qm" ),
-                                                                 QDir::Files );
+  QStringList availLocs = QDir( Config::getLocDir() ).entryList( QStringList( "*.qm" ), QDir::Files );
 
   // We need to sort by language name -- otherwise list looks really weird
   QMultiMap< QString, QString > sortedLocs;
-  sortedLocs.insert( Language::languageForLocale( "en_US" ), "en_US");
+  sortedLocs.insert( Language::languageForLocale( "en_US" ), "en_US" );
   for ( const auto & availLoc : availLocs ) {
     // Here we assume the xx_YY naming, where xx is language and YY is region.
     //remove .qm suffix.
@@ -87,32 +86,46 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   }
 
   for ( auto i = sortedLocs.begin(); i != sortedLocs.end(); ++i ) {
-    ui.interfaceLanguage->addItem(  i.key(), i.value() );
+    ui.interfaceLanguage->addItem( i.key(), i.value() );
   }
 
-  for( int x = 0; x < ui.interfaceLanguage->count(); ++x ) {
-    if ( ui.interfaceLanguage->itemData( x ).toString() == p.interfaceLanguage )
-    {
+  for ( int x = 0; x < ui.interfaceLanguage->count(); ++x ) {
+    if ( ui.interfaceLanguage->itemData( x ).toString() == p.interfaceLanguage ) {
       ui.interfaceLanguage->setCurrentIndex( x );
       prevInterfaceLanguage = x;
       break;
     }
   }
 
-#if( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
-  const QStringList fontFamilies = QFontDatabase::families();
-#else
-  QFontDatabase fontDb;
-  const QStringList fontFamilies = fontDb.families();
-#endif
-  for( const QString & family : fontFamilies )
-  {
-    ui.fontFamilies->addItem( family );
-  }
-  prevWebFontFamily = p.webFontFamily;
+  prevWebFontFamily = p.customFonts;
 
-  if(!p.webFontFamily.isEmpty())
-    ui.fontFamilies->setCurrentText( p.webFontFamily );
+  if ( !p.customFonts.standard.isEmpty() )
+    ui.font_standard->setCurrentText( p.customFonts.standard );
+  else {
+    ui.font_standard->setCurrentFont(
+      QWebEngineProfile::defaultProfile()->settings()->fontFamily( QWebEngineSettings::StandardFont ) );
+  }
+
+  if ( !p.customFonts.serif.isEmpty() )
+    ui.font_serif->setCurrentText( p.customFonts.serif );
+  else {
+    ui.font_serif->setCurrentFont(
+      QWebEngineProfile::defaultProfile()->settings()->fontFamily( QWebEngineSettings::SerifFont ) );
+  }
+
+  if ( !p.customFonts.sansSerif.isEmpty() )
+    ui.font_sans->setCurrentText( p.customFonts.sansSerif );
+  else {
+    ui.font_sans->setCurrentFont(
+      QWebEngineProfile::defaultProfile()->settings()->fontFamily( QWebEngineSettings::SansSerifFont ) );
+  }
+
+  if ( !p.customFonts.monospace.isEmpty() )
+    ui.font_monospace->setCurrentText( p.customFonts.monospace );
+  else {
+    ui.font_monospace->setCurrentFont(
+      QWebEngineProfile::defaultProfile()->settings()->fontFamily( QWebEngineSettings::FixedFont ) );
+  }
 
   ui.displayStyle->addItem( QIcon( ":/icons/programicon_old.png" ), tr( "Default" ), QString() );
   ui.displayStyle->addItem( QIcon( ":/icons/programicon.png" ), tr( "Classic" ), QString( "classic" ) );
@@ -122,12 +135,33 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.displayStyle->addItem( QIcon( ":/icons/icon32_lingoes.png" ), tr( "Lingoes" ), QString( "lingoes" ) );
   ui.displayStyle->addItem( QIcon( ":/icons/icon32_lingoes.png" ), tr( "Lingoes-Blue" ), QString( "lingoes-blue" ) );
 
-  for( int x = 0; x < ui.displayStyle->count(); ++x )
-    if ( ui.displayStyle->itemData( x ).toString() == p.displayStyle )
-    {
+  for ( int x = 0; x < ui.displayStyle->count(); ++x ) {
+    if ( ui.displayStyle->itemData( x ).toString() == p.displayStyle ) {
       ui.displayStyle->setCurrentIndex( x );
       break;
     }
+  }
+
+#if !defined( Q_OS_WIN )
+  ui.InterfaceStyle->addItem( "Default", "Default" );
+
+  for ( const auto & style : QStyleFactory::keys() ) {
+    ui.InterfaceStyle->addItem( style, style );
+  }
+
+  for ( int i = 0; i < ui.InterfaceStyle->count(); ++i ) {
+    if ( ui.InterfaceStyle->itemData( i ).toString() == p.interfaceStyle ) {
+      ui.InterfaceStyle->setCurrentIndex( i );
+      prevInterfaceStyle = i;
+      break;
+    }
+  }
+#endif
+
+#if defined( Q_OS_WIN )
+  ui.interfaceStyleLabel->hide();
+  ui.InterfaceStyle->hide();
+#endif
 
 #ifdef Q_OS_WIN32
   // 1 MB stands for 2^20 bytes on Windows. "MiB" is never used by this OS.
@@ -144,11 +178,11 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.closeToTray->setChecked( p.closeToTray );
   ui.cbAutostart->setChecked( p.autoStart );
   ui.doubleClickTranslates->setChecked( p.doubleClickTranslates );
-  ui.selectBySingleClick->setChecked( p.selectWordBySingleClick);
+  ui.selectBySingleClick->setChecked( p.selectWordBySingleClick );
   ui.autoScrollToTargetArticle->setChecked( p.autoScrollToTargetArticle );
   ui.escKeyHidesMainWindow->setChecked( p.escKeyHidesMainWindow );
-  ui.darkMode->setChecked(p.darkMode);
-  ui.darkReaderMode -> setChecked(p.darkReaderMode);
+  ui.darkMode->setChecked( p.darkMode );
+  ui.darkReaderMode->setChecked( p.darkReaderMode );
 #ifndef Q_OS_WIN32
   ui.darkMode->hide();
 #endif
@@ -215,24 +249,26 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.rightCtrl->hide();
   ui.leftShift->hide();
   ui.rightShift->hide();
-#ifdef Q_OS_MAC
+  #ifdef Q_OS_MAC
   ui.altKey->setText( "Opt" );
   ui.winKey->setText( "Ctrl" );
   ui.ctrlKey->setText( "Cmd" );
-#endif
+  #endif
 #endif
 
-//Platform-specific options
+  //Platform-specific options
 
 #ifdef HAVE_X11
-  ui.enableX11SelectionTrack->setChecked(p.trackSelectionScan);
-  ui.enableClipboardTrack ->setChecked(p.trackClipboardScan);
-  ui.showScanFlag->setChecked(p.showScanFlag);
+  ui.enableX11SelectionTrack->setChecked( p.trackSelectionScan );
+  ui.enableClipboardTrack->setChecked( p.trackClipboardScan );
+  ui.showScanFlag->setChecked( p.showScanFlag );
+  ui.delayTimer->setValue( p.selectionChangeDelayTimer );
 #else
   ui.enableX11SelectionTrack->hide();
   ui.enableClipboardTrack->hide();
   ui.showScanFlag->hide();
   ui.ignoreOwnClipboardChanges->hide();
+  ui.delayTimer->hide();
 #endif
 
   // Sound
@@ -246,19 +282,17 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   // on_useExternalPlayer_toggled() is called.
   ui.useExternalPlayer->setChecked( true );
 
-  if( ui.internalPlayerBackend->count() > 0 )
-  {
+  if ( ui.internalPlayerBackend->count() > 0 ) {
     // Checking ui.useInternalPlayer automatically unchecks ui.useExternalPlayer.
     ui.useInternalPlayer->setChecked( p.useInternalPlayer );
 
     int index = ui.internalPlayerBackend->findText( p.internalPlayerBackend.uiName() );
-    if( index < 0 ) // The specified backend is unavailable.
+    if ( index < 0 ) // The specified backend is unavailable.
       index = ui.internalPlayerBackend->findText( Config::InternalPlayerBackend::defaultBackend().uiName() );
     Q_ASSERT( index >= 0 && "Logic error: the default backend must be present in the backend name list." );
     ui.internalPlayerBackend->setCurrentIndex( index );
   }
-  else
-  {
+  else {
     ui.useInternalPlayer->hide();
     ui.internalPlayerBackend->hide();
   }
@@ -281,13 +315,11 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.proxyUser->setText( p.proxyServer.user );
   ui.proxyPassword->setText( p.proxyServer.password );
 
-  if( p.proxyServer.useSystemProxy )
-  {
+  if ( p.proxyServer.useSystemProxy ) {
     ui.systemProxy->setChecked( true );
     ui.customSettingsGroup->setEnabled( false );
   }
-  else
-  {
+  else {
     ui.customProxy->setChecked( true );
     ui.customSettingsGroup->setEnabled( p.proxyServer.enabled );
   }
@@ -297,11 +329,11 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.ankiHost->setText( p.ankiConnectServer.host );
   ui.ankiPort->setValue( p.ankiConnectServer.port );
   ui.ankiModel->setText( p.ankiConnectServer.model );
-  ui.ankiDeck->setText(p.ankiConnectServer.deck);
+  ui.ankiDeck->setText( p.ankiConnectServer.deck );
   //anki connect fields
-  ui.ankiText->setText(p.ankiConnectServer.text);
-  ui.ankiWord->setText(p.ankiConnectServer.word);
-  ui.ankiSentence->setText(p.ankiConnectServer.sentence);
+  ui.ankiText->setText( p.ankiConnectServer.text );
+  ui.ankiWord->setText( p.ankiConnectServer.word );
+  ui.ankiSentence->setText( p.ankiConnectServer.sentence );
 
   connect( ui.customProxy, &QAbstractButton::toggled, this, &Preferences::customProxyToggled );
 
@@ -332,6 +364,8 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.allowZim->setChecked( !p.fts.disabledTypes.contains( "ZIM", Qt::CaseInsensitive ) );
   ui.allowEpwing->setChecked( !p.fts.disabledTypes.contains( "EPWING", Qt::CaseInsensitive ) );
   ui.allowGls->setChecked( !p.fts.disabledTypes.contains( "GLS", Qt::CaseInsensitive ) );
+
+  ui.enablePosition->setChecked( p.fts.enablePosition );
 #ifndef MAKE_ZIM_SUPPORT
   ui.allowZim->hide();
   ui.allowSlob->hide();
@@ -340,212 +374,157 @@ Preferences::Preferences( QWidget * parent, Config::Class & cfg_ ):
   ui.allowEpwing->hide();
 #endif
   ui.maxDictionarySize->setValue( p.fts.maxDictionarySize );
+
+  ui.parallelThreads->setMaximum( QThread::idealThreadCount() );
+  ui.parallelThreads->setValue( p.fts.parallelThreads );
+}
+
+void Preferences::buildDisabledTypes( QString & disabledTypes, bool is_checked, QString name )
+{
+  if ( !is_checked ) {
+    if ( !disabledTypes.isEmpty() )
+      disabledTypes += ',';
+    disabledTypes += name;
+  }
 }
 
 Config::Preferences Preferences::getPreferences()
 {
   Config::Preferences p;
 
-  p.interfaceLanguage =
-    ui.interfaceLanguage->itemData(
-      ui.interfaceLanguage->currentIndex() ).toString();
+  p.interfaceLanguage = ui.interfaceLanguage->itemData( ui.interfaceLanguage->currentIndex() ).toString();
 
-  //bypass the first default
-  if(ui.fontFamilies->currentIndex()>0)
-    p.webFontFamily = ui.fontFamilies->currentText();
-  else
-    p.webFontFamily = "";
+  Config::CustomFonts c;
+  c.standard    = ui.font_standard->currentText();
+  c.serif       = ui.font_serif->currentText();
+  c.sansSerif   = ui.font_sans->currentText();
+  c.monospace   = ui.font_monospace->currentText();
+  p.customFonts = c;
 
-  p.displayStyle =
-    ui.displayStyle->itemData(
-      ui.displayStyle->currentIndex() ).toString();
+
+  p.displayStyle = ui.displayStyle->itemData( ui.displayStyle->currentIndex() ).toString();
+#if !defined( Q_OS_WIN )
+  p.interfaceStyle = ui.InterfaceStyle->itemData( ui.InterfaceStyle->currentIndex() ).toString();
+#endif
 
   p.newTabsOpenAfterCurrentOne = ui.newTabsOpenAfterCurrentOne->isChecked();
-  p.newTabsOpenInBackground = ui.newTabsOpenInBackground->isChecked();
-  p.hideSingleTab = ui.hideSingleTab->isChecked();
-  p.mruTabOrder = ui.mruTabOrder->isChecked();
-  p.enableTrayIcon = ui.enableTrayIcon->isChecked();
-  p.startToTray = ui.startToTray->isChecked();
-  p.closeToTray = ui.closeToTray->isChecked();
-  p.autoStart = ui.cbAutostart->isChecked();
-  p.doubleClickTranslates = ui.doubleClickTranslates->isChecked();
-  p.selectWordBySingleClick = ui.selectBySingleClick->isChecked();
-  p.autoScrollToTargetArticle = ui.autoScrollToTargetArticle->isChecked();
-  p.escKeyHidesMainWindow = ui.escKeyHidesMainWindow->isChecked();
+  p.newTabsOpenInBackground    = ui.newTabsOpenInBackground->isChecked();
+  p.hideSingleTab              = ui.hideSingleTab->isChecked();
+  p.mruTabOrder                = ui.mruTabOrder->isChecked();
+  p.enableTrayIcon             = ui.enableTrayIcon->isChecked();
+  p.startToTray                = ui.startToTray->isChecked();
+  p.closeToTray                = ui.closeToTray->isChecked();
+  p.autoStart                  = ui.cbAutostart->isChecked();
+  p.doubleClickTranslates      = ui.doubleClickTranslates->isChecked();
+  p.selectWordBySingleClick    = ui.selectBySingleClick->isChecked();
+  p.autoScrollToTargetArticle  = ui.autoScrollToTargetArticle->isChecked();
+  p.escKeyHidesMainWindow      = ui.escKeyHidesMainWindow->isChecked();
 
-  p.darkMode = ui.darkMode->isChecked();
-  p.darkReaderMode = ui.darkReaderMode->isChecked();
+  p.darkMode               = ui.darkMode->isChecked();
+  p.darkReaderMode         = ui.darkReaderMode->isChecked();
   p.enableMainWindowHotkey = ui.enableMainWindowHotkey->isChecked();
-  p.mainWindowHotkey = ui.mainWindowHotkey->keySequence();
-  p.enableClipboardHotkey = ui.enableClipboardHotkey->isChecked();
-  p.clipboardHotkey = ui.clipboardHotkey->keySequence();
+  p.mainWindowHotkey       = ui.mainWindowHotkey->keySequence();
+  p.enableClipboardHotkey  = ui.enableClipboardHotkey->isChecked();
+  p.clipboardHotkey        = ui.clipboardHotkey->keySequence();
 
-  p.startWithScanPopupOn = ui.startWithScanPopupOn->isChecked();
+  p.startWithScanPopupOn     = ui.startWithScanPopupOn->isChecked();
   p.enableScanPopupModifiers = ui.enableScanPopupModifiers->isChecked();
 
   p.scanPopupModifiers += ui.altKey->isChecked() ? KeyboardState::Alt : 0;
-  p.scanPopupModifiers += ui.ctrlKey->isChecked() ? KeyboardState::Ctrl: 0;
-  p.scanPopupModifiers += ui.shiftKey->isChecked() ? KeyboardState::Shift: 0;
-  p.scanPopupModifiers += ui.winKey->isChecked() ? KeyboardState::Win: 0;
-  p.scanPopupModifiers += ui.leftAlt->isChecked() ? KeyboardState::LeftAlt: 0;
-  p.scanPopupModifiers += ui.rightAlt->isChecked() ? KeyboardState::RightAlt: 0;
-  p.scanPopupModifiers += ui.leftCtrl->isChecked() ? KeyboardState::LeftCtrl: 0;
-  p.scanPopupModifiers += ui.rightCtrl->isChecked() ? KeyboardState::RightCtrl: 0;
-  p.scanPopupModifiers += ui.leftShift->isChecked() ? KeyboardState::LeftShift: 0;
-  p.scanPopupModifiers += ui.rightShift->isChecked() ? KeyboardState::RightShift: 0;
+  p.scanPopupModifiers += ui.ctrlKey->isChecked() ? KeyboardState::Ctrl : 0;
+  p.scanPopupModifiers += ui.shiftKey->isChecked() ? KeyboardState::Shift : 0;
+  p.scanPopupModifiers += ui.winKey->isChecked() ? KeyboardState::Win : 0;
+  p.scanPopupModifiers += ui.leftAlt->isChecked() ? KeyboardState::LeftAlt : 0;
+  p.scanPopupModifiers += ui.rightAlt->isChecked() ? KeyboardState::RightAlt : 0;
+  p.scanPopupModifiers += ui.leftCtrl->isChecked() ? KeyboardState::LeftCtrl : 0;
+  p.scanPopupModifiers += ui.rightCtrl->isChecked() ? KeyboardState::RightCtrl : 0;
+  p.scanPopupModifiers += ui.leftShift->isChecked() ? KeyboardState::LeftShift : 0;
+  p.scanPopupModifiers += ui.rightShift->isChecked() ? KeyboardState::RightShift : 0;
 
   p.ignoreOwnClipboardChanges = ui.ignoreOwnClipboardChanges->isChecked();
-  p.scanToMainWindow = ui.scanToMainWindow->isChecked();
+  p.scanToMainWindow          = ui.scanToMainWindow->isChecked();
 #ifdef HAVE_X11
-  p.trackSelectionScan = ui.enableX11SelectionTrack ->isChecked();
-  p.trackClipboardScan = ui.enableClipboardTrack ->isChecked();
-  p.showScanFlag= ui.showScanFlag->isChecked();
+  p.trackSelectionScan        = ui.enableX11SelectionTrack->isChecked();
+  p.trackClipboardScan        = ui.enableClipboardTrack->isChecked();
+  p.showScanFlag              = ui.showScanFlag->isChecked();
+  p.selectionChangeDelayTimer = ui.delayTimer->value();
 #endif
 
-  p.storeHistory = ui.storeHistory->isChecked();
-  p.maxStringsInHistory = ui.historyMaxSizeField->text().toUInt();
-  p.historyStoreInterval = ui.historySaveIntervalField->text().toUInt();
+  p.storeHistory              = ui.storeHistory->isChecked();
+  p.maxStringsInHistory       = ui.historyMaxSizeField->text().toUInt();
+  p.historyStoreInterval      = ui.historySaveIntervalField->text().toUInt();
   p.alwaysExpandOptionalParts = ui.alwaysExpandOptionalParts->isChecked();
 
-  p.favoritesStoreInterval = ui.favoritesSaveIntervalField->text().toUInt();
+  p.favoritesStoreInterval   = ui.favoritesSaveIntervalField->text().toUInt();
   p.confirmFavoritesDeletion = ui.confirmFavoritesDeletion->isChecked();
 
-  p.collapseBigArticles = ui.collapseBigArticles->isChecked();
-  p.articleSizeLimit = ui.articleSizeLimit->value();
+  p.collapseBigArticles    = ui.collapseBigArticles->isChecked();
+  p.articleSizeLimit       = ui.articleSizeLimit->value();
   p.limitInputPhraseLength = ui.limitInputPhraseLength->isChecked();
   p.inputPhraseLengthLimit = ui.inputPhraseLengthLimit->value();
-  p.ignoreDiacritics = ui.ignoreDiacritics->isChecked();
-  p.ignorePunctuation = ui.ignorePunctuation->isChecked();
+  p.ignoreDiacritics       = ui.ignoreDiacritics->isChecked();
+  p.ignorePunctuation      = ui.ignorePunctuation->isChecked();
   p.sessionCollapse        = ui.sessionCollapse->isChecked();
-  p.stripClipboard = ui.stripClipboard->isChecked();
-  p.raiseWindowOnSearch = ui.raiseWindowOnSearch->isChecked();
+  p.stripClipboard         = ui.stripClipboard->isChecked();
+  p.raiseWindowOnSearch    = ui.raiseWindowOnSearch->isChecked();
 
   p.synonymSearchEnabled = ui.synonymSearchEnabled->isChecked();
 
   p.maxDictionaryRefsInContextMenu = ui.maxDictsInContextMenu->text().toInt();
 
-  p.pronounceOnLoadMain = ui.pronounceOnLoadMain->isChecked();
+  p.pronounceOnLoadMain  = ui.pronounceOnLoadMain->isChecked();
   p.pronounceOnLoadPopup = ui.pronounceOnLoadPopup->isChecked();
-  p.useInternalPlayer = ui.useInternalPlayer->isChecked();
+  p.useInternalPlayer    = ui.useInternalPlayer->isChecked();
   p.internalPlayerBackend.setUiName( ui.internalPlayerBackend->currentText() );
   p.audioPlaybackProgram = ui.audioPlaybackProgram->text();
 
-  p.proxyServer.enabled = ui.useProxyServer->isChecked();
+  p.proxyServer.enabled        = ui.useProxyServer->isChecked();
   p.proxyServer.useSystemProxy = ui.systemProxy->isChecked();
 
-  p.proxyServer.type = ( Config::ProxyServer::Type ) ui.proxyType->currentIndex();
+  p.proxyServer.type = (Config::ProxyServer::Type)ui.proxyType->currentIndex();
 
   p.proxyServer.host = ui.proxyHost->text();
-  p.proxyServer.port = ( unsigned ) ui.proxyPort->value();
+  p.proxyServer.port = (unsigned)ui.proxyPort->value();
 
-  p.proxyServer.user = ui.proxyUser->text();
+  p.proxyServer.user     = ui.proxyUser->text();
   p.proxyServer.password = ui.proxyPassword->text();
 
   //anki connect
   p.ankiConnectServer.enabled = ui.useAnkiConnect->isChecked();
   p.ankiConnectServer.host    = ui.ankiHost->text();
   p.ankiConnectServer.port    = (unsigned)ui.ankiPort->value();
-  p.ankiConnectServer.deck = ui.ankiDeck->text();
-  p.ankiConnectServer.model = ui.ankiModel->text();
+  p.ankiConnectServer.deck    = ui.ankiDeck->text();
+  p.ankiConnectServer.model   = ui.ankiModel->text();
   //anki connect fields
-  p.ankiConnectServer.text = ui.ankiText->text();
-  p.ankiConnectServer.word = ui.ankiWord->text();
+  p.ankiConnectServer.text     = ui.ankiText->text();
+  p.ankiConnectServer.word     = ui.ankiWord->text();
   p.ankiConnectServer.sentence = ui.ankiSentence->text();
 
-  p.checkForNewReleases = ui.checkForNewReleases->isChecked();
+  p.checkForNewReleases           = ui.checkForNewReleases->isChecked();
   p.disallowContentFromOtherSites = ui.disallowContentFromOtherSites->isChecked();
-  p.hideGoldenDictHeader = ui.hideGoldenDictHeader->isChecked();
-  p.maxNetworkCacheSize = ui.maxNetworkCacheSize->value();
-  p.clearNetworkCacheOnExit = ui.clearNetworkCacheOnExit->isChecked();
+  p.hideGoldenDictHeader          = ui.hideGoldenDictHeader->isChecked();
+  p.maxNetworkCacheSize           = ui.maxNetworkCacheSize->value();
+  p.clearNetworkCacheOnExit       = ui.clearNetworkCacheOnExit->isChecked();
 
   p.addonStyle = ui.addonStyles->getCurrentStyle();
 
-  p.fts.enabled = ui.ftsGroupBox->isChecked();
+  p.fts.enabled           = ui.ftsGroupBox->isChecked();
   p.fts.maxDictionarySize = ui.maxDictionarySize->value();
+  p.fts.parallelThreads   = ui.parallelThreads->value();
+  p.fts.enablePosition    = ui.enablePosition->isChecked();
 
-  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";
-  }
-
-  if( !ui.allowGls->isChecked() )
-  {
-    if( !p.fts.disabledTypes.isEmpty() )
-      p.fts.disabledTypes += ',';
-    p.fts.disabledTypes += "GLS";
-  }
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowAard->isChecked(), "AARD" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowBGL->isChecked(), "BGL" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowDictD->isChecked(), "DICTD" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowDSL->isChecked(), "DSL" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowMDict->isChecked(), "MDICT" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowSDict->isChecked(), "SDICT" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowSlob->isChecked(), "SLOB" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowStardict->isChecked(), "STARDICT" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowXDXF->isChecked(), "XDXF" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowZim->isChecked(), "ZIM" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowEpwing->isChecked(), "EPWING" );
+  buildDisabledTypes( p.fts.disabledTypes, ui.allowGls->isChecked(), "GLS" );
 
   return p;
 }
@@ -553,22 +532,20 @@ Config::Preferences Preferences::getPreferences()
 void Preferences::enableScanPopupModifiersToggled( bool b )
 {
   ui.scanPopupModifiers->setEnabled( b );
-  if( b )
+  if ( b )
     ui.showScanFlag->setChecked( false );
 }
 
 void Preferences::showScanFlagToggled( bool b )
 {
-  if( b )
+  if ( b )
     ui.enableScanPopupModifiers->setChecked( false );
 }
 
 
-
 void Preferences::wholeAltClicked( bool b )
 {
-  if ( b )
-  {
+  if ( b ) {
     ui.leftAlt->setChecked( false );
     ui.rightAlt->setChecked( false );
   }
@@ -576,8 +553,7 @@ void Preferences::wholeAltClicked( bool b )
 
 void Preferences::wholeCtrlClicked( bool b )
 {
-  if ( b )
-  {
+  if ( b ) {
     ui.leftCtrl->setChecked( false );
     ui.rightCtrl->setChecked( false );
   }
@@ -585,8 +561,7 @@ void Preferences::wholeCtrlClicked( bool b )
 
 void Preferences::wholeShiftClicked( bool b )
 {
-  if ( b )
-  {
+  if ( b ) {
     ui.leftShift->setChecked( false );
     ui.rightShift->setChecked( false );
   }
@@ -622,22 +597,27 @@ void Preferences::on_enableClipboardHotkey_toggled( bool checked )
 void Preferences::on_buttonBox_accepted()
 {
   if ( prevInterfaceLanguage != ui.interfaceLanguage->currentIndex() )
-    QMessageBox::information( this, tr( "Changing Language" ),
+    QMessageBox::information( this,
+                              tr( "Changing Language" ),
                               tr( "Restart the program to apply the language change." ) );
 
-  auto currentFontFamily = ui.fontFamilies->currentText();
-  if( prevWebFontFamily != currentFontFamily )
-  {
-    //reset to default font .
-    if( currentFontFamily.isEmpty() )
-    {
-      QWebEngineProfile::defaultProfile()->settings()->resetFontFamily( QWebEngineSettings::StandardFont );
-    }
-    else
-    {
-      QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::StandardFont,
-                                                                      currentFontFamily );
-    }
+#if !defined( Q_OS_WIN )
+  if ( prevInterfaceStyle != ui.InterfaceStyle->currentIndex() ) {
+    QMessageBox::information( this, tr( "Restart needed" ), tr( "Restart to apply the interface style change." ) );
+  }
+#endif
+
+
+  auto c = getPreferences();
+  if ( c.customFonts != prevWebFontFamily ) {
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::StandardFont,
+                                                                    c.customFonts.standard );
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::SerifFont,
+                                                                    c.customFonts.serif );
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::SansSerifFont,
+                                                                    c.customFonts.sansSerif );
+    QWebEngineProfile::defaultProfile()->settings()->setFontFamily( QWebEngineSettings::FixedFont,
+                                                                    c.customFonts.monospace );
   }
 }
 
@@ -649,8 +629,7 @@ void Preferences::on_useExternalPlayer_toggled( bool enabled )
 
 void Preferences::customProxyToggled( bool )
 {
-  ui.customSettingsGroup->setEnabled( ui.customProxy->isChecked()
-                                      && ui.useProxyServer->isChecked() );
+  ui.customSettingsGroup->setEnabled( ui.customProxy->isChecked() && ui.useProxyServer->isChecked() );
 }
 
 void Preferences::on_maxNetworkCacheSize_valueChanged( int value )
diff --git a/src/ui/preferences.hh b/src/ui/preferences.hh
index ea386c9f..c5dc6eaa 100644
--- a/src/ui/preferences.hh
+++ b/src/ui/preferences.hh
@@ -11,9 +11,14 @@ class Preferences: public QDialog
 {
   Q_OBJECT
 
-  int prevInterfaceLanguage;
+  int prevInterfaceLanguage = 0;
 
-  QString prevWebFontFamily;
+#if !defined( Q_OS_WIN )
+  int prevInterfaceStyle = 0;
+#endif
+
+
+  Config::CustomFonts prevWebFontFamily;
 
   Config::Class & cfg;
   QAction helpAction;
@@ -21,7 +26,8 @@ class Preferences: public QDialog
 public:
 
   Preferences( QWidget * parent, Config::Class & cfg_ );
-  ~Preferences() = default;
+  void buildDisabledTypes( QString & disabledTypes, bool is_checked, QString name );
+  ~Preferences() override = default;
 
   Config::Preferences getPreferences();
 
@@ -54,9 +60,6 @@ private slots:
 
   void on_collapseBigArticles_toggled( bool checked );
   void on_limitInputPhraseLength_toggled( bool checked );
-
-
 };
 
 #endif
-
diff --git a/src/ui/preferences.ui b/src/ui/preferences.ui
index e3c9c83f..a49fde24 100644
--- a/src/ui/preferences.ui
+++ b/src/ui/preferences.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>787</width>
-    <height>629</height>
+    <width>788</width>
+    <height>730</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -53,229 +53,6 @@
        <property name="topMargin">
         <number>9</number>
        </property>
-       <item row="1" column="0">
-        <widget class="QGroupBox" name="enableTrayIcon">
-         <property name="toolTip">
-          <string>When enabled, an icon appears in the system tray area which can be used
-to open main window and perform other tasks.</string>
-         </property>
-         <property name="title">
-          <string>Enable system tray icon</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-         </property>
-         <property name="flat">
-          <bool>false</bool>
-         </property>
-         <property name="checkable">
-          <bool>true</bool>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QCheckBox" name="startToTray">
-            <property name="toolTip">
-             <string>With this on, the application starts directly to system tray without showing
-its main window.</string>
-            </property>
-            <property name="text">
-             <string>Start to system tray</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QCheckBox" name="closeToTray">
-            <property name="toolTip">
-             <string>With this on, an attempt to close main window would hide it instead of closing
-the application.</string>
-            </property>
-            <property name="text">
-             <string>Close to system tray</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="4" column="0">
-        <widget class="QCheckBox" name="escKeyHidesMainWindow">
-         <property name="toolTip">
-          <string>Normally, pressing ESC key moves focus to the translation line.
-With this on however, it will hide the main window.</string>
-         </property>
-         <property name="text">
-          <string>ESC key hides main window</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="1">
-        <widget class="QCheckBox" name="autoScrollToTargetArticle">
-         <property name="toolTip">
-          <string>Normally, clicking on a link, double-clicking on a word or looking up
-selection in an article loads the translation and almost immediately
-scrolls to the article from the same dictionary. With this option off,
-however, the article from the topmost dictionary is shown.</string>
-         </property>
-         <property name="text">
-          <string>Automatically scroll to target article</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_13">
-         <item>
-          <widget class="QLabel" name="maxDictsInContextMenuLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="toolTip">
-            <string>Adjust this value to avoid huge context menus.</string>
-           </property>
-           <property name="text">
-            <string>Context menu dictionaries limit:</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="maxDictsInContextMenu">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximum">
-            <number>9999</number>
-           </property>
-           <property name="value">
-            <number>20</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="label_12">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="1">
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>Startup</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <item>
-           <widget class="QCheckBox" name="cbAutostart">
-            <property name="toolTip">
-             <string>Automatically starts GoldenDict after operation system bootup.</string>
-            </property>
-            <property name="text">
-             <string>Start with system</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="5" column="0">
-        <widget class="QLabel" name="label_6">
-         <property name="text">
-          <string>Interface language:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="7" column="0">
-        <widget class="QLabel" name="label_21">
-         <property name="text">
-          <string>Dictionary Font: </string>
-         </property>
-        </widget>
-       </item>
-       <item row="20" column="0" colspan="2">
-        <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 row="10" column="0" colspan="2">
-        <layout class="QVBoxLayout" name="verticalLayout_16">
-         <item>
-          <widget class="QCheckBox" name="darkMode">
-           <property name="toolTip">
-            <string>Turn the UI to dark.</string>
-           </property>
-           <property name="text">
-            <string>Dark Mode</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QCheckBox" name="darkReaderMode">
-           <property name="toolTip">
-            <string>Turn the article display style to dark.</string>
-           </property>
-           <property name="text">
-            <string>Dark Reader Mode</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="selectBySingleClick">
-         <property name="toolTip">
-          <string>Turn this option on if you want to select words by single mouse click</string>
-         </property>
-         <property name="text">
-          <string>Select word by single click</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0">
-        <widget class="QComboBox" name="interfaceLanguage">
-         <property name="sizeAdjustPolicy">
-          <enum>QComboBox::AdjustToContents</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="8" column="0">
-        <widget class="QComboBox" name="fontFamilies">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="toolTip">
-          <string>set the fallback font family for dictionary</string>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="0">
         <widget class="QCheckBox" name="doubleClickTranslates">
          <property name="text">
@@ -336,30 +113,394 @@ be the last ones.</string>
          </layout>
         </widget>
        </item>
-       <item row="9" column="0">
-        <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="escKeyHidesMainWindow">
+         <property name="toolTip">
+          <string>Normally, pressing ESC key moves focus to the translation line.
+With this on however, it will hide the main window.</string>
+         </property>
+         <property name="text">
+          <string>ESC key hides main window</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="selectBySingleClick">
+         <property name="toolTip">
+          <string>Turn this option on if you want to select words by single mouse click</string>
+         </property>
+         <property name="text">
+          <string>Select word by single click</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Startup</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QCheckBox" name="cbAutostart">
+            <property name="toolTip">
+             <string>Automatically starts GoldenDict after operation system bootup.</string>
+            </property>
+            <property name="text">
+             <string>Start with system</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="3" column="1">
+        <widget class="QCheckBox" name="autoScrollToTargetArticle">
+         <property name="toolTip">
+          <string>Normally, clicking on a link, double-clicking on a word or looking up
+selection in an article loads the translation and almost immediately
+scrolls to the article from the same dictionary. With this option off,
+however, the article from the topmost dictionary is shown.</string>
+         </property>
+         <property name="text">
+          <string>Automatically scroll to target article</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="enableTrayIcon">
+         <property name="toolTip">
+          <string>When enabled, an icon appears in the system tray area which can be used
+to open main window and perform other tasks.</string>
+         </property>
+         <property name="title">
+          <string>Enable system tray icon</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+         </property>
+         <property name="flat">
+          <bool>false</bool>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QCheckBox" name="startToTray">
+            <property name="toolTip">
+             <string>With this on, the application starts directly to system tray without showing
+its main window.</string>
+            </property>
+            <property name="text">
+             <string>Start to system tray</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="closeToTray">
+            <property name="toolTip">
+             <string>With this on, an attempt to close main window would hide it instead of closing
+the application.</string>
+            </property>
+            <property name="text">
+             <string>Close to system tray</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="16" column="0" colspan="2">
+        <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 row="2" column="1">
+        <layout class="QHBoxLayout" name="horizontalLayout_13">
          <item>
-          <widget class="QLabel" name="label_9">
+          <widget class="QLabel" name="maxDictsInContextMenuLabel">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="toolTip">
+            <string>Adjust this value to avoid huge context menus.</string>
+           </property>
            <property name="text">
-            <string>Article Display style:</string>
+            <string>Context menu dictionaries limit:</string>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="QComboBox" name="displayStyle"/>
-         </item>
-         <item>
-          <widget class="QLabel" name="addonStylesLabel">
-           <property name="text">
-            <string>Add-on style:</string>
+          <widget class="QSpinBox" name="maxDictsInContextMenu">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maximum">
+            <number>9999</number>
+           </property>
+           <property name="value">
+            <number>20</number>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="StylesComboBox" name="addonStyles"/>
+          <widget class="QLabel" name="label_12">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
+       <item row="9" column="0">
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>Appearance</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_16">
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="QLabel" name="label_6">
+              <property name="text">
+               <string>Interface language:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="interfaceLanguage">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>153</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="sizeAdjustPolicy">
+               <enum>QComboBox::AdjustToContents</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_5">
+            <item>
+             <widget class="QLabel" name="label_9">
+              <property name="text">
+               <string>Article Display style:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="displayStyle">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>100</width>
+                <height>0</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_12">
+            <item>
+             <widget class="QLabel" name="addonStylesLabel">
+              <property name="text">
+               <string>Add-on style:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="StylesComboBox" name="addonStyles">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>100</width>
+                <height>0</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="interfaceStyleLayout">
+            <item>
+             <widget class="QLabel" name="interfaceStyleLabel">
+              <property name="text">
+               <string>Interface Style:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="InterfaceStyle"/>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="darkMode">
+            <property name="toolTip">
+             <string>Turn the UI to dark.</string>
+            </property>
+            <property name="text">
+             <string>Dark Mode</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="darkReaderMode">
+            <property name="toolTip">
+             <string>Turn the article display style to dark.</string>
+            </property>
+            <property name="text">
+             <string>Dark Reader Mode</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <spacer name="verticalSpacer_5">
+            <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>
+       </item>
+       <item row="9" column="1">
+        <widget class="QGroupBox" name="groupBox_10">
+         <property name="toolTip">
+          <string>These fonts will be applied when the fonts specified by a dictionary are not found.</string>
+         </property>
+         <property name="title">
+          <string>Fallback Fonts</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_17">
+          <item>
+           <widget class="QLabel" name="label_16">
+            <property name="text">
+             <string>Standard Font</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFontComboBox" name="font_standard">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_21">
+            <property name="text">
+             <string>Serif Font</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFontComboBox" name="font_serif">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_26">
+            <property name="text">
+             <string>Sans-serif Font</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFontComboBox" name="font_sans">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="label_27">
+            <property name="text">
+             <string>Monospace Font</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QFontComboBox" name="font_monospace">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="fontFilters">
+             <set>QFontComboBox::MonospacedFonts</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_popup">
@@ -620,6 +761,35 @@ in the pressed state when the word selection changes.</string>
             </property>
            </widget>
           </item>
+          <item>
+           <widget class="QWidget" name="widget" native="true">
+            <layout class="QHBoxLayout" name="horizontalLayout_6">
+             <item>
+              <widget class="QLabel" name="delayTimerLabel">
+               <property name="text">
+                <string>Delay time</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QSpinBox" name="delayTimer">
+               <property name="suffix">
+                <string> ms</string>
+               </property>
+               <property name="minimum">
+                <number>0</number>
+               </property>
+               <property name="maximum">
+                <number>10000</number>
+               </property>
+               <property name="singleStep">
+                <number>50</number>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -1239,10 +1409,27 @@ download page.</string>
           <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_4">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="allowAard">
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="allowZim">
             <property name="text">
-             <string notr="true">Aard</string>
+             <string notr="true">Zim</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="7" column="0" colspan="2">
+           <widget class="QCheckBox" name="enablePosition">
+            <property name="toolTip">
+             <string>Positional information is required to use Xapian's phrase searching and NEAR operator, but the database size will be much bigger. Applies only to new incoming dictionaries.</string>
+            </property>
+            <property name="text">
+             <string>Enable index with positional information</string>
             </property>
            </widget>
           </item>
@@ -1260,17 +1447,10 @@ download page.</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
-           <widget class="QCheckBox" name="allowDSL">
+          <item row="2" column="1">
+           <widget class="QCheckBox" name="allowXDXF">
             <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>
+             <string notr="true">XDXF</string>
             </property>
            </widget>
           </item>
@@ -1281,6 +1461,27 @@ download page.</string>
             </property>
            </widget>
           </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="allowEpwing">
+            <property name="text">
+             <string notr="true">Epwing</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="5" column="1">
+           <widget class="QCheckBox" name="allowGls">
+            <property name="text">
+             <string notr="true">GLS</string>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1">
            <widget class="QCheckBox" name="allowSlob">
             <property name="text">
@@ -1295,34 +1496,6 @@ download page.</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="4" column="1">
-           <widget class="QCheckBox" name="allowEpwing">
-            <property name="text">
-             <string notr="true">Epwing</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="1">
-           <widget class="QCheckBox" name="allowGls">
-            <property name="text">
-             <string notr="true">GLS</string>
-            </property>
-           </widget>
-          </item>
           <item row="6" column="0" colspan="2">
            <layout class="QHBoxLayout" name="horizontalLayout_14">
             <item>
@@ -1364,6 +1537,31 @@ download page.</string>
             </item>
            </layout>
           </item>
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="allowAard">
+            <property name="text">
+             <string notr="true">Aard</string>
+            </property>
+           </widget>
+          </item>
+          <item row="8" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_18">
+            <item>
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>Create fulltext index with parallel threads </string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="parallelThreads">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
          </layout>
         </widget>
        </item>
diff --git a/src/ui/scanflag.cc b/src/ui/scanflag.cc
index 99785034..eb628b61 100644
--- a/src/ui/scanflag.cc
+++ b/src/ui/scanflag.cc
@@ -4,32 +4,28 @@
 #include <QScreen>
 
 
-ScanFlag::ScanFlag(QWidget *parent) :
-    QMainWindow(parent),
-    pushButton(new QPushButton(this))
+ScanFlag::ScanFlag( QWidget * parent ):
+  QMainWindow( parent ),
+  pushButton( new QPushButton( this ) )
 {
 
-  pushButton->setIcon(QIcon(":/icons/programicon.png"));
+  pushButton->setIcon( QIcon( ":/icons/programicon.png" ) );
 
-  setCentralWidget(pushButton);
+  setCentralWidget( pushButton );
 
-  setFixedSize(30,30);
+  setFixedSize( 30, 30 );
 
-  setWindowFlags( Qt::ToolTip
-                | Qt::FramelessWindowHint
-                | Qt::WindowStaysOnTopHint
-                | Qt::WindowDoesNotAcceptFocus);
+  setWindowFlags( Qt::ToolTip | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus );
 
 
-  setAttribute(Qt::WA_TranslucentBackground);
-  setAttribute(Qt::WA_X11DoNotAcceptFocus);
+  setAttribute( Qt::WA_TranslucentBackground );
+  setAttribute( Qt::WA_X11DoNotAcceptFocus );
 
   hideTimer.setSingleShot( true );
   hideTimer.setInterval( 1000 );
 
-  connect( &hideTimer, &QTimer::timeout,this,&ScanFlag::hideWindow);
-  connect( pushButton, &QPushButton::clicked,
-           this, &ScanFlag::pushButtonClicked );
+  connect( &hideTimer, &QTimer::timeout, this, &ScanFlag::hideWindow );
+  connect( pushButton, &QPushButton::clicked, this, &ScanFlag::pushButtonClicked );
 }
 
 void ScanFlag::pushButtonClicked()
diff --git a/src/ui/scanflag.hh b/src/ui/scanflag.hh
index 7f332608..ffdb6090 100644
--- a/src/ui/scanflag.hh
+++ b/src/ui/scanflag.hh
@@ -5,21 +5,21 @@
 #include <QPushButton>
 #include <QTimer>
 
-class ScanFlag : public QMainWindow
+class ScanFlag: public QMainWindow
 {
   Q_OBJECT
 
 public:
-  ScanFlag( QWidget *parent );
+  ScanFlag( QWidget * parent );
 
-  ~ScanFlag()=default;
+  ~ScanFlag() = default;
 
   void showScanFlag();
   void pushButtonClicked();
   void hideWindow();
 
 signals:
-  void requestScanPopup ();
+  void requestScanPopup();
 
 private:
   QTimer hideTimer;
diff --git a/src/ui/scanpopup.cc b/src/ui/scanpopup.cc
index 062fb228..11e9d789 100644
--- a/src/ui/scanpopup.cc
+++ b/src/ui/scanpopup.cc
@@ -8,17 +8,17 @@
 #include <QBitmap>
 #include <QMenu>
 #include <QMouseEvent>
-#if (QT_VERSION < QT_VERSION_CHECK(6,0,0))
-#include <QDesktopWidget>
-#include <QScreen>
-#include <QStringList>
+#if ( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
+  #include <QDesktopWidget>
+  #include <QScreen>
+  #include <QStringList>
 #endif
 #include "gddebug.hh"
 #include "gestures.hh"
 
 #ifdef Q_OS_MAC
-#include "macos/macmouseover.hh"
-#define MouseOver MacMouseOver
+  #include "macos/macmouseover.hh"
+  #define MouseOver MacMouseOver
 #endif
 #include "base_type.hh"
 
@@ -26,30 +26,29 @@
 /// in their behavior on those platforms.
 static const Qt::WindowFlags defaultUnpinnedWindowFlags =
 
-#if defined (Q_OS_WIN)
-Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
+#if defined( Q_OS_WIN )
+  Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint
 #else
-Qt::Popup
+  Qt::Popup
 #endif
-;
+  ;
 
 static const Qt::WindowFlags pinnedWindowFlags =
 #ifdef HAVE_X11
-/// With the Qt::Dialog flag, scan popup is always on top of the main window
-/// on Linux/X11 with Qt 4, Qt 5 since version 5.12.1 (QTBUG-74309).
-/// Qt::Window allows to use the scan popup and the main window independently.
-Qt::Window
+  /// With the Qt::Dialog flag, scan popup is always on top of the main window
+  /// on Linux/X11 with Qt 4, Qt 5 since version 5.12.1 (QTBUG-74309).
+  /// Qt::Window allows to use the scan popup and the main window independently.
+  Qt::Window
 #else
-Qt::Dialog
+  Qt::Dialog
 #endif
-;
+  ;
 
 #ifdef HAVE_X11
 static bool ownsClipboardMode( QClipboard::Mode mode )
 {
   const QClipboard & clipboard = *QApplication::clipboard();
-  switch( mode )
-  {
+  switch ( mode ) {
     case QClipboard::Clipboard:
       return clipboard.ownsClipboard();
     case QClipboard::Selection:
@@ -87,8 +86,7 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   openSearchAction.setShortcut( QKeySequence( "Ctrl+F" ) );
 
-  if( layoutDirection() == Qt::RightToLeft )
-  {
+  if ( layoutDirection() == Qt::RightToLeft ) {
     // Adjust button icons for Right-To-Left layout
     ui.goBackButton->setIcon( QIcon( ":/icons/next.svg" ) );
     ui.goForwardButton->setIcon( QIcon( ":/icons/previous.svg" ) );
@@ -98,12 +96,16 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   ui.queryError->hide();
 
-  definition = new ArticleView( ui.outerFrame, articleNetMgr, audioPlayer_,
-                                allDictionaries, groups, true, cfg,
+  definition = new ArticleView( ui.outerFrame,
+                                articleNetMgr,
+                                audioPlayer_,
+                                allDictionaries,
+                                groups,
+                                true,
+                                cfg,
                                 openSearchAction,
                                 ui.translateBox->translateLine(),
-                                dictionaryBar.toggleViewAction()
-                                );
+                                dictionaryBar.toggleViewAction() );
 
   connect( definition, &ArticleView::inspectSignal, this, &ScanPopup::inspectElementWhenPinned );
   connect( definition, &ArticleView::forceAddWordToHistory, this, &ScanPopup::forceAddWordToHistory );
@@ -111,67 +113,54 @@ ScanPopup::ScanPopup( QWidget * parent,
   connect( definition, &ArticleView::sendWordToHistory, this, &ScanPopup::sendWordToHistory );
   connect( definition, &ArticleView::typingEvent, this, &ScanPopup::typingEvent );
 
-  wordListDefaultFont      = ui.translateBox->wordList()->font();
+  wordListDefaultFont      = ui.translateBox->completerWidget()->font();
   translateLineDefaultFont = ui.translateBox->font();
-  groupListDefaultFont = ui.groupList->font();
+  groupListDefaultFont     = ui.groupList->font();
 
   ui.mainLayout->addWidget( definition );
 
-  ui.translateBox->wordList()->attachFinder( &wordFinder );
-  ui.translateBox->wordList()->setFocusPolicy(Qt::ClickFocus);
   ui.translateBox->translateLine()->installEventFilter( this );
-  definition->installEventFilter(this);
-  this->installEventFilter(this);
+  definition->installEventFilter( this );
+  this->installEventFilter( this );
 
   connect( ui.translateBox->translateLine(), &QLineEdit::textChanged, this, &ScanPopup::translateInputChanged );
 
   connect( ui.translateBox->translateLine(), &QLineEdit::returnPressed, this, &ScanPopup::translateInputFinished );
 
-  connect( ui.translateBox->wordList(), &QListWidget::itemClicked, this, &ScanPopup::wordListItemActivated );
-
-  connect( ui.translateBox->wordList(),
-    SIGNAL( itemDoubleClicked( QListWidgetItem * ) ),
-    this,
-    SLOT( wordListItemActivated( QListWidgetItem * ) ) );
-
-  connect( ui.translateBox->wordList(), &WordList::statusBarMessage, this, &ScanPopup::showStatusBarMessage );
-
   ui.pronounceButton->setDisabled( true );
 
   ui.groupList->fill( groups );
   ui.groupList->setCurrentGroup( cfg.lastPopupGroupId );
 
+  definition->setCurrentGroupId( ui.groupList->getCurrentGroup() );
   dictionaryBar.setFloatable( false );
 
   Instances::Group const * igrp = groups.findGroup( cfg.lastPopupGroupId );
-  if( cfg.lastPopupGroupId == Instances::Group::AllGroupId )
-  {
-    if( igrp )
+  if ( cfg.lastPopupGroupId == Instances::Group::AllGroupId ) {
+    if ( igrp )
       igrp->checkMutedDictionaries( &cfg.popupMutedDictionaries );
     dictionaryBar.setMutedDictionaries( &cfg.popupMutedDictionaries );
   }
-  else
-  {
+  else {
     Config::Group * grp = cfg.getGroup( cfg.lastPopupGroupId );
-    if( igrp && grp )
+    if ( igrp && grp )
       igrp->checkMutedDictionaries( &grp->popupMutedDictionaries );
-    dictionaryBar.setMutedDictionaries( grp ? &grp->popupMutedDictionaries : 0 );
+    dictionaryBar.setMutedDictionaries( grp ? &grp->popupMutedDictionaries : nullptr );
   }
 
   addToolBar( Qt::RightToolBarArea, &dictionaryBar );
 
-  connect( &dictionaryBar, SIGNAL(editGroupRequested()),
-           this, SLOT(editGroupRequested()) );
+  connect( &dictionaryBar, &DictionaryBar::editGroupRequested, this, &ScanPopup::editGroupRequested );
   connect( this, &ScanPopup::closeMenu, &dictionaryBar, &DictionaryBar::closePopupMenu );
   connect( &dictionaryBar, &DictionaryBar::showDictionaryInfo, this, &ScanPopup::showDictionaryInfo );
   connect( &dictionaryBar, &DictionaryBar::openDictionaryFolder, this, &ScanPopup::openDictionaryFolder );
 
   pinnedGeometry = cfg.popupWindowGeometry;
-  if( cfg.popupWindowGeometry.size() )
+  if ( cfg.popupWindowGeometry.size() )
     restoreGeometry( cfg.popupWindowGeometry );
 
   if ( cfg.popupWindowState.size() )
-    restoreState( cfg.popupWindowState, 1 );
+    restoreState( cfg.popupWindowState );
 
   ui.onTopButton->setChecked( cfg.popupWindowAlwaysOnTop );
   ui.onTopButton->setVisible( cfg.pinPopupWindow );
@@ -179,23 +168,21 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   ui.pinButton->setChecked( cfg.pinPopupWindow );
 
-  if ( cfg.pinPopupWindow )
-  {
+  if ( cfg.pinPopupWindow ) {
     dictionaryBar.setMovable( true );
     Qt::WindowFlags flags = pinnedWindowFlags;
-    if( cfg.popupWindowAlwaysOnTop )
+    if ( cfg.popupWindowAlwaysOnTop )
       flags |= Qt::WindowStaysOnTopHint;
     setWindowFlags( flags );
 #ifdef Q_OS_MACOS
-    setAttribute(Qt::WA_MacAlwaysShowToolWindow);
+    setAttribute( Qt::WA_MacAlwaysShowToolWindow );
 #endif
   }
-  else
-  {
+  else {
     dictionaryBar.setMovable( false );
     setWindowFlags( unpinnedWindowFlags() );
 #ifdef Q_OS_MACOS
-    setAttribute(Qt::WA_MacAlwaysShowToolWindow, false);
+    setAttribute( Qt::WA_MacAlwaysShowToolWindow, false );
 #endif
   }
 
@@ -203,8 +190,8 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   definition->focus();
 
-  #if 0 // Experimental code to give window a non-rectangular shape (i.e.
-        // balloon) using a colorkey mask.
+#if 0 // Experimental code to give window a non-rectangular shape (i.e. \
+      // balloon) using a colorkey mask.
   QPixmap pixMask( size() );
   render( &pixMask );
 
@@ -212,7 +199,7 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   // This helps against flickering
   setAttribute( Qt::WA_NoSystemBackground );
-  #endif
+#endif
 
   escapeAction.setShortcut( QKeySequence( "Esc" ) );
   addAction( &escapeAction );
@@ -220,9 +207,8 @@ ScanPopup::ScanPopup( QWidget * parent,
 
   focusTranslateLineAction.setShortcutContext( Qt::WidgetWithChildrenShortcut );
   addAction( &focusTranslateLineAction );
-  focusTranslateLineAction.setShortcuts( QList< QKeySequence >() <<
-                                         QKeySequence( "Alt+D" ) <<
-                                         QKeySequence( "Ctrl+L" ) );
+  focusTranslateLineAction.setShortcuts( QList< QKeySequence >()
+                                         << QKeySequence( "Alt+D" ) << QKeySequence( "Ctrl+L" ) );
 
   connect( &focusTranslateLineAction, &QAction::triggered, this, &ScanPopup::focusTranslateLine );
 
@@ -232,16 +218,14 @@ ScanPopup::ScanPopup( QWidget * parent,
   addAction( focusArticleViewAction );
   connect( focusArticleViewAction, &QAction::triggered, definition, &ArticleView::focus );
 
-  switchExpandModeAction.setShortcuts( QList< QKeySequence >() <<
-                                       QKeySequence( Qt::CTRL | Qt::Key_8 ) <<
-                                       QKeySequence( Qt::CTRL | Qt::Key_Asterisk ) <<
-                                       QKeySequence( Qt::CTRL | Qt::SHIFT | Qt::Key_8 ) );
+  switchExpandModeAction.setShortcuts( QList< QKeySequence >() << QKeySequence( Qt::CTRL | Qt::Key_8 )
+                                                               << QKeySequence( Qt::CTRL | Qt::Key_Asterisk )
+                                                               << QKeySequence( Qt::CTRL | Qt::SHIFT | Qt::Key_8 ) );
 
   addAction( &switchExpandModeAction );
   connect( &switchExpandModeAction, &QAction::triggered, this, &ScanPopup::switchExpandOptionalPartsMode );
 
-  connect( ui.groupList, &QComboBox::currentIndexChanged,
-           this, &ScanPopup::currentGroupChanged);
+  connect( ui.groupList, &QComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
 
   connect( &wordFinder, &WordFinder::finished, this, &ScanPopup::prefixMatchFinished );
 
@@ -254,10 +238,7 @@ ScanPopup::ScanPopup( QWidget * parent,
   connect( definition, &ArticleView::titleChanged, this, &ScanPopup::titleChanged );
 
 #ifdef Q_OS_MAC
-  connect( &MouseOver::instance(),
-    SIGNAL( hovered( QString const &, bool ) ),
-    this,
-    SLOT( handleInputWord( QString const &, bool ) ) );
+  connect( &MouseOver::instance(), &MouseOver::hovered, this, &ScanPopup::handleInputWord );
 #endif
 
   hideTimer.setSingleShot( true );
@@ -280,14 +261,14 @@ ScanPopup::ScanPopup( QWidget * parent,
 #ifdef HAVE_X11
   scanFlag = new ScanFlag( this );
 
-  connect( scanFlag, &ScanFlag::requestScanPopup,
-    this, [=]{
+  connect( scanFlag, &ScanFlag::requestScanPopup, this, [ this ] {
     translateWordFromSelection();
-  });
+  } );
 
-  // Use delay show to prevent multiple popups while selection in progress
+  // Use delay show to prevent popup from showing up while selection is still in progress
+  // Only certain software has this problem (e.g. Chrome)
   selectionDelayTimer.setSingleShot( true );
-  selectionDelayTimer.setInterval( 800 );
+  selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
 
   connect( &selectionDelayTimer, &QTimer::timeout, this, &ScanPopup::translateWordFromSelection );
 #endif
@@ -296,14 +277,14 @@ ScanPopup::ScanPopup( QWidget * parent,
   applyWordsZoomLevel();
 }
 
-void ScanPopup::refresh() {
+void ScanPopup::refresh()
+{
 
   // TODO: GroupCombox's update should be moved inside GroupCombox
 
   // currentIndexChanged() signal is very trigger-happy. To avoid triggering
   // it, we disconnect it while we're clearing and filling back groups.
-  disconnect( ui.groupList, &GroupComboBox::currentIndexChanged,
-    this, &ScanPopup::currentGroupChanged );
+  disconnect( ui.groupList, &GroupComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
 
   auto OldGroupID = ui.groupList->getCurrentGroup();
 
@@ -313,12 +294,14 @@ void ScanPopup::refresh() {
 
   ui.groupList->setCurrentGroup( OldGroupID ); // This does nothing if OldGroupID doesn't exist;
 
-  ui.groupList->setVisible(!cfg.groups.empty());
+  ui.groupList->setVisible( !cfg.groups.empty() );
 
   updateDictionaryBar();
 
-  connect( ui.groupList, &GroupComboBox::currentIndexChanged,
-    this, &ScanPopup::currentGroupChanged );
+  connect( ui.groupList, &GroupComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
+#ifdef HAVE_X11
+  selectionDelayTimer.setInterval( cfg.preferences.selectionChangeDelayTimer );
+#endif
 }
 
 
@@ -333,15 +316,16 @@ ScanPopup::~ScanPopup()
 void ScanPopup::saveConfigData()
 {
   // Save state, geometry and pin status
-  cfg.popupWindowState = saveState( 1 );
-  cfg.popupWindowGeometry = saveGeometry();
-  cfg.pinPopupWindow = ui.pinButton->isChecked();
+  cfg.popupWindowState       = saveState();
+  cfg.popupWindowGeometry    = saveGeometry();
+  cfg.pinPopupWindow         = ui.pinButton->isChecked();
   cfg.popupWindowAlwaysOnTop = ui.onTopButton->isChecked();
 }
 
-void ScanPopup::inspectElementWhenPinned( QWebEnginePage * page ){
-  if(cfg.pinPopupWindow)
-    emit inspectSignal(page);
+void ScanPopup::inspectElementWhenPinned( QWebEnginePage * page )
+{
+  if ( cfg.pinPopupWindow )
+    emit inspectSignal( page );
 }
 
 void ScanPopup::applyZoomFactor()
@@ -354,22 +338,20 @@ void ScanPopup::applyWordsZoomLevel()
   QFont font( wordListDefaultFont );
   int ps = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
     if ( ps < 1 )
       ps = 1;
     font.setPointSize( ps );
   }
 
-  if ( ui.translateBox->wordList()->font().pointSize() != ps )
-    ui.translateBox->wordList()->setFont( font );
+  if ( ui.translateBox->completerWidget()->font().pointSize() != ps )
+    ui.translateBox->completerWidget()->setFont( font );
 
   font = translateLineDefaultFont;
-  ps = font.pointSize();
+  ps   = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
     if ( ps < 1 )
       ps = 1;
@@ -380,27 +362,23 @@ void ScanPopup::applyWordsZoomLevel()
     ui.translateBox->translateLine()->setFont( font );
 
   font = groupListDefaultFont;
-  ps = font.pointSize();
+  ps   = font.pointSize();
 
-  if ( cfg.preferences.wordsZoomLevel != 0 )
-  {
+  if ( cfg.preferences.wordsZoomLevel != 0 ) {
     ps += cfg.preferences.wordsZoomLevel;
     if ( ps < 1 )
       ps = 1;
     font.setPointSize( ps );
   }
 
-  if ( ui.groupList->font().pointSize() != ps )
-  {
-    disconnect( ui.groupList, &GroupComboBox::currentIndexChanged,
-                this, &ScanPopup::currentGroupChanged );
+  if ( ui.groupList->font().pointSize() != ps ) {
+    disconnect( ui.groupList, &GroupComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
     int n = ui.groupList->currentIndex();
     ui.groupList->clear();
     ui.groupList->setFont( font );
     ui.groupList->fill( groups );
     ui.groupList->setCurrentIndex( n );
-    connect( ui.groupList, &GroupComboBox::currentIndexChanged,
-                this, &ScanPopup::currentGroupChanged );
+    connect( ui.groupList, &GroupComboBox::currentIndexChanged, this, &ScanPopup::currentGroupChanged );
   }
 
   ui.outerFrame->layout()->activate();
@@ -413,26 +391,26 @@ Qt::WindowFlags ScanPopup::unpinnedWindowFlags() const
 
 void ScanPopup::translateWordFromClipboard()
 {
-	return translateWordFromClipboard(QClipboard::Clipboard);
+  return translateWordFromClipboard( QClipboard::Clipboard );
 }
 
 void ScanPopup::translateWordFromSelection()
 {
-	return translateWordFromClipboard(QClipboard::Selection);
+  return translateWordFromClipboard( QClipboard::Selection );
 }
 
 void ScanPopup::editGroupRequested()
 {
-  emit editGroupRequested( ui.groupList->getCurrentGroup() );
+  emit editGroupRequest( ui.groupList->getCurrentGroup() );
 }
 
-void ScanPopup::translateWordFromClipboard(QClipboard::Mode m)
+void ScanPopup::translateWordFromClipboard( QClipboard::Mode m )
 {
-  qDebug()<< "translating from clipboard or selection" ;
+  qDebug() << "translating from clipboard or selection";
 
   QString subtype = "plain";
 
-  QString str = QApplication::clipboard()->text( subtype, m);
+  QString str = QApplication::clipboard()->text( subtype, m );
   qDebug() << "clipboard data:" << str;
   translateWord( str );
 }
@@ -450,28 +428,26 @@ void ScanPopup::translateWord( QString const & word )
 
   engagePopup( false,
 #ifdef Q_OS_WIN
-      true // We only focus popup under Windows when activated via Ctrl+C+C
-           // -- on Linux it already has an implicit focus
+               true // We only focus popup under Windows when activated via Ctrl+C+C
+                    // -- on Linux it already has an implicit focus
 #else
-      false
+               false
 #endif
-      );
+  );
 }
 
 #ifdef HAVE_X11
 void ScanPopup::showEngagePopup()
 {
-  engagePopup(false);
+  engagePopup( false );
 }
 #endif
 
-[[deprecated]]
-void ScanPopup::handleInputWord( QString const & str, bool forcePopup )
+[[deprecated]] void ScanPopup::handleInputWord( QString const & str, bool forcePopup )
 {
   auto sanitizedPhrase = cfg.preferences.sanitizeInputPhrase( str );
 
-  if ( isVisible() && sanitizedPhrase == pendingWord )
-  {
+  if ( isVisible() && sanitizedPhrase == pendingWord ) {
     // Attempt to translate the same word we already have shown in scan popup.
     // Ignore it, as it is probably a spurious mouseover event.
     return;
@@ -491,8 +467,7 @@ void ScanPopup::handleInputWord( QString const & str, bool forcePopup )
 
 void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
 {
-  if( cfg.preferences.scanToMainWindow && !forcePopup )
-  {
+  if ( cfg.preferences.scanToMainWindow && !forcePopup ) {
     // Send translated word to main window istead of show popup
     emit sendPhraseToMainWindow( pendingWord );
     return;
@@ -500,12 +475,10 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
 
   definition->setSelectionBySingleClick( cfg.preferences.selectWordBySingleClick );
 
-  if ( !isVisible() )
-  {
+  if ( !isVisible() ) {
     // Need to show the window
 
-    if ( !ui.pinButton->isChecked() )
-    {
+    if ( !ui.pinButton->isChecked() ) {
       // Decide where should the window land
 
       QPoint currentPos = QCursor::pos();
@@ -524,29 +497,28 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
       if ( currentPos.x() + 4 + windowSize.width() <= desktop.topRight().x() )
         x = currentPos.x() + 4;
       else
-      /// Try the to-the-left placement
-      if ( currentPos.x() - 4 - windowSize.width() >= desktop.x() )
-        x = currentPos.x() - 4 - windowSize.width();
-      else
-      // Center it
-        x = desktop.x() + ( desktop.width() - windowSize.width() ) / 2;
+        /// Try the to-the-left placement
+        if ( currentPos.x() - 4 - windowSize.width() >= desktop.x() )
+          x = currentPos.x() - 4 - windowSize.width();
+        else
+          // Center it
+          x = desktop.x() + ( desktop.width() - windowSize.width() ) / 2;
 
       /// Try the to-the-bottom placement
       if ( currentPos.y() + 15 + windowSize.height() <= desktop.bottomLeft().y() )
         y = currentPos.y() + 15;
       else
-      /// Try the to-the-top placement
-      if ( currentPos.y() - 15 - windowSize.height() >= desktop.y() )
-        y = currentPos.y() - 15 - windowSize.height();
-      else
-      // Center it
-        y = desktop.y() + ( desktop.height() - windowSize.height() ) / 2;
+        /// Try the to-the-top placement
+        if ( currentPos.y() - 15 - windowSize.height() >= desktop.y() )
+          y = currentPos.y() - 15 - windowSize.height();
+        else
+          // Center it
+          y = desktop.y() + ( desktop.height() - windowSize.height() ) / 2;
 
       move( x, y );
     }
-    else
-    {
-      if( pinnedGeometry.size() > 0 )
+    else {
+      if ( pinnedGeometry.size() > 0 )
         restoreGeometry( pinnedGeometry );
     }
 
@@ -560,14 +532,12 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
       giveFocus = true;
 #endif
 
-    if ( giveFocus )
-    {
+    if ( giveFocus ) {
       activateWindow();
       raise();
     }
 
-    if ( !ui.pinButton->isChecked() )
-    {
+    if ( !ui.pinButton->isChecked() ) {
       mouseEnteredOnce = false;
       // Need to monitor the mouse so we know when to hide the window
       interceptMouse();
@@ -576,16 +546,16 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
     // This produced some funky mouse grip-related bugs so we commented it out
     //QApplication::processEvents(); // Make window appear immediately no matter what
   }
-  else if( ui.pinButton->isChecked() ) {
+  else if ( ui.pinButton->isChecked() ) {
     // Pinned-down window isn't always on top, so we need to raise it
     show();
-    if( cfg.preferences.raiseWindowOnSearch ) {
+    if ( cfg.preferences.raiseWindowOnSearch ) {
       activateWindow();
       raise();
     }
   }
 #if defined( HAVE_X11 )
-  else if( ( windowFlags() & Qt::Tool ) == Qt::Tool && cfg.preferences.raiseWindowOnSearch ) {
+  else if ( ( windowFlags() & Qt::Tool ) == Qt::Tool && cfg.preferences.raiseWindowOnSearch ) {
     // Ensure that the window with Qt::Tool flag always has focus on X11.
     activateWindow();
     raise();
@@ -593,7 +563,7 @@ void ScanPopup::engagePopup( bool forcePopup, bool giveFocus )
 #endif
 
   if ( ui.pinButton->isChecked() )
-       setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) );
+    setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) );
 
   /// Too large strings make window expand which is probably not what user
   /// wants
@@ -609,31 +579,29 @@ QString ScanPopup::elideInputWord()
 
 void ScanPopup::currentGroupChanged( int )
 {
-    cfg.lastPopupGroupId = ui.groupList->getCurrentGroup();
-    Instances::Group const * igrp = groups.findGroup( cfg.lastPopupGroupId );
-    if( cfg.lastPopupGroupId == Instances::Group::AllGroupId )
-    {
-      if( igrp )
-        igrp->checkMutedDictionaries( &cfg.popupMutedDictionaries );
-      dictionaryBar.setMutedDictionaries( &cfg.popupMutedDictionaries );
+  cfg.lastPopupGroupId          = ui.groupList->getCurrentGroup();
+  Instances::Group const * igrp = groups.findGroup( cfg.lastPopupGroupId );
+  if ( cfg.lastPopupGroupId == Instances::Group::AllGroupId ) {
+    if ( igrp )
+      igrp->checkMutedDictionaries( &cfg.popupMutedDictionaries );
+    dictionaryBar.setMutedDictionaries( &cfg.popupMutedDictionaries );
+  }
+  else {
+    Config::Group * grp = cfg.getGroup( cfg.lastPopupGroupId );
+    if ( grp ) {
+      if ( igrp )
+        igrp->checkMutedDictionaries( &grp->popupMutedDictionaries );
+      dictionaryBar.setMutedDictionaries( &grp->popupMutedDictionaries );
     }
     else
-    {
-      Config::Group * grp = cfg.getGroup( cfg.lastPopupGroupId );
-      if( grp )
-      {
-        if( igrp )
-          igrp->checkMutedDictionaries( &grp->popupMutedDictionaries );
-        dictionaryBar.setMutedDictionaries( &grp->popupMutedDictionaries );
-      }
-      else
-        dictionaryBar.setMutedDictionaries( 0 );
-    }
+      dictionaryBar.setMutedDictionaries( nullptr );
+  }
 
   updateDictionaryBar();
 
-  if ( isVisible() )
-  {
+  definition->setCurrentGroupId( cfg.lastPopupGroupId );
+
+  if ( isVisible() ) {
     updateSuggestionList();
     translateInputFinished();
   }
@@ -641,11 +609,6 @@ void ScanPopup::currentGroupChanged( int )
   cfg.lastPopupGroupId = ui.groupList->getCurrentGroup();
 }
 
-void ScanPopup::wordListItemActivated( QListWidgetItem * item )
-{
-  showTranslationFor( item->text() );
-}
-
 void ScanPopup::translateInputChanged( QString const & text )
 {
   updateSuggestionList( text );
@@ -659,21 +622,16 @@ void ScanPopup::updateSuggestionList()
 void ScanPopup::updateSuggestionList( QString const & text )
 {
   mainStatusBar->clearMessage();
-  ui.translateBox->wordList()->setCurrentItem( 0, QItemSelectionModel::Clear );
 
   QString req = text.trimmed();
 
-  if ( !req.size() )
-  {
+  if ( !req.size() ) {
     // An empty request always results in an empty result
     wordFinder.cancel();
-    ui.translateBox->wordList()->clear();
-    ui.translateBox->wordList()->unsetCursor();
 
     // Reset the noResults mark if it's on right now
-    if ( ui.translateBox->translateLine()->property( "noResults" ).toBool() )
-    {
-      auto translateLine=ui.translateBox->translateLine();
+    if ( ui.translateBox->translateLine()->property( "noResults" ).toBool() ) {
+      auto translateLine = ui.translateBox->translateLine();
       translateLine->setProperty( "noResults", false );
 
       Utils::Widget::setNoResultColor( translateLine, false );
@@ -681,8 +639,6 @@ void ScanPopup::updateSuggestionList( QString const & text )
     return;
   }
 
-  ui.translateBox->wordList()->setCursor( Qt::WaitCursor );
-
   wordFinder.prefixMatch( req, getActiveDicts() );
 }
 
@@ -705,16 +661,15 @@ vector< sptr< Dictionary::Class > > const & ScanPopup::getActiveDicts()
 {
   int current = ui.groupList->currentIndex();
 
-  Q_ASSERT(0 <= current || current <= groups.size());
+  Q_ASSERT( 0 <= current || current <= groups.size() );
 
   Config::MutedDictionaries const * mutedDictionaries = dictionaryBar.getMutedDictionaries();
 
-  if ( !dictionaryBar.toggleViewAction()->isChecked() || mutedDictionaries == nullptr ){
-    return groups[current].dictionaries;
+  if ( !dictionaryBar.toggleViewAction()->isChecked() || mutedDictionaries == nullptr ) {
+    return groups[ current ].dictionaries;
   }
 
-  vector< sptr< Dictionary::Class > > const & activeDicts =
-  groups[current].dictionaries;
+  vector< sptr< Dictionary::Class > > const & activeDicts = groups[ current ].dictionaries;
 
   // Populate the special dictionariesUnmuted array with only unmuted
   // dictionaries
@@ -722,8 +677,8 @@ vector< sptr< Dictionary::Class > > const & ScanPopup::getActiveDicts()
   dictionariesUnmuted.clear();
   dictionariesUnmuted.reserve( activeDicts.size() );
 
-  for(const auto & activeDict : activeDicts){
-    if ( !mutedDictionaries->contains(QString::fromStdString( activeDict->getId() ) ) ){
+  for ( const auto & activeDict : activeDicts ) {
+    if ( !mutedDictionaries->contains( QString::fromStdString( activeDict->getId() ) ) ) {
       dictionariesUnmuted.push_back( activeDict );
     }
   }
@@ -746,8 +701,7 @@ void ScanPopup::typingEvent( QString const & t )
 
 bool ScanPopup::eventFilter( QObject * watched, QEvent * event )
 {
-  if ( watched == ui.translateBox->translateLine() && event->type() == QEvent::FocusIn )
-  {
+  if ( watched == ui.translateBox->translateLine() && event->type() == QEvent::FocusIn ) {
     const QFocusEvent * focusEvent = static_cast< QFocusEvent * >( event );
 
     // select all on mouse click
@@ -757,33 +711,29 @@ bool ScanPopup::eventFilter( QObject * watched, QEvent * event )
     return false;
   }
 
-  if ( mouseIntercepted )
-  {
+  if ( mouseIntercepted ) {
     // We're only interested in our events
 
-    if ( event->type() == QEvent::MouseMove )
-    {
-      QMouseEvent * mouseEvent = ( QMouseEvent * ) event;
+    if ( event->type() == QEvent::MouseMove ) {
+      QMouseEvent * mouseEvent = (QMouseEvent *)event;
       reactOnMouseMove( mouseEvent->globalPos() );
     }
   }
 
   if ( event->type() == QEvent::KeyPress && watched != ui.translateBox->translateLine() ) {
 
-    if ( const auto key_event = dynamic_cast< QKeyEvent * >(event);  key_event->modifiers() == Qt::NoModifier ) {
+    if ( const auto key_event = dynamic_cast< QKeyEvent * >( event ); key_event->modifiers() == Qt::NoModifier ) {
       const QString text = key_event->text();
 
-      if ( Utils::ignoreKeyEvent( key_event ) ||
-           key_event->key() == Qt::Key_Return ||
-           key_event->key() == Qt::Key_Enter )
-          return false; // Those key have other uses than to start typing
+      if ( Utils::ignoreKeyEvent( key_event ) || key_event->key() == Qt::Key_Return
+           || key_event->key() == Qt::Key_Enter )
+        return false; // Those key have other uses than to start typing
       // or don't make sense
       if ( !text.isEmpty() ) {
-          typingEvent( text );
-          return true;
+        typingEvent( text );
+        return true;
       }
     }
-
   }
 
   return QMainWindow::eventFilter( watched, event );
@@ -791,17 +741,15 @@ bool ScanPopup::eventFilter( QObject * watched, QEvent * event )
 
 void ScanPopup::reactOnMouseMove( QPoint const & p )
 {
-  if ( geometry().contains( p ) )
-  {
-//        GD_DPRINTF( "got inside\n" );
+  if ( geometry().contains( p ) ) {
+    //        GD_DPRINTF( "got inside\n" );
 
     hideTimer.stop();
     mouseEnteredOnce = true;
     uninterceptMouse();
   }
-  else
-  {
-//        GD_DPRINTF( "outside\n" );
+  else {
+    //        GD_DPRINTF( "outside\n" );
     // We're in grab mode and outside the window - calculate the
     // distance from it. We might want to hide it.
 
@@ -813,9 +761,7 @@ void ScanPopup::reactOnMouseMove( QPoint const & p )
     // receiving this event, meaning there's basically nothing under the
     // cursor.
     if ( /*watched == this &&*/
-         !frameGeometry().adjusted( -proximity, -proximity, proximity, proximity ).
-         contains( p ) )
-    {
+         !frameGeometry().adjusted( -proximity, -proximity, proximity, proximity ).contains( p ) ) {
       // We've way too far from the window -- hide the popup
 
       // If the mouse never entered the popup, hide the window instantly --
@@ -834,15 +780,13 @@ void ScanPopup::mousePressEvent( QMouseEvent * ev )
   // With mouse grabs, the press can occur anywhere on the screen, which
   // might mean hiding the window.
 
-  if ( !frameGeometry().contains( ev->globalPos() ) )
-  {
+  if ( !frameGeometry().contains( ev->globalPos() ) ) {
     hideWindow();
 
     return;
   }
 
-  if ( ev->button() == Qt::LeftButton )
-  {
+  if ( ev->button() == Qt::LeftButton ) {
     startPos = ev->globalPos();
     setCursor( Qt::ClosedHandCursor );
   }
@@ -852,8 +796,7 @@ void ScanPopup::mousePressEvent( QMouseEvent * ev )
 
 void ScanPopup::mouseMoveEvent( QMouseEvent * event )
 {
-  if ( event->buttons() && cursor().shape() == Qt::ClosedHandCursor )
-  {
+  if ( event->buttons() && cursor().shape() == Qt::ClosedHandCursor ) {
     QPoint newPos = event->globalPos();
 
     QPoint delta = newPos - startPos;
@@ -885,14 +828,13 @@ void ScanPopup::leaveEvent( QEvent * event )
   // If the dialog is pinned, we don't hide the popup.
   // If some mouse buttons are pressed, we don't hide the popup either,
   // since it indicates the move operation is underway.
-  if ( !ui.pinButton->isChecked() && !geometry().contains( QCursor::pos() ) &&
-       QApplication::mouseButtons() == Qt::NoButton )
-  {
+  if ( !ui.pinButton->isChecked() && !geometry().contains( QCursor::pos() )
+       && QApplication::mouseButtons() == Qt::NoButton ) {
     hideTimer.start();
   }
 }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
 void ScanPopup::enterEvent( QEnterEvent * event )
 #else
 void ScanPopup::enterEvent( QEvent * event )
@@ -900,8 +842,7 @@ void ScanPopup::enterEvent( QEvent * event )
 {
   QMainWindow::enterEvent( event );
 
-  if ( mouseEnteredOnce )
-  {
+  if ( mouseEnteredOnce ) {
     // We "enter" first time via our event filter. This seems to evade some
     // unexpected behavior under Windows.
 
@@ -915,7 +856,6 @@ void ScanPopup::requestWindowFocus()
   // One of the rare, actually working workarounds for requesting a user keyboard focus on X11,
   // works for Qt::Popup windows, exactly like our Scan Popup (in unpinned state).
   // Modern window managers actively resist to automatically focus pop-up windows.
-
 }
 
 void ScanPopup::showEvent( QShowEvent * ev )
@@ -927,8 +867,7 @@ void ScanPopup::showEvent( QShowEvent * ev )
   if ( groups.size() <= 1 ) // Only the default group? Hide then.
     ui.groupList->hide();
 
-  if ( ui.showDictionaryBar->isChecked() != dictionaryBar.isVisible() )
-  {
+  if ( ui.showDictionaryBar->isChecked() != dictionaryBar.isVisible() ) {
     ui.showDictionaryBar->setChecked( dictionaryBar.isVisible() );
     updateDictionaryBar();
   }
@@ -936,7 +875,7 @@ void ScanPopup::showEvent( QShowEvent * ev )
 
 void ScanPopup::closeEvent( QCloseEvent * ev )
 {
-  if( isVisible() && ui.pinButton->isChecked() )
+  if ( isVisible() && ui.pinButton->isChecked() )
     pinnedGeometry = saveGeometry();
 
   QMainWindow::closeEvent( ev );
@@ -944,7 +883,7 @@ void ScanPopup::closeEvent( QCloseEvent * ev )
 
 void ScanPopup::moveEvent( QMoveEvent * ev )
 {
-  if( isVisible() && ui.pinButton->isChecked() )
+  if ( isVisible() && ui.pinButton->isChecked() )
     pinnedGeometry = saveGeometry();
 
   QMainWindow::moveEvent( ev );
@@ -953,15 +892,24 @@ void ScanPopup::moveEvent( QMoveEvent * ev )
 void ScanPopup::prefixMatchFinished()
 {
   // Check that there's a window there at all
-  if ( isVisible() )
-  {
-    if ( wordFinder.getErrorString().size() )
-    {
+  if ( isVisible() ) {
+    if ( wordFinder.getErrorString().size() ) {
       ui.queryError->setToolTip( wordFinder.getErrorString() );
       ui.queryError->show();
+      showStatusBarMessage( tr( "WARNING: %1" ).arg( wordFinder.getErrorString() ),
+                            20000,
+                            QPixmap( ":/icons/error.svg" ) );
     }
-    else
+    else {
       ui.queryError->hide();
+      auto results = wordFinder.getResults();
+      QStringList _results;
+      for ( auto const & [ fst, snd ] : results ) {
+        _results << fst;
+      }
+
+      ui.translateBox->setModel( _results );
+    }
   }
 }
 
@@ -972,32 +920,30 @@ void ScanPopup::on_pronounceButton_clicked()
 
 void ScanPopup::pinButtonClicked( bool checked )
 {
-  if ( checked )
-  {
+  if ( checked ) {
     uninterceptMouse();
 
     ui.onTopButton->setVisible( true );
     Qt::WindowFlags flags = pinnedWindowFlags;
-    if( ui.onTopButton->isChecked() )
+    if ( ui.onTopButton->isChecked() )
       flags |= Qt::WindowStaysOnTopHint;
     setWindowFlags( flags );
 
 #ifdef Q_OS_MACOS
-    setAttribute(Qt::WA_MacAlwaysShowToolWindow);
+    setAttribute( Qt::WA_MacAlwaysShowToolWindow );
 #endif
 
     setWindowTitle( tr( "%1 - %2" ).arg( elideInputWord(), "GoldenDict" ) );
     dictionaryBar.setMovable( true );
     hideTimer.stop();
   }
-  else
-  {
+  else {
     ui.onTopButton->setVisible( false );
     dictionaryBar.setMovable( false );
     setWindowFlags( unpinnedWindowFlags() );
 
 #ifdef Q_OS_MACOS
-    setAttribute(Qt::WA_MacAlwaysShowToolWindow, false);
+    setAttribute( Qt::WA_MacAlwaysShowToolWindow, false );
 #endif
 
     mouseEnteredOnce = true;
@@ -1006,7 +952,7 @@ void ScanPopup::pinButtonClicked( bool checked )
 
   show();
 
-  if( checked )
+  if ( checked )
     pinnedGeometry = saveGeometry();
 }
 
@@ -1034,20 +980,15 @@ void ScanPopup::hideTimerExpired()
 
 void ScanPopup::pageLoaded( ArticleView * )
 {
-  if( !isVisible() )
+  if ( !isVisible() )
     return;
   auto pronounceBtn = ui.pronounceButton;
-  definition->hasSound(
-    [ pronounceBtn ]( bool has )
-    {
-      if( pronounceBtn )
-        pronounceBtn->setDisabled( !has );
-    } );
+  definition->hasSound( [ pronounceBtn ]( bool has ) {
+    if ( pronounceBtn )
+      pronounceBtn->setDisabled( !has );
+  } );
 
   updateBackForwardButtons();
-
-  if ( cfg.preferences.pronounceOnLoadPopup )
-    definition->playSound();
 }
 
 void ScanPopup::showStatusBarMessage( QString const & message, int timeout, QPixmap const & icon )
@@ -1075,13 +1016,12 @@ void ScanPopup::hideWindow()
 
 void ScanPopup::interceptMouse()
 {
-  if ( !mouseIntercepted )
-  {
+  if ( !mouseIntercepted ) {
     // We used to grab the mouse -- but this doesn't always work reliably
     // (e.g. doesn't work at all in Windows 7 for some reason). Therefore
     // we use a polling timer now.
 
-//    grabMouse();
+    //    grabMouse();
     mouseGrabPollTimer.start();
 
     qApp->installEventFilter( this );
@@ -1098,11 +1038,10 @@ void ScanPopup::mouseGrabPoll()
 
 void ScanPopup::uninterceptMouse()
 {
-  if ( mouseIntercepted )
-  {
+  if ( mouseIntercepted ) {
     qApp->removeEventFilter( this );
     mouseGrabPollTimer.stop();
-//    releaseMouse();
+    //    releaseMouse();
 
     mouseIntercepted = false;
   }
@@ -1113,18 +1052,17 @@ void ScanPopup::updateDictionaryBar()
   if ( !dictionaryBar.toggleViewAction()->isChecked() )
     return; // It's not enabled, therefore hidden -- don't waste time
 
-  unsigned currentId = ui.groupList->getCurrentGroup();
+  unsigned currentId           = ui.groupList->getCurrentGroup();
   Instances::Group const * grp = groups.findGroup( currentId );
 
   if ( grp ) // Should always be !0, but check as a safeguard
     dictionaryBar.setDictionaries( grp->dictionaries );
 
-  if( currentId == Instances::Group::AllGroupId )
+  if ( currentId == Instances::Group::AllGroupId )
     dictionaryBar.setMutedDictionaries( &cfg.popupMutedDictionaries );
-  else
-  {
-    Config::Group * grp = cfg.getGroup( currentId );
-    dictionaryBar.setMutedDictionaries( grp ? &grp->popupMutedDictionaries : 0 );
+  else {
+    Config::Group * group = cfg.getGroup( currentId );
+    dictionaryBar.setMutedDictionaries( group ? &group->popupMutedDictionaries : nullptr );
   }
 
   setDictionaryIconSize();
@@ -1141,8 +1079,7 @@ void ScanPopup::on_sendWordButton_clicked()
 {
   if ( !isVisible() )
     return;
-  if( !ui.pinButton->isChecked() )
-  {
+  if ( !ui.pinButton->isChecked() ) {
     definition->closeSearch();
     hideWindow();
   }
@@ -1162,14 +1099,14 @@ void ScanPopup::on_sendWordToFavoritesButton_clicked()
 
 void ScanPopup::switchExpandOptionalPartsMode()
 {
-  if( isVisible() )
+  if ( isVisible() )
     emit switchExpandMode();
 }
 
 void ScanPopup::updateBackForwardButtons()
 {
-  ui.goBackButton->setEnabled(definition->canGoBack());
-  ui.goForwardButton->setEnabled(definition->canGoForward());
+  ui.goBackButton->setEnabled( definition->canGoBack() );
+  ui.goForwardButton->setEnabled( definition->canGoForward() );
 }
 
 void ScanPopup::on_goBackButton_clicked()
@@ -1184,38 +1121,34 @@ void ScanPopup::on_goForwardButton_clicked()
 
 void ScanPopup::setDictionaryIconSize()
 {
-  int extent = cfg.usingSmallIconsInToolbars ?
-               QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
-               QApplication::style()->pixelMetric(QStyle::PM_ToolBarIconSize);
+  int extent = cfg.usingSmallIconsInToolbars ? QApplication::style()->pixelMetric( QStyle::PM_SmallIconSize ) :
+                                               QApplication::style()->pixelMetric( QStyle::PM_ToolBarIconSize );
   dictionaryBar.setDictionaryIconSize( extent );
 }
 
 void ScanPopup::setGroupByName( QString const & name )
 {
   int i;
-  for( i = 0; i < ui.groupList->count(); i++ )
-  {
-    if( ui.groupList->itemText( i ) == name )
-    {
+  for ( i = 0; i < ui.groupList->count(); i++ ) {
+    if ( ui.groupList->itemText( i ) == name ) {
       ui.groupList->setCurrentIndex( i );
       break;
     }
   }
-  if( i >= ui.groupList->count() )
+  if ( i >= ui.groupList->count() )
     gdWarning( "Group \"%s\" for popup window is not found\n", name.toUtf8().data() );
 }
 
 void ScanPopup::alwaysOnTopClicked( bool checked )
 {
   bool wasVisible = isVisible();
-  if( ui.pinButton->isChecked() )
-  {
+  if ( ui.pinButton->isChecked() ) {
     Qt::WindowFlags flags = this->windowFlags();
-    if( checked )
-      setWindowFlags(flags | Qt::WindowStaysOnTopHint );
+    if ( checked )
+      setWindowFlags( flags | Qt::WindowStaysOnTopHint );
     else
-      setWindowFlags(flags ^ Qt::WindowStaysOnTopHint );
-    if( wasVisible )
+      setWindowFlags( flags ^ Qt::WindowStaysOnTopHint );
+    if ( wasVisible )
       show();
   }
 }
@@ -1225,8 +1158,7 @@ void ScanPopup::titleChanged( ArticleView *, QString const & title )
   unsigned groupId = ui.groupList->getCurrentGroup();
 
   // Set icon for "Add to Favorites" button
-  ui.sendWordToFavoritesButton->setIcon( isWordPresentedInFavorites( title, groupId ) ?
-                                         blueStarIcon : starIcon );
+  ui.sendWordToFavoritesButton->setIcon( isWordPresentedInFavorites( title, groupId ) ? blueStarIcon : starIcon );
 }
 
 bool ScanPopup::isWordPresentedInFavorites( QString const & word, unsigned groupId ) const
@@ -1237,11 +1169,13 @@ bool ScanPopup::isWordPresentedInFavorites( QString const & word, unsigned group
 }
 
 #ifdef HAVE_X11
-void ScanPopup::showScanFlag(){
+void ScanPopup::showScanFlag()
+{
   scanFlag->showScanFlag();
 }
 
-void ScanPopup::hideScanFlag(){
+void ScanPopup::hideScanFlag()
+{
   scanFlag->hideWindow();
 }
 #endif
diff --git a/src/ui/scanpopup.hh b/src/ui/scanpopup.hh
index c4e56890..bb363cce 100644
--- a/src/ui/scanpopup.hh
+++ b/src/ui/scanpopup.hh
@@ -16,7 +16,7 @@
 #include "dictionarybar.hh"
 #include "mainstatusbar.hh"
 #ifdef HAVE_X11
-#include "scanflag.hh"
+  #include "scanflag.hh"
 #endif
 
 /// This is a popup dialog to show translations when clipboard scanning mode
@@ -62,17 +62,17 @@ public:
 signals:
 
   /// Forwarded from the dictionary bar, so that main window could act on this.
-  void editGroupRequested( unsigned id );
+  void editGroupRequest( unsigned id );
   /// Send word to main window
   void sendPhraseToMainWindow( QString const & word );
   /// Close opened menus when window hide
   void closeMenu();
 
-  void inspectSignal(QWebEnginePage * page);
+  void inspectSignal( QWebEnginePage * page );
   /// Signal to switch expand optional parts mode
   void switchExpandMode();
   /// Signal to add word to history even if history is disabled
-  void forceAddWordToHistory( const QString & word);
+  void forceAddWordToHistory( const QString & word );
   /// Retranslate signal from dictionary bar
   void showDictionaryInfo( QString const & id );
   void openDictionaryFolder( QString const & id );
@@ -109,7 +109,7 @@ private:
   Qt::WindowFlags unpinnedWindowFlags() const;
 
   // Translates the word from the clipboard or the clipboard selection
-  void translateWordFromClipboard(QClipboard::Mode m);
+  void translateWordFromClipboard( QClipboard::Mode m );
 
   // Hides the popup window, effectively closing it.
   void hideWindow();
@@ -159,7 +159,7 @@ private:
   QIcon starIcon     = QIcon( ":/icons/star.svg" );
   QIcon blueStarIcon = QIcon( ":/icons/star_blue.svg" );
 
-  void handleInputWord( QString const & , bool forcePopup = false );
+  void handleInputWord( QString const &, bool forcePopup = false );
   void engagePopup( bool forcePopup, bool giveFocus = false );
 
   vector< sptr< Dictionary::Class > > const & getActiveDicts();
@@ -174,7 +174,7 @@ private:
   virtual void mouseMoveEvent( QMouseEvent * );
   virtual void mouseReleaseEvent( QMouseEvent * );
   virtual void leaveEvent( QEvent * event );
-#if (QT_VERSION >= QT_VERSION_CHECK(6,0,0))
+#if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
   virtual void enterEvent( QEnterEvent * event );
 #else
   virtual void enterEvent( QEvent * event );
@@ -198,7 +198,7 @@ private slots:
   void on_pronounceButton_clicked();
   void pinButtonClicked( bool checked );
   void on_showDictionaryBar_clicked( bool checked );
-  void showStatusBarMessage ( QString const &, int, QPixmap const & );
+  void showStatusBarMessage( QString const &, int, QPixmap const & );
   void on_sendWordButton_clicked();
   void on_sendWordToFavoritesButton_clicked();
   void on_goBackButton_clicked();
@@ -220,9 +220,8 @@ private slots:
 
   void switchExpandOptionalPartsMode();
 
-  void translateInputChanged(QString const & text);
+  void translateInputChanged( QString const & text );
   void translateInputFinished();
-  void wordListItemActivated( QListWidgetItem * );
 
   void focusTranslateLine();
 
@@ -231,7 +230,6 @@ private slots:
   void alwaysOnTopClicked( bool checked );
 
   void titleChanged( ArticleView *, QString const & title );
-
 };
 
 #endif
diff --git a/src/ui/searchpanel.cc b/src/ui/searchpanel.cc
index 95f1ea30..dd7a7d6c 100644
--- a/src/ui/searchpanel.cc
+++ b/src/ui/searchpanel.cc
@@ -2,7 +2,8 @@
 #include <QLabel>
 #include <QVBoxLayout>
 
-SearchPanel::SearchPanel( QWidget * parent ): QWidget( parent )
+SearchPanel::SearchPanel( QWidget * parent ):
+  QWidget( parent )
 {
   lineEdit = new QLineEdit( this );
 
diff --git a/src/ui/searchpanel.hh b/src/ui/searchpanel.hh
index 61a0ae3a..fa8a03ff 100644
--- a/src/ui/searchpanel.hh
+++ b/src/ui/searchpanel.hh
@@ -9,7 +9,8 @@
 class SearchPanel: public QWidget
 {
   Q_OBJECT
- public:
+
+public:
   explicit SearchPanel( QWidget * parent = nullptr );
   QLineEdit * lineEdit;
   QPushButton * close;
diff --git a/src/ui/searchpanewidget.hh b/src/ui/searchpanewidget.hh
index cd770a58..02065ae4 100644
--- a/src/ui/searchpanewidget.hh
+++ b/src/ui/searchpanewidget.hh
@@ -25,4 +25,3 @@ public:
 };
 
 #endif
-
diff --git a/src/ui/stylescombobox.cc b/src/ui/stylescombobox.cc
index 93fd577c..f14d06a4 100644
--- a/src/ui/stylescombobox.cc
+++ b/src/ui/stylescombobox.cc
@@ -16,8 +16,7 @@ void StylesComboBox::fill()
   clear();
   addItem( tr( "None" ) );
   QString stylesDir = Config::getStylesDir();
-  if( !stylesDir.isEmpty() )
-  {
+  if ( !stylesDir.isEmpty() ) {
     QDir dir( stylesDir );
     QStringList styles = dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::LocaleAware );
     addItems( styles );
@@ -27,11 +26,9 @@ void StylesComboBox::fill()
 void StylesComboBox::setCurrentStyle( QString const & style )
 {
   int nom = 0;
-  if( !style.isEmpty() )
-  {
-    for( int i = 1; i < count(); i++ )
-      if( style.compare( itemText( i ) ) == 0 )
-      {
+  if ( !style.isEmpty() ) {
+    for ( int i = 1; i < count(); i++ )
+      if ( style.compare( itemText( i ) ) == 0 ) {
         nom = i;
         break;
       }
@@ -41,7 +38,7 @@ void StylesComboBox::setCurrentStyle( QString const & style )
 
 QString StylesComboBox::getCurrentStyle() const
 {
-  if( currentIndex() == 0 )
+  if ( currentIndex() == 0 )
     return QString();
   return itemText( currentIndex() );
 }
diff --git a/src/ui/stylescombobox.hh b/src/ui/stylescombobox.hh
index 853ef698..2d4c1f6f 100644
--- a/src/ui/stylescombobox.hh
+++ b/src/ui/stylescombobox.hh
@@ -7,7 +7,7 @@
 #include <QString>
 
 /// This is a combo box which is for choosing the add-on styles
-class StylesComboBox : public QComboBox
+class StylesComboBox: public QComboBox
 {
   Q_OBJECT
 
@@ -24,7 +24,6 @@ public:
 
   /// Returns current style.
   QString getCurrentStyle() const;
-
 };
 
 #endif // __STYLESCOMBOBOX_HH_INCLUDED__
diff --git a/src/ui/translatebox.cc b/src/ui/translatebox.cc
index 903b0a07..0490dab8 100644
--- a/src/ui/translatebox.cc
+++ b/src/ui/translatebox.cc
@@ -11,209 +11,54 @@
 #include <QModelIndex>
 #include <QScrollBar>
 #include <QStyle>
-
-namespace
-{
-#define MAX_POPUP_ROWS 17
-}
-
-CompletionList::CompletionList(TranslateBox * parent) : WordList(parent),
-  translateBox(parent)
-{
-#ifdef Q_OS_WIN
-  setWindowFlags(Qt::ToolTip);
-#else
-  setParent( parent->window() );
-  setAutoFillBackground( true );
-#endif
-
-  connect( this, &QAbstractItemView::activated, this, &CompletionList::acceptCurrentEntry );
-
-  connect( this, &QListWidget::itemClicked, this, &CompletionList::acceptCurrentEntry );
-
-  translateBox->window()->installEventFilter(this);
-}
-
-bool CompletionList::eventFilter( QObject * obj, QEvent * ev )
-{
-  // when the main window is moved or resized, hide the word list suggestions
-  if ( obj != this && !isAncestorOf( qobject_cast< QWidget * >( obj ) )
-       && ( ev->type() == QEvent::Move || ev->type() == QEvent::Resize ) )
-  {
-    translateBox->setPopupEnabled( false );
-    return false;
-  }
-
-  return QWidget::eventFilter( obj, ev );
-}
-
-int CompletionList::preferredHeight() const
-{
-#if( QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 ) )
-  const QSize itemSizeHint = itemDelegate()->sizeHint( viewOptions(), model()->index( 0, 0 ) );
-#else
-  QStyleOptionViewItem option;
-  initViewItemOption( &option );
-  const QSize itemSizeHint = itemDelegate()->sizeHint(option, model()->index( 0, 0 ) );
-#endif
-  int rows = qMin( count(), MAX_POPUP_ROWS );
-
-  int scrollBarHeight = 0;
-
-  bool hBarIsVisible = horizontalScrollBar()->maximum() > 0;
-
-  if ( hBarIsVisible )
-    scrollBarHeight += QApplication::style()->pixelMetric( QStyle::PM_ScrollBarExtent );
-
-  return rows == 0 ? 0 : itemSizeHint.height() * rows + frameWidth() * 2 + scrollBarHeight;
-}
-
-bool CompletionList::acceptCurrentEntry()
-{
-  if (!isVisible())
-  {
-    return false;
-  }
-
-  const QModelIndex index = currentIndex();
-  if ( !index.isValid() )
-  {
-    return false;
-  }
-
-  emit doubleClicked(index);
-  translateBox->setPopupEnabled( false );
-
-  return true;
-}
+#include <QStringListModel>
+#include <QTimer>
 
 TranslateBox::TranslateBox( QWidget * parent ):
-    QWidget( parent ),
-    word_list( new CompletionList( this ) ),
-    translate_line( new QLineEdit( this ) ),
-    m_popupEnabled( false )
+  QWidget( parent ),
+  translate_line( new QLineEdit( this ) ),
+  m_popupEnabled( false )
 {
-  // initially hidden
-  word_list->hide();
+  completer = new QCompleter( words, this );
+  resize( 200, 90 );
+  QSizePolicy sizePolicy( QSizePolicy::Fixed, QSizePolicy::Preferred );
+  sizePolicy.setHorizontalStretch( 0 );
+  sizePolicy.setVerticalStretch( 0 );
+  setSizePolicy( sizePolicy );
 
-  resize(200, 90);
-  QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
-  sizePolicy.setHorizontalStretch(0);
-  sizePolicy.setVerticalStretch(0);
-  setSizePolicy(sizePolicy);
-  // setMinimumSize(QSize(800, 0));
-
-  setFocusProxy(translate_line);
-  translate_line->setObjectName("translateLine");
+  setFocusProxy( translate_line );
+  translate_line->setObjectName( "translateLine" );
   translate_line->setPlaceholderText( tr( "Type a word or phrase to search dictionaries" ) );
-  word_list->setTranslateLine(translate_line);
 
-  // completer = new QCompleter(m_completionList->model(), this);
-  // completer->setCaseSensitivity(Qt::CaseInsensitive);
-  // completer->setCompletionMode(QCompleter::InlineCompletion);
+  auto layout = new QHBoxLayout( this );
+  setLayout( layout );
+  layout->setContentsMargins( 0, 0, 0, 0 );
+  layout->addWidget( translate_line );
 
-  QHBoxLayout *layout = new QHBoxLayout(this);
-  setLayout(layout);
-  layout->setContentsMargins(0,0,0,0);
-  layout->addWidget(translate_line);
+  auto dropdown = new QAction( QIcon( ":/icons/1downarrow.svg" ), tr( "Drop-down" ), this );
+  connect( dropdown, &QAction::triggered, this, &TranslateBox::rightButtonClicked );
 
-  QAction * dropdown = new QAction( QIcon(":/icons/1downarrow.svg"), tr("Drop-down"),this);
-  connect( dropdown,&QAction::triggered,this, &TranslateBox::rightButtonClicked );
+  translate_line->addAction( dropdown, QLineEdit::TrailingPosition );
+  translate_line->addAction( new QAction( QIcon( ":/icons/system-search.svg" ), "", this ),
+                             QLineEdit::LeadingPosition );
 
-  translate_line->addAction( dropdown,QLineEdit::TrailingPosition);
-  translate_line->addAction( new QAction(QIcon(":/icons/system-search.svg"),"",this),QLineEdit::LeadingPosition);
-
-  translate_line->setFocusPolicy(Qt::ClickFocus);
+  translate_line->setFocusPolicy( Qt::ClickFocus );
 
   translate_line->installEventFilter( this );
-  this->installEventFilter( this );
 
-  connect( translate_line, &QLineEdit::textChanged, this, &TranslateBox::onTextEdit );
+  translate_line->setCompleter( completer );
+  completer->setCompletionMode( QCompleter::UnfilteredPopupCompletion );
+  completer->setMaxVisibleItems( 16 );
 
-
-  connect( word_list, &WordList::contentChanged, this, &TranslateBox::showPopup );
+  connect( completer,
+           QOverload< const QString & >::of( &QCompleter::activated ),
+           translate_line,
+           [ & ]( const QString & ) {
+             emit translate_line->returnPressed();
+           } );
 }
 
-bool TranslateBox::eventFilter(QObject *obj, QEvent *event)
-{
-    // hide the suggestions list when the window is not active
-    if ( event->type() == QEvent::WindowDeactivate )
-    {
-      if (!word_list->isActiveWindow())
-      {
-        setPopupEnabled( false );
-      }
-      return false;
-    }
-
-    if (obj == translate_line && event->type() == QEvent::KeyPress) {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
-        switch (keyEvent->key()) {
-        case Qt::Key_Up:
-        case Qt::Key_Down:
-        case Qt::Key_PageUp:
-        case Qt::Key_PageDown:
-          if ( !word_list->isVisible() )
-          {
-            setPopupEnabled( true );
-          }
-          else
-          {
-            QApplication::sendEvent(word_list, event);
-          }
-          return true;
-        case Qt::Key_Enter:
-        case Qt::Key_Return:
-          return word_list->acceptCurrentEntry();
-        case Qt::Key_Escape:
-          setPopupEnabled( false );
-          return true;
-        case Qt::Key_Tab:
-          if ( !word_list->isVisible() )
-          {
-            setPopupEnabled( true );
-          }
-          else
-          {
-            QKeyEvent event( QEvent::KeyPress, Qt::Key_Down, Qt::NoModifier );
-            QApplication::sendEvent( word_list, &event );
-          }
-          return true;
-        case Qt::Key_Backtab:
-          if ( !word_list->isVisible() )
-          {
-            setPopupEnabled( true );
-          }
-          else
-          {
-            QKeyEvent event( QEvent::KeyPress, Qt::Key_Up, Qt::NoModifier );
-            QApplication::sendEvent( word_list, &event );
-          }
-          return true;
-        default:
-            break;
-        }
-    } else if (obj == translate_line && event->type() == QEvent::FocusOut) {
-#if defined(Q_OS_WIN)
-        QFocusEvent *fev = static_cast<QFocusEvent*>(event);
-        if (fev->reason() != Qt::ActiveWindowFocusReason ||
-            (fev->reason() == Qt::ActiveWindowFocusReason && !word_list->isActiveWindow()))
-#endif
-          setPopupEnabled( false );
-    } else if (obj == translate_line && event->type() == QEvent::FocusIn) {
-      // By default, focusing the traslate line does not show
-      // the popup window.
-    } else if (obj == this && event->type() == QEvent::ShortcutOverride) {
-        QKeyEvent *ke = static_cast<QKeyEvent *>(event);
-        if (ke->key() == Qt::Key_Escape && !ke->modifiers() && word_list->isVisible() ) {
-            event->accept();
-            return true;
-        }
-    }
-    return QWidget::eventFilter(obj, event);
-}
-
-void TranslateBox::setText( QString text, bool showPopup )
+void TranslateBox::setText( const QString & text, bool showPopup )
 {
   setPopupEnabled( showPopup );
   translate_line->setText( text );
@@ -232,56 +77,22 @@ void TranslateBox::setSizePolicy( QSizePolicy policy )
     translate_line->setSizePolicy( policy );
 }
 
+void TranslateBox::setModel( QStringList & _words )
+{
+  auto model = (QStringListModel *)( completer->model() );
+
+  model->setStringList( _words );
+}
+
 void TranslateBox::showPopup()
 {
-  // completer->setCompletionPrefix( m_fileLineEdit->text() );
-  // qDebug() << "COMPLETION:" << completer->currentCompletion();
-
-  // Don't allow recursive call
-  if( translateBoxMutex.tryLock() )
-    translateBoxMutex.unlock();
-  else
-    return;
-  QMutexLocker _( &translateBoxMutex );
-
-  if (translate_line->text().trimmed().isEmpty() || word_list->count() == 0)
-  {
-    // nothing to show
-    if (word_list->isVisible())
-    {
-      word_list->hide();
-      translate_line->setFocus();
-    }
-    return;
+  if ( m_popupEnabled ) {
+    completer->popup()->show();
+    completer->complete();
   }
-
-  if ( !m_popupEnabled )
-  {
-    word_list->hide();
-    return;
+  else {
+    completer->popup()->hide();
   }
-
-  int preferredHeight = word_list->preferredHeight();
-
-  QPoint origin( translate_line->x(), translate_line->y() + translate_line->height() );
-
-  if ( word_list->isWindow() )
-  {
-    origin = mapToGlobal( origin );
-  }
-  else
-  {
-    origin = mapTo( window(), origin );
-    preferredHeight = qMin( translate_line->window()->height() - origin.y(), preferredHeight );
-  }
-
-  const QSize size(width(), preferredHeight);
-  const QRect rect( origin, size );
-
-  word_list->setGeometry(rect);
-  word_list->show();
-  word_list->raise();
-  translate_line->setFocus();
 }
 
 QLineEdit * TranslateBox::translateLine()
@@ -289,18 +100,16 @@ QLineEdit * TranslateBox::translateLine()
   return translate_line;
 }
 
-WordList * TranslateBox::wordList()
+QWidget * TranslateBox::completerWidget()
 {
-  return word_list;
+  return completer->widget();
 }
 
 void TranslateBox::rightButtonClicked()
 {
   setPopupEnabled( !m_popupEnabled );
 }
-
-void TranslateBox::onTextEdit()
+void TranslateBox::setSizePolicy( QSizePolicy::Policy hor, QSizePolicy::Policy ver )
 {
-  if ( translate_line->hasFocus() )
-    setPopupEnabled( true );
+  setSizePolicy( QSizePolicy( hor, ver ) );
 }
diff --git a/src/ui/translatebox.hh b/src/ui/translatebox.hh
index 41e72168..00cdf8c3 100644
--- a/src/ui/translatebox.hh
+++ b/src/ui/translatebox.hh
@@ -4,67 +4,38 @@
 #ifndef TRANSLATEBOX_HH
 #define TRANSLATEBOX_HH
 
-#include "wordlist.hh"
-
-
 #include <QLineEdit>
 #include <QWidget>
 #include <QListWidget>
 #include <QFocusEvent>
+#include <QCompleter>
 
-class TranslateBox;
-
-class CompletionList : public WordList
+class TranslateBox: public QWidget
 {
   Q_OBJECT
 
 public:
-  CompletionList(TranslateBox * parent);
-  int preferredHeight() const;
-  virtual void setTranslateLine(QLineEdit * line)
-  {
-    WordList::setTranslateLine( line );
-    setFocusProxy( line );
-  }
-
-public slots:
-  bool acceptCurrentEntry();
-
-private:
-  virtual bool eventFilter( QObject *, QEvent * );
-  TranslateBox * translateBox;
-};
-
-class TranslateBox : public QWidget
-{
-  Q_OBJECT
-
-public:
-  explicit TranslateBox(QWidget * parent = 0);
+  explicit TranslateBox( QWidget * parent = nullptr );
   QLineEdit * translateLine();
-  WordList * wordList();
-  void setText(QString text, bool showPopup=true);
-  void setSizePolicy(QSizePolicy policy);
-  inline void setSizePolicy(QSizePolicy::Policy hor, QSizePolicy::Policy ver)
-  { setSizePolicy(QSizePolicy(hor, ver)); }
+  QWidget * completerWidget();
+  void setText( const QString & text, bool showPopup = true );
+  void setSizePolicy( QSizePolicy policy );
+  void setSizePolicy( QSizePolicy::Policy hor, QSizePolicy::Policy ver );
 
-signals:
+  void setModel( QStringList & _words );
 
 public slots:
-  void setPopupEnabled(bool enable);
+  void setPopupEnabled( bool enable );
 
 private slots:
   void showPopup();
   void rightButtonClicked();
-  void onTextEdit();
 
 private:
-  bool eventFilter(QObject *obj, QEvent *event);
-  CompletionList * word_list;
   QLineEdit * translate_line;
   bool m_popupEnabled;
-  QMutex translateBoxMutex;
-  // QCompleter * completer; // disabled for now
+  QCompleter * completer;
+  QStringList words;
 };
 
 #endif // TRANSLATEBOX_HH
diff --git a/src/version.cc b/src/version.cc
new file mode 100644
index 00000000..32cfadd3
--- /dev/null
+++ b/src/version.cc
@@ -0,0 +1,24 @@
+#include "version.hh"
+#include <QFile>
+
+namespace Version {
+QString version()
+{
+  QFile versionFile( ":/version.txt" );
+
+  if ( !versionFile.open( QFile::ReadOnly ) ) {
+    return QStringLiteral( "[Unknown Version]" );
+  }
+  else {
+    return versionFile.readAll().trimmed();
+  }
+}
+
+QString everything()
+{
+  return QStringLiteral( "Goldendict-ng " ) + Version::version() + "\n" + "Qt " + QLatin1String( qVersion() ) + " "
+    + Version::compiler + QSysInfo::productType() + " " + QSysInfo::kernelType() + " " + QSysInfo::kernelVersion() + " "
+    + QSysInfo::buildAbi() + "\n" + "Flags:" + flags;
+}
+
+} // namespace Version
diff --git a/src/version.hh b/src/version.hh
new file mode 100644
index 00000000..e077c41d
--- /dev/null
+++ b/src/version.hh
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <QString>
+
+namespace Version {
+
+const QLatin1String flags = QLatin1String(
+  "USE_XAPIAN"
+#ifdef MAKE_ZIM_SUPPORT
+  " MAKE_ZIM_SUPPORT"
+#endif
+#ifdef NO_EPWING_SUPPORT
+  " NO_EPWING_SUPPORT"
+#endif
+#ifdef USE_ICONV
+  " USE_ICONV"
+#endif
+#ifdef MAKE_CHINESE_CONVERSION_SUPPORT
+  " MAKE_CHINESE_CONVERSION_SUPPORT"
+#endif
+);
+
+const QLatin1String compiler = QLatin1String(
+#if defined( Q_CC_MSVC )
+  "Visual C++ Compiler " QT_STRINGIFY( _MSC_FULL_VER )
+#elif defined( Q_CC_CLANG )
+  "Clang " __clang_version__
+#elif defined( Q_CC_GNU )
+  "GCC " __VERSION__
+#else
+  "Unknown complier"
+#endif
+);
+/// Version string from the version.txt
+QString version();
+
+/// Full report of version & various information
+QString everything();
+
+} // namespace Version
diff --git a/src/webmultimediadownload.cc b/src/webmultimediadownload.cc
index 5f8e0036..9fd2e8b0 100644
--- a/src/webmultimediadownload.cc
+++ b/src/webmultimediadownload.cc
@@ -5,18 +5,16 @@ namespace Dictionary {
 
 #define MAX_REDIRECTS 10
 
-WebMultimediaDownload::WebMultimediaDownload( QUrl const & url,
-                                              QNetworkAccessManager & _mgr ) :
-mgr( _mgr ),
-redirectCount( 0 )
+WebMultimediaDownload::WebMultimediaDownload( QUrl const & url, QNetworkAccessManager & _mgr ):
+  mgr( _mgr ),
+  redirectCount( 0 )
 {
   connect( &mgr, &QNetworkAccessManager::finished, this, &WebMultimediaDownload::replyFinished, Qt::QueuedConnection );
 
   reply = mgr.get( QNetworkRequest( url ) );
 
 #ifndef QT_NO_SSL
-  connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ),
-           reply, SLOT( ignoreSslErrors() ) );
+  connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) );
 #endif
 }
 
@@ -32,19 +30,16 @@ void WebMultimediaDownload::replyFinished( QNetworkReply * r )
   if ( !r || r != reply )
     return; // Not our reply
 
-  if ( r->error() == QNetworkReply::NoError )
-  {
+  if ( r->error() == QNetworkReply::NoError ) {
     // Check for redirect reply
 
     QVariant possibleRedirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
-    QUrl redirectUrl = possibleRedirectUrl.toUrl();
-    if( !redirectUrl.isEmpty() )
-    {
+    QUrl redirectUrl             = possibleRedirectUrl.toUrl();
+    if ( !redirectUrl.isEmpty() ) {
       disconnect( reply, 0, 0, 0 );
       reply->deleteLater();
 
-      if( ++redirectCount > MAX_REDIRECTS )
-      {
+      if ( ++redirectCount > MAX_REDIRECTS ) {
         setErrorString( "Too many redirects detected" );
         finish();
         return;
@@ -52,8 +47,7 @@ void WebMultimediaDownload::replyFinished( QNetworkReply * r )
 
       reply = mgr.get( QNetworkRequest( redirectUrl ) );
 #ifndef QT_NO_SSL
-      connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ),
-               reply, SLOT( ignoreSslErrors() ) );
+      connect( reply, SIGNAL( sslErrors( QList< QSslError > ) ), reply, SLOT( ignoreSslErrors() ) );
 #endif
       return;
     }
@@ -82,8 +76,8 @@ bool WebMultimediaDownload::isAudioUrl( QUrl const & url )
 {
   // Note: we check for forvo sound links explicitly, as they don't have extensions
 
-  return ( url.scheme() == "http" || url.scheme() == "https" ) && (
-      Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
+  return ( url.scheme() == "http" || url.scheme() == "https" )
+    && ( Filetype::isNameOfSound( url.path().toUtf8().data() ) || url.host() == "apifree.forvo.com" );
 }
 
-}
+} // namespace Dictionary
diff --git a/src/webmultimediadownload.hh b/src/webmultimediadownload.hh
index 0fb45952..aa1486cb 100644
--- a/src/webmultimediadownload.hh
+++ b/src/webmultimediadownload.hh
@@ -30,6 +30,6 @@ private slots:
   void replyFinished( QNetworkReply * );
 };
 
-}
+} // namespace Dictionary
 
 #endif // WEBMULTIMEDIADOWNLOAD_HH
diff --git a/src/weburlrequestinterceptor.cc b/src/weburlrequestinterceptor.cc
index ee731229..be156bc8 100644
--- a/src/weburlrequestinterceptor.cc
+++ b/src/weburlrequestinterceptor.cc
@@ -39,19 +39,19 @@ void WebUrlRequestInterceptor::interceptRequest( QWebEngineUrlRequestInfo & info
     }
   }
 
-  if (QWebEngineUrlRequestInfo::NavigationTypeLink == info.navigationType() && info.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame) {
+  if ( QWebEngineUrlRequestInfo::NavigationTypeLink == info.navigationType()
+       && info.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeMainFrame ) {
     //workaround to fix devtool "Switch devtool to chinese" interface was blocked.
-    if( info.requestUrl().scheme() == "devtools" )
-    {
+    if ( info.requestUrl().scheme() == "devtools" ) {
       return;
     }
     emit linkClicked( info.requestUrl() );
-    info.block(true);
+    info.block( true );
   }
 
   //window.location=audio link
-  if( Utils::Url::isAudioUrl(info.requestUrl()) && info.navigationType()==QWebEngineUrlRequestInfo::NavigationTypeRedirect )
-  {
+  if ( Utils::Url::isAudioUrl( info.requestUrl() )
+       && info.navigationType() == QWebEngineUrlRequestInfo::NavigationTypeRedirect ) {
     qDebug() << "blocked audio url from page redirect" << info.requestUrl().url();
     info.block( true );
   }
diff --git a/src/weburlrequestinterceptor.hh b/src/weburlrequestinterceptor.hh
index 36ed0bb1..5bb46c8e 100644
--- a/src/weburlrequestinterceptor.hh
+++ b/src/weburlrequestinterceptor.hh
@@ -3,14 +3,15 @@
 
 #include <QWebEngineUrlRequestInterceptor>
 
-class WebUrlRequestInterceptor : public QWebEngineUrlRequestInterceptor
+class WebUrlRequestInterceptor: public QWebEngineUrlRequestInterceptor
 {
-    Q_OBJECT
+  Q_OBJECT
+
 public:
-    WebUrlRequestInterceptor(QObject *p);
-    void interceptRequest(QWebEngineUrlRequestInfo &info);
-  signals:
-    void linkClicked( const QUrl & url );
+  WebUrlRequestInterceptor( QObject * p );
+  void interceptRequest( QWebEngineUrlRequestInfo & info );
+signals:
+  void linkClicked( const QUrl & url );
 };
 
 #endif // WEBURLREQUESTINTERCEPTOR_H
diff --git a/src/wordfinder.cc b/src/wordfinder.cc
index 2c840f48..64fd7206 100644
--- a/src/wordfinder.cc
+++ b/src/wordfinder.cc
@@ -15,7 +15,8 @@ using std::map;
 using std::pair;
 
 WordFinder::WordFinder( QObject * parent ):
-  QObject( parent ), searchInProgress( false ),
+  QObject( parent ),
+  searchInProgress( false ),
   updateResultsTimer( this ),
   searchQueued( false )
 {
@@ -37,19 +38,18 @@ void WordFinder::prefixMatch( QString const & str,
 {
   cancel();
 
-  searchQueued = true;
-  searchType = PrefixMatch;
-  inputWord = str;
-  inputDicts = &dicts;
+  searchQueued        = true;
+  searchType          = PrefixMatch;
+  inputWord           = str;
+  inputDicts          = &dicts;
   requestedMaxResults = maxResults;
-  requestedFeatures = features;
+  requestedFeatures   = features;
 
   resultsArray.clear();
   resultsIndex.clear();
   searchResults.clear();
 
-  if ( queuedRequests.empty() )
-  {
+  if ( queuedRequests.empty() ) {
     // No requests are queued, no need to wait for them to finish.
     startSearch();
   }
@@ -67,13 +67,13 @@ void WordFinder::stemmedMatch( QString const & str,
 {
   cancel();
 
-  searchQueued = true;
-  searchType = StemmedMatch;
-  inputWord = str;
-  inputDicts = &dicts;
-  requestedMaxResults = maxResults;
-  requestedFeatures = features;
-  stemmedMinLength = minLength;
+  searchQueued              = true;
+  searchType                = StemmedMatch;
+  inputWord                 = str;
+  inputDicts                = &dicts;
+  requestedMaxResults       = maxResults;
+  requestedFeatures         = features;
+  stemmedMinLength          = minLength;
   stemmedMaxSuffixVariation = maxSuffixVariation;
 
   resultsArray.clear();
@@ -91,19 +91,18 @@ void WordFinder::expressionMatch( QString const & str,
 {
   cancel();
 
-  searchQueued = true;
-  searchType = ExpressionMatch;
-  inputWord = str;
-  inputDicts = &dicts;
+  searchQueued        = true;
+  searchType          = ExpressionMatch;
+  inputWord           = str;
+  inputDicts          = &dicts;
   requestedMaxResults = maxResults;
-  requestedFeatures = features;
+  requestedFeatures   = features;
 
   resultsArray.clear();
   resultsIndex.clear();
   searchResults.clear();
 
-  if ( queuedRequests.empty() )
-  {
+  if ( queuedRequests.empty() ) {
     // No requests are queued, no need to wait for them to finish.
     startSearch();
   }
@@ -121,47 +120,43 @@ void WordFinder::startSearch()
   searchErrorString.clear();
   searchResultsUncertain = false;
 
-  searchQueued = false;
+  searchQueued     = false;
   searchInProgress = true;
 
   // Gather all writings of the word
 
   if ( allWordWritings.size() != 1 )
     allWordWritings.resize( 1 );
-  
+
   allWordWritings[ 0 ] = gd::toWString( inputWord );
 
-  for( size_t x = 0; x < inputDicts->size(); ++x )
-  {
-    vector< wstring > writings = (*inputDicts)[ x ]->getAlternateWritings( allWordWritings[ 0 ] );
+  for ( const auto & inputDict : *inputDicts ) {
+    vector< wstring > writings = inputDict->getAlternateWritings( allWordWritings[ 0 ] );
 
     allWordWritings.insert( allWordWritings.end(), writings.begin(), writings.end() );
   }
 
   // Query each dictionary for all word writings
 
-  for( size_t x = 0; x < inputDicts->size(); ++x )
-  {
-    if ( ( (*inputDicts)[ x ]->getFeatures() & requestedFeatures ) != requestedFeatures )
+  for ( const auto & inputDict : *inputDicts ) {
+    if ( ( inputDict->getFeatures() & requestedFeatures ) != requestedFeatures )
       continue;
 
-    for( size_t y = 0; y < allWordWritings.size(); ++y )
-    {
-      try
-      {
-        sptr< Dictionary::WordSearchRequest > sr =
-          ( searchType == PrefixMatch || searchType == ExpressionMatch ) ?
-            (*inputDicts)[ x ]->prefixMatch( allWordWritings[ y ], requestedMaxResults ) :
-            (*inputDicts)[ x ]->stemmedMatch( allWordWritings[ y ], stemmedMinLength, stemmedMaxSuffixVariation, requestedMaxResults );
+    for ( const auto & allWordWriting : allWordWritings ) {
+      try {
+        sptr< Dictionary::WordSearchRequest > sr = ( searchType == PrefixMatch || searchType == ExpressionMatch ) ?
+          inputDict->prefixMatch( allWordWriting, requestedMaxResults ) :
+          inputDict->stemmedMatch( allWordWriting, stemmedMinLength, stemmedMaxSuffixVariation, requestedMaxResults );
 
         connect( sr.get(), &Dictionary::Request::finished, this, &WordFinder::requestFinished, Qt::QueuedConnection );
 
         queuedRequests.push_back( sr );
       }
-      catch( std::exception & e )
-      {
+      catch ( std::exception & e ) {
         gdWarning( "Word \"%s\" search error (%s) in \"%s\"\n",
-                   inputWord.toUtf8().data(), e.what(), (*inputDicts)[ x ]->getName().c_str() );
+                   inputWord.toUtf8().data(),
+                   e.what(),
+                   inputDict->getName().c_str() );
       }
     }
   }
@@ -173,9 +168,9 @@ void WordFinder::startSearch()
 
 void WordFinder::cancel()
 {
-  searchQueued = false;
+  searchQueued     = false;
   searchInProgress = false;
-  
+
   cancelSearches();
 }
 
@@ -191,19 +186,15 @@ void WordFinder::requestFinished()
   bool newResults = false;
 
   // See how many new requests have finished, and if we have any new results
-  for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
-         queuedRequests.begin(); i != queuedRequests.end(); )
-  {
-    if ( (*i)->isFinished() )
-    {
-      if ( searchInProgress && !(*i)->getErrorString().isEmpty() )
+  for ( auto i = queuedRequests.begin(); i != queuedRequests.end(); ) {
+    if ( ( *i )->isFinished() ) {
+      if ( searchInProgress && !( *i )->getErrorString().isEmpty() )
         searchErrorString = tr( "Failed to query some dictionaries." );
 
-      if ( (*i)->isUncertain() )
+      if ( ( *i )->isUncertain() )
         searchResultsUncertain = true;
 
-      if ( (*i)->matchesCount() )
-      {
+      if ( ( *i )->matchesCount() ) {
         newResults = true;
 
         // This list is handled by updateResults()
@@ -216,16 +207,14 @@ void WordFinder::requestFinished()
       ++i;
   }
 
-  if ( !searchInProgress )
-  {
+  if ( !searchInProgress ) {
     // There is no search in progress, so we just wait until there's
     // no requests left
-    
-    if ( queuedRequests.empty() )
-    {
+
+    if ( queuedRequests.empty() ) {
       // We got rid of all queries, queued search can now start
       finishedRequests.clear();
-  
+
       if ( searchQueued )
         startSearch();
     }
@@ -233,15 +222,13 @@ void WordFinder::requestFinished()
     return;
   }
 
-  if ( newResults && queuedRequests.size() && !updateResultsTimer.isActive() )
-  {
+  if ( newResults && !queuedRequests.empty() && !updateResultsTimer.isActive() ) {
     // If we have got some new results, but not all of them, we would start a
     // timer to update a user some time in the future
     updateResultsTimer.start();
   }
 
-  if ( queuedRequests.empty() )
-  {
+  if ( queuedRequests.empty() ) {
     // Search is finished.
     updateResults();
   }
@@ -259,25 +246,20 @@ unsigned saturated( unsigned x )
 /// both sides by either whitespace, punctuation or begin/end of string.
 /// If true is returned, pos holds the offset in the haystack. If the offset
 /// is larger than 255, it is set to 255.
-bool hasSurroundedWithWs( wstring const & haystack, wstring const & needle,
-                          wstring::size_type & pos )
+bool hasSurroundedWithWs( wstring const & haystack, wstring const & needle, wstring::size_type & pos )
 {
   if ( haystack.size() < needle.size() )
     return false; // Needle won't even fit into a haystack
 
-  for( pos = 0; ; ++pos )
-  {
+  for ( pos = 0;; ++pos ) {
     pos = haystack.find( needle, pos );
-  
+
     if ( pos == wstring::npos )
       return false; // Not found
-  
-    if ( ( !pos || Folding::isWhitespace( haystack[ pos - 1 ] ) ||
-           Folding::isPunct( haystack[ pos - 1 ] ) ) &&
-         ( ( pos + needle.size() == haystack.size() ) ||
-           Folding::isWhitespace( haystack[ pos + needle.size() ] ) ||
-           Folding::isPunct( haystack[ pos + needle.size() ] ) ) )
-    {
+
+    if ( ( !pos || Folding::isWhitespace( haystack[ pos - 1 ] ) || Folding::isPunct( haystack[ pos - 1 ] ) )
+         && ( ( pos + needle.size() == haystack.size() ) || Folding::isWhitespace( haystack[ pos + needle.size() ] )
+              || Folding::isPunct( haystack[ pos + needle.size() ] ) ) ) {
       pos = saturated( pos );
 
       return true;
@@ -285,7 +267,7 @@ bool hasSurroundedWithWs( wstring const & haystack, wstring const & needle,
   }
 }
 
-}
+} // namespace
 
 void WordFinder::updateResults()
 {
@@ -297,60 +279,48 @@ void WordFinder::updateResults()
 
   wstring original = Folding::applySimpleCaseOnly( allWordWritings[ 0 ] );
 
-  for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
-         finishedRequests.begin(); i != finishedRequests.end(); )
-  {
-    for( size_t count = (*i)->matchesCount(), x = 0; x < count; ++x )
-    {
-      wstring match = (**i)[ x ].word;
-      int weight = (**i)[ x ].weight;
+  for ( auto i = finishedRequests.begin(); i != finishedRequests.end(); ) {
+    for ( size_t count = ( *i )->matchesCount(), x = 0; x < count; ++x ) {
+      wstring match      = ( **i )[ x ].word;
+      int weight         = ( **i )[ x ].weight;
       wstring lowerCased = Folding::applySimpleCaseOnly( match );
 
-      if( searchType == ExpressionMatch )
-      {
+      if ( searchType == ExpressionMatch ) {
         unsigned ws;
 
-        for( ws = 0; ws < allWordWritings.size(); ws++ )
-        {
-          if( ws == 0 )
-          {
+        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 )
+            if ( lowerCased.compare( 0, original.size(), original ) == 0 )
               break;
           }
-          else
-          if( lowerCased == Folding::applySimpleCaseOnly( allWordWritings[ ws ] ) )
+          else if ( lowerCased == Folding::applySimpleCaseOnly( allWordWritings[ ws ] ) )
             break;
         }
 
-        if( ws >= allWordWritings.size() )
-        {
+        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() ) );
+      auto insertResult =
+        resultsIndex.insert( pair< wstring, ResultsArray::iterator >( lowerCased, resultsArray.end() ) );
 
-      if ( !insertResult.second )
-      {
+      if ( !insertResult.second ) {
         // Wasn't inserted since there was already an item -- check the case
-        if ( insertResult.first->second->word != match )
-        {
+        if ( insertResult.first->second->word != match ) {
           // The case is different -- agree on a lowercase version
           insertResult.first->second->word = lowerCased;
         }
         if ( !weight && insertResult.first->second->wasSuggested )
           insertResult.first->second->wasSuggested = false;
       }
-      else
-      {
-        resultsArray.push_back( OneResult() );
+      else {
+        resultsArray.emplace_back();
 
-        resultsArray.back().word = match;
-        resultsArray.back().rank = INT_MAX;
+        resultsArray.back().word         = match;
+        resultsArray.back().rank         = INT_MAX;
         resultsArray.back().wasSuggested = ( weight != 0 );
 
         insertResult.first->second = --resultsArray.end();
@@ -361,14 +331,11 @@ void WordFinder::updateResults()
 
   size_t maxSearchResults = 500;
 
-  if ( resultsArray.size() )
-  {
-    if ( searchType == PrefixMatch )
-    {
+  if ( !resultsArray.empty() ) {
+    if ( searchType == PrefixMatch ) {
       /// Assign each result a category, storing it in the rank's field
-  
-      enum Category
-      {
+
+      enum Category {
         ExactMatch,
         ExactNoFullCaseMatch,
         ExactNoDiaMatch,
@@ -385,100 +352,84 @@ void WordFinder::updateResults()
         Multiplier = 256 // Categories should be multiplied by Multiplier
       };
 
-      for( unsigned wr = 0; wr < allWordWritings.size(); ++wr )
-      {
-        wstring target = Folding::applySimpleCaseOnly( allWordWritings[ wr ] );
+      for ( const auto & allWordWriting : allWordWritings ) {
+        wstring target           = Folding::applySimpleCaseOnly( allWordWriting );
         wstring targetNoFullCase = Folding::applyFullCaseOnly( target );
-        wstring targetNoDia = Folding::applyDiacriticsOnly( targetNoFullCase );
-        wstring targetNoPunct = Folding::applyPunctOnly( targetNoDia );
-        wstring targetNoWs = Folding::applyWhitespaceOnly( targetNoPunct );
-    
+        wstring targetNoDia      = Folding::applyDiacriticsOnly( targetNoFullCase );
+        wstring targetNoPunct    = Folding::applyPunctOnly( targetNoDia );
+        wstring targetNoWs       = Folding::applyWhitespaceOnly( targetNoPunct );
+
         wstring::size_type matchPos = 0;
-    
-        for( ResultsIndex::const_iterator i = resultsIndex.begin(), j = resultsIndex.end();
-             i != j; ++i )
-        {
+
+        for ( const auto & i : resultsIndex ) {
           wstring resultNoFullCase, resultNoDia, resultNoPunct, resultNoWs;
 
           int rank;
-          
-          if ( i->first == target )
+
+          if ( i.first == target )
             rank = ExactMatch * Multiplier;
-          else
-          if ( ( resultNoFullCase = Folding::applyFullCaseOnly( i->first ) ) == targetNoFullCase )
+          else if ( ( resultNoFullCase = Folding::applyFullCaseOnly( i.first ) ) == targetNoFullCase )
             rank = ExactNoFullCaseMatch * Multiplier;
-          else
-          if ( ( resultNoDia = Folding::applyDiacriticsOnly( resultNoFullCase ) ) == targetNoDia )
+          else if ( ( resultNoDia = Folding::applyDiacriticsOnly( resultNoFullCase ) ) == targetNoDia )
             rank = ExactNoDiaMatch * Multiplier;
-          else
-          if ( ( resultNoPunct = Folding::applyPunctOnly( resultNoDia ) ) == targetNoPunct )
+          else if ( ( resultNoPunct = Folding::applyPunctOnly( resultNoDia ) ) == targetNoPunct )
             rank = ExactNoPunctMatch * Multiplier;
-          else
-          if ( ( resultNoWs = Folding::applyWhitespaceOnly( resultNoPunct ) ) == targetNoWs )
+          else if ( ( resultNoWs = Folding::applyWhitespaceOnly( resultNoPunct ) ) == targetNoWs )
             rank = ExactNoWsMatch * Multiplier;
-          else
-          if ( hasSurroundedWithWs( i->first, target, matchPos ) )
+          else if ( hasSurroundedWithWs( i.first, target, matchPos ) )
             rank = ExactInsideMatch * Multiplier + matchPos;
-          else
-          if ( hasSurroundedWithWs( resultNoDia, targetNoDia, matchPos ) )
+          else if ( hasSurroundedWithWs( resultNoDia, targetNoDia, matchPos ) )
             rank = ExactNoDiaInsideMatch * Multiplier + matchPos;
-          else
-          if ( hasSurroundedWithWs( resultNoPunct, targetNoPunct, matchPos ) )
+          else if ( hasSurroundedWithWs( resultNoPunct, targetNoPunct, matchPos ) )
             rank = ExactNoPunctInsideMatch * Multiplier + matchPos;
-          else
-          if ( i->first.size() > target.size() && i->first.compare( 0, target.size(), target ) == 0 )
-            rank = PrefixMatch * Multiplier + saturated( i->first.size() );
-          else
-          if ( resultNoDia.size() > targetNoDia.size() && resultNoDia.compare( 0, targetNoDia.size(), targetNoDia ) == 0 )
-            rank = PrefixNoDiaMatch * Multiplier + saturated( i->first.size() );
-          else
-          if ( resultNoPunct.size() > targetNoPunct.size() && resultNoPunct.compare( 0, targetNoPunct.size(), targetNoPunct ) == 0 )
-            rank = PrefixNoPunctMatch * Multiplier + saturated( i->first.size() );
-          else
-          if ( resultNoWs.size() > targetNoWs.size() && resultNoWs.compare( 0, targetNoWs.size(), targetNoWs ) == 0 )
-            rank = PrefixNoWsMatch * Multiplier + saturated( i->first.size() );
+          else if ( i.first.size() > target.size() && i.first.compare( 0, target.size(), target ) == 0 )
+            rank = PrefixMatch * Multiplier + saturated( i.first.size() );
+          else if ( resultNoDia.size() > targetNoDia.size()
+                    && resultNoDia.compare( 0, targetNoDia.size(), targetNoDia ) == 0 )
+            rank = PrefixNoDiaMatch * Multiplier + saturated( i.first.size() );
+          else if ( resultNoPunct.size() > targetNoPunct.size()
+                    && resultNoPunct.compare( 0, targetNoPunct.size(), targetNoPunct ) == 0 )
+            rank = PrefixNoPunctMatch * Multiplier + saturated( i.first.size() );
+          else if ( resultNoWs.size() > targetNoWs.size()
+                    && resultNoWs.compare( 0, targetNoWs.size(), targetNoWs ) == 0 )
+            rank = PrefixNoWsMatch * Multiplier + saturated( i.first.size() );
           else
             rank = WorstMatch * Multiplier;
 
-          if ( i->second->rank > rank )
-            i->second->rank = rank; // We store the best rank of any writing
+          if ( i.second->rank > rank )
+            i.second->rank = rank; // We store the best rank of any writing
         }
       }
-  
+
       resultsArray.sort( SortByRank() );
     }
-    else
-    if( searchType == StemmedMatch )
-    {
+    else if ( searchType == StemmedMatch ) {
       // Handling stemmed matches
 
       // We use two factors -- first is the number of characters strings share
       // in their beginnings, and second, the length of the strings. Here we assign
       // only the first one, storing it in rank. Then we sort the results using
       // SortByRankAndLength.
-      for( unsigned wr = 0; wr < allWordWritings.size(); ++wr )
-      {
-        wstring target = Folding::apply( allWordWritings[ wr ] );
-  
-        for( ResultsIndex::const_iterator i = resultsIndex.begin(), j = resultsIndex.end();
-             i != j; ++i )
-        {
-          wstring resultFolded = Folding::apply( i->first );
-  
+      for ( const auto & allWordWriting : allWordWritings ) {
+        wstring target = Folding::apply( allWordWriting );
+
+        for ( const auto & i : resultsIndex ) {
+          wstring resultFolded = Folding::apply( i.first );
+
           int charsInCommon = 0;
-  
-          for( wchar const * t = target.c_str(), * r = resultFolded.c_str();
-               *t && *t == *r; ++t, ++r, ++charsInCommon ) ;
-  
+
+          for ( wchar const *t = target.c_str(), *r = resultFolded.c_str(); *t && *t == *r; ++t, ++r, ++charsInCommon )
+            ;
+
           int rank = -charsInCommon; // Negated so the lesser-than
                                      // comparison would yield right
                                      // results.
 
-          if ( i->second->rank > rank )
-            i->second->rank = rank; // We store the best rank of any writing
+          if ( i.second->rank > rank )
+            i.second->rank = rank; // We store the best rank of any writing
         }
       }
-      
+
       resultsArray.sort( SortByRankAndLength() );
 
       maxSearchResults = 15;
@@ -488,24 +439,18 @@ void WordFinder::updateResults()
   searchResults.clear();
   searchResults.reserve( resultsArray.size() < maxSearchResults ? resultsArray.size() : maxSearchResults );
 
-  for( ResultsArray::const_iterator i = resultsArray.begin(), j = resultsArray.end();
-       i != j; ++i )
-  {
-    //GD_DPRINTF( "%d: %ls\n", i->second, i->first.c_str() );
-
+  for ( const auto & i : resultsArray ) {
     if ( searchResults.size() < maxSearchResults )
-      searchResults.push_back( std::pair< QString, bool >( QString::fromStdU32String( i->word ), i->wasSuggested ) );
+      searchResults.emplace_back( QString::fromStdU32String( i.word ), i.wasSuggested );
     else
       break;
   }
 
-  if ( queuedRequests.size() )
-  {
+  if ( !queuedRequests.empty() ) {
     // There are still some unhandled results.
     emit updated();
   }
-  else
-  {
+  else {
     // That were all of them.
     searchInProgress = false;
     emit finished();
@@ -514,8 +459,6 @@ void WordFinder::updateResults()
 
 void WordFinder::cancelSearches()
 {
-  for( list< sptr< Dictionary::WordSearchRequest > >::iterator i =
-         queuedRequests.begin(); i != queuedRequests.end(); ++i )
-    (*i)->cancel();
+  for ( auto & queuedRequest : queuedRequests )
+    queuedRequest->cancel();
 }
-
diff --git a/src/wordfinder.hh b/src/wordfinder.hh
index 8e6d49c6..8c7fcd23 100644
--- a/src/wordfinder.hh
+++ b/src/wordfinder.hh
@@ -22,15 +22,14 @@ class WordFinder: public QObject
 
 public:
 
-  typedef std::vector< std::pair< QString, bool > > SearchResults; // bool is a "was suggested" flag
+  using SearchResults = std::vector< std::pair< QString, bool > >; // bool is a "was suggested" flag
 
 private:
 
   SearchResults searchResults;
   QString searchErrorString;
   bool searchResultsUncertain;
-  std::list< sptr< Dictionary::WordSearchRequest > > queuedRequests,
-                                                     finishedRequests;
+  std::list< sptr< Dictionary::WordSearchRequest > > queuedRequests, finishedRequests;
   bool searchInProgress;
 
   QTimer updateResultsTimer;
@@ -38,8 +37,7 @@ private:
   // Saved search params
   bool searchQueued;
   QString inputWord;
-  enum SearchType
-  {
+  enum SearchType {
     PrefixMatch,
     StemmedMatch,
     ExpressionMatch
@@ -52,7 +50,7 @@ private:
   std::vector< sptr< Dictionary::Class > > const * inputDicts;
 
   std::vector< gd::wstring > allWordWritings; // All writings of the inputWord
-  
+
   struct OneResult
   {
     gd::wstring word;
@@ -66,7 +64,7 @@ private:
   typedef std::map< gd::wstring, ResultsArray::iterator > ResultsIndex;
   ResultsArray resultsArray;
   ResultsIndex resultsIndex;
-    
+
 public:
 
   WordFinder( QObject * parent );
@@ -84,39 +82,45 @@ public:
   void prefixMatch( QString const &,
                     std::vector< sptr< Dictionary::Class > > const &,
                     unsigned long maxResults = 40,
-                    Dictionary::Features = Dictionary::NoFeatures );
+                    Dictionary::Features     = Dictionary::NoFeatures );
 
   /// Do a stemmed-match search in the given list of dictionaries. All comments
   /// from prefixMatch() generally apply as well.
   void stemmedMatch( QString const &,
                      std::vector< sptr< Dictionary::Class > > const &,
-                     unsigned minLength = 3,
+                     unsigned minLength          = 3,
                      unsigned maxSuffixVariation = 3,
-                     unsigned long maxResults = 30,
-                     Dictionary::Features = Dictionary::NoFeatures );
-  
+                     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 );
+                        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.
   SearchResults const & getResults() const
-  { return searchResults; }
+  {
+    return searchResults;
+  }
 
   /// Returns a human-readable error string for the last finished request. Empty
   /// string means it finished without any error.
   QString const & getErrorString()
-  { return searchErrorString; }
+  {
+    return searchErrorString;
+  }
 
   /// Returns true if the search was inconclusive -- that is, there may be more
   /// results than the ones returned.
   bool wasSearchUncertain() const
-  { return searchResultsUncertain; }
+  {
+    return searchResultsUncertain;
+  }
 
   /// Cancels any pending search operation, if any.
   void cancel();
@@ -155,14 +159,14 @@ private:
   /// Compares results based on their ranks
   struct SortByRank
   {
-    bool operator () ( OneResult const & first, OneResult const & second )
+    bool operator()( OneResult const & first, OneResult const & second )
     {
       if ( first.rank < second.rank )
         return true;
-  
+
       if ( first.rank > second.rank )
         return false;
-  
+
       // Do any sort of collation here in the future. For now we just put the
       // strings sorted lexicographically.
       return first.word < second.word;
@@ -172,7 +176,7 @@ private:
   /// Compares results based on their ranks and lengths
   struct SortByRankAndLength
   {
-    bool operator () ( OneResult const & first, OneResult const & second )
+    bool operator()( OneResult const & first, OneResult const & second )
     {
       if ( first.rank < second.rank )
         return true;
@@ -194,4 +198,3 @@ private:
 };
 
 #endif
-
diff --git a/src/wordlist.cc b/src/wordlist.cc
deleted file mode 100644
index dca31671..00000000
--- a/src/wordlist.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-/* This file is (c) 2013 Tvangeste <i.4m.l33t@yandex.ru>
- * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
-
-
-#include "wordlist.hh"
-
-WordList::WordList( QWidget * parent ) : QListWidget( parent )
-, listItemDelegate( itemDelegate() )
-{
-  wordFinder = 0;
-  translateLine = 0;
-  setItemDelegate( &listItemDelegate );
-}
-
-void WordList::attachFinder( WordFinder * finder )
-{
-  // qDebug() << "Attaching the word finder..." << finder;
-
-  if ( wordFinder == finder )
-    return;
-
-  if ( wordFinder )
-  {
-    disconnect( wordFinder, &WordFinder::updated, this, &WordList::prefixMatchUpdated );
-    disconnect( wordFinder, &WordFinder::finished, this, &WordList::prefixMatchFinished );
-  }
-
-  wordFinder = finder;
-
-  connect( wordFinder, &WordFinder::updated, this, &WordList::prefixMatchUpdated );
-  connect( wordFinder, &WordFinder::finished, this, &WordList::prefixMatchFinished );
-}
-
-void WordList::prefixMatchUpdated()
-{
-  updateMatchResults( false );
-}
-
-void WordList::prefixMatchFinished()
-{
-  updateMatchResults( true );
-}
-
-void WordList::updateMatchResults( bool finished )
-{
-  WordFinder::SearchResults const & results = wordFinder->getResults();
-
-  setUpdatesEnabled( false );
-  //clear all existed items
-  clear();
-
-  for( unsigned x = 0; x < results.size(); ++x )
-  {
-    QListWidgetItem * i = new QListWidgetItem( results[ x ].first, this );
-    i->setToolTip( results[ x ].first );
-
-    if( results[ x ].second )
-    {
-      QFont f = i->font();
-      f.setItalic( true );
-      i->setFont( f );
-    }
-
-    i->setTextAlignment( Qt::AlignLeft );
-  }
-
-  if ( count() )
-  {
-    scrollToItem( item( 0 ), QAbstractItemView::PositionAtTop );
-    setCurrentItem( 0, QItemSelectionModel::Clear );
-  }
-
-  setUpdatesEnabled( true );
-
-  if ( finished )
-  {
-    unsetCursor();
-
-    refreshTranslateLine();
-
-    if ( !wordFinder->getErrorString().isEmpty() )
-      emit statusBarMessage(tr("WARNING: %1").arg(wordFinder->getErrorString()),
-                            20000, QPixmap(":/icons/error.svg"));
-  }
-
-  if( !results.empty() && results.front().first.isRightToLeft() )
-    setLayoutDirection( Qt::RightToLeft );
-  else
-    setLayoutDirection( Qt::LeftToRight );
-
-  emit contentChanged();
-}
-
-void WordList::refreshTranslateLine()
-{
-  if ( !translateLine )
-    return;
-
-  // Visually mark the input line to mark if there's no results
-  bool setMark = wordFinder->getResults().empty() && !wordFinder->wasSearchUncertain();
-
-  if ( translateLine->property( "noResults" ).toBool() != setMark )
-  {
-    translateLine->setProperty( "noResults", setMark );
-
-    Utils::Widget::setNoResultColor( translateLine, setMark );
-  }
-
-}
diff --git a/src/wordlist.hh b/src/wordlist.hh
deleted file mode 100644
index 26a04bae..00000000
--- a/src/wordlist.hh
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This file is (c) 2013 Tvangeste <i.4m.l33t@yandex.ru>
- * Part of GoldenDict. Licensed under GPLv3 or later, see the LICENSE file */
-
-#ifndef WORDLIST_HH
-#define WORDLIST_HH
-
-#include <QListWidget>
-#include <QLineEdit>
-
-#include "wordfinder.hh"
-#include "delegate.hh"
-
-class WordList : public QListWidget
-{
-  Q_OBJECT
-public:
-  explicit WordList(QWidget * parent = 0);
-  void attachFinder(WordFinder * finder);
-  virtual void setTranslateLine(QLineEdit * line)
-  { translateLine = line; }
-
-protected:
-
-signals:
-  void statusBarMessage(QString const & message, int timeout = 0, QPixmap const & pixmap = QPixmap());
-  void contentChanged();
-
-public slots:
-
-private slots:
-  void prefixMatchUpdated();
-  void prefixMatchFinished();
-  void updateMatchResults( bool finished );
-
-private:
-  void refreshTranslateLine();
-
-  WordFinder * wordFinder;
-  QLineEdit * translateLine;
-  WordListItemDelegate listItemDelegate;
-
-  QVector< QSize > resizedSizes;
-};
-
-#endif // WORDLIST_HH
diff --git a/src/zipfile.cc b/src/zipfile.cc
index 04a43b0c..1b92aca1 100644
--- a/src/zipfile.cc
+++ b/src/zipfile.cc
@@ -19,7 +19,7 @@ struct EndOfCdirRecord
   quint16 commentLength;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -28,12 +28,11 @@ struct CentralFileHeaderRecord
   quint32 signature;
   quint16 verMadeBy, verNeeded, gpBits, compressionMethod, fileTime, fileDate;
   quint32 crc32, compressedSize, uncompressedSize;
-  quint16 fileNameLength, extraFieldLength, fileCommentLength, diskNumberStart,
-          intFileAttrs;
+  quint16 fileNameLength, extraFieldLength, fileCommentLength, diskNumberStart, intFileAttrs;
   quint32 externalFileAttrs, offsetOfLocalHeader;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
@@ -45,26 +44,25 @@ struct LocalFileHeaderRecord
   quint16 fileNameLength, extraFieldLength;
 }
 #ifndef _MSC_VER
-__attribute__((packed))
+__attribute__( ( packed ) )
 #endif
 ;
 
 #pragma pack( pop )
 
 static quint32 const endOfCdirRecordSignatureValue = qToLittleEndian( 0x06054b50 );
-static quint32 const centralFileHeaderSignature = qToLittleEndian( 0x02014b50 );
-static quint32 const localFileHeaderSignature = qToLittleEndian( 0x04034b50 );
+static quint32 const centralFileHeaderSignature    = qToLittleEndian( 0x02014b50 );
+static quint32 const localFileHeaderSignature      = qToLittleEndian( 0x04034b50 );
 
 static CompressionMethod getCompressionMethod( quint16 compressionMethod )
 {
-  switch( qFromLittleEndian( compressionMethod ) )
-  {
-  case 0:
-    return Uncompressed;
-  case 8:
-    return Deflated;
-  default:
-    return Unsupported;
+  switch ( qFromLittleEndian( compressionMethod ) ) {
+    case 0:
+      return Uncompressed;
+    case 8:
+      return Deflated;
+    default:
+      return Unsupported;
   }
 }
 
@@ -76,8 +74,7 @@ bool positionAtCentralDir( SplitZipFile & zip )
 
   if ( zip.size() > maxEofBufferSize )
     zip.seek( zip.size() - maxEofBufferSize );
-  else
-  if ( (size_t) zip.size() < sizeof( EndOfCdirRecord ) )
+  else if ( (size_t)zip.size() < sizeof( EndOfCdirRecord ) )
     return false;
   else
     zip.seek( 0 );
@@ -96,16 +93,14 @@ bool positionAtCentralDir( SplitZipFile & zip )
 
   quint32 cdir_offset;
 
-  for( ; ; --lastIndex )
-  {
+  for ( ;; --lastIndex ) {
     lastIndex = eocBuffer.lastIndexOf( endOfCdirRecordSignature, lastIndex );
 
     if ( lastIndex == -1 )
       return false;
 
     /// We need to copy it due to possible alignment issues on ARM etc
-    memcpy( &endOfCdirRecord, eocBuffer.data() + lastIndex,
-            sizeof( endOfCdirRecord ) );
+    memcpy( &endOfCdirRecord, eocBuffer.data() + lastIndex, sizeof( endOfCdirRecord ) );
 
     /// Sanitize the record by checking the offset
 
@@ -142,23 +137,23 @@ bool readNextEntry( SplitZipFile & zip, CentralDirEntry & entry )
   // Read file name
 
   int fileNameLength = qFromLittleEndian( record.fileNameLength );
-  entry.fileName = zip.read( fileNameLength );
+  entry.fileName     = zip.read( fileNameLength );
 
   if ( entry.fileName.size() != fileNameLength )
     return false;
 
   // Skip extra fields
 
-  if ( !zip.seek( ( zip.pos() + qFromLittleEndian( record.extraFieldLength ) ) +
-                  qFromLittleEndian( record.fileCommentLength ) ) )
+  if ( !zip.seek( ( zip.pos() + qFromLittleEndian( record.extraFieldLength ) )
+                  + qFromLittleEndian( record.fileCommentLength ) ) )
     return false;
 
   entry.localHeaderOffset = zip.calcAbsoluteOffset( qFromLittleEndian( record.offsetOfLocalHeader ),
                                                     qFromLittleEndian( record.diskNumberStart ) );
-  entry.compressedSize = qFromLittleEndian( record.compressedSize );
-  entry.uncompressedSize = qFromLittleEndian( record.uncompressedSize );
+  entry.compressedSize    = qFromLittleEndian( record.compressedSize );
+  entry.uncompressedSize  = qFromLittleEndian( record.uncompressedSize );
   entry.compressionMethod = getCompressionMethod( record.compressionMethod );
-  entry.fileNameInUTF8 = ( qFromLittleEndian( record.gpBits ) & 0x800 ) != 0;
+  entry.fileNameInUTF8    = ( qFromLittleEndian( record.gpBits ) & 0x800 ) != 0;
 
   return true;
 }
@@ -176,7 +171,7 @@ bool readLocalHeader( SplitZipFile & zip, LocalFileHeader & entry )
   // Read file name
 
   int fileNameLength = qFromLittleEndian( record.fileNameLength );
-  entry.fileName = zip.read( fileNameLength );
+  entry.fileName     = zip.read( fileNameLength );
 
   if ( entry.fileName.size() != fileNameLength )
     return false;
@@ -186,8 +181,8 @@ bool readLocalHeader( SplitZipFile & zip, LocalFileHeader & entry )
   if ( !zip.seek( zip.pos() + qFromLittleEndian( record.extraFieldLength ) ) )
     return false;
 
-  entry.compressedSize = qFromLittleEndian( record.compressedSize );
-  entry.uncompressedSize = qFromLittleEndian( record.uncompressedSize );
+  entry.compressedSize    = qFromLittleEndian( record.compressedSize );
+  entry.uncompressedSize  = qFromLittleEndian( record.uncompressedSize );
   entry.compressionMethod = getCompressionMethod( record.compressionMethod );
 
   return true;
@@ -202,34 +197,29 @@ void SplitZipFile::setFileName( const QString & name )
 {
   {
     QString lname = name.toLower();
-    if( lname.endsWith( ".zips" ) )
-    {
+    if ( lname.endsWith( ".zips" ) ) {
       appendFile( name );
       return;
     }
 
-    if( !lname.endsWith( ".zip" ) )
+    if ( !lname.endsWith( ".zip" ) )
       return;
   }
 
-  if( QFileInfo( name ).isFile() )
-  {
-    for( int i = 1; i < 100; i++ )
-    {
+  if ( QFileInfo( name ).isFile() ) {
+    for ( int i = 1; i < 100; i++ ) {
       QString name2 = name.left( name.size() - 2 ) + QString( "%1" ).arg( i, 2, 10, QChar( '0' ) );
-      if( QFileInfo( name2 ).isFile() )
+      if ( QFileInfo( name2 ).isFile() )
         appendFile( name2 );
       else
         break;
     }
     appendFile( name );
   }
-  else
-  {
-    for( int i = 1; i < 1000; i++ )
-    {
+  else {
+    for ( int i = 1; i < 1000; i++ ) {
       QString name2 = name + QString( ".%1" ).arg( i, 3, 10, QChar( '0' ) );
-      if( QFileInfo( name2 ).isFile() )
+      if ( QFileInfo( name2 ).isFile() )
         appendFile( name2 );
       else
         break;
@@ -240,10 +230,9 @@ void SplitZipFile::setFileName( const QString & name )
 QDateTime SplitZipFile::lastModified() const
 {
   unsigned long ts = 0;
-  for( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i )
-  {
-    unsigned long t = QFileInfo( (*i)->fileName() ).lastModified().toSecsSinceEpoch();
-    if( t > ts )
+  for ( QVector< QFile * >::const_iterator i = files.begin(); i != files.end(); ++i ) {
+    unsigned long t = QFileInfo( ( *i )->fileName() ).lastModified().toSecsSinceEpoch();
+    if ( t > ts )
       ts = t;
   }
   return QDateTime::fromSecsSinceEpoch( ts );
@@ -251,10 +240,10 @@ QDateTime SplitZipFile::lastModified() const
 
 qint64 SplitZipFile::calcAbsoluteOffset( qint64 offset, quint16 partNo )
 {
-  if( partNo >= offsets.size() )
+  if ( partNo >= offsets.size() )
     return 0;
 
   return offsets.at( partNo ) + offset;
 }
 
-}
+} // namespace ZipFile
diff --git a/src/zipfile.hh b/src/zipfile.hh
index 7e63746b..debf16ec 100644
--- a/src/zipfile.hh
+++ b/src/zipfile.hh
@@ -13,11 +13,10 @@
 namespace ZipFile {
 
 // Support for split zip files
-class SplitZipFile : public SplitFile::SplitFile
+class SplitZipFile: public SplitFile::SplitFile
 {
 public:
-  SplitZipFile()
-  {}
+  SplitZipFile() {}
   SplitZipFile( const QString & name );
 
   virtual void setFileName( const QString & name );
@@ -29,8 +28,7 @@ public:
   qint64 calcAbsoluteOffset( qint64 offset, quint16 partNo );
 };
 
-enum CompressionMethod
-{
+enum CompressionMethod {
   Uncompressed,
   Deflated,
   Unsupported
@@ -73,6 +71,6 @@ bool readNextEntry( SplitZipFile &, CentralDirEntry & );
 /// Returns true on success, false otherwise.
 bool readLocalHeader( SplitZipFile &, LocalFileHeader & );
 
-}
+} // namespace ZipFile
 
 #endif
diff --git a/tools/generators/generate.cc b/tools/generators/generate.cc
index 6b7df8fa..ee8bcedf 100644
--- a/tools/generators/generate.cc
+++ b/tools/generators/generate.cc
@@ -164,8 +164,9 @@ int main()
 
     fprintf( outf, "// This file was generated automatically. Do not edit directly.\n\n" );
 
+    fprintf( outf, "#pragma once\n\n" );
     fprintf( outf, "enum { foldCaseMaxOut = 3 };\n\n" );
-    fprintf( outf, "size_t foldCase( wchar in, wchar * out )\n{\n  switch( in )\n  {\n" );
+    fprintf( outf, "inline size_t foldCase( char32_t in, char32_t * out )\n{\n  switch( in )\n  {\n" );
 
     for ( map< char32_t, u32string >::const_iterator i = foldTable.begin(); i != foldTable.end(); ++i ) {
       if ( i->second.size() == 1 )
@@ -183,7 +184,7 @@ int main()
     fprintf( outf, "    default: *out = in; return 1;\n" );
     fprintf( outf, "  }\n}\n\n" );
 
-    fprintf( outf, "wchar foldCaseSimple( wchar in )\n{\n  switch( in )\n  {\n" );
+    fprintf( outf, "char32_t foldCaseSimple( char32_t in )\n{\n  switch( in )\n  {\n" );
 
     for ( map< char32_t, char32_t >::const_iterator i = simpleFoldTable.begin(); i != simpleFoldTable.end(); ++i )
       fprintf( outf, "    case 0x%x: return 0x%x;\n", i->first, i->second );
diff --git a/tools/scripts/Build ffmpeg on macos.md b/tools/scripts/Build ffmpeg on macos.md
new file mode 100644
index 00000000..5a3a172a
--- /dev/null
+++ b/tools/scripts/Build ffmpeg on macos.md	
@@ -0,0 +1,194 @@
+```
+brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
+brew install speex
+git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
+cd ffmpeg
+./configure  --prefix=../build/  \
+--enable-shared \
+--disable-static \
+--disable-debug \
+--disable-programs \
+--disable-network \
+--disable-avdevice \
+--disable-avfilter \
+--disable-swscale \
+--disable-network \
+--disable-muxers \
+--disable-demuxers \
+--enable-rdft \
+--enable-demuxer=aac \
+--enable-demuxer=ac3 \
+--enable-demuxer=aiff \
+--enable-demuxer=ape \
+--enable-demuxer=asf \
+--enable-demuxer=flac \
+--enable-demuxer=matroska \
+--enable-demuxer=mp3 \
+--enable-demuxer=mpc \
+--enable-demuxer=mov \
+--enable-demuxer=mpc8 \
+--enable-demuxer=ogg \
+--enable-demuxer=tta \
+--enable-demuxer=wav \
+--enable-demuxer=wv \
+--disable-bsfs \
+--disable-filters \
+--disable-parsers \
+--enable-parser=aac \
+--enable-parser=ac3 \
+--enable-parser=mpegaudio \
+--disable-protocols \
+--disable-indevs \
+--disable-outdevs \
+--disable-encoders \
+--disable-decoders \
+--enable-decoder=eightsvx_exp \
+--enable-decoder=eightsvx_fib \
+--enable-decoder=aac \
+--enable-decoder=aac_latm \
+--enable-decoder=ac3 \
+--enable-decoder=adpcm_4xm \
+--enable-decoder=adpcm_adx \
+--enable-decoder=adpcm_afc \
+--enable-decoder=adpcm_ct \
+--enable-decoder=adpcm_ea \
+--enable-decoder=adpcm_ea_maxis_xa \
+--enable-decoder=adpcm_ea_r1 \
+--enable-decoder=adpcm_ea_r2 \
+--enable-decoder=adpcm_ea_r3 \
+--enable-decoder=adpcm_ea_xas \
+--enable-decoder=adpcm_g722 \
+--enable-decoder=adpcm_g726 \
+--enable-decoder=adpcm_ima_amv \
+--enable-decoder=adpcm_ima_apc \
+--enable-decoder=adpcm_ima_dk3 \
+--enable-decoder=adpcm_ima_dk4 \
+--enable-decoder=adpcm_ima_ea_eacs \
+--enable-decoder=adpcm_ima_ea_sead \
+--enable-decoder=adpcm_ima_iss \
+--enable-decoder=adpcm_ima_oki \
+--enable-decoder=adpcm_ima_qt \
+--enable-decoder=adpcm_ima_smjpeg \
+--enable-decoder=adpcm_ima_wav \
+--enable-decoder=adpcm_ima_ws \
+--enable-decoder=adpcm_ms \
+--enable-decoder=adpcm_sbpro_2 \
+--enable-decoder=adpcm_sbpro_3 \
+--enable-decoder=adpcm_sbpro_4 \
+--enable-decoder=adpcm_swf \
+--enable-decoder=adpcm_thp \
+--enable-decoder=adpcm_xa \
+--enable-decoder=adpcm_yamaha \
+--enable-decoder=alac \
+--enable-decoder=amrnb \
+--enable-decoder=libopencore_amrnb \
+--enable-decoder=amrwb \
+--enable-decoder=libopencore_amrwb \
+--enable-decoder=ape \
+--enable-decoder=atrac1 \
+--enable-decoder=atrac3 \
+--enable-decoder=binkaudio_dct \
+--enable-decoder=binkaudio_rdft \
+--enable-decoder=bmv_audio \
+--enable-decoder=comfortnoise \
+--enable-decoder=cook \
+--enable-decoder=dsicinaudio \
+--enable-decoder=dca \
+--enable-decoder=eac3 \
+--enable-decoder=flac \
+--enable-decoder=g723_1 \
+--enable-decoder=g729 \
+--enable-decoder=gsm \
+--enable-decoder=libgsm \
+--enable-decoder=gsm_ms \
+--enable-decoder=libgsm_ms \
+--enable-decoder=iac \
+--enable-decoder=imc \
+--enable-decoder=interplay_dpcm \
+--enable-decoder=mace3 \
+--enable-decoder=mace6 \
+--enable-decoder=mlp \
+--enable-decoder=mp1 \
+--enable-decoder=mp1float \
+--enable-decoder=mp2 \
+--enable-decoder=mp2float \
+--enable-decoder=mp3 \
+--enable-decoder=mp3float \
+--enable-decoder=mp3adu \
+--enable-decoder=mp3adufloat \
+--enable-decoder=mp3on4 \
+--enable-decoder=mp3on4float \
+--enable-decoder=als \
+--enable-decoder=mpc7 \
+--enable-decoder=mpc8 \
+--enable-decoder=nellymoser \
+--enable-decoder=libopus \
+--enable-decoder=paf_audio \
+--enable-decoder=pcm_alaw \
+--enable-decoder=pcm_bluray \
+--enable-decoder=pcm_dvd \
+--enable-decoder=pcm_f32be \
+--enable-decoder=pcm_f32le \
+--enable-decoder=pcm_f64be \
+--enable-decoder=pcm_f64le \
+--enable-decoder=pcm_lxf \
+--enable-decoder=pcm_mulaw \
+--enable-decoder=pcm_s16be \
+--enable-decoder=pcm_s16be_planar \
+--enable-decoder=pcm_s16le \
+--enable-decoder=pcm_s16le_planar \
+--enable-decoder=pcm_s24be \
+--enable-decoder=pcm_s24daud \
+--enable-decoder=pcm_s24le \
+--enable-decoder=pcm_s24le_planar \
+--enable-decoder=pcm_s32be \
+--enable-decoder=pcm_s32le \
+--enable-decoder=pcm_s32le_planar \
+--enable-decoder=pcm_s8 \
+--enable-decoder=pcm_s8_planar \
+--enable-decoder=pcm_u16be \
+--enable-decoder=pcm_u16le \
+--enable-decoder=pcm_u24be \
+--enable-decoder=pcm_u24le \
+--enable-decoder=pcm_u32be \
+--enable-decoder=pcm_u32le \
+--enable-decoder=pcm_u8 \
+--enable-decoder=pcm_zork \
+--enable-decoder=qcelp \
+--enable-decoder=qdm2 \
+--enable-decoder=ra_144 \
+--enable-decoder=ra_288 \
+--enable-decoder=ralf \
+--enable-decoder=roq_dpcm \
+--enable-decoder=s302m \
+--enable-decoder=shorten \
+--enable-decoder=sipr \
+--enable-decoder=smackaud \
+--enable-decoder=sol_dpcm \
+--enable-decoder=sonic \
+--enable-decoder=libspeex \
+--enable-decoder=tak \
+--enable-decoder=truehd \
+--enable-decoder=truespeech \
+--enable-decoder=tta \
+--enable-decoder=twinvq \
+--enable-decoder=vima \
+--enable-decoder=vmdaudio \
+--enable-decoder=vorbis \
+--enable-decoder=ffwavesynth \
+--enable-decoder=wavpack \
+--enable-decoder=ws_snd1 \
+--enable-decoder=wmalossless \
+--enable-decoder=wmapro \
+--enable-decoder=wmav1 \
+--enable-decoder=wmav2 \
+--enable-decoder=wmavoice \
+--enable-decoder=xan_dpcm \
+--enable-libspeex
+make
+sudo make install
+
+ls -al ../build
+# otool -L build/*.dylib
+
+```
\ No newline at end of file
diff --git a/website/docs/developer.md b/website/docs/developer.md
index bea17c17..256bc202 100644
--- a/website/docs/developer.md
+++ b/website/docs/developer.md
@@ -4,12 +4,10 @@ If you know some C++ and optionally some Qt, you can start to modify GoldenDict
 
 * Install Qt and QtCreator
 * (On Linux, install dependencies)
-* Load `goldendict.pro`
+* Load `goldendict.pro` or `CMakeLists.txt`
 * Modify some code
 * Hit the `Run`.
 
-A CMake build script is also provided `CMakeLists.txt` is provided which can be used directly in other IDEs like CLion or Visual Studio 2022.
-
 ## Coding Standards
 
 Please follow [C++ Core Guidelines](https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines) and write modern C++ code.
diff --git a/website/docs/dictformats.md b/website/docs/dictformats.md
index 80ec6e0c..43d3de97 100644
--- a/website/docs/dictformats.md
+++ b/website/docs/dictformats.md
@@ -2,21 +2,22 @@ Popular dictionary formats are all supported.
 
 ## Local Dictionaries Sources
 
-* MDict dictionaries (.mdx/.mdd)
-* StarDict dictionaries (.ifo/.dict./.idx/.syn)
-* DSL dictionaries (ABBYY Lingvo source files .dsl(.dz))
+* [MDict](https://www.mdict.cn/) dictionaries (.mdx/.mdd)
+* [StarDict](http://www.huzheng.org/stardict/) dictionaries (.ifo/.dict./.idx/.syn)
+* [DSL](https://lingvoboard.ru/store/html/DSLReference_HTML/index.html) dictionaries (ABBYY Lingvo source files .dsl(.dz))
 * [Xdxf](https://github.com/soshial/xdxf_makedict) dictionaries (.xdxf(.dz))
 * [Zim](https://wiki.openzim.org/wiki/OpenZIM) dictionaries (.zim)
 * [Slob (Aard 2)](https://aarddict.org/) dictionaries (.slob)
-* DictD dictionaries (.index/.dict(.dz))
-* Epwing dictionaries
-* Babylon dictionaries (.BGL), complete with images and resources
-* Aard Dictionary dictionaries (.aar)
+* [DictD](https://en.wikipedia.org/wiki/DICT#Dict_file_format) dictionaries (.index/.dict(.dz))
+* [Epwing](<https://ja.wikipedia.org/wiki/EPWING>) dictionaries
+* Aard Dictionary dictionaries, outdated predecessor of Slob (.aar)
 * [SDictionary](http://swaj.net/sdict/index.html) dictionaries (.dct)
-* Babylon source files (.gls(.dz))
+* [Babylon glossary builder](https://www.babylon-software.com/glossary-builder/) source files (.gls(.dz))
+* Babylon dictionaries, complete support with images and resources (.BGL)
 * ABBYY Lingvo sound archives (.lsa/.dat)
-* Sound files in separate folders
-* Zips sound packs (.zips)
+
+* Sound files in separate folders. File names are used as word
+* Zipped sound pack. Sound files zipped, but with extension changed from .zip to (.zips)
 
 ## Network Sources
 
@@ -27,8 +28,24 @@ Popular dictionary formats are all supported.
 
 ## Other Sources
 
-* Programs: Any External programs that can output text
-* System Text-to-speech engines
+**Programs**
+
+Any external apps can be added by setting a launch command. The `%GDWORD%` will be replaced by word from search line. If command line don't contains such template the word will be fed into standard input stream in 8-bit current locale encoding.
+
+| Type | Notes |
+|--|--|
+| Audio| Application play sound. A sound icon will be provided as article, click it will trigger the program. |
+| Text | Application output some plain text in 8-bit current locale encoding into standard output stream. This text will be shown as separate article. |
+| Html | Application output some html code into standard output stream. This code will be shown as separate article. |
+| Prefix | Application output some word list into standard output stream. This list will be added in common matches list.|
+
+**System Text-to-speech engines**
+
+Its capability is provided via Qt Speech.
+
+On Windows & macOS, the system provides sounds.
+
+On Linux, speech-dispatcher and flite are the backends.
 
 ## Additional info
 
diff --git a/website/docs/howto/How to use ocr together with GoldenDict.md b/website/docs/howto/How to use ocr together with GoldenDict.md
deleted file mode 100644
index 23551a11..00000000
--- a/website/docs/howto/How to use ocr together with GoldenDict.md	
+++ /dev/null
@@ -1,75 +0,0 @@
-# Current Situation
-GoldenDict did offer a functionality to translate the word under cursor(when scan popup been enabled) on Windows.
-the technique used there is old and can not work crossplatform .
-
-with the help of another great tool [Capture2Text](https://sourceforge.net/projects/capture2text/) ,GoldenDict can work with ocr seamlessly.
-
-# Note
-Capture2Text has offered Windows precompiled executable files.I have ported it to Linux https://github.com/xiaoyifang/Capture2Text
-
-Thanks to:
-- [Capture2Text Linux Port](https://github.com/GSam/Capture2Text )
-- [another on nixos](https://github.com/sikmir/nur-packages/blob/7c876e3fb20160781207a8f652fb052647e6da0d/pkgs/misc/capture2text/default.nix) from [sikmir](https://github.com/goldendict/goldendict/issues/1445#issuecomment-1022972220)
-
-# Download release or compile by yourself
-https://github.com/xiaoyifang/Capture2Text/releases
-# Configuration on Windows
-after installation of both software.
-configure the Capture2Text ,see screenshots below.
-## configure external `Call Executable` path   (Windows for example)
-`path\GoldenDict.exe "${capture}"`
-
-![image](https://user-images.githubusercontent.com/105986/151507994-97ab732d-686a-47b1-b950-3b2db076ef4c.png)
-
-## configure hotkey
-I only left three of them .
-![image](https://user-images.githubusercontent.com/105986/151481239-16cbb733-746c-425d-bc6c-2bb5e5a158c5.png)
-
-## configure `First word only`
-without this configuration ,it will capture the last word of 
-![image](https://user-images.githubusercontent.com/105986/151481312-4e9bc457-6667-4e80-95bd-6f2ad58c37e1.png)
-
-
-## Use it
-place the cursor on the word (can be on the  image ),press 
-- Win+W to capture the first word.
-
-![image](https://user-images.githubusercontent.com/105986/151481735-6c1c7fc1-715f-4f5c-a98c-7452099b9709.png)
-
-- Win+Q select rectangle.
-
-![image](https://user-images.githubusercontent.com/105986/151489148-6fb09787-8d27-4c55-92bb-b385e23ed859.png)
-
-result:
-
-![image](https://user-images.githubusercontent.com/105986/151489807-71231884-75bf-45e7-9bfa-b5242be1b189.png)
-
-
-
-## use Capture2Text on Linxu
-
-### download and build the capture2text
-https://github.com/xiaoyifang/Capture2Text
-
-![2022-01-30 15-54-35屏幕截图](https://user-images.githubusercontent.com/105986/151691526-f28cc053-f6e0-4099-b677-f7a4657aa9fc.png)
-
-### settings
-
-![2022-01-30 15-54-35屏幕截图1](https://user-images.githubusercontent.com/105986/151691583-eda3e059-a77f-4476-a5a5-18d34463005e.png)
-
-![image](https://user-images.githubusercontent.com/105986/151694194-7f0048fc-5649-46b3-940f-d4d5d10968b7.png)
-
-### start capture
-
-`Ctrl+Shift+Q`
-
-![image](https://user-images.githubusercontent.com/105986/151691692-955caf26-e828-4ffe-a630-b17b66b8a955.png)
-
-
-### end capture
-press `Ctrl+Shift+Q` again.
-
-
-
-
-
diff --git a/website/docs/howto/build_from_source.md b/website/docs/howto/build_from_source.md
new file mode 100644
index 00000000..a9b09414
--- /dev/null
+++ b/website/docs/howto/build_from_source.md
@@ -0,0 +1,217 @@
+## Dependencies
+
+* C++17 compiler
+* Latest QT6
+* Various libraries for Linux & macOS, see below
+* On Windows all the libraries are included in the repository
+
+For debian/ubuntu, those packages are needed
+
+```shell
+libavformat-dev libavutil-dev libbz2-dev libeb16-dev libhunspell-dev \
+liblzma-dev liblzo2-dev libopencc-dev libvorbis-dev \ 
+libx11-dev libxtst-dev libzim-dev libzstd-dev qt6-5compat-dev \
+qt6-base-dev qt6-multimedia-dev qt6-speech-dev qt6-svg-dev \
+qt6-tools-dev qt6-tools-dev-tools qt6-webchannel-dev \
+qt6-webengine-dev x11proto-record-dev zlib1g-dev
+```
+
+In other words, those libraries
+
+* Qt6 (with webengine)
+* ffmpeg
+* libzim
+* xapian
+* hunspell
+* opencc
+* libeb
+* libvorbis
+* x11 (linux only)
+
+And a few compression libraries:
+
+* xz (lzma)
+* bzip2
+* lzo2
+* zlib
+
+## CMake Build
+
+```shell
+cd goldendict-ng && mkdir build_dir
+# config step
+cmake -S . -B build_dir \
+      --install-prefix=/usr/local/ \
+      -DCMAKE_BUILD_TYPE=Release
+# actual build
+cmake --build build_dir --parallel 7
+
+cmake --install ./build_dir/
+```
+
+### Feature flags
+
+Append `-D{flag_names}=ON/OFF` to cmake's config step
+
+Available flags:
+
+* `WITH_FFMPEG_PLAYER` "Enable support for FFMPEG player"
+* `WITH_EPWING_SUPPORT` "Enable epwing support"
+* `WITH_XAPIAN` "enable Xapian support"
+* `WITH_ZIM` "enable zim support"
+
+* `USE_SYSTEM_FMT` "use system fmt instead of bundled one"
+* `USE_SYSTEM_TOML` "use system toml++ instead of bundled one"
+
+### Windows
+
+Install Qt6(msvc) through the standard installer
+
+Pass those parameters to cmake, the path should be changed to your actual installation paths
+```
+-DCMAKE_PREFIX_PATH=F:\Qt\6.4.1\msvc2019_64
+```
+
+Use`windeployqt.exe {your_build_dir}/goldendict.exe` which will copy the qt related `.dll` and other necessary files automatically.
+
+Due to the `winlibs` are built on Release mode, there are troubles to build GoldenDict on Debug mode.
+
+### macOS
+
+Similar to Linux build, but need `macdeployqt ./goldendict.app` to copy necessary dependencies to the app bundle.
+
+## Qmake
+
+```shell
+git clone https://github.com/xiaoyifang/goldendict-ng.git
+```
+
+### Build Steps
+
+**Notice**: All additional configs for `qmake` that must be combined in one  of pass config options to `qmake`:
+```shell
+qmake6 "CONFIG+=release"
+make
+```
+
+For ARM macOS, `QMAKE_APPLE_DEVICE_ARCHS="arm64"` should be passed to qmake.
+
+#### Building with Chinese conversion support
+
+To add Chinese conversion support you need at first install libopencc-dev package, then pass `"CONFIG+=chinese_conversion_support"` to `qmake`.
+
+```
+sudo apt-get install libopencc-dev
+```
+
+#### Building with Zim dictionaries support
+
+To add Zim and Slob formats support you need at first install lzma-dev and zstd-dev packages, then pass `"CONFIG+=zim_support"` to `qmake`
+
+```
+sudo apt-get install liblzma-dev libzstd-dev libzim-dev
+```
+
+**Note**: Some linux distros do not support latest zim version, so you need to compile from latest source.
+On Windows,  you can use vcpkg to compile the libzim
+```
+vcpkg install libzim:x64-windows
+```
+and copy the corresponding(debug/release) library to the `winlibs/lib` folder. the zim's `include` directory to the `winlibs/include` directory.
+
+
+#### 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
+
+#### Building without internal audio players
+
+If you have problem building with FFmpeg (for example, very old linux distro), you can pass
+`"CONFIG+=no_ffmpeg_player"` to `qmake` in order to disable FFmpeg internal audio player back end.
+
+If you have problem building with Qt5 Multimedia or experience GStreamer run-time errors (for example, Ubuntu 14.04), you can pass
+`"CONFIG+=no_qtmultimedia_player"` to `qmake` in order to disable Qt Multimedia internal audio player back end.
+
+#### Building with xapian
+
+build xapian from source, download and extract the xapian-core source code.
+
+```
+./configure
+make 
+make install
+```
+
+On Windows, `vcpkg install xapian:x64-windows` and copy the libs/dlls into the `winlibs`
+A precompiled version of xapian lib has provided in winlibs.
+
+On Linux,  install libxapian-dev package using package manager.
+
+On Mac, use homebrew to install xapian `brew install xapian`
+
+Goldendict-ng has used xapian as the default and the only one fulltext engine.
+
+#### use iconv (recommend to enable)
+use `CONFIG+=use_iconv` to enable this feature. when enabled ,iconv will be used to convert encoding other than the QTextCodec(which will be deprecated in future Qt version)
+
+```
+qmake "CONFIG+=use_iconv"
+```
+
+when enabled ,iconv should be installed on the platform at the same time.
+
+#### use breakpad
+
+use `CONFIG+=use_breakpad` to enable this crash dump. when enabled [breakpad](https://chromium.googlesource.com/breakpad/breakpad/+/master/docs), goldendict will generate a crash dump alongside with Goldendict in the `crash` directory.
+
+on Windows:
+`vcpkg install breakpad:x64-windows-release` and copy the installed packages into `thirdparty/breakpad` directory.
+with a structure like this:
+```
+├─breakpad
+│  ├─include
+│  │  ├─client
+│  │  │  └─windows
+│  │  │      ├─common
+│  │  │      ├─crash_generation
+│  │  │      ├─handler
+│  │  │      └─sender
+│  │  ├─common
+│  │  │  └─windows
+│  │  └─google_breakpad
+│  │      ├─common
+│  │      └─processor
+│  └─lib
+```
+
+on Mac/Linux:
+[vcpkg](https://techviewleo.com/install-vcpkg-c-library-manager-on-linux-macos-windows/) can also be used or you can just install breakpad from source or use precompiled packages. 
+
+Then enable google breakpad like this with qmake:
+
+```
+qmake "CONFIG+=use_breakpad"
+```
+
+### Build with VS2019
+
+Install `QT tool for VS` from VS extension
+
+#### steps: 
+
+- configure qt path
+toolbar Extensions=>Qt VS Tools=>Options=>versions.
+add qt installation folder
+
+- Open pro project file directly throughttoolbar Extensions=>Qt VS Tools=>Open Qt Project file(.pro)
+
+ref: 
+[1](https://blog.csdn.net/qq_43493715/article/details/109839046)
+
+#### build
+
+after successfully build,in the target folder(where goldendict.exe resides) ,run windeployqt which copy all the necessary files to this folder.
+and copy other missing dlls to this folder. you can click the exe to verify the application can run .
+
+after alll this ,you can debug the application normally.
diff --git a/website/docs/howto/how to build and debug with VS2019.md b/website/docs/howto/how to build and debug with VS2019.md
deleted file mode 100644
index 230d5100..00000000
--- a/website/docs/howto/how to build and debug with VS2019.md	
+++ /dev/null
@@ -1,26 +0,0 @@
-# prerequisite:
-+ [VS2019 ](https://visualstudio.microsoft.com/zh-hans/vs/)
-- QT
-- QT tool for VS(installed from VS extension)
-
-
-# steps: 
-
-- configure qt path
-toolbar Extensions=>Qt VS Tools=>Options=>versions.
-add qt installation folder
-
-- Open pro project file directly throughttoolbar Extensions=>Qt VS Tools=>Open Qt Project file(.pro)
-
-
-ref: 
-[1](https://blog.csdn.net/qq_43493715/article/details/109839046)
-
-# build
-
-
-# debug
-after successfully build,in the target folder(where goldendict.exe resides) ,run windeployqt which copy all the necessary files to this folder.
-and copy other missing dlls to this folder. you can click the exe to verify the application can run .
-
-after alll this ,you can debug the application normally.
diff --git a/website/docs/howto/how to build ffmpeg for visual studio.md b/website/docs/howto/how to build ffmpeg for visual studio.md
index a529230e..4ace73c7 100644
--- a/website/docs/howto/how to build ffmpeg for visual studio.md	
+++ b/website/docs/howto/how to build ffmpeg for visual studio.md	
@@ -1,44 +1,43 @@
-# use vcpkg to build the ffmpeg.
+# Use vcpkg to build ffmpeg.
 
 Steps:
-1. folow the instructions https://trac.ffmpeg.org/wiki/CompilationGuide/vcpkg
-2. run command 
+
+1. follow the instructions at https://trac.ffmpeg.org/wiki/CompilationGuide/vcpkg
+
+   
+2. run the command 
 ```
 vcpkg.exe install ffmpeg[core,avcodec,avdevice,avfilter,avformat,speex,avresample,mp3lame,opus,sdl2,swresample,vorbis]:x64-windows-rel 
 ```
+
 3. copy dll and libs in vcpkg\installed\x64-windows-rel to goldendict's winlibs\lib\msvc
 
-**pros**: can be compiled with speex.
+**Pros**: Can be compiled with speex.
 
-# alternative Method 
-just download the ffmpeg from official website: https://github.com/BtbN/FFmpeg-Builds/releases
-then replace the dlls and libs in the winlibs\lib\msvc
+# Alternative method 
+simply download ffmpeg from the official website: https://github.com/BtbN/FFmpeg-Builds/releases
+Then replace the dlls and libs in the winlibs\lib\msvc.
 
-**cons**: seems lack libspeex or I just download the wrong package.
+**Cons**: Seems to be missing libspeex or I just downloaded the wrong package.
 
-**pros**: easy to manage.
+**Pros**: Easy to manage.
 
 
-# I have tried the following methods with no luck
+# I have tried the following methods without success
 
-##  use the scripts provided by the following url
+## Use the scripts provided by the following url
 
 https://github.com/Microsoft/FFmpegInterop/issues/67
 
 https://github.com/Microsoft/FFmpegInterop   
 
 
-did not know how to link with libspeex. 
+did not know how to link to libspeex. 
 
-##  conan
+## conan
   
-  conan seems has not included libspeex option up to now.
+  conan does not seem to have the libspeex option yet.
 
 
-# links worth checking
+## Links worth checking
 https://stackoverflow.com/a/44556505/968188
-
-# notes(deprecated)
-
-winlib/scripts/ffmpeg-configure-mingw32.sh is the script provided by goldendict .
-though I have compiled it wiht mingw32 ,I do not know how to compile it for visual studio .
diff --git a/website/docs/howto/how to compile with cmake.md b/website/docs/howto/how to compile with cmake.md
deleted file mode 100644
index 4fba1526..00000000
--- a/website/docs/howto/how to compile with cmake.md	
+++ /dev/null
@@ -1,38 +0,0 @@
-# Linux
-
-```shell
-cmake -S . -B build_dir \
-      --install-prefix=/usr/local/ \
-      -G Ninja \
-      -DCMAKE_BUILD_TYPE=Release
-      
-cmake --build build_dir --parallel 7
-
- cmake --install ./build_dir/
-```
-
-# macOS
-
-Install necessary dependencies
-
-```shell
-brew install pkg-config qt@6 bzip2 zlib \
-hunspell opencc libvorbis ffmpeg
-```
-
-Use standard CMake build commands, then use `macdeployqt ./goldendict.app` to copy necessary dependencies to the app bundle.
-
-# Windows 
-
-## Steps
-
-Install Qt6(msvc) through the standard installer
-
-Pass those parameters to cmake, the path should be changed to your actual installation paths
-```
--DCMAKE_PREFIX_PATH=F:\Qt\6.4.1\msvc2019_64
-```
-
-Use`windeployqt.exe {your_build_dir}/goldendict.exe` which will copy the qt related `.dll` and other necessary files automatically.
-
-Due to the `winlibs` are built on Release mode, there are troubles to build GoldenDict on Debug mode.
\ No newline at end of file
diff --git a/website/docs/howto/how to update crowdin.ts file.md b/website/docs/howto/how to update crowdin.ts file.md
new file mode 100644
index 00000000..6573b122
--- /dev/null
+++ b/website/docs/howto/how to update crowdin.ts file.md	
@@ -0,0 +1,11 @@
+This project uses crowdin to organize all the transactions.When some new transactions items are added.The crowdin.ts file needs to be updated to reflect the changes.   Then crowdin will automatically generate all other transactions in different languages(Though all these translations still need to be translated manually or by Machine Translation).
+
+# how to update the crowdin.ts file
+
+```
+lupdate-pro.exe -no-obsolete -no-ui-lines  goldendict.pro -ts locale\crowdin.ts
+```
+
+the option `-no-obsolete`  will remove obsolete items from crowdin.ts file.
+
+the option `-no-ui-lines` will not generate line numbers in the crowdin.ts file.  The line numbers changes too often which will make too much code changes  between commits.
\ No newline at end of file
diff --git a/website/docs/howto/how to use breadpad crash analysis.md b/website/docs/howto/how to use breadpad crash analysis.md
index da10d101..6e3c43b3 100644
--- a/website/docs/howto/how to use breadpad crash analysis.md	
+++ b/website/docs/howto/how to use breadpad crash analysis.md	
@@ -6,7 +6,7 @@ Goldendict-ng has provide an option to build the application with [breakpad](htt
 `CONFIG+=use_breakpad` to enable this feature.
 
 
-Currently only Windows xapian has built with breakpad support.
+Currently only Windows release has built with breakpad support,for other platforms , you can enable the feature manually.
 
 How to analyze the dump created by breakpad.
 ------------
@@ -41,4 +41,4 @@ minidump_stackwalk.exe  -s a.dmp symbols > a.txt
 
 Note
 ------------
-The tools can be downloaded from [minidump-tools](https://gitee.com/wabwh/breakpad-minindump-tools/tree/master/)
\ No newline at end of file
+The tools can be downloaded from [minidump-tools](https://gitee.com/wabwh/breakpad-minindump-tools/tree/master/)
diff --git a/website/docs/howto/ocr.md b/website/docs/howto/ocr.md
new file mode 100644
index 00000000..93a7daef
--- /dev/null
+++ b/website/docs/howto/ocr.md
@@ -0,0 +1,80 @@
+## Current Situation
+
+GoldenDict offered a functionality to translate the word under cursor on Windows in the past, but the technique used there is old and does not work crossplatformly.
+
+However, any OCR program that allow you to set "after capturing action" can be easily used in conjunction with GoldenDict.
+
+A few examples are provided below, but there are many options:
+
+## Capture2Text
+
+Capture2Text can call executable after capturing, and you can set the executable to GoldenDict.
+
+Detailed usage document: [Capture2Text](https://capture2text.sourceforge.net/)
+
+For example, change the Output action `Call Executable` to `path_to_the_GD_executable\GoldenDict.exe "${capture}"`
+
+Then press <kbd>Win+Q</kbd> and select a region. After capturing a word, Capture2Text will forward the word to GoldenDict. If GoldenDict's scanpopup is enabled, it will show up.
+
+![image](https://user-images.githubusercontent.com/105986/151507994-97ab732d-686a-47b1-b950-3b2db076ef4c.png)
+
+The hotkeys can be configured:
+
+![image](https://user-images.githubusercontent.com/105986/151481239-16cbb733-746c-425d-bc6c-2bb5e5a158c5.png)
+
+Capture2Text can also obtain word near cursor without selecting a region via the "Forward Text Line Capture" by pressing <kdb> Win+W </kbd>
+
+you may want to enable "First word only" so that only a single word would be captured
+
+![image](https://user-images.githubusercontent.com/105986/151481312-4e9bc457-6667-4e80-95bd-6f2ad58c37e1.png)
+
+### Use Capture2Text on Linux
+
+Capture2Text does not have Linux version, but I have ported it to Linux <https://github.com/xiaoyifang/Capture2Text> thanks to [Capture2Text Linux Port](https://github.com/GSam/Capture2Text ) and
+[sikmir](https://github.com/goldendict/goldendict/issues/1445#issuecomment-1022972220).
+
+![2022-01-30 15-54-35屏幕截图](https://user-images.githubusercontent.com/105986/151691526-f28cc053-f6e0-4099-b677-f7a4657aa9fc.png)
+
+## Shortcuts.app & Apple's OCR
+
+Enable the Clipboard monitoring of GoldenDict, then create a "Shorcut" that will interactively take screnshot and change the clipboard.
+
+![image](https://github.com/xiaoyifang/goldendict-ng/assets/20123683/3933141b-9f06-4829-8135-c69514111971)
+
+You may also add additional capiblities like only getting the first word
+
+![image](https://github.com/xiaoyifang/goldendict-ng/assets/20123683/d8eab075-1c4b-4e82-9515-eafd9df75489)
+
+## Tesseract via command line
+
+On Linux, you can combine command line screenshot then pass the output image to Tesseract then pass the text result to `goldendict`
+
+Example with spectacle (KDE) and grim (wayland/wlroots)
+
+```
+#!/usr/bin/env bash
+
+set -e
+
+case $DESKTOP_SESSION in
+    sway)
+        grim -g "$(slurp)" /tmp/tmp.just_random_name.png
+    ;;
+    plasmawayland | plasma)
+        spectacle --region --nonotify --background \
+        --output /tmp/tmp.just_random_name.png
+    ;;
+    *)
+        echo "Failed to know desktop type"
+        exit 1
+    ;;
+esac
+
+# note that tesseract will apppend .txt to output file
+tesseract /tmp/tmp.just_random_name.png /tmp/tmp.just_random_name --oem 1  -l eng
+
+goldendict "$(cat /tmp/tmp.just_random_name.txt)"
+
+rm /tmp/tmp.just_random_name.png
+rm /tmp/tmp.just_random_name.txt
+```
diff --git a/website/docs/img/fulltext.png b/website/docs/img/fulltext.png
new file mode 100644
index 00000000..ea644d6e
Binary files /dev/null and b/website/docs/img/fulltext.png differ
diff --git a/website/docs/img/fulltext.webp b/website/docs/img/fulltext.webp
deleted file mode 100644
index 42f8f947..00000000
Binary files a/website/docs/img/fulltext.webp and /dev/null differ
diff --git a/website/docs/index_cn.md b/website/docs/index_cn.md
deleted file mode 100644
index 600435be..00000000
--- a/website/docs/index_cn.md
+++ /dev/null
@@ -1,3 +0,0 @@
-暂时没有中文文档 😅
-
-如果想翻译文档，请到 github 上开个 issue 讨论一下:)
\ No newline at end of file
diff --git a/website/docs/install.md b/website/docs/install.md
index 18240bbd..b158bf62 100644
--- a/website/docs/install.md
+++ b/website/docs/install.md
@@ -1,3 +1,7 @@
+<a href="https://repology.org/project/goldendict-ng/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/goldendict-ng.svg" alt="Packaging status" align="right">
+</a>
+
 ## Download
 
 * [Latest stable version](https://github.com/xiaoyifang/goldendict/releases/latest) 
@@ -5,6 +9,7 @@
 
 Both Qt5 and Qt6 builds are provided.
 
+
 ## Windows 
 
 Choose either
@@ -17,13 +22,10 @@ If Qt's version is not changed, you can also download a single `goldendict.exe`
 ## Linux
 
 * `.Appimage` can be used in any recent linux distros.
-* [Debian packages](https://tracker.debian.org/pkg/goldendict-webengine) are available in Debian 12 or later.
-* [Ubuntu packages](https://launchpad.net/ubuntu/+source/goldendict-webengine) are available in Ubuntu 23.04 or later.
-* Archlinux can use [goldendict-ng-git](https://aur.archlinux.org/packages/goldendict-ng-git). Built binary is also availiable from [archlinuxcn's repo](https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/goldendict-ng-git).
+* See the right side for available packages in various linux distros.
+* In Debian 12 and Ubuntu 23.04, `goldendict-webengine` is available (For later versions it is `goldendict-ng`).
+* Pre-built binary is also available from [archlinuxcn's repo](https://github.com/archlinuxcn/repo/tree/master/archlinuxcn/goldendict-ng-git).
 * [Gentoo package from PG_Overlay](https://gitlab.com/Perfect_Gentleman/PG_Overlay/-/blob/master/app-text/goldendict/goldendict-9999-r6.ebuild)
-* openSUSE ships an old version of this fork.
-
-!!! Help "Please package this GoldenDict for your linux distros!"
 
 ## macOS
 
diff --git a/website/docs/topic_portablemode.md b/website/docs/topic_portablemode.md
index 99537637..43a686a3 100644
--- a/website/docs/topic_portablemode.md
+++ b/website/docs/topic_portablemode.md
@@ -1,11 +1,11 @@
 # Portable mode
 
-Usually GoldenDict store all program settings and dictionary indexes in home folder of current user. In portable mode program settings and dictionary indexes stored in "portable" folder beside the main program file. This mode suit for using of GoldenDict with common settings directly from flash drive on different computers.
+Usually GoldenDict store all program settings and dictionary indexes in home folder of current user. In portable mode program settings and dictionary indexes stored in `portable` folder beside the main program file. This mode suit for using of GoldenDict with common settings directly from flash drive on different computers.
 
-To turn on portable mode it needs only create "portable" folder beside the main program file. If such folder exists GoldenDict will launched in portable mode.
+To turn on portable mode it needs only create `portable` folder beside the main program file. If such folder exists GoldenDict will launched in portable mode.
 
 In portable mode GoldenDict works with some limitations:
 
-You can't select folders with dictionaries. All dictionaries should be placed in "contents" folder beside the main program file and/or its subfolders.
+You can't select folders with dictionaries. All dictionaries should be placed in `content` folder beside the main program file and/or its subfolders.
 You can't use sound files in separate folders.
 
diff --git a/website/docs/topic_userstyle.md b/website/docs/topic_userstyle.md
index c21ba4fa..8249093f 100644
--- a/website/docs/topic_userstyle.md
+++ b/website/docs/topic_userstyle.md
@@ -1,7 +1,18 @@
-# User defined stylesheets
+By creating `article-style.css` or `article-script.js` in GoldenDict's configuration folder (beside the `config` file), you can change dictionaries' presentation or inject javascript to dictionaries.
 
-To change of dictionary articles presentation you can create the file with styles which will be used while articles output. Such file must be named `article-style.css` and placed in GoldenDict configuration folder beside the "config" file. The `article-style.css` is just style sheet file wrote in accordance with standard html style sheet rules. To see a class names used in articles you can call inspector via article context menu.
+The `article-style.css` is just standard HTML [Style Sheets](https://developer.mozilla.org/docs/Web/CSS). To know class or id names used in article, you can open inspector by right click article's body and click `Inspect (F12)`. The inspector's documentation can be found at [Chrome DevTools](https://developer.chrome.com/docs/devtools/)
 
-Also you can tune GoldenDict interface. To make it you should create the `qt-style.css` style sheet file in GoldenDict configuration folder beside the "config" file. The rules for Qt style sheets you can find here.
+You can adjust dark reader mode's parameter by add those lines to `article-script.js`
 
-The examples of "article-style.css" and "qt-style.css" files you can find in GoldenDict
\ No newline at end of file
+```javascript
+DarkReader.enable({
+    brightness: 100,
+    contrast: 100,
+    sepia: 0,
+    grayscale: 0,
+});
+```
+
+Also, you can tune GoldenDict's interface by creating `qt-style.css` style sheet file in GoldenDict configuration folder. It is a [Qt Style Sheet](https://doc.qt.io/qt-6/stylesheet-reference.html) loaded during startup.
+
+Samples of `article-style.css` and `qt-style.css` files can found in GoldenDict's source code at [/src/stylesheets](https://github.com/xiaoyifang/goldendict-ng/tree/staged/src/stylesheets)
diff --git a/website/docs/ui_fulltextsearch.md b/website/docs/ui_fulltextsearch.md
index b62e7c2d..a59878e5 100644
--- a/website/docs/ui_fulltextsearch.md
+++ b/website/docs/ui_fulltextsearch.md
@@ -2,29 +2,19 @@ The full-text search dialog can be opened via menu "Search" or "Ctrl+Shift+F".
 
 Full-text search allow to search words or sentences not in dictionary headwords but in articles text of dictionaries from current dictionaries group.
 
-!!! note
-    The dictionary will index for full-text search in background and started immediately after program start, name of the currently indexing dictionary is displayed in the status line. This process can take a long time and require many computing resources.You may turn off indexing for huge dictionaries like Wikipedias or Wiktionaries in preferences. To find dictionary which can't be indexed check GoldenDict with `--log-to-file` or check `stdout`.
-
-
-![full text serach](img/fulltext.webp){ width="450" }
+![full text serach](img/fulltext.png){ width="450" }
 
 Type the desired word in "Search line" to search.
 
 Search modes
 
-* "Whole words" - for every word contains more then 4 characters in search line the exact match will be found. The "Max distance between words" element define the maximum unmatched words number between matched words. It is the fastest search mode. The search line must contain at least one word from 4 or more characters.
+* "Default" — This follows the [xapian search syntax](https://xapian.org/docs/queryparser.html). Note that phrase searching and NEAR operator needs `Enable index with positional information` enabled at settings.
 * "Plain text" - mode like "Whole words" but every word in search line can be treated as word fragment.
-* "Wildcards" - the search line contains a Unix-like template. Such template can contain wildcard symbols `?` (matches any one character), `*` (matches any characters number) or ranges of characters `[...]` To find characters `?`, `*`, `[` and `]` it should be escaped by backslash like `\?`, `\*`, `\[`, `\]`.
-* "RegExp" - the search line contains a regular expression.
+* "Wildcards" - the search line contains a Unix-like template. Such template can contain wildcard symbols `?` (matches any one character), `*` (matches any character number) or ranges of characters `[...]` To find characters `?`, `*`, `[` and `]` it should be escaped by backslash like `\?`, `\*`, `\[`, `\]`.
 
-"Max articles per dictionary" - the search in dictionary will be stopped when this articles number is found in that dictionary.
+"Available dictionaries in group" - here you can view how many dictionaries in the current group are suitable for full-text search, how many dictionaries already indexed and how many dictionaries wait for indexing.
 
-"Match case" - if this option is turned on the matches search will be completed in the case-sensitive mode, otherwise in case-insensitive mode.
+When you place mouse cursor over headword in results list, the tooltip with dictionary list contains such articles matched the search conditions will be shown.
 
-"Ignore words order" - if this option is enabled, the words specified in the search string will be searched in any order in dictionaries. Otherwise ones will be searched in the order stated in the search string.
-
-"Ignore diacritics" - if this option is enabled, the diacritic symbols will be searched as its base ones.
-
-"Available dictionaries in group" - here you can view how many dictionaries in current group are suitable for full-text search, how many dictionaries already indexed and how many dictionaries wait for indexing.
-
-When you place mouse cursor over headword in results list the tooltip with dictionaries list contains such articles matched the search conditions will be shown.
\ No newline at end of file
+!!! note
+    The dictionary will index for full-text search in background and started immediately after program start, name of the currently indexing dictionary is displayed in the status line. This process can take a long time and require many computing resources.You may turn off indexing for huge dictionaries like Wikipedias or Wiktionaries in preferences. To find dictionary which can't be indexed check GoldenDict with `--log-to-file` or check `stdout`.
diff --git a/website/mkdocs.yml b/website/mkdocs.yml
index cd36d956..547949cb 100644
--- a/website/mkdocs.yml
+++ b/website/mkdocs.yml
@@ -1,5 +1,6 @@
 site_name: GoldenDict-NG
-site_description: Goldendict-ng is a dictionary 是一个可以用在 Windows Linux 和 mac 上的字典程序
+site_description: GoldenDict-ng is a open source, cross platform, multi formats, feature rich dictionary 是一个开源跨平台支持各种格式的字典程序
+site_url: https://xiaoyifang.github.io/goldendict-ng/
 
 theme:
   name: material
@@ -38,20 +39,19 @@ nav:
   - Special Usages:
       - Anki Integration: topic_anki.md
       - Command Lines: topic_commandline.md
-      - Custom Stylesheets: topic_userstyle.md
+      - Custom Stylesheet & JavaScript: topic_userstyle.md
       - Portable Mode: topic_portablemode.md
       - Custom transliteration: topic_transliteration.md
       - Customize Dictionary Name: custom_dictionary_name.md
-      - OCR Integration: howto/How to use ocr together with GoldenDict.md
+      - OCR Integration: howto/ocr.md
   - Report Bugs & Feedbacks: feedbacks.md
   - Contributor Guides:
     - Developer: developer.md
     - How to:
-       - Build and debug with VS2019: howto/how to build and debug with VS2019.md
-       - Compile with cmake: howto/how to compile with cmake.md
+       - Build from source: howto/build_from_source.md
        - Customize the opencc: howto/how to customize the opencc.md
        - Qt version and github action: howto/how to find out the latest qt version and module in github qt action.md
        - Use .clang-format: howto/how to use .clang-format to format the code.md
        - Breadpad crash analysis: howto/how to use breadpad crash analysis.md
        - Build ffmpeg on Windows: howto/how to build ffmpeg for visual studio.md 
-  - 中文文档: index_cn.md
+       - How to update the crowdin.ts file: howto/how to update crowdin.ts file.md
diff --git a/winlibs/include/hunspell/affentry.hxx b/winlibs/include/hunspell/affentry.hxx
deleted file mode 100644
index 4bafc043..00000000
--- a/winlibs/include/hunspell/affentry.hxx
+++ /dev/null
@@ -1,223 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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 AFFIX_HXX_
-#define AFFIX_HXX_
-
-#include "atypes.hxx"
-#include "baseaffix.hxx"
-#include "affixmgr.hxx"
-
-/* A Prefix Entry  */
-
-class PfxEntry : public AffEntry {
- private:
-  PfxEntry(const PfxEntry&);
-  PfxEntry& operator=(const PfxEntry&);
-
- private:
-  AffixMgr* pmyMgr;
-
-  PfxEntry* next;
-  PfxEntry* nexteq;
-  PfxEntry* nextne;
-  PfxEntry* flgnxt;
-
- public:
-  explicit PfxEntry(AffixMgr* pmgr);
-
-  bool allowCross() const { return ((opts & aeXPRODUCT) != 0); }
-  struct hentry* checkword(const char* word,
-                           int len,
-                           char in_compound,
-                           const FLAG needflag = FLAG_NULL);
-
-  struct hentry* check_twosfx(const char* word,
-                              int len,
-                              char in_compound,
-                              const FLAG needflag = FLAG_NULL);
-
-  std::string check_morph(const char* word,
-                          int len,
-                          char in_compound,
-                          const FLAG needflag = FLAG_NULL);
-
-  std::string check_twosfx_morph(const char* word,
-                                 int len,
-                                 char in_compound,
-                                 const FLAG needflag = FLAG_NULL);
-
-  FLAG getFlag() { return aflag; }
-  const char* getKey() { return appnd.c_str(); }
-  std::string add(const char* word, size_t len);
-
-  inline short getKeyLen() { return appnd.size(); }
-
-  inline const char* getMorph() { return morphcode; }
-
-  inline const unsigned short* getCont() { return contclass; }
-  inline short getContLen() { return contclasslen; }
-
-  inline PfxEntry* getNext() { return next; }
-  inline PfxEntry* getNextNE() { return nextne; }
-  inline PfxEntry* getNextEQ() { return nexteq; }
-  inline PfxEntry* getFlgNxt() { return flgnxt; }
-
-  inline void setNext(PfxEntry* ptr) { next = ptr; }
-  inline void setNextNE(PfxEntry* ptr) { nextne = ptr; }
-  inline void setNextEQ(PfxEntry* ptr) { nexteq = ptr; }
-  inline void setFlgNxt(PfxEntry* ptr) { flgnxt = ptr; }
-
-  inline char* nextchar(char* p);
-  inline int test_condition(const char* st);
-};
-
-/* A Suffix Entry */
-
-class SfxEntry : public AffEntry {
- private:
-  SfxEntry(const SfxEntry&);
-  SfxEntry& operator=(const SfxEntry&);
-
- private:
-  AffixMgr* pmyMgr;
-  std::string rappnd;
-
-  SfxEntry* next;
-  SfxEntry* nexteq;
-  SfxEntry* nextne;
-  SfxEntry* flgnxt;
-
-  SfxEntry* l_morph;
-  SfxEntry* r_morph;
-  SfxEntry* eq_morph;
-
- public:
-  explicit SfxEntry(AffixMgr* pmgr);
-
-  bool allowCross() const { return ((opts & aeXPRODUCT) != 0); }
-  struct hentry* checkword(const char* word,
-                           int len,
-                           int optflags,
-                           PfxEntry* ppfx,
-                           const FLAG cclass,
-                           const FLAG needflag,
-                           const FLAG badflag);
-
-  struct hentry* check_twosfx(const char* word,
-                              int len,
-                              int optflags,
-                              PfxEntry* ppfx,
-                              const FLAG needflag = FLAG_NULL);
-
-  std::string check_twosfx_morph(const char* word,
-                                 int len,
-                                 int optflags,
-                                 PfxEntry* ppfx,
-                                 const FLAG needflag = FLAG_NULL);
-  struct hentry* get_next_homonym(struct hentry* he);
-  struct hentry* get_next_homonym(struct hentry* word,
-                                  int optflags,
-                                  PfxEntry* ppfx,
-                                  const FLAG cclass,
-                                  const FLAG needflag);
-
-  FLAG getFlag() { return aflag; }
-  const char* getKey() { return rappnd.c_str(); }
-  std::string add(const char* word, size_t len);
-
-  inline const char* getMorph() { return morphcode; }
-
-  inline const unsigned short* getCont() { return contclass; }
-  inline short getContLen() { return contclasslen; }
-  inline const char* getAffix() { return appnd.c_str(); }
-
-  inline short getKeyLen() { return appnd.size(); }
-
-  inline SfxEntry* getNext() { return next; }
-  inline SfxEntry* getNextNE() { return nextne; }
-  inline SfxEntry* getNextEQ() { return nexteq; }
-
-  inline SfxEntry* getLM() { return l_morph; }
-  inline SfxEntry* getRM() { return r_morph; }
-  inline SfxEntry* getEQM() { return eq_morph; }
-  inline SfxEntry* getFlgNxt() { return flgnxt; }
-
-  inline void setNext(SfxEntry* ptr) { next = ptr; }
-  inline void setNextNE(SfxEntry* ptr) { nextne = ptr; }
-  inline void setNextEQ(SfxEntry* ptr) { nexteq = ptr; }
-  inline void setFlgNxt(SfxEntry* ptr) { flgnxt = ptr; }
-  void initReverseWord();
-
-  inline char* nextchar(char* p);
-  inline int test_condition(const char* st, const char* begin);
-};
-
-#endif
diff --git a/winlibs/include/hunspell/affixmgr.hxx b/winlibs/include/hunspell/affixmgr.hxx
deleted file mode 100644
index d41e69cf..00000000
--- a/winlibs/include/hunspell/affixmgr.hxx
+++ /dev/null
@@ -1,369 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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 AFFIXMGR_HXX_
-#define AFFIXMGR_HXX_
-
-#include <stdio.h>
-
-#include <string>
-#include <vector>
-
-#include "atypes.hxx"
-#include "baseaffix.hxx"
-#include "hashmgr.hxx"
-#include "phonet.hxx"
-#include "replist.hxx"
-
-// check flag duplication
-#define dupSFX (1 << 0)
-#define dupPFX (1 << 1)
-
-class PfxEntry;
-class SfxEntry;
-
-class AffixMgr {
-  PfxEntry* pStart[SETSIZE];
-  SfxEntry* sStart[SETSIZE];
-  PfxEntry* pFlag[SETSIZE];
-  SfxEntry* sFlag[SETSIZE];
-  const std::vector<HashMgr*>& alldic;
-  const HashMgr* pHMgr;
-  std::string keystring;
-  std::string trystring;
-  std::string encoding;
-  struct cs_info* csconv;
-  int utf8;
-  int complexprefixes;
-  FLAG compoundflag;
-  FLAG compoundbegin;
-  FLAG compoundmiddle;
-  FLAG compoundend;
-  FLAG compoundroot;
-  FLAG compoundforbidflag;
-  FLAG compoundpermitflag;
-  int compoundmoresuffixes;
-  int checkcompounddup;
-  int checkcompoundrep;
-  int checkcompoundcase;
-  int checkcompoundtriple;
-  int simplifiedtriple;
-  FLAG forbiddenword;
-  FLAG nosuggest;
-  FLAG nongramsuggest;
-  FLAG needaffix;
-  int cpdmin;
-  bool parsedrep;
-  std::vector<replentry> reptable;
-  RepList* iconvtable;
-  RepList* oconvtable;
-  bool parsedmaptable;
-  std::vector<mapentry> maptable;
-  bool parsedbreaktable;
-  std::vector<std::string> breaktable;
-  bool parsedcheckcpd;
-  std::vector<patentry> checkcpdtable;
-  int simplifiedcpd;
-  bool parseddefcpd;
-  std::vector<flagentry> defcpdtable;
-  phonetable* phone;
-  int maxngramsugs;
-  int maxcpdsugs;
-  int maxdiff;
-  int onlymaxdiff;
-  int nosplitsugs;
-  int sugswithdots;
-  int cpdwordmax;
-  int cpdmaxsyllable;
-  std::string cpdvowels; // vowels (for calculating of Hungarian compounding limit,
-  std::vector<w_char> cpdvowels_utf16; //vowels for UTF-8 encoding
-  std::string cpdsyllablenum; // syllable count incrementing flag
-  const char* pfxappnd;  // BUG: not stateless
-  const char* sfxappnd;  // BUG: not stateless
-  int sfxextra;          // BUG: not stateless
-  FLAG sfxflag;          // BUG: not stateless
-  char* derived;         // BUG: not stateless
-  SfxEntry* sfx;         // BUG: not stateless
-  PfxEntry* pfx;         // BUG: not stateless
-  int checknum;
-  std::string wordchars; // letters + spec. word characters
-  std::vector<w_char> wordchars_utf16;
-  std::string ignorechars; // letters + spec. word characters
-  std::vector<w_char> ignorechars_utf16;
-  std::string version;   // affix and dictionary file version string
-  std::string lang;	 // language
-  int langnum;
-  FLAG lemma_present;
-  FLAG circumfix;
-  FLAG onlyincompound;
-  FLAG keepcase;
-  FLAG forceucase;
-  FLAG warn;
-  int forbidwarn;
-  FLAG substandard;
-  int checksharps;
-  int fullstrip;
-
-  int havecontclass;           // boolean variable
-  char contclasses[CONTSIZE];  // flags of possible continuing classes (twofold
-                               // affix)
-
- public:
-  AffixMgr(const char* affpath, const std::vector<HashMgr*>& ptr, const char* key = NULL);
-  ~AffixMgr();
-  struct hentry* affix_check(const char* word,
-                             int len,
-                             const unsigned short needflag = (unsigned short)0,
-                             char in_compound = IN_CPD_NOT);
-  struct hentry* prefix_check(const char* word,
-                              int len,
-                              char in_compound,
-                              const FLAG needflag = FLAG_NULL);
-  inline int isSubset(const char* s1, const char* s2);
-  struct hentry* prefix_check_twosfx(const char* word,
-                                     int len,
-                                     char in_compound,
-                                     const FLAG needflag = FLAG_NULL);
-  inline int isRevSubset(const char* s1, const char* end_of_s2, int len);
-  struct hentry* suffix_check(const char* word,
-                              int len,
-                              int sfxopts,
-                              PfxEntry* ppfx,
-                              const FLAG cclass = FLAG_NULL,
-                              const FLAG needflag = FLAG_NULL,
-                              char in_compound = IN_CPD_NOT);
-  struct hentry* suffix_check_twosfx(const char* word,
-                                     int len,
-                                     int sfxopts,
-                                     PfxEntry* ppfx,
-                                     const FLAG needflag = FLAG_NULL);
-
-  std::string affix_check_morph(const char* word,
-                                int len,
-                                const FLAG needflag = FLAG_NULL,
-                                char in_compound = IN_CPD_NOT);
-  std::string prefix_check_morph(const char* word,
-                                 int len,
-                                 char in_compound,
-                                 const FLAG needflag = FLAG_NULL);
-  std::string suffix_check_morph(const char* word,
-                                 int len,
-                                 int sfxopts,
-                                 PfxEntry* ppfx,
-                                 const FLAG cclass = FLAG_NULL,
-                                 const FLAG needflag = FLAG_NULL,
-                                 char in_compound = IN_CPD_NOT);
-
-  std::string prefix_check_twosfx_morph(const char* word,
-                                        int len,
-                                        char in_compound,
-                                        const FLAG needflag = FLAG_NULL);
-  std::string suffix_check_twosfx_morph(const char* word,
-                                        int len,
-                                        int sfxopts,
-                                        PfxEntry* ppfx,
-                                        const FLAG needflag = FLAG_NULL);
-
-  std::string morphgen(const char* ts,
-                       int wl,
-                       const unsigned short* ap,
-                       unsigned short al,
-                       const char* morph,
-                       const char* targetmorph,
-                       int level);
-
-  int expand_rootword(struct guessword* wlst,
-                      int maxn,
-                      const char* ts,
-                      int wl,
-                      const unsigned short* ap,
-                      unsigned short al,
-                      const char* bad,
-                      int,
-                      const char*);
-
-  short get_syllable(const std::string& word);
-  int cpdrep_check(const char* word, int len);
-  int cpdpat_check(const char* word,
-                   int len,
-                   hentry* r1,
-                   hentry* r2,
-                   const char affixed);
-  int defcpd_check(hentry*** words,
-                   short wnum,
-                   hentry* rv,
-                   hentry** rwords,
-                   char all);
-  int cpdcase_check(const char* word, int len);
-  inline int candidate_check(const char* word, int len);
-  void setcminmax(int* cmin, int* cmax, const char* word, int len);
-  struct hentry* compound_check(const std::string& word,
-                                short wordnum,
-                                short numsyllable,
-                                short maxwordnum,
-                                short wnum,
-                                hentry** words,
-                                hentry** rwords,
-                                char hu_mov_rule,
-                                char is_sug,
-                                int* info);
-
-  int compound_check_morph(const char* word,
-                           int len,
-                           short wordnum,
-                           short numsyllable,
-                           short maxwordnum,
-                           short wnum,
-                           hentry** words,
-                           hentry** rwords,
-                           char hu_mov_rule,
-                           std::string& result,
-                           const std::string* partresult);
-
-  std::vector<std::string> get_suffix_words(short unsigned* suff,
-                       int len,
-                       const char* root_word);
-
-  struct hentry* lookup(const char* word);
-  const std::vector<replentry>& get_reptable() const;
-  RepList* get_iconvtable() const;
-  RepList* get_oconvtable() const;
-  struct phonetable* get_phonetable() const;
-  const std::vector<mapentry>& get_maptable() const;
-  const std::vector<std::string>& get_breaktable() const;
-  const std::string& get_encoding();
-  int get_langnum() const;
-  char* get_key_string();
-  char* get_try_string() const;
-  const std::string& get_wordchars() const;
-  const std::vector<w_char>& get_wordchars_utf16() const;
-  const char* get_ignore() const;
-  const std::vector<w_char>& get_ignore_utf16() const;
-  int get_compound() const;
-  FLAG get_compoundflag() const;
-  FLAG get_forbiddenword() const;
-  FLAG get_nosuggest() const;
-  FLAG get_nongramsuggest() const;
-  FLAG get_needaffix() const;
-  FLAG get_onlyincompound() const;
-  const char* get_derived() const;
-  const std::string& get_version() const;
-  int have_contclass() const;
-  int get_utf8() const;
-  int get_complexprefixes() const;
-  char* get_suffixed(char) const;
-  int get_maxngramsugs() const;
-  int get_maxcpdsugs() const;
-  int get_maxdiff() const;
-  int get_onlymaxdiff() const;
-  int get_nosplitsugs() const;
-  int get_sugswithdots(void) const;
-  FLAG get_keepcase(void) const;
-  FLAG get_forceucase(void) const;
-  FLAG get_warn(void) const;
-  int get_forbidwarn(void) const;
-  int get_checksharps(void) const;
-  char* encode_flag(unsigned short aflag) const;
-  int get_fullstrip() const;
-
- private:
-  int parse_file(const char* affpath, const char* key);
-  bool parse_flag(const std::string& line, unsigned short* out, FileMgr* af);
-  bool parse_num(const std::string& line, int* out, FileMgr* af);
-  bool parse_cpdsyllable(const std::string& line, FileMgr* af);
-  bool parse_reptable(const std::string& line, FileMgr* af);
-  bool parse_convtable(const std::string& line,
-                      FileMgr* af,
-                      RepList** rl,
-                      const std::string& keyword);
-  bool parse_phonetable(const std::string& line, FileMgr* af);
-  bool parse_maptable(const std::string& line, FileMgr* af);
-  bool parse_breaktable(const std::string& line, FileMgr* af);
-  bool parse_checkcpdtable(const std::string& line, FileMgr* af);
-  bool parse_defcpdtable(const std::string& line, FileMgr* af);
-  bool parse_affix(const std::string& line, const char at, FileMgr* af, char* dupflags);
-
-  void reverse_condition(std::string&);
-  std::string& debugflag(std::string& result, unsigned short flag);
-  int condlen(const char*);
-  int encodeit(AffEntry& entry, const char* cs);
-  int build_pfxtree(PfxEntry* pfxptr);
-  int build_sfxtree(SfxEntry* sfxptr);
-  int process_pfx_order();
-  int process_sfx_order();
-  PfxEntry* process_pfx_in_order(PfxEntry* ptr, PfxEntry* nptr);
-  SfxEntry* process_sfx_in_order(SfxEntry* ptr, SfxEntry* nptr);
-  int process_pfx_tree_to_list();
-  int process_sfx_tree_to_list();
-  int redundant_condition(char, const char* strip, int stripl, const char* cond, int);
-  void finishFileMgr(FileMgr* afflst);
-};
-
-#endif
diff --git a/winlibs/include/hunspell/atypes.hxx b/winlibs/include/hunspell/atypes.hxx
index f8415231..1b78d472 100644
--- a/winlibs/include/hunspell/atypes.hxx
+++ b/winlibs/include/hunspell/atypes.hxx
@@ -1,7 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Copyright (C) 2002-2017 Németh László
+ * Copyright (C) 2002-2022 Németh László
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
@@ -95,6 +95,16 @@ static inline void HUNSPELL_WARNING(FILE*, const char*, ...) {}
 
 #define TESTAFF(a, b, c) (std::binary_search(a, a + c, b))
 
+// timelimit: max. ~1/4 sec (process time on Linux) for
+// for a suggestion, including max. ~/10 sec for a case
+// sensitive plain or compound word suggestion, within
+// ~1/20 sec long time consuming suggestion functions
+#define TIMELIMIT_GLOBAL (CLOCKS_PER_SEC / 4)
+#define TIMELIMIT_SUGGESTION (CLOCKS_PER_SEC / 10)
+#define TIMELIMIT (CLOCKS_PER_SEC / 20)
+#define MINTIMER 100
+#define MAXPLUSTIMER 100
+
 struct guessword {
   char* word;
   bool allow;
diff --git a/winlibs/include/hunspell/baseaffix.hxx b/winlibs/include/hunspell/baseaffix.hxx
deleted file mode 100644
index 9191dba4..00000000
--- a/winlibs/include/hunspell/baseaffix.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef BASEAFF_HXX_
-#define BASEAFF_HXX_
-
-#include <string>
-
-class AffEntry {
- private:
-  AffEntry(const AffEntry&);
-  AffEntry& operator=(const AffEntry&);
-
- public:
-  AffEntry()
-      : numconds(0),
-        opts(0),
-        aflag(0),
-        morphcode(0),
-        contclass(NULL),
-        contclasslen(0) {}
-  virtual ~AffEntry();
-  std::string appnd;
-  std::string strip;
-  unsigned char numconds;
-  char opts;
-  unsigned short aflag;
-  union {
-    char conds[MAXCONDLEN];
-    struct {
-      char conds1[MAXCONDLEN_1];
-      char* conds2;
-    } l;
-  } c;
-  char* morphcode;
-  unsigned short* contclass;
-  short contclasslen;
-};
-
-#endif
diff --git a/winlibs/include/hunspell/csutil.hxx b/winlibs/include/hunspell/csutil.hxx
deleted file mode 100644
index 5d83f809..00000000
--- a/winlibs/include/hunspell/csutil.hxx
+++ /dev/null
@@ -1,314 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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 CSUTIL_HXX_
-#define CSUTIL_HXX_
-
-#include "hunvisapi.h"
-
-// First some base level utility routines
-
-#include <fstream>
-#include <string>
-#include <vector>
-#include <string.h>
-#include "w_char.hxx"
-#include "htypes.hxx"
-
-#ifdef MOZILLA_CLIENT
-#include "nscore.h"  // for mozalloc headers
-#endif
-
-// casing
-#define NOCAP 0
-#define INITCAP 1
-#define ALLCAP 2
-#define HUHCAP 3
-#define HUHINITCAP 4
-
-// default encoding and keystring
-#define SPELL_ENCODING "ISO8859-1"
-#define SPELL_KEYSTRING "qwertyuiop|asdfghjkl|zxcvbnm"
-
-// default morphological fields
-#define MORPH_STEM "st:"
-#define MORPH_ALLOMORPH "al:"
-#define MORPH_POS "po:"
-#define MORPH_DERI_PFX "dp:"
-#define MORPH_INFL_PFX "ip:"
-#define MORPH_TERM_PFX "tp:"
-#define MORPH_DERI_SFX "ds:"
-#define MORPH_INFL_SFX "is:"
-#define MORPH_TERM_SFX "ts:"
-#define MORPH_SURF_PFX "sp:"
-#define MORPH_FREQ "fr:"
-#define MORPH_PHON "ph:"
-#define MORPH_HYPH "hy:"
-#define MORPH_PART "pa:"
-#define MORPH_FLAG "fl:"
-#define MORPH_HENTRY "_H:"
-#define MORPH_TAG_LEN strlen(MORPH_STEM)
-
-#define MSEP_FLD ' '
-#define MSEP_REC '\n'
-#define MSEP_ALT '\v'
-
-// default flags
-#define DEFAULTFLAGS 65510
-#define FORBIDDENWORD 65510
-#define ONLYUPCASEFLAG 65511
-
-// fix long pathname problem of WIN32 by using w_char std::fstream::open override
-LIBHUNSPELL_DLL_EXPORTED void myopen(std::ifstream& stream, const char* path,
-                                     std::ios_base::openmode mode);
-
-// convert UTF-16 characters to UTF-8
-LIBHUNSPELL_DLL_EXPORTED std::string& u16_u8(std::string& dest,
-                                             const std::vector<w_char>& src);
-
-// convert UTF-8 characters to UTF-16
-LIBHUNSPELL_DLL_EXPORTED int u8_u16(std::vector<w_char>& dest,
-                                    const std::string& src);
-
-// remove end of line char(s)
-LIBHUNSPELL_DLL_EXPORTED void mychomp(std::string& s);
-
-// duplicate string
-LIBHUNSPELL_DLL_EXPORTED char* mystrdup(const char* s);
-
-// parse into tokens with char delimiter
-LIBHUNSPELL_DLL_EXPORTED std::string::const_iterator mystrsep(const std::string &str,
-                                                              std::string::const_iterator& start);
-
-// replace pat by rep in word and return word
-LIBHUNSPELL_DLL_EXPORTED std::string& mystrrep(std::string& str,
-                                               const std::string& search,
-                                               const std::string& replace);
-
-// append s to ends of every lines in text
-LIBHUNSPELL_DLL_EXPORTED std::string& strlinecat(std::string& str,
-                                                 const std::string& apd);
-
-// tokenize into lines with new line
-LIBHUNSPELL_DLL_EXPORTED std::vector<std::string> line_tok(const std::string& text,
-                                                           char breakchar);
-
-// tokenize into lines with new line and uniq in place
-LIBHUNSPELL_DLL_EXPORTED void line_uniq(std::string& text, char breakchar);
-
-LIBHUNSPELL_DLL_EXPORTED void line_uniq_app(std::string& text, char breakchar);
-
-// reverse word
-LIBHUNSPELL_DLL_EXPORTED size_t reverseword(std::string& word);
-
-// reverse word
-LIBHUNSPELL_DLL_EXPORTED size_t reverseword_utf(std::string&);
-
-// remove duplicates
-LIBHUNSPELL_DLL_EXPORTED void uniqlist(std::vector<std::string>& list);
-
-// character encoding information
-struct cs_info {
-  unsigned char ccase;
-  unsigned char clower;
-  unsigned char cupper;
-};
-
-LIBHUNSPELL_DLL_EXPORTED void initialize_utf_tbl();
-LIBHUNSPELL_DLL_EXPORTED void free_utf_tbl();
-LIBHUNSPELL_DLL_EXPORTED unsigned short unicodetoupper(unsigned short c,
-                                                       int langnum);
-LIBHUNSPELL_DLL_EXPORTED w_char upper_utf(w_char u, int langnum);
-LIBHUNSPELL_DLL_EXPORTED w_char lower_utf(w_char u, int langnum);
-LIBHUNSPELL_DLL_EXPORTED unsigned short unicodetolower(unsigned short c,
-                                                       int langnum);
-LIBHUNSPELL_DLL_EXPORTED int unicodeisalpha(unsigned short c);
-
-LIBHUNSPELL_DLL_EXPORTED struct cs_info* get_current_cs(const std::string& es);
-
-// get language identifiers of language codes
-LIBHUNSPELL_DLL_EXPORTED int get_lang_num(const std::string& lang);
-
-// get characters of the given 8bit encoding with lower- and uppercase forms
-LIBHUNSPELL_DLL_EXPORTED std::string get_casechars(const char* enc);
-
-// convert std::string to all caps
-LIBHUNSPELL_DLL_EXPORTED std::string& mkallcap(std::string& s,
-                                               const struct cs_info* csconv);
-
-// convert null terminated string to all little
-LIBHUNSPELL_DLL_EXPORTED std::string& mkallsmall(std::string& s,
-                                                 const struct cs_info* csconv);
-
-// convert first letter of string to little
-LIBHUNSPELL_DLL_EXPORTED std::string& mkinitsmall(std::string& s,
-                                                 const struct cs_info* csconv);
-
-// convert first letter of string to capital
-LIBHUNSPELL_DLL_EXPORTED std::string& mkinitcap(std::string& s,
-                                                const struct cs_info* csconv);
-
-// convert first letter of UTF-8 string to capital
-LIBHUNSPELL_DLL_EXPORTED std::vector<w_char>&
-mkinitcap_utf(std::vector<w_char>& u, int langnum);
-
-// convert UTF-8 string to little
-LIBHUNSPELL_DLL_EXPORTED std::vector<w_char>&
-mkallsmall_utf(std::vector<w_char>& u, int langnum);
-
-// convert first letter of UTF-8 string to little
-LIBHUNSPELL_DLL_EXPORTED std::vector<w_char>&
-mkinitsmall_utf(std::vector<w_char>& u, int langnum);
-
-// convert UTF-8 string to capital
-LIBHUNSPELL_DLL_EXPORTED std::vector<w_char>&
-mkallcap_utf(std::vector<w_char>& u, int langnum);
-
-// get type of capitalization
-LIBHUNSPELL_DLL_EXPORTED int get_captype(const std::string& q, cs_info*);
-
-// get type of capitalization (UTF-8)
-LIBHUNSPELL_DLL_EXPORTED int get_captype_utf8(const std::vector<w_char>& q, int langnum);
-
-// strip all ignored characters in the string
-LIBHUNSPELL_DLL_EXPORTED size_t remove_ignored_chars_utf(
-    std::string& word,
-    const std::vector<w_char>& ignored_chars);
-
-// strip all ignored characters in the string
-LIBHUNSPELL_DLL_EXPORTED size_t remove_ignored_chars(
-    std::string& word,
-    const std::string& ignored_chars);
-
-LIBHUNSPELL_DLL_EXPORTED bool parse_string(const std::string& line,
-                                           std::string& out,
-                                           int ln);
-
-LIBHUNSPELL_DLL_EXPORTED bool parse_array(const std::string& line,
-                                          std::string& out,
-                                          std::vector<w_char>& out_utf16,
-                                          int utf8,
-                                          int ln);
-
-LIBHUNSPELL_DLL_EXPORTED int fieldlen(const char* r);
-
-LIBHUNSPELL_DLL_EXPORTED bool copy_field(std::string& dest,
-                                         const std::string& morph,
-                                         const std::string& var);
-
-// conversion function for protected memory
-LIBHUNSPELL_DLL_EXPORTED void store_pointer(char* dest, char* source);
-
-// conversion function for protected memory
-LIBHUNSPELL_DLL_EXPORTED char* get_stored_pointer(const char* s);
-
-// hash entry macros
-LIBHUNSPELL_DLL_EXPORTED inline char* HENTRY_DATA(struct hentry* h) {
-  char* ret;
-  if (!h->var)
-    ret = NULL;
-  else if (h->var & H_OPT_ALIASM)
-    ret = get_stored_pointer(HENTRY_WORD(h) + h->blen + 1);
-  else
-    ret = HENTRY_WORD(h) + h->blen + 1;
-  return ret;
-}
-
-LIBHUNSPELL_DLL_EXPORTED inline const char* HENTRY_DATA(
-    const struct hentry* h) {
-  const char* ret;
-  if (!h->var)
-    ret = NULL;
-  else if (h->var & H_OPT_ALIASM)
-    ret = get_stored_pointer(HENTRY_WORD(h) + h->blen + 1);
-  else
-    ret = HENTRY_WORD(h) + h->blen + 1;
-  return ret;
-}
-
-// NULL-free version for warning-free OOo build
-LIBHUNSPELL_DLL_EXPORTED inline const char* HENTRY_DATA2(
-    const struct hentry* h) {
-  const char* ret;
-  if (!h->var)
-    ret = "";
-  else if (h->var & H_OPT_ALIASM)
-    ret = get_stored_pointer(HENTRY_WORD(h) + h->blen + 1);
-  else
-    ret = HENTRY_WORD(h) + h->blen + 1;
-  return ret;
-}
-
-LIBHUNSPELL_DLL_EXPORTED inline char* HENTRY_FIND(struct hentry* h,
-                                                  const char* p) {
-  return (HENTRY_DATA(h) ? strstr(HENTRY_DATA(h), p) : NULL);
-}
-
-#endif
diff --git a/winlibs/include/hunspell/filemgr.hxx b/winlibs/include/hunspell/filemgr.hxx
deleted file mode 100644
index 62433aee..00000000
--- a/winlibs/include/hunspell/filemgr.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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.
- */
-
-/* file manager class - read lines of files [filename] OR [filename.hz] */
-#ifndef FILEMGR_HXX_
-#define FILEMGR_HXX_
-
-#include "hunzip.hxx"
-#include <stdio.h>
-#include <string>
-#include <fstream>
-
-class FileMgr {
- private:
-  FileMgr(const FileMgr&);
-  FileMgr& operator=(const FileMgr&);
-
- protected:
-  std::ifstream fin;
-  Hunzip* hin;
-  char in[BUFSIZE + 50];  // input buffer
-  int fail(const char* err, const char* par);
-  int linenum;
-
- public:
-  FileMgr(const char* filename, const char* key = NULL);
-  ~FileMgr();
-  bool getline(std::string&);
-  int getlinenum();
-};
-#endif
diff --git a/winlibs/include/hunspell/hashmgr.hxx b/winlibs/include/hunspell/hashmgr.hxx
deleted file mode 100644
index da485d7a..00000000
--- a/winlibs/include/hunspell/hashmgr.hxx
+++ /dev/null
@@ -1,145 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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 HASHMGR_HXX_
-#define HASHMGR_HXX_
-
-#include <stdio.h>
-#include <string>
-#include <vector>
-
-#include "htypes.hxx"
-#include "filemgr.hxx"
-#include "w_char.hxx"
-
-enum flag { FLAG_CHAR, FLAG_LONG, FLAG_NUM, FLAG_UNI };
-
-class HashMgr {
-  int tablesize;
-  struct hentry** tableptr;
-  flag flag_mode;
-  int complexprefixes;
-  int utf8;
-  unsigned short forbiddenword;
-  int langnum;
-  std::string enc;
-  std::string lang;
-  struct cs_info* csconv;
-  std::string ignorechars;
-  std::vector<w_char> ignorechars_utf16;
-  int numaliasf;  // flag vector `compression' with aliases
-  unsigned short** aliasf;
-  unsigned short* aliasflen;
-  int numaliasm;  // morphological desciption `compression' with aliases
-  char** aliasm;
-
- public:
-  HashMgr(const char* tpath, const char* apath, const char* key = NULL);
-  ~HashMgr();
-
-  struct hentry* lookup(const char*) const;
-  int hash(const char*) const;
-  struct hentry* walk_hashtable(int& col, struct hentry* hp) const;
-
-  int add(const std::string& word);
-  int add_with_affix(const std::string& word, const std::string& pattern);
-  int remove(const std::string& word);
-  int decode_flags(unsigned short** result, const std::string& flags, FileMgr* af) const;
-  bool decode_flags(std::vector<unsigned short>& result, const std::string& flags, FileMgr* af) const;
-  unsigned short decode_flag(const char* flag) const;
-  char* encode_flag(unsigned short flag) const;
-  int is_aliasf() const;
-  int get_aliasf(int index, unsigned short** fvec, FileMgr* af) const;
-  int is_aliasm() const;
-  char* get_aliasm(int index) const;
-
- private:
-  int get_clen_and_captype(const std::string& word, int* captype);
-  int get_clen_and_captype(const std::string& word, int* captype, std::vector<w_char> &workbuf);
-  int load_tables(const char* tpath, const char* key);
-  int add_word(const std::string& word,
-               int wcl,
-               unsigned short* ap,
-               int al,
-               const std::string* desc,
-               bool onlyupcase);
-  int load_config(const char* affpath, const char* key);
-  bool parse_aliasf(const std::string& line, FileMgr* af);
-  int add_hidden_capitalized_word(const std::string& word,
-                                  int wcl,
-                                  unsigned short* flags,
-                                  int al,
-                                  const std::string* dp,
-                                  int captype);
-  bool parse_aliasm(const std::string& line, FileMgr* af);
-  int remove_forbidden_flag(const std::string& word);
-};
-
-#endif
diff --git a/winlibs/include/hunspell/htypes.hxx b/winlibs/include/hunspell/htypes.hxx
deleted file mode 100644
index 8f66a008..00000000
--- a/winlibs/include/hunspell/htypes.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef HTYPES_HXX_
-#define HTYPES_HXX_
-
-#define ROTATE_LEN 5
-
-#define ROTATE(v, q) \
-  (v) = ((v) << (q)) | (((v) >> (32 - q)) & ((1 << (q)) - 1));
-
-// hentry options
-#define H_OPT (1 << 0)
-#define H_OPT_ALIASM (1 << 1)
-#define H_OPT_PHON (1 << 2)
-
-// see also csutil.hxx
-#define HENTRY_WORD(h) &(h->word[0])
-
-// approx. number  of user defined words
-#define USERWORD 1000
-
-struct hentry {
-  unsigned char blen;    // word length in bytes
-  unsigned char clen;    // word length in characters (different for UTF-8 enc.)
-  short alen;            // length of affix flag vector
-  unsigned short* astr;  // affix flag vector
-  struct hentry* next;   // next word with same hash code
-  struct hentry* next_homonym;  // next homonym word (with same hash code)
-  char var;      // variable fields (only for special pronounciation yet)
-  char word[1];  // variable-length word (8-bit or UTF-8 encoding)
-};
-
-#endif
diff --git a/winlibs/include/hunspell/hunspell.hxx b/winlibs/include/hunspell/hunspell.hxx
index a06bdd43..8640a35c 100644
--- a/winlibs/include/hunspell/hunspell.hxx
+++ b/winlibs/include/hunspell/hunspell.hxx
@@ -1,7 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Copyright (C) 2002-2017 Németh László
+ * Copyright (C) 2002-2022 Németh László
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
@@ -78,7 +78,10 @@
 
 #define SPELL_XML "<?xml?>"
 
+#ifndef MAXSUGGESTION
 #define MAXSUGGESTION 15
+#endif
+
 #define MAXSHARPS 5
 
 #ifndef MAXWORDLEN
diff --git a/winlibs/include/hunspell/hunvisapi.h b/winlibs/include/hunspell/hunvisapi.h
index eb2b3480..4db2414a 100644
--- a/winlibs/include/hunspell/hunvisapi.h
+++ b/winlibs/include/hunspell/hunvisapi.h
@@ -3,13 +3,13 @@
 
 #if defined(HUNSPELL_STATIC)
 #  define LIBHUNSPELL_DLL_EXPORTED
-#elif defined(_MSC_VER)
+#elif defined(_WIN32)
 #  if defined(BUILDING_LIBHUNSPELL)
 #    define LIBHUNSPELL_DLL_EXPORTED __declspec(dllexport)
 #  else
 #    define LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
 #  endif
-#elif defined(BUILDING_LIBHUNSPELL) && 1
+#elif defined(BUILDING_LIBHUNSPELL) && 0
 #  define LIBHUNSPELL_DLL_EXPORTED __attribute__((__visibility__("default")))
 #else
 #  define LIBHUNSPELL_DLL_EXPORTED
diff --git a/winlibs/include/hunspell/hunzip.hxx b/winlibs/include/hunspell/hunzip.hxx
deleted file mode 100644
index ea2bc58d..00000000
--- a/winlibs/include/hunspell/hunzip.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* hunzip: file decompression for sorted dictionaries with optional encryption,
- * algorithm: prefix-suffix encoding and 16-bit Huffman encoding */
-
-#ifndef HUNZIP_HXX_
-#define HUNZIP_HXX_
-
-#include "hunvisapi.h"
-
-#include <stdio.h>
-#include <fstream>
-#include <vector>
-
-#define BUFSIZE 65536
-#define HZIP_EXTENSION ".hz"
-
-#define MSG_OPEN "error: %s: cannot open\n"
-#define MSG_FORMAT "error: %s: not in hzip format\n"
-#define MSG_MEMORY "error: %s: missing memory\n"
-#define MSG_KEY "error: %s: missing or bad password\n"
-
-struct bit {
-  unsigned char c[2];
-  int v[2];
-};
-
-class LIBHUNSPELL_DLL_EXPORTED Hunzip {
- private:
-  Hunzip(const Hunzip&);
-  Hunzip& operator=(const Hunzip&);
-
- protected:
-  char* filename;
-  std::ifstream fin;
-  int bufsiz, lastbit, inc, inbits, outc;
-  std::vector<bit> dec;     // code table
-  char in[BUFSIZE];         // input buffer
-  char out[BUFSIZE + 1];    // Huffman-decoded buffer
-  char line[BUFSIZE + 50];  // decoded line
-  int getcode(const char* key);
-  int getbuf();
-  int fail(const char* err, const char* par);
-
- public:
-  Hunzip(const char* filename, const char* key = NULL);
-  ~Hunzip();
-  bool is_open() { return fin.is_open(); }
-  bool getline(std::string& dest);
-};
-
-#endif
diff --git a/winlibs/include/hunspell/langnum.hxx b/winlibs/include/hunspell/langnum.hxx
deleted file mode 100644
index a64d3d78..00000000
--- a/winlibs/include/hunspell/langnum.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef LANGNUM_HXX_
-#define LANGNUM_HXX_
-
-/*
- language numbers for language specific codes
- see https://wiki.openoffice.org/w/index.php?title=Languages&oldid=230199
-*/
-
-enum {
-  LANG_ar = 96,
-  LANG_az = 100,  // custom number
-  LANG_bg = 41,
-  LANG_ca = 37,
-  LANG_cs = 42,
-  LANG_da = 45,
-  LANG_de = 49,
-  LANG_el = 30,
-  LANG_en = 01,
-  LANG_es = 34,
-  LANG_eu = 10,
-  LANG_fr = 02,
-  LANG_gl = 38,
-  LANG_hr = 78,
-  LANG_hu = 36,
-  LANG_it = 39,
-  LANG_la = 99,   // custom number
-  LANG_lv = 101,  // custom number
-  LANG_nl = 31,
-  LANG_pl = 48,
-  LANG_pt = 03,
-  LANG_ru = 07,
-  LANG_sv = 50,
-  LANG_tr = 90,
-  LANG_uk = 80,
-  LANG_xx = 999
-};
-
-#endif
diff --git a/winlibs/include/hunspell/phonet.hxx b/winlibs/include/hunspell/phonet.hxx
deleted file mode 100644
index 2d58b3ba..00000000
--- a/winlibs/include/hunspell/phonet.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*  phonetic.c - generic replacement aglogithms for phonetic transformation
-    Copyright (C) 2000 Bjoern Jacke
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License version 2.1 as published by the Free Software Foundation;
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; If not, see
-    <http://www.gnu.org/licenses/>.
-
-    Changelog:
-
-    2000-01-05  Bjoern Jacke <bjoern at j3e.de>
-                Initial Release insprired by the article about phonetic
-                transformations out of c't 25/1999
-
-    2007-07-26  Bjoern Jacke <bjoern at j3e.de>
-                Released under MPL/GPL/LGPL tri-license for Hunspell
-
-    2007-08-23  Laszlo Nemeth <nemeth at OOo>
-                Porting from Aspell to Hunspell using C-like structs
-*/
-
-#ifndef PHONET_HXX_
-#define PHONET_HXX_
-
-#define HASHSIZE 256
-#define MAXPHONETLEN 256
-#define MAXPHONETUTF8LEN (MAXPHONETLEN * 4)
-
-#include "hunvisapi.h"
-
-struct phonetable {
-  char utf8;
-  std::vector<std::string> rules;
-  int hash[HASHSIZE];
-};
-
-LIBHUNSPELL_DLL_EXPORTED void init_phonet_hash(phonetable& parms);
-
-LIBHUNSPELL_DLL_EXPORTED std::string phonet(const std::string& inword,
-                                            phonetable& phone);
-
-#endif
diff --git a/winlibs/include/hunspell/replist.hxx b/winlibs/include/hunspell/replist.hxx
deleted file mode 100644
index 1e3efa41..00000000
--- a/winlibs/include/hunspell/replist.hxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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.
- */
-
-/* string replacement list class */
-#ifndef REPLIST_HXX_
-#define REPLIST_HXX_
-
-#include "w_char.hxx"
-
-#include <string>
-#include <vector>
-
-class RepList {
- private:
-  RepList(const RepList&);
-  RepList& operator=(const RepList&);
-
- protected:
-  replentry** dat;
-  int size;
-  int pos;
-
- public:
-  explicit RepList(int n);
-  ~RepList();
-
-  int add(const std::string& pat1, const std::string& pat2);
-  replentry* item(int n);
-  int find(const char* word);
-  std::string replace(const char* word, int n, bool atstart);
-  bool conv(const std::string& word, std::string& dest);
-};
-#endif
diff --git a/winlibs/include/hunspell/suggestmgr.hxx b/winlibs/include/hunspell/suggestmgr.hxx
deleted file mode 100644
index 19ffc03a..00000000
--- a/winlibs/include/hunspell/suggestmgr.hxx
+++ /dev/null
@@ -1,188 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * Copyright (C) 2002-2017 Németh László
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * Hunspell is based on MySpell which is Copyright (C) 2002 Kevin Hendricks.
- *
- * Contributor(s): David Einstein, Davide Prina, Giuseppe Modugno,
- * Gianluca Turconi, Simon Brouwer, Noll János, Bíró Árpád,
- * Goldman Eleonóra, Sarlós Tamás, Bencsáth Boldizsár, Halácsy Péter,
- * Dvornik László, Gefferth András, Nagy Viktor, Varga Dániel, Chris Halls,
- * Rene Engelhard, Bram Moolenaar, Dafydd Jones, Harri Pitkänen
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*
- * Copyright 2002 Kevin B. Hendricks, Stratford, Ontario, Canada
- * And Contributors.  All rights reserved.
- *
- * 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. All modifications to the source code must be clearly marked as
- *    such.  Binary redistributions based on modified source code
- *    must be clearly marked as modified versions in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY KEVIN B. HENDRICKS 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
- * KEVIN B. HENDRICKS 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 SUGGESTMGR_HXX_
-#define SUGGESTMGR_HXX_
-
-#define MAX_ROOTS 100
-#define MAX_WORDS 100
-#define MAX_GUESS 200
-#define MAXNGRAMSUGS 4
-#define MAXPHONSUGS 2
-#define MAXCOMPOUNDSUGS 3
-
-// timelimit: max ~1/4 sec (process time on Linux) for a time consuming function
-#define TIMELIMIT (CLOCKS_PER_SEC >> 2)
-#define MINTIMER 100
-#define MAXPLUSTIMER 100
-
-#define NGRAM_LONGER_WORSE (1 << 0)
-#define NGRAM_ANY_MISMATCH (1 << 1)
-#define NGRAM_LOWERING (1 << 2)
-#define NGRAM_WEIGHTED (1 << 3)
-
-#include "atypes.hxx"
-#include "affixmgr.hxx"
-#include "hashmgr.hxx"
-#include "langnum.hxx"
-#include <time.h>
-
-enum { LCS_UP, LCS_LEFT, LCS_UPLEFT };
-
-class SuggestMgr {
- private:
-  SuggestMgr(const SuggestMgr&);
-  SuggestMgr& operator=(const SuggestMgr&);
-
- private:
-  char* ckey;
-  size_t ckeyl;
-  std::vector<w_char> ckey_utf;
-
-  char* ctry;
-  size_t ctryl;
-  std::vector<w_char> ctry_utf;
-
-  AffixMgr* pAMgr;
-  unsigned int maxSug;
-  struct cs_info* csconv;
-  int utf8;
-  int langnum;
-  int nosplitsugs;
-  int maxngramsugs;
-  int maxcpdsugs;
-  int complexprefixes;
-
- public:
-  SuggestMgr(const char* tryme, unsigned int maxn, AffixMgr* aptr);
-  ~SuggestMgr();
-
-  void suggest(std::vector<std::string>& slst, const char* word, int* onlycmpdsug);
-  void ngsuggest(std::vector<std::string>& slst, const char* word, const std::vector<HashMgr*>& rHMgr);
-
-  std::string suggest_morph(const std::string& word);
-  std::string suggest_gen(const std::vector<std::string>& pl, const std::string& pattern);
-
- private:
-  void testsug(std::vector<std::string>& wlst,
-               const std::string& candidate,
-               int cpdsuggest,
-               int* timer,
-               clock_t* timelimit);
-  int checkword(const std::string& word, int, int*, clock_t*);
-  int check_forbidden(const char*, int);
-
-  void capchars(std::vector<std::string>&, const char*, int);
-  int replchars(std::vector<std::string>&, const char*, int);
-  int doubletwochars(std::vector<std::string>&, const char*, int);
-  int forgotchar(std::vector<std::string>&, const char*, int);
-  int swapchar(std::vector<std::string>&, const char*, int);
-  int longswapchar(std::vector<std::string>&, const char*, int);
-  int movechar(std::vector<std::string>&, const char*, int);
-  int extrachar(std::vector<std::string>&, const char*, int);
-  int badcharkey(std::vector<std::string>&, const char*, int);
-  int badchar(std::vector<std::string>&, const char*, int);
-  int twowords(std::vector<std::string>&, const char*, int);
-
-  void capchars_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int doubletwochars_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int forgotchar_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int extrachar_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int badcharkey_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int badchar_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int swapchar_utf(std::vector<std::string>&, const w_char*, int wl, int);
-  int longswapchar_utf(std::vector<std::string>&, const w_char*, int, int);
-  int movechar_utf(std::vector<std::string>&, const w_char*, int, int);
-
-  int mapchars(std::vector<std::string>&, const char*, int);
-  int map_related(const char*,
-                  std::string&,
-                  int,
-                  std::vector<std::string>& wlst,
-                  int,
-                  const std::vector<mapentry>&,
-                  int*,
-                  clock_t*);
-  int ngram(int n, const std::vector<w_char>& su1,
-            const std::vector<w_char>& su2, int opt);
-  int ngram(int n, const std::string& s1, const std::string& s2, int opt);
-  int mystrlen(const char* word);
-  int leftcommonsubstring(const std::vector<w_char>& su1,
-                          const std::vector<w_char>& su2);
-  int leftcommonsubstring(const char* s1, const char* s2);
-  int commoncharacterpositions(const char* s1, const char* s2, int* is_swap);
-  void bubblesort(char** rwd, char** rwd2, int* rsc, int n);
-  void lcs(const char* s, const char* s2, int* l1, int* l2, char** result);
-  int lcslen(const char* s, const char* s2);
-  int lcslen(const std::string& s, const std::string& s2);
-  std::string suggest_hentry_gen(hentry* rv, const char* pattern);
-};
-
-#endif
diff --git a/winlibs/include/hunspell/w_char.hxx b/winlibs/include/hunspell/w_char.hxx
index 5accb756..7e71d046 100644
--- a/winlibs/include/hunspell/w_char.hxx
+++ b/winlibs/include/hunspell/w_char.hxx
@@ -1,7 +1,7 @@
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
- * Copyright (C) 2002-2017 Németh László
+ * Copyright (C) 2002-2022 Németh László
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
diff --git a/winlibs/include/opencc/BinaryDict.hpp b/winlibs/include/opencc/BinaryDict.hpp
index 9d900ced..7c23268f 100644
--- a/winlibs/include/opencc/BinaryDict.hpp
+++ b/winlibs/include/opencc/BinaryDict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
 
 namespace opencc {
 /**
-* Binary dictionary for faster deserialization
-* @ingroup opencc_cpp_api
-*/
+ * Binary dictionary for faster deserialization
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT BinaryDict : public SerializableDict {
 public:
   BinaryDict(const LexiconPtr& _lexicon) : lexicon(_lexicon) {}
@@ -42,12 +42,12 @@ public:
 
 private:
   LexiconPtr lexicon;
-  string keyBuffer;
-  string valueBuffer;
+  std::string keyBuffer;
+  std::string valueBuffer;
 
-  void ConstructBuffer(string& keyBuffer, vector<size_t>& keyOffset,
-                       size_t& keyTotalLength, string& valueBuffer,
-                       vector<size_t>& valueOffset,
+  void ConstructBuffer(std::string& keyBuffer, std::vector<size_t>& keyOffset,
+                       size_t& keyTotalLength, std::string& valueBuffer,
+                       std::vector<size_t>& valueOffset,
                        size_t& valueTotalLength) const;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Common.hpp b/winlibs/include/opencc/Common.hpp
index 2315fae9..067966b5 100644
--- a/winlibs/include/opencc/Common.hpp
+++ b/winlibs/include/opencc/Common.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,30 +23,14 @@
 #pragma warning(disable : 4251 4266 4350 4503 4512 4514 4710 4820)
 #endif
 
-#include <algorithm>
-#include <fstream>
-#include <functional>
-#include <iostream>
-#include <list>
-#include <map>
+#include <cstddef>
 #include <memory>
-#include <sstream>
 #include <string>
 #include <vector>
 
-#include <cassert>
-#include <cstddef>
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-
-#include "Exception.hpp"
 #include "Export.hpp"
 #include "Optional.hpp"
-
-using std::list;
-using std::string;
-using std::vector;
+#include "opencc_config.h"
 
 // Forward decalarations and alias
 namespace opencc {
@@ -78,7 +62,7 @@ typedef std::shared_ptr<Segments> SegmentsPtr;
 typedef std::shared_ptr<SerializableDict> SerializableDictPtr;
 typedef std::shared_ptr<TextDict> TextDictPtr;
 
-#ifdef ENABLE_DARTS
+#ifdef OPENCC_ENABLE_DARTS
 class BinaryDict;
 class DartsDict;
 typedef std::shared_ptr<BinaryDict> BinaryDictPtr;
@@ -88,14 +72,11 @@ typedef std::shared_ptr<DartsDict> DartsDictPtr;
 } // namespace opencc
 
 #ifndef PKGDATADIR
-const string PACKAGE_DATA_DIRECTORY = "";
+const std::string PACKAGE_DATA_DIRECTORY = "";
 #else  // ifndef PKGDATADIR
-const string PACKAGE_DATA_DIRECTORY = PKGDATADIR "/";
+const std::string PACKAGE_DATA_DIRECTORY = PKGDATADIR "/";
 #endif // ifndef PKGDATADIR
 
 #ifndef VERSION
 #define VERSION "1.0.*"
 #endif // ifndef VERSION
-
-// The following definitions are provided by CMake
-// #define ENABLE_DARTS
diff --git a/winlibs/include/opencc/Config.hpp b/winlibs/include/opencc/Config.hpp
index a71a00d0..7a904cee 100644
--- a/winlibs/include/opencc/Config.hpp
+++ b/winlibs/include/opencc/Config.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,21 @@
 
 namespace opencc {
 /**
-* Configuration loader
-* @ingroup opencc_cpp_api
-*/
+ * Configuration loader
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Config {
 public:
   Config();
 
   virtual ~Config();
 
-  ConverterPtr NewFromString(const string& json, const string& configDirectory);
+  ConverterPtr NewFromString(const std::string& json,
+                             const std::string& configDirectory);
 
-  ConverterPtr NewFromFile(const string& fileName);
+  ConverterPtr NewFromFile(const std::string& fileName);
 
 private:
   void* internal;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Conversion.hpp b/winlibs/include/opencc/Conversion.hpp
index 6bfc455f..cf73a254 100644
--- a/winlibs/include/opencc/Conversion.hpp
+++ b/winlibs/include/opencc/Conversion.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,18 +23,18 @@
 
 namespace opencc {
 /**
-* Conversion interface
-* @ingroup opencc_cpp_api
-*/
+ * Conversion interface
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Conversion {
 public:
   Conversion(DictPtr _dict) : dict(_dict) {}
 
   // Convert single phrase
-  string Convert(const string& phrase) const;
+  std::string Convert(const std::string& phrase) const;
 
   // Convert single phrase
-  string Convert(const char* phrase) const;
+  std::string Convert(const char* phrase) const;
 
   // Convert segmented text
   SegmentsPtr Convert(const SegmentsPtr& input) const;
@@ -44,4 +44,4 @@ public:
 private:
   const DictPtr dict;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/ConversionChain.hpp b/winlibs/include/opencc/ConversionChain.hpp
index db9e6251..28853c67 100644
--- a/winlibs/include/opencc/ConversionChain.hpp
+++ b/winlibs/include/opencc/ConversionChain.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,24 +18,26 @@
 
 #pragma once
 
+#include <list>
+
 #include "Common.hpp"
 #include "Conversion.hpp"
 
 namespace opencc {
 /**
-* Chain of conversions
-* Consists of a list of conversions. Converts input in sequence.
-* @ingroup opencc_cpp_api
-*/
+ * Chain of conversions
+ * Consists of a list of conversions. Converts input in sequence.
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT ConversionChain {
 public:
-  ConversionChain(const list<ConversionPtr> _conversions);
+  ConversionChain(const std::list<ConversionPtr> _conversions);
 
   SegmentsPtr Convert(const SegmentsPtr& input) const;
 
-  const list<ConversionPtr> GetConversions() const { return conversions; }
+  const std::list<ConversionPtr> GetConversions() const { return conversions; }
 
 private:
-  const list<ConversionPtr> conversions;
+  const std::list<ConversionPtr> conversions;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Converter.hpp b/winlibs/include/opencc/Converter.hpp
index 65cdda2a..9f1f3f94 100644
--- a/winlibs/include/opencc/Converter.hpp
+++ b/winlibs/include/opencc/Converter.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,17 +23,17 @@
 
 namespace opencc {
 /**
-* Controller of segmentation and conversion
-* @ingroup opencc_cpp_api
-*/
+ * Controller of segmentation and conversion
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Converter {
 public:
-  Converter(const string& _name, SegmentationPtr _segmentation,
+  Converter(const std::string& _name, SegmentationPtr _segmentation,
             ConversionChainPtr _conversionChain)
       : name(_name), segmentation(_segmentation),
         conversionChain(_conversionChain) {}
 
-  string Convert(const string& text) const;
+  std::string Convert(const std::string& text) const;
 
   size_t Convert(const char* input, char* output) const;
 
@@ -44,8 +44,8 @@ public:
   }
 
 private:
-  const string name;
+  const std::string name;
   const SegmentationPtr segmentation;
   const ConversionChainPtr conversionChain;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/DartsDict.hpp b/winlibs/include/opencc/DartsDict.hpp
index 609486db..eacc1a8c 100644
--- a/winlibs/include/opencc/DartsDict.hpp
+++ b/winlibs/include/opencc/DartsDict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,26 +23,27 @@
 
 namespace opencc {
 /**
-* Darts dictionary
-* @ingroup opencc_cpp_api
-*/
+ * Darts dictionary
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT DartsDict : public Dict, public SerializableDict {
 public:
   virtual ~DartsDict();
 
   virtual size_t KeyMaxLength() const;
 
-  virtual Optional<const DictEntry*> Match(const char* word) const;
+  virtual Optional<const DictEntry*> Match(const char* word, size_t len) const;
 
-  virtual Optional<const DictEntry*> MatchPrefix(const char* word) const;
+  virtual Optional<const DictEntry*> MatchPrefix(const char* word,
+                                                 size_t len) const;
 
   virtual LexiconPtr GetLexicon() const;
 
   virtual void SerializeToFile(FILE* fp) const;
 
   /**
-  * Constructs a DartsDict from another dictionary.
-  */
+   * Constructs a DartsDict from another dictionary.
+   */
   static DartsDictPtr NewFromDict(const Dict& thatDict);
 
   static DartsDictPtr NewFromFile(FILE* fp);
@@ -56,4 +57,4 @@ private:
   class DartsInternal;
   DartsInternal* internal;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Dict.hpp b/winlibs/include/opencc/Dict.hpp
index f923f378..1c810346 100644
--- a/winlibs/include/opencc/Dict.hpp
+++ b/winlibs/include/opencc/Dict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2020 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,59 +23,70 @@
 
 namespace opencc {
 /**
-* Abstract class of dictionary
-* @ingroup opencc_cpp_api
-*/
+ * Abstract class of dictionary
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Dict {
 public:
   /**
-  * Matches a word exactly and returns the DictEntry or Optional::Null().
-  */
-  virtual Optional<const DictEntry*> Match(const char* word) const = 0;
+   * Matches a word exactly and returns the DictEntry or Optional::Null().
+   */
+  virtual Optional<const DictEntry*> Match(const char* word,
+                                           size_t len) const = 0;
 
   /**
-  * Matches a word exactly and returns the DictEntry or Optional::Null().
-  */
-  Optional<const DictEntry*> Match(const string& word) const {
-    return Match(word.c_str());
+   * Matches a word exactly and returns the DictEntry or Optional::Null().
+   */
+  Optional<const DictEntry*> Match(const std::string& word) const {
+    return Match(word.c_str(), word.length());
   }
 
   /**
-  * Matches the longest matched prefix of a word.
-  * For example given a dictionary having "a", "an", "b", "ba", "ban", "bana",
-  * the longest prefix of "banana" matched is "bana".
-  */
-  virtual Optional<const DictEntry*> MatchPrefix(const char* word) const;
+   * Matches the longest matched prefix of a word.
+   * For example given a dictionary having "a", "an", "b", "ba", "ban", "bana",
+   * the longest prefix of "banana" matched is "bana".
+   */
+  virtual Optional<const DictEntry*> MatchPrefix(const char* word,
+                                                 size_t len) const;
 
   /**
-  * Matches the longest matched prefix of a word.
-  */
-  Optional<const DictEntry*> MatchPrefix(const string& word) const {
-    return MatchPrefix(word.c_str());
+   * Matches the longest matched prefix of a word.
+   */
+  Optional<const DictEntry*> MatchPrefix(const char* word) const {
+    return MatchPrefix(word, KeyMaxLength());
   }
 
   /**
-  * Returns all matched prefixes of a word, sorted by the length (desc).
-  * For example given a dictionary having "a", "an", "b", "ba", "ban", "bana",
-  * all the matched prefixes of "banana" are "bana", "ban", "ba", "b".
-  */
-  virtual vector<const DictEntry*> MatchAllPrefixes(const char* word) const;
-
-  /**
-  * Returns all matched prefixes of a word, sorted by the length (desc).
-  */
-  vector<const DictEntry*> MatchAllPrefixes(const string& word) const {
-    return MatchAllPrefixes(word.c_str());
+   * Matches the longest matched prefix of a word.
+   */
+  Optional<const DictEntry*> MatchPrefix(const std::string& word) const {
+    return MatchPrefix(word.c_str(), word.length());
   }
 
   /**
-  * Returns the length of the longest key in the dictionary.
-  */
+   * Returns all matched prefixes of a word, sorted by the length (desc).
+   * For example given a dictionary having "a", "an", "b", "ba", "ban", "bana",
+   * all the matched prefixes of "banana" are "bana", "ban", "ba", "b".
+   */
+  virtual std::vector<const DictEntry*> MatchAllPrefixes(const char* word,
+                                                         size_t len) const;
+
+  /**
+   * Returns all matched prefixes of a word, sorted by the length (desc).
+   */
+  std::vector<const DictEntry*>
+  MatchAllPrefixes(const std::string& word) const {
+    return MatchAllPrefixes(word.c_str(), word.length());
+  }
+
+  /**
+   * Returns the length of the longest key in the dictionary.
+   */
   virtual size_t KeyMaxLength() const = 0;
 
   /**
-  * Returns all entries in the dictionary.
-  */
+   * Returns all entries in the dictionary.
+   */
   virtual LexiconPtr GetLexicon() const = 0;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/DictConverter.hpp b/winlibs/include/opencc/DictConverter.hpp
index 7d392a1e..f911c4fe 100644
--- a/winlibs/include/opencc/DictConverter.hpp
+++ b/winlibs/include/opencc/DictConverter.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2017 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2017 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,11 @@
 
 namespace opencc {
 /**
-* Converts a dictionary from a format to another.
-* @ingroup opencc_cpp_api
-*/
-OPENCC_EXPORT void ConvertDictionary(const string inputFileName, const string outputFileName,
-                       const string formatFrom, const string formatTo);
-}
+ * Converts a dictionary from a format to another.
+ * @ingroup opencc_cpp_api
+ */
+OPENCC_EXPORT void ConvertDictionary(const std::string& inputFileName,
+                                     const std::string& outputFileName,
+                                     const std::string& formatFrom,
+                                     const std::string& formatTo);
+} // namespace opencc
diff --git a/winlibs/include/opencc/DictEntry.hpp b/winlibs/include/opencc/DictEntry.hpp
index 4370200e..7b2babda 100644
--- a/winlibs/include/opencc/DictEntry.hpp
+++ b/winlibs/include/opencc/DictEntry.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2020 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2020 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,13 +33,13 @@ public:
 
   virtual std::string Key() const = 0;
 
-  virtual vector<std::string> Values() const = 0;
+  virtual std::vector<std::string> Values() const = 0;
 
   virtual std::string GetDefault() const = 0;
 
   virtual size_t NumValues() const = 0;
 
-  virtual string ToString() const = 0;
+  virtual std::string ToString() const = 0;
 
   size_t KeyLength() const { return Key().length(); }
 
@@ -55,42 +55,46 @@ public:
 
 class OPENCC_EXPORT NoValueDictEntry : public DictEntry {
 public:
-  NoValueDictEntry(const string& _key) : key(_key) {}
+  NoValueDictEntry(const std::string& _key) : key(_key) {}
 
   virtual ~NoValueDictEntry() {}
 
   virtual std::string Key() const { return key; }
 
-  virtual vector<std::string> Values() const { return vector<std::string>(); }
+  virtual std::vector<std::string> Values() const {
+    return std::vector<std::string>();
+  }
 
   virtual std::string GetDefault() const { return key; }
 
   virtual size_t NumValues() const { return 0; }
 
-  virtual string ToString() const { return key; }
+  virtual std::string ToString() const { return key; }
 
 private:
-  string key;
+  std::string key;
 };
 
 class OPENCC_EXPORT SingleValueDictEntry : public DictEntry {
 public:
   virtual std::string Value() const = 0;
 
-  virtual vector<std::string> Values() const {
-    return vector<std::string>{Value()};
+  virtual std::vector<std::string> Values() const {
+    return std::vector<std::string>{Value()};
   }
 
   virtual std::string GetDefault() const { return Value(); }
 
   virtual size_t NumValues() const { return 1; }
 
-  virtual string ToString() const { return string(Key()) + "\t" + Value(); }
+  virtual std::string ToString() const {
+    return std::string(Key()) + "\t" + Value();
+  }
 };
 
 class OPENCC_EXPORT StrSingleValueDictEntry : public SingleValueDictEntry {
 public:
-  StrSingleValueDictEntry(const string& _key, const string& _value)
+  StrSingleValueDictEntry(const std::string& _key, const std::string& _value)
       : key(_key), value(_value) {}
 
   virtual ~StrSingleValueDictEntry() {}
@@ -100,8 +104,8 @@ public:
   virtual std::string Value() const { return value; }
 
 private:
-  string key;
-  string value;
+  std::string key;
+  std::string value;
 };
 
 class OPENCC_EXPORT MultiValueDictEntry : public DictEntry {
@@ -114,12 +118,13 @@ public:
     }
   }
 
-  virtual string ToString() const;
+  virtual std::string ToString() const;
 };
 
 class OPENCC_EXPORT StrMultiValueDictEntry : public MultiValueDictEntry {
 public:
-  StrMultiValueDictEntry(const string& _key, const vector<std::string>& _values)
+  StrMultiValueDictEntry(const std::string& _key,
+                         const std::vector<std::string>& _values)
       : key(_key), values(_values) {}
 
   virtual ~StrMultiValueDictEntry() {}
@@ -128,22 +133,25 @@ public:
 
   size_t NumValues() const { return values.size(); }
 
-  vector<std::string> Values() const { return values; }
+  std::vector<std::string> Values() const { return values; }
 
 private:
-  string key;
-  vector<string> values;
+  std::string key;
+  std::vector<std::string> values;
 };
 
 class OPENCC_EXPORT DictEntryFactory {
 public:
-  static DictEntry* New(const string& key) { return new NoValueDictEntry(key); }
+  static DictEntry* New(const std::string& key) {
+    return new NoValueDictEntry(key);
+  }
 
-  static DictEntry* New(const string& key, const string& value) {
+  static DictEntry* New(const std::string& key, const std::string& value) {
     return new StrSingleValueDictEntry(key, value);
   }
 
-  static DictEntry* New(const string& key, const vector<string>& values) {
+  static DictEntry* New(const std::string& key,
+                        const std::vector<std::string>& values) {
     if (values.size() == 0) {
       return New(key);
     } else if (values.size() == 1) {
@@ -156,11 +164,9 @@ public:
     if (entry->NumValues() == 0) {
       return new NoValueDictEntry(entry->Key());
     } else if (entry->NumValues() == 1) {
-      const auto svEntry = static_cast<const SingleValueDictEntry*>(entry);
-      return new StrSingleValueDictEntry(svEntry->Key(), svEntry->Value());
+      return new StrSingleValueDictEntry(entry->Key(), entry->Values().front());
     } else {
-      const auto mvEntry = static_cast<const MultiValueDictEntry*>(entry);
-      return new StrMultiValueDictEntry(mvEntry->Key(), mvEntry->Values());
+      return new StrMultiValueDictEntry(entry->Key(), entry->Values());
     }
   }
 };
diff --git a/winlibs/include/opencc/DictGroup.hpp b/winlibs/include/opencc/DictGroup.hpp
index 8098addd..fd51d913 100644
--- a/winlibs/include/opencc/DictGroup.hpp
+++ b/winlibs/include/opencc/DictGroup.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,19 @@
 
 #pragma once
 
+#include <list>
+
 #include "Common.hpp"
 #include "Dict.hpp"
 
 namespace opencc {
 /**
-* Group of dictionaries
-* @ingroup opencc_cpp_api
-*/
+ * Group of dictionaries
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT DictGroup : public Dict {
 public:
-  DictGroup(const list<DictPtr>& dicts);
+  DictGroup(const std::list<DictPtr>& dicts);
 
   static DictGroupPtr NewFromDict(const Dict& dict);
 
@@ -36,18 +38,20 @@ public:
 
   virtual size_t KeyMaxLength() const;
 
-  virtual Optional<const DictEntry*> Match(const char* word) const;
+  virtual Optional<const DictEntry*> Match(const char* word, size_t len) const;
 
-  virtual Optional<const DictEntry*> MatchPrefix(const char* word) const;
+  virtual Optional<const DictEntry*> MatchPrefix(const char* word,
+                                                 size_t len) const;
 
-  virtual vector<const DictEntry*> MatchAllPrefixes(const char* word) const;
+  virtual std::vector<const DictEntry*> MatchAllPrefixes(const char* word,
+                                                         size_t len) const;
 
   virtual LexiconPtr GetLexicon() const;
 
-  const list<DictPtr> GetDicts() const { return dicts; }
+  const std::list<DictPtr> GetDicts() const { return dicts; }
 
 private:
   const size_t keyMaxLength;
-  const list<DictPtr> dicts;
+  const std::list<DictPtr> dicts;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Exception.hpp b/winlibs/include/opencc/Exception.hpp
index 98ebb605..7875537f 100644
--- a/winlibs/include/opencc/Exception.hpp
+++ b/winlibs/include/opencc/Exception.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,8 @@
 #include "Export.hpp"
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
-// Before Visual Studio 2015 (14.0), C++ 11 "noexcept" qualifier is not supported
+// Before Visual Studio 2015 (14.0), C++ 11 "noexcept" qualifier is not
+// supported
 #define noexcept
 #endif // ifdef _MSC_VER
 
diff --git a/winlibs/include/opencc/Export.hpp b/winlibs/include/opencc/Export.hpp
index e511b8a4..0015e880 100644
--- a/winlibs/include/opencc/Export.hpp
+++ b/winlibs/include/opencc/Export.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/winlibs/include/opencc/Lexicon.hpp b/winlibs/include/opencc/Lexicon.hpp
index e54f2f92..68891287 100644
--- a/winlibs/include/opencc/Lexicon.hpp
+++ b/winlibs/include/opencc/Lexicon.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ namespace opencc {
 class OPENCC_EXPORT Lexicon {
 public:
   Lexicon() {}
-  Lexicon(vector<std::unique_ptr<DictEntry>> entries_)
+  Lexicon(std::vector<std::unique_ptr<DictEntry>> entries_)
       : entries(std::move(entries_)) {}
   Lexicon(const Lexicon&) = delete;
   Lexicon& operator=(const Lexicon&) = delete;
@@ -41,28 +41,28 @@ public:
     entries.push_back(std::move(entry));
   }
 
-  void Sort() {
-    std::sort(entries.begin(), entries.end(), DictEntry::UPtrLessThan);
-  }
+  void Sort();
 
-  bool IsSorted() {
-    return std::is_sorted(entries.begin(), entries.end(),
-                          DictEntry::UPtrLessThan);
-  }
+  // Returns true if the lexicon is sorted by key.
+  bool IsSorted();
+
+  // Returns true if every key unique (after sorted).
+  // When dupkey is set, it is set to the duplicate key.
+  bool IsUnique(std::string* dupkey = nullptr);
 
   const DictEntry* At(size_t index) const { return entries.at(index).get(); }
 
   size_t Length() const { return entries.size(); }
 
-  vector<std::unique_ptr<DictEntry>>::const_iterator begin() const {
+  std::vector<std::unique_ptr<DictEntry>>::const_iterator begin() const {
     return entries.begin();
   }
 
-  vector<std::unique_ptr<DictEntry>>::const_iterator end() const {
+  std::vector<std::unique_ptr<DictEntry>>::const_iterator end() const {
     return entries.end();
   }
 
 private:
-  vector<std::unique_ptr<DictEntry>> entries;
+  std::vector<std::unique_ptr<DictEntry>> entries;
 };
 } // namespace opencc
diff --git a/winlibs/include/opencc/MarisaDict.hpp b/winlibs/include/opencc/MarisaDict.hpp
index ef20121b..6917c23a 100644
--- a/winlibs/include/opencc/MarisaDict.hpp
+++ b/winlibs/include/opencc/MarisaDict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2020 BYVoid <byvoid@byvoid.com>
+ * Copyright 2020 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,13 @@ public:
 
   virtual size_t KeyMaxLength() const;
 
-  virtual Optional<const DictEntry*> Match(const char* word) const;
+  virtual Optional<const DictEntry*> Match(const char* word, size_t len) const;
 
-  virtual Optional<const DictEntry*> MatchPrefix(const char* word) const;
+  virtual Optional<const DictEntry*> MatchPrefix(const char* word,
+                                                 size_t len) const;
 
-  virtual vector<const DictEntry*> MatchAllPrefixes(const char* word) const;
+  virtual std::vector<const DictEntry*> MatchAllPrefixes(const char* word,
+                                                         size_t len) const;
 
   virtual LexiconPtr GetLexicon() const;
 
diff --git a/winlibs/include/opencc/MaxMatchSegmentation.hpp b/winlibs/include/opencc/MaxMatchSegmentation.hpp
index ace021e6..1ecc227e 100644
--- a/winlibs/include/opencc/MaxMatchSegmentation.hpp
+++ b/winlibs/include/opencc/MaxMatchSegmentation.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,20 +24,20 @@
 
 namespace opencc {
 /**
-* Implementation of maximal match segmentation
-* @ingroup opencc_cpp_api
-*/
+ * Implementation of maximal match segmentation
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT MaxMatchSegmentation : public Segmentation {
 public:
   MaxMatchSegmentation(const DictPtr _dict) : dict(_dict) {}
 
   virtual ~MaxMatchSegmentation() {}
 
-  virtual SegmentsPtr Segment(const string& text) const;
+  virtual SegmentsPtr Segment(const std::string& text) const;
 
   const DictPtr GetDict() const { return dict; }
 
 private:
   const DictPtr dict;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Optional.hpp b/winlibs/include/opencc/Optional.hpp
index 9279101b..8a510f43 100644
--- a/winlibs/include/opencc/Optional.hpp
+++ b/winlibs/include/opencc/Optional.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,29 +20,29 @@
 
 namespace opencc {
 /**
-* A class that wraps type T into a nullable type.
-* @ingroup opencc_cpp_api
-*/
+ * A class that wraps type T into a nullable type.
+ * @ingroup opencc_cpp_api
+ */
 template <typename T> class Optional {
 public:
   /**
-  * The constructor of Optional.
-  */
+   * The constructor of Optional.
+   */
   Optional(T actual) : isNull(false), data(actual) {}
 
   /**
-  * Returns true if the instance is null.
-  */
+   * Returns true if the instance is null.
+   */
   bool IsNull() const { return isNull; }
 
   /**
-  * Returns the containing data of the instance.
-  */
+   * Returns the containing data of the instance.
+   */
   const T& Get() const { return data; }
 
   /**
-  * Constructs a null instance.
-  */
+   * Constructs a null instance.
+   */
   static Optional<T> Null() { return Optional(); }
 
 private:
@@ -53,10 +53,10 @@ private:
 };
 
 /**
-* Specialization of Optional for pointers.
-*
-* Reduce a bool.
-*/
+ * Specialization of Optional for pointers.
+ *
+ * Reduce a bool.
+ */
 template <typename T> class Optional<T*> {
 private:
   Optional() : data(nullptr) {}
@@ -73,4 +73,4 @@ public:
 
   static Optional<TPtr> Null() { return Optional(); }
 };
-}
\ No newline at end of file
+} // namespace opencc
\ No newline at end of file
diff --git a/winlibs/include/opencc/PhraseExtract.hpp b/winlibs/include/opencc/PhraseExtract.hpp
index 5397c863..75a165de 100644
--- a/winlibs/include/opencc/PhraseExtract.hpp
+++ b/winlibs/include/opencc/PhraseExtract.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2015 BYVoid <byvoid@byvoid.com>
+ * Copyright 2015 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <functional>
 #include <unordered_map>
 
 #include "Common.hpp"
@@ -35,7 +36,7 @@ public:
 
   virtual ~PhraseExtract();
 
-  void Extract(const string& text) {
+  void Extract(const std::string& text) {
     SetFullText(text);
     ExtractSuffixes();
     CalculateFrequency();
@@ -49,7 +50,7 @@ public:
     SelectWords();
   }
 
-  void SetFullText(const string& fullText) {
+  void SetFullText(const std::string& fullText) {
     utf8FullText = UTF8StringSlice(fullText.c_str());
   }
 
@@ -76,23 +77,25 @@ public:
   }
 
   // PreCalculationFilter is called after frequencies statistics.
-  void SetPreCalculationFilter(const std::function<
-      bool(const PhraseExtract&, const UTF8StringSlice8Bit&)>& filter) {
+  void SetPreCalculationFilter(
+      const std::function<bool(const PhraseExtract&,
+                               const UTF8StringSlice8Bit&)>& filter) {
     preCalculationFilter = filter;
   }
 
-  void SetPostCalculationFilter(const std::function<
-      bool(const PhraseExtract&, const UTF8StringSlice8Bit&)>& filter) {
+  void SetPostCalculationFilter(
+      const std::function<bool(const PhraseExtract&,
+                               const UTF8StringSlice8Bit&)>& filter) {
     postCalculationFilter = filter;
   }
 
-  void ReleaseSuffixes() { vector<UTF8StringSlice8Bit>().swap(suffixes); }
+  void ReleaseSuffixes() { std::vector<UTF8StringSlice8Bit>().swap(suffixes); }
 
-  void ReleasePrefixes() { vector<UTF8StringSlice8Bit>().swap(prefixes); }
+  void ReleasePrefixes() { std::vector<UTF8StringSlice8Bit>().swap(prefixes); }
 
-  const vector<UTF8StringSlice8Bit>& Words() const { return words; }
+  const std::vector<UTF8StringSlice8Bit>& Words() const { return words; }
 
-  const vector<UTF8StringSlice8Bit>& WordCandidates() const {
+  const std::vector<UTF8StringSlice8Bit>& WordCandidates() const {
     return wordCandidates;
   }
 
@@ -155,8 +158,9 @@ private:
 
   double CalculateCohesion(const UTF8StringSlice8Bit& wordCandidate) const;
 
-  double CalculateEntropy(const std::unordered_map<
-      UTF8StringSlice8Bit, size_t, UTF8StringSlice8Bit::Hasher>& choices) const;
+  double CalculateEntropy(
+      const std::unordered_map<UTF8StringSlice8Bit, size_t,
+                               UTF8StringSlice8Bit::Hasher>& choices) const;
 
   LengthType wordMinLength;
   LengthType wordMaxLength;
@@ -179,10 +183,10 @@ private:
   UTF8StringSlice utf8FullText;
   size_t totalOccurrence;
   double logTotalOccurrence;
-  vector<UTF8StringSlice8Bit> prefixes;
-  vector<UTF8StringSlice8Bit> suffixes;
-  vector<UTF8StringSlice8Bit> wordCandidates;
-  vector<UTF8StringSlice8Bit> words;
+  std::vector<UTF8StringSlice8Bit> prefixes;
+  std::vector<UTF8StringSlice8Bit> suffixes;
+  std::vector<UTF8StringSlice8Bit> wordCandidates;
+  std::vector<UTF8StringSlice8Bit> words;
   DictType* signals;
 
   friend class PhraseExtractTest;
diff --git a/winlibs/include/opencc/Segmentation.hpp b/winlibs/include/opencc/Segmentation.hpp
index 84e7f216..c260ea6d 100644
--- a/winlibs/include/opencc/Segmentation.hpp
+++ b/winlibs/include/opencc/Segmentation.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
 
 namespace opencc {
 /**
-* Abstract segmentation
-* @ingroup opencc_cpp_api
-*/
+ * Abstract segmentation
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Segmentation {
 public:
-  virtual SegmentsPtr Segment(const string& text) const = 0;
+  virtual SegmentsPtr Segment(const std::string& text) const = 0;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/Segments.hpp b/winlibs/include/opencc/Segments.hpp
index 6225e1a4..21c39813 100644
--- a/winlibs/include/opencc/Segments.hpp
+++ b/winlibs/include/opencc/Segments.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,25 +18,27 @@
 
 #pragma once
 
+#include <sstream>
+
 #include "Common.hpp"
 
 namespace opencc {
 /**
-* Segmented text
-* @ingroup opencc_cpp_api
-*/
+ * Segmented text
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT Segments {
 public:
   Segments() {}
 
   Segments(std::initializer_list<const char*> initList) {
-    for (const string& item : initList) {
+    for (const std::string& item : initList) {
       AddSegment(item);
     }
   }
 
-  Segments(std::initializer_list<string> initList) {
-    for (const string& item : initList) {
+  Segments(std::initializer_list<std::string> initList) {
+    for (const std::string& item : initList) {
       AddSegment(item);
     }
   }
@@ -46,7 +48,7 @@ public:
     unmanaged.push_back(unmanagedString);
   }
 
-  void AddSegment(const string& str) {
+  void AddSegment(const std::string& str) {
     indexes.push_back(std::make_pair(managed.size(), true));
     managed.push_back(str);
   }
@@ -91,7 +93,7 @@ public:
 
   iterator end() const { return iterator(this, indexes.size()); }
 
-  string ToString() const {
+  std::string ToString() const {
     // TODO implement a nested structure to reduce concatenation,
     // like a purely functional differential list
     std::ostringstream buffer;
@@ -104,9 +106,9 @@ public:
 private:
   Segments(const Segments&) {}
 
-  vector<const char*> unmanaged;
-  vector<string> managed;
+  std::vector<const char*> unmanaged;
+  std::vector<std::string> managed;
   // index, managed
-  vector<std::pair<size_t, bool>> indexes;
+  std::vector<std::pair<size_t, bool>> indexes;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/SerializableDict.hpp b/winlibs/include/opencc/SerializableDict.hpp
index a02e53e6..17cea890 100644
--- a/winlibs/include/opencc/SerializableDict.hpp
+++ b/winlibs/include/opencc/SerializableDict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,20 +22,20 @@
 
 namespace opencc {
 /**
-* Serializable dictionary interface
-* @ingroup opencc_cpp_api
-*/
+ * Serializable dictionary interface
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT SerializableDict {
 public:
   /**
-  * Serializes the dictionary and writes in to a file.
-  */
+   * Serializes the dictionary and writes in to a file.
+   */
   virtual void SerializeToFile(FILE* fp) const = 0;
 
   /**
-  * Serializes the dictionary and writes in to a file.
-  */
-  virtual void SerializeToFile(const string& fileName) const {
+   * Serializes the dictionary and writes in to a file.
+   */
+  virtual void SerializeToFile(const std::string& fileName) const {
     FILE* fp = fopen(fileName.c_str(), "wb");
     if (fp == NULL) {
       throw FileNotWritable(fileName);
@@ -45,16 +45,16 @@ public:
   }
 
   template <typename DICT>
-  static bool TryLoadFromFile(const string& fileName,
+  static bool TryLoadFromFile(const std::string& fileName,
                               std::shared_ptr<DICT>* dict) {
-      FILE* fp =
+    FILE* fp =
 #ifdef _MSC_VER
-          // well, the 'GetPlatformString' shall return a 'wstring'
-          _wfopen(UTF8Util::GetPlatformString(fileName).c_str(), L"rb")
+        // well, the 'GetPlatformString' shall return a 'wstring'
+        _wfopen(UTF8Util::GetPlatformString(fileName).c_str(), L"rb")
 #else
-          fopen(UTF8Util::GetPlatformString(fileName).c_str(), "rb")
+        fopen(UTF8Util::GetPlatformString(fileName).c_str(), "rb")
 #endif // _MSC_VER
-          ;
+        ;
 
     if (fp == NULL) {
       return false;
@@ -66,7 +66,7 @@ public:
   }
 
   template <typename DICT>
-  static std::shared_ptr<DICT> NewFromFile(const string& fileName) {
+  static std::shared_ptr<DICT> NewFromFile(const std::string& fileName) {
     std::shared_ptr<DICT> dict;
     if (!TryLoadFromFile<DICT>(fileName, &dict)) {
       throw FileNotFound(fileName);
@@ -74,4 +74,4 @@ public:
     return dict;
   }
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/SerializedValues.hpp b/winlibs/include/opencc/SerializedValues.hpp
index c75b488f..c17210ba 100644
--- a/winlibs/include/opencc/SerializedValues.hpp
+++ b/winlibs/include/opencc/SerializedValues.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2020 BYVoid <byvoid@byvoid.com>
+ * Copyright 2020 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,8 @@ public:
 private:
   LexiconPtr lexicon;
 
-  void ConstructBuffer(string* valueBuffer, vector<uint16_t>* valueBytes,
+  void ConstructBuffer(std::string* valueBuffer,
+                       std::vector<uint16_t>* valueBytes,
                        uint32_t* valueTotalLength) const;
 };
 } // namespace opencc
diff --git a/winlibs/include/opencc/SimpleConverter.hpp b/winlibs/include/opencc/SimpleConverter.hpp
index 0dabefbb..56932b76 100644
--- a/winlibs/include/opencc/SimpleConverter.hpp
+++ b/winlibs/include/opencc/SimpleConverter.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,67 +16,72 @@
  * limitations under the License.
  */
 
+#include "Export.hpp"
+#include <string>
+
 #ifndef __OPENCC_SIMPLECONVERTER_HPP_
 #define __OPENCC_SIMPLECONVERTER_HPP_
 
 /**
-* @defgroup opencc_simple_api OpenCC C++ Simple API
-*
-* Simple API in C++ language
-*/
+ * @defgroup opencc_simple_api OpenCC C++ Simple API
+ *
+ * Simple API in C++ language
+ */
 
 namespace opencc {
 /**
-* A high level converter
-* This interface does not require C++11 to compile.
-* @ingroup opencc_simple_api
-*/
+ * A high level converter
+ * This interface does not require C++11 to compile.
+ * @ingroup opencc_simple_api
+ */
 class OPENCC_EXPORT SimpleConverter {
 public:
   /**
-  * Constructor of SimpleConverter
-  * @param configFileName File name of configuration.
-  */
+   * Constructor of SimpleConverter
+   * @param configFileName File name of configuration.
+   */
   SimpleConverter(const std::string& configFileName);
 
   ~SimpleConverter();
 
   /**
-  * Converts a text
-  * @param input Text to be converted.
-  */
+   * Converts a text
+   * @param input Text to be converted.
+   */
   std::string Convert(const std::string& input) const;
 
   /**
-  * Converts a text
-  * @param input A C-Style string (terminated by '\0') to be converted.
-  */
+   * Converts a text
+   * @param input A C-Style std::string (terminated by '\0') to be converted.
+   */
   std::string Convert(const char* input) const;
 
   /**
-  * Converts a text
-  * @param input  A C-Style string limited by a given length to be converted.
-  * @param length Maximal length in byte of the input string.
-  */
+   * Converts a text
+   * @param input  A C-Style std::string limited by a given length to be
+   * converted.
+   * @param length Maximal length in byte of the input std::string.
+   */
   std::string Convert(const char* input, size_t length) const;
 
   /**
-  * Converts a text and writes to an allocated buffer
-  * Please make sure the buffer has sufficent space.
-  * @param input  A C-Style string (terminated by '\0') to be converted.
-  * @param output Buffer to write the converted text.
-  * @return       Length of converted text.
-  */
+   * Converts a text and writes to an allocated buffer
+   * Please make sure the buffer has sufficient space.
+   * @param input  A C-Style std::string (terminated by '\0') to be converted.
+   * @param output Buffer to write the converted text.
+   * @return       Length of converted text.
+   */
   size_t Convert(const char* input, char* output) const;
 
   /**
-  * Converts a text and writes to an allocated buffer
-  * Please make sure the buffer has sufficent space.
-  * @param input  A C-Style string limited by a given length to be converted.
-  * @param length Maximal length in byte of the input string.
-  * @param output Buffer to write the converted text.
-  * @return       Length of converted text.
-  */
+   * Converts a text and writes to an allocated buffer
+   * Please make sure the buffer has sufficient space.
+   * @param input  A C-Style std::string limited by a given length to be
+   * converted.
+   * @param length Maximal length in byte of the input std::string.
+   * @param output Buffer to write the converted text.
+   * @return       Length of converted text.
+   */
   size_t Convert(const char* input, size_t length, char* output) const;
 
 private:
diff --git a/winlibs/include/opencc/TextDict.hpp b/winlibs/include/opencc/TextDict.hpp
index 5000b27c..f1cb67d9 100644
--- a/winlibs/include/opencc/TextDict.hpp
+++ b/winlibs/include/opencc/TextDict.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2020 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,30 +23,30 @@
 
 namespace opencc {
 /**
-* Text dictionary
-* @ingroup opencc_cpp_api
-*/
+ * Text dictionary
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT TextDict : public Dict, public SerializableDict {
 public:
   /**
-  * Constructor of TextDict.
-  * _lexicon must be sorted.
-  */
+   * Constructor of TextDict.
+   * _lexicon must be sorted.
+   */
   TextDict(const LexiconPtr& _lexicon);
 
   virtual ~TextDict();
 
   virtual size_t KeyMaxLength() const;
 
-  virtual Optional<const DictEntry*> Match(const char* word) const;
+  virtual Optional<const DictEntry*> Match(const char* word, size_t len) const;
 
   virtual LexiconPtr GetLexicon() const;
 
   virtual void SerializeToFile(FILE* fp) const;
 
   /**
-  * Constructs a TextDict from another dictionary.
-  */
+   * Constructs a TextDict from another dictionary.
+   */
   static TextDictPtr NewFromDict(const Dict& dict);
 
   static TextDictPtr NewFromFile(FILE* fp);
@@ -57,4 +57,4 @@ private:
   const size_t maxLength;
   const LexiconPtr lexicon;
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/UTF8StringSlice.hpp b/winlibs/include/opencc/UTF8StringSlice.hpp
index 96006313..0c9dfdc6 100644
--- a/winlibs/include/opencc/UTF8StringSlice.hpp
+++ b/winlibs/include/opencc/UTF8StringSlice.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2015 BYVoid <byvoid@byvoid.com>
+ * Copyright 2015 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
  * limitations under the License.
  */
 
+#include <cstring>
+
 #include "Common.hpp"
 #include "UTF8Util.hpp"
 
@@ -105,13 +107,13 @@ public:
     }
   }
 
-  string ToString() const { return string(str, str + byteLength); }
+  std::string ToString() const { return std::string(str, str + byteLength); }
 
   const char* CString() const { return str; }
 
   LengthType CommonPrefixLength(const UTF8StringSliceBase& that) const {
     if (str == that.str) {
-      return std::min(utf8Length, that.utf8Length);
+      return (std::min)(utf8Length, that.utf8Length);
     } else {
       const char* pstr1 = str;
       const char* pstr2 = that.str;
@@ -149,13 +151,13 @@ public:
   int ReverseCompare(const UTF8StringSliceBase& that) const {
     const char* pstr1 = str + byteLength;
     const char* pstr2 = that.str + that.byteLength;
-    const size_t length = std::min(utf8Length, that.utf8Length);
+    const size_t length = (std::min)(utf8Length, that.utf8Length);
     for (size_t i = 0; i < length; i++) {
       const size_t charLen1 = UTF8Util::PrevCharLength(pstr1);
       const size_t charLen2 = UTF8Util::PrevCharLength(pstr2);
       pstr1 -= charLen1;
       pstr2 -= charLen2;
-      const int cmp = strncmp(pstr1, pstr2, std::min(charLen1, charLen2));
+      const int cmp = strncmp(pstr1, pstr2, (std::min)(charLen1, charLen2));
       if (cmp < 0) {
         return -1;
       } else if (cmp > 0) {
@@ -207,7 +209,7 @@ public:
 
 private:
   inline int Compare(const UTF8StringSliceBase& that) const {
-    int cmp = strncmp(str, that.str, std::min(byteLength, that.byteLength));
+    int cmp = strncmp(str, that.str, (std::min)(byteLength, that.byteLength));
     if (cmp == 0) {
       if (utf8Length < that.utf8Length) {
         cmp = -1;
diff --git a/winlibs/include/opencc/UTF8Util.hpp b/winlibs/include/opencc/UTF8Util.hpp
index 70bbf83b..9d3e39b8 100644
--- a/winlibs/include/opencc/UTF8Util.hpp
+++ b/winlibs/include/opencc/UTF8Util.hpp
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2013 BYVoid <byvoid@byvoid.com>
+ * Copyright 2013 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,24 +24,27 @@
 #undef NOMINMAX
 #endif // _MSC_VER
 
+#include <cstring>
+
 #include "Common.hpp"
+#include "Exception.hpp"
 
 namespace opencc {
 /**
-* UTF8 string utilities
-* @ingroup opencc_cpp_api
-*/
+ * UTF8 std::string utilities
+ * @ingroup opencc_cpp_api
+ */
 class OPENCC_EXPORT UTF8Util {
 public:
   /**
-  * Detect UTF8 BOM and skip it.
-  */
+   * Detect UTF8 BOM and skip it.
+   */
   static void SkipUtf8Bom(FILE* fp);
 
   /**
-  * Returns the length in byte for the next UTF8 character.
-  * On error returns 0.
-  */
+   * Returns the length in byte for the next UTF8 character.
+   * On error returns 0.
+   */
   static size_t NextCharLengthNoException(const char* str) {
     char ch = *str;
     if ((ch & 0xF0) == 0xE0) {
@@ -72,8 +75,8 @@ public:
   }
 
   /**
-  * Returns the length in byte for the previous UTF8 character.
-  */
+   * Returns the length in byte for the previous UTF8 character.
+   */
   static size_t PrevCharLength(const char* str) {
     {
       const size_t length = NextCharLengthNoException(str - 3);
@@ -103,21 +106,21 @@ public:
   }
 
   /**
-  * Returns the char* pointer over the next UTF8 character.
-  */
+   * Returns the char* pointer over the next UTF8 character.
+   */
   static const char* NextChar(const char* str) {
     return str + NextCharLength(str);
   }
 
   /**
-  * Move the char* pointer before the previous UTF8 character.
-  */
+   * Move the char* pointer before the previous UTF8 character.
+   */
   static const char* PrevChar(const char* str) {
     return str - PrevCharLength(str);
   }
 
   /**
-   * Returns the UTF8 length of a valid UTF8 string.
+   * Returns the UTF8 length of a valid UTF8 std::string.
    */
   static size_t Length(const char* str) {
     size_t length = 0;
@@ -129,11 +132,11 @@ public:
   }
 
   /**
-  * Finds a character in the same line.
-  * @param str The text to be searched in.
-  * @param ch  The character to find.
-  * @return    The pointer that points to the found chacter in str or EOL/EOF.
-  */
+   * Finds a character in the same line.
+   * @param str The text to be searched in.
+   * @param ch  The character to find.
+   * @return    The pointer that points to the found chacter in str or EOL/EOF.
+   */
   static const char* FindNextInline(const char* str, const char ch) {
     while (!IsLineEndingOrFileEnding(*str) && *str != ch) {
       str = NextChar(str);
@@ -142,25 +145,26 @@ public:
   }
 
   /**
-  * Returns ture if the character is a line ending or end of file.
-  */
+   * Returns true if the character is a line ending or end of file.
+   */
   static bool IsLineEndingOrFileEnding(const char ch) {
     return ch == '\0' || ch == '\n' || ch == '\r';
   }
 
   /**
-  * Copies a substring with given length to a new std::string.
-  */
-  static string FromSubstr(const char* str, size_t length) {
-    string newStr;
+   * Copies a substring with given length to a new string.
+   */
+  static std::string FromSubstr(const char* str, size_t length) {
+    std::string newStr;
     newStr.resize(length);
     strncpy(const_cast<char*>(newStr.c_str()), str, length);
     return newStr;
   }
 
   /**
-  * Returns true if the given string is longer or as long as the given length.
-  */
+   * Returns true if the given std::string is longer or as long as the given
+   * length.
+   */
   static bool NotShorterThan(const char* str, size_t byteLength) {
     while (byteLength > 0) {
       if (*str == '\0') {
@@ -173,11 +177,11 @@ public:
   }
 
   /**
-  * Truncates a string with a maximal length in byte.
-  * No UTF8 character will be broken.
-  */
-  static string TruncateUTF8(const char* str, size_t maxByteLength) {
-    string wordTrunc;
+   * Truncates a std::string with a maximal length in byte.
+   * No UTF8 character will be broken.
+   */
+  static std::string TruncateUTF8(const char* str, size_t maxByteLength) {
+    std::string wordTrunc;
     if (NotShorterThan(str, maxByteLength)) {
       size_t len = 0;
       const char* pStr = str;
@@ -197,22 +201,23 @@ public:
   }
 
   /**
-  * Replaces all patterns in a string in place.
-  */
-  static void ReplaceAll(string& str, const char* from, const char* to) {
-    string::size_type pos = 0;
-    string::size_type fromLen = strlen(from);
-    string::size_type toLen = strlen(to);
-    while ((pos = str.find(from, pos)) != string::npos) {
+   * Replaces all patterns in a std::string in place.
+   */
+  static void ReplaceAll(std::string& str, const char* from, const char* to) {
+    std::string::size_type pos = 0;
+    std::string::size_type fromLen = strlen(from);
+    std::string::size_type toLen = strlen(to);
+    while ((pos = str.find(from, pos)) != std::string::npos) {
       str.replace(pos, fromLen, to);
       pos += toLen;
     }
   }
 
   /**
-  * Joins a string vector in to a string with a separator.
-  */
-  static string Join(const vector<string>& strings, const string& separator) {
+   * Joins a std::string vector in to a std::string with a separator.
+   */
+  static std::string Join(const std::vector<std::string>& strings,
+                          const std::string& separator) {
     std::ostringstream buffer;
     bool first = true;
     for (const auto& str : strings) {
@@ -226,9 +231,9 @@ public:
   }
 
   /**
-  * Joins a string vector in to a string.
-  */
-  static string Join(const vector<string>& strings) {
+   * Joins a std::string vector in to a std::string.
+   */
+  static std::string Join(const std::vector<std::string>& strings) {
     std::ostringstream buffer;
     for (const auto& str : strings) {
       buffer << str;
@@ -237,7 +242,7 @@ public:
   }
 
   static void GetByteMap(const char* str, const size_t utf8Length,
-                         vector<size_t>* byteMap) {
+                         std::vector<size_t>* byteMap) {
     if (byteMap->size() < utf8Length) {
       byteMap->resize(utf8Length);
     }
@@ -253,20 +258,19 @@ public:
     return U8ToU16(str);
   }
 #else
-  static std::string GetPlatformString(const std::string& str) {
-    return str;
-  }
+  static std::string GetPlatformString(const std::string& str) { return str; }
 #endif // _MSC_VER
 
-
 #ifdef _MSC_VER
   static std::string U16ToU8(const std::wstring& wstr) {
     std::string ret;
     int length = static_cast<int>(wstr.length());
-    int convcnt = WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), length, NULL, 0, NULL, NULL);
+    int convcnt = WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), length, NULL, 0,
+                                      NULL, NULL);
     if (convcnt > 0) {
       ret.resize(convcnt);
-      WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), length, &ret[0], convcnt, NULL, NULL);
+      WideCharToMultiByte(CP_UTF8, 0, wstr.c_str(), length, &ret[0], convcnt,
+                          NULL, NULL);
     }
     return ret;
   }
@@ -283,4 +287,4 @@ public:
   }
 #endif // _MSC_VER
 };
-}
+} // namespace opencc
diff --git a/winlibs/include/opencc/opencc.h b/winlibs/include/opencc/opencc.h
index 21b90469..bc3a9e97 100644
--- a/winlibs/include/opencc/opencc.h
+++ b/winlibs/include/opencc/opencc.h
@@ -1,7 +1,7 @@
 /*
  * Open Chinese Convert
  *
- * Copyright 2010-2014 BYVoid <byvoid@byvoid.com>
+ * Copyright 2010-2014 Carbo Kuo <byvoid@byvoid.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
 
 #ifdef __cplusplus
 
-#include <string>
 #include "Export.hpp"
 #include "SimpleConverter.hpp"
+#include <string>
 
 extern "C" {
 #else
@@ -35,118 +35,117 @@ extern "C" {
 #endif
 
 /**
-* @defgroup opencc_c_api OpenCC C API
-*
-* API in C language
-*/
+ * @defgroup opencc_c_api OpenCC C API
+ *
+ * API in C language
+ */
 
 /**
-* Filename of default Simplified to Traditional configuration
-*
-* @ingroup opencc_c_api
-*/
+ * Filename of default Simplified to Traditional configuration
+ *
+ * @ingroup opencc_c_api
+ */
 #define OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD "s2t.json"
 
 /**
-* Filename of default Traditional to Simplified configuration
-*
-* @ingroup opencc_c_api
-*/
+ * Filename of default Traditional to Simplified configuration
+ *
+ * @ingroup opencc_c_api
+ */
 #define OPENCC_DEFAULT_CONFIG_TRAD_TO_SIMP "t2s.json"
 
 /**
-* Type of opencc descriptor
-*
-* @ingroup opencc_c_api
-*/
+ * Type of opencc descriptor
+ *
+ * @ingroup opencc_c_api
+ */
 typedef void* opencc_t;
 
 /**
-* Makes an instance of opencc
-*
-* @param configFileName Location of configuration file. If this is set to NULL,
-*                       OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD will be loaded.
-* @return            A description pointer of the newly allocated instance of
-*                    opencc. On error the return value will be (opencc_t) -1.
-* @ingroup opencc_c_api
-*/
+ * Makes an instance of opencc
+ *
+ * @param configFileName Location of configuration file. If this is set to NULL,
+ *                       OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD will be loaded.
+ * @return            A description pointer of the newly allocated instance of
+ *                    opencc. On error the return value will be (opencc_t) -1.
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT opencc_t opencc_open(const char* configFileName);
 #ifdef _MSC_VER
 /**
-* Makes an instance of opencc (wide char / Unicode)
-*
-* @param configFileName Location of configuration file. If this is set to NULL,
-*                       OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD will be loaded.
-* @return            A description pointer of the newly allocated instance of
-*                    opencc. On error the return value will be (opencc_t) -1.
-* @ingroup opencc_c_api
-*/
+ * Makes an instance of opencc (wide char / Unicode)
+ *
+ * @param configFileName Location of configuration file. If this is set to NULL,
+ *                       OPENCC_DEFAULT_CONFIG_SIMP_TO_TRAD will be loaded.
+ * @return            A description pointer of the newly allocated instance of
+ *                    opencc. On error the return value will be (opencc_t) -1.
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT opencc_t opencc_open_w(const wchar_t* configFileName);
 #endif /* _MSC_VER */
 
 /**
-* Destroys an instance of opencc
-*
-* @param opencc The description pointer.
-* @return 0 on success or non-zero number on failure.
-* @ingroup opencc_c_api
-*/
+ * Destroys an instance of opencc
+ *
+ * @param opencc The description pointer.
+ * @return 0 on success or non-zero number on failure.
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT int opencc_close(opencc_t opencc);
 
 /**
-* Converts UTF-8 string
-*
-* @param opencc The opencc description pointer.
-* @param input  The UTF-8 encoded string.
-* @param length The maximum length in byte to convert. If length is (size_t)-1,
-*               the whole string (terminated by '\0') will be converted.
-* @param output The buffer to store converted text. You MUST make sure this
-*               buffer has sufficient space.
-*
-* @return       The length of converted string or (size_t)-1 on error.
-*
-* @ingroup opencc_c_api
-*/
+ * Converts UTF-8 std::string
+ *
+ * @param opencc The opencc description pointer.
+ * @param input  The UTF-8 encoded std::string.
+ * @param length The maximum length in byte to convert. If length is (size_t)-1,
+ *               the whole std::string (terminated by '\0') will be converted.
+ * @param output The buffer to store converted text. You MUST make sure this
+ *               buffer has sufficient space.
+ *
+ * @return       The length of converted std::string or (size_t)-1 on error.
+ *
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT size_t opencc_convert_utf8_to_buffer(opencc_t opencc,
                                                    const char* input,
-                                                   size_t length,
-                                                   char* output);
+                                                   size_t length, char* output);
 
 /**
-* Converts UTF-8 string
-* This function returns an allocated C-Style string, which stores
-* the converted string.
-* You MUST call opencc_convert_utf8_free() to release allocated memory.
-*
-* @param opencc The opencc description pointer.
-* @param input  The UTF-8 encoded string.
-* @param length The maximum length in byte to convert. If length is (size_t)-1,
-*               the whole string (terminated by '\0') will be converted.
-*
-* @return       The newly allocated UTF-8 string that stores text converted,
-*               or NULL on error.
-* @ingroup opencc_c_api
-*/
-OPENCC_EXPORT char* opencc_convert_utf8(opencc_t opencc,
-                                        const char* input,
+ * Converts UTF-8 std::string
+ * This function returns an allocated C-Style std::string, which stores
+ * the converted std::string.
+ * You MUST call opencc_convert_utf8_free() to release allocated memory.
+ *
+ * @param opencc The opencc description pointer.
+ * @param input  The UTF-8 encoded std::string.
+ * @param length The maximum length in byte to convert. If length is (size_t)-1,
+ *               the whole std::string (terminated by '\0') will be converted.
+ *
+ * @return       The newly allocated UTF-8 std::string that stores text
+ * converted, or NULL on error.
+ * @ingroup opencc_c_api
+ */
+OPENCC_EXPORT char* opencc_convert_utf8(opencc_t opencc, const char* input,
                                         size_t length);
 
 /**
-* Releases allocated buffer by opencc_convert_utf8
-*
-* @param str    Pointer to the allocated string buffer by opencc_convert_utf8.
-*
-* @ingroup opencc_c_api
-*/
+ * Releases allocated buffer by opencc_convert_utf8
+ *
+ * @param str    Pointer to the allocated std::string buffer by
+ * opencc_convert_utf8.
+ *
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT void opencc_convert_utf8_free(char* str);
 
 /**
-* Returns the last error message
-*
-* Note that this function is the only one which is NOT thread-safe.
-*
-* @ingroup opencc_c_api
-*/
+ * Returns the last error message
+ *
+ * Note that this function is the only one which is NOT thread-safe.
+ *
+ * @ingroup opencc_c_api
+ */
 OPENCC_EXPORT const char* opencc_error(void);
 
 #ifdef __cplusplus
@@ -154,9 +153,9 @@ OPENCC_EXPORT const char* opencc_error(void);
 #endif
 
 /**
-* @defgroup opencc_cpp_api OpenCC C++ Comprehensive API
-*
-* Comprehensive API in C++ language
-*/
+ * @defgroup opencc_cpp_api OpenCC C++ Comprehensive API
+ *
+ * Comprehensive API in C++ language
+ */
 
 #endif
diff --git a/winlibs/include/opencc/opencc_config.h b/winlibs/include/opencc/opencc_config.h
new file mode 100644
index 00000000..711f432c
--- /dev/null
+++ b/winlibs/include/opencc/opencc_config.h
@@ -0,0 +1,21 @@
+/*
+ * Open Chinese Convert
+ *
+ * Copyright 2021 Carbo Kuo <byvoid@byvoid.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#define OPENCC_ENABLE_DARTS
diff --git a/winlibs/lib/charset-1.dll b/winlibs/lib/charset-1.dll
new file mode 100644
index 00000000..edcf1066
Binary files /dev/null and b/winlibs/lib/charset-1.dll differ
diff --git a/winlibs/lib/dbg/charset-1.dll b/winlibs/lib/dbg/charset-1.dll
new file mode 100644
index 00000000..f7287c6f
Binary files /dev/null and b/winlibs/lib/dbg/charset-1.dll differ
diff --git a/winlibs/lib/dbg/hunspell-1.7-0.dll b/winlibs/lib/dbg/hunspell-1.7-0.dll
new file mode 100644
index 00000000..bd76251d
Binary files /dev/null and b/winlibs/lib/dbg/hunspell-1.7-0.dll differ
diff --git a/winlibs/lib/dbg/hunspell-1.7.lib b/winlibs/lib/dbg/hunspell-1.7.lib
new file mode 100644
index 00000000..263cff89
Binary files /dev/null and b/winlibs/lib/dbg/hunspell-1.7.lib differ
diff --git a/winlibs/lib/dbg/iconv-2.dll b/winlibs/lib/dbg/iconv-2.dll
new file mode 100644
index 00000000..5ad5d468
Binary files /dev/null and b/winlibs/lib/dbg/iconv-2.dll differ
diff --git a/winlibs/lib/dbg/opencc.dll b/winlibs/lib/dbg/opencc.dll
new file mode 100644
index 00000000..1c3a1aab
Binary files /dev/null and b/winlibs/lib/dbg/opencc.dll differ
diff --git a/winlibs/lib/dbg/opencc.lib b/winlibs/lib/dbg/opencc.lib
new file mode 100644
index 00000000..d61569a6
Binary files /dev/null and b/winlibs/lib/dbg/opencc.lib differ
diff --git a/winlibs/lib/xapian/dbg/xapian-30.dll b/winlibs/lib/dbg/xapian-30.dll
similarity index 99%
rename from winlibs/lib/xapian/dbg/xapian-30.dll
rename to winlibs/lib/dbg/xapian-30.dll
index 07a860d7..c9c135e5 100644
Binary files a/winlibs/lib/xapian/dbg/xapian-30.dll and b/winlibs/lib/dbg/xapian-30.dll differ
diff --git a/winlibs/lib/xapian/dbg/xapian.lib b/winlibs/lib/dbg/xapian.lib
similarity index 100%
rename from winlibs/lib/xapian/dbg/xapian.lib
rename to winlibs/lib/dbg/xapian.lib
diff --git a/winlibs/lib/hunspell-1.7-0.dll b/winlibs/lib/hunspell-1.7-0.dll
new file mode 100644
index 00000000..8cec7b7d
Binary files /dev/null and b/winlibs/lib/hunspell-1.7-0.dll differ
diff --git a/winlibs/lib/hunspell-1.7.lib b/winlibs/lib/hunspell-1.7.lib
new file mode 100644
index 00000000..263cff89
Binary files /dev/null and b/winlibs/lib/hunspell-1.7.lib differ
diff --git a/winlibs/lib/iconv-2.dll b/winlibs/lib/iconv-2.dll
new file mode 100644
index 00000000..fd1df8e1
Binary files /dev/null and b/winlibs/lib/iconv-2.dll differ
diff --git a/winlibs/lib/msvc/hunspell.lib b/winlibs/lib/msvc/hunspell.lib
deleted file mode 100644
index 2655a18c..00000000
Binary files a/winlibs/lib/msvc/hunspell.lib and /dev/null differ
diff --git a/winlibs/lib/msvc/hunspelld.lib b/winlibs/lib/msvc/hunspelld.lib
deleted file mode 100644
index 197f629c..00000000
Binary files a/winlibs/lib/msvc/hunspelld.lib and /dev/null differ
diff --git a/winlibs/lib/msvc/msys-2.0.dll b/winlibs/lib/msvc/msys-2.0.dll
deleted file mode 100644
index c732988b..00000000
Binary files a/winlibs/lib/msvc/msys-2.0.dll and /dev/null differ
diff --git a/winlibs/lib/msvc/opencc.dll b/winlibs/lib/msvc/opencc.dll
deleted file mode 100644
index 4bba4f19..00000000
Binary files a/winlibs/lib/msvc/opencc.dll and /dev/null differ
diff --git a/winlibs/lib/msvc/opencc.lib b/winlibs/lib/msvc/opencc.lib
deleted file mode 100644
index cc81da44..00000000
Binary files a/winlibs/lib/msvc/opencc.lib and /dev/null differ
diff --git a/winlibs/lib/msvc/openccd.dll b/winlibs/lib/msvc/openccd.dll
deleted file mode 100644
index f24c63a5..00000000
Binary files a/winlibs/lib/msvc/openccd.dll and /dev/null differ
diff --git a/winlibs/lib/msvc/openccd.lib b/winlibs/lib/msvc/openccd.lib
deleted file mode 100644
index 7e70ffc2..00000000
Binary files a/winlibs/lib/msvc/openccd.lib and /dev/null differ
diff --git a/winlibs/lib/opencc.dll b/winlibs/lib/opencc.dll
new file mode 100644
index 00000000..0fc85b54
Binary files /dev/null and b/winlibs/lib/opencc.dll differ
diff --git a/winlibs/lib/opencc.lib b/winlibs/lib/opencc.lib
new file mode 100644
index 00000000..d61569a6
Binary files /dev/null and b/winlibs/lib/opencc.lib differ
diff --git a/winlibs/lib/xapian/rel/xapian-30.dll b/winlibs/lib/xapian-30.dll
similarity index 99%
rename from winlibs/lib/xapian/rel/xapian-30.dll
rename to winlibs/lib/xapian-30.dll
index a34a5301..29ff2ef5 100644
Binary files a/winlibs/lib/xapian/rel/xapian-30.dll and b/winlibs/lib/xapian-30.dll differ
diff --git a/winlibs/lib/xapian/rel/xapian.lib b/winlibs/lib/xapian.lib
similarity index 100%
rename from winlibs/lib/xapian/rel/xapian.lib
rename to winlibs/lib/xapian.lib